nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

services: shepherd: Compile service files. 

This reduces resident memory for PID 1 from 29.8MiB to 28.7MiB right
after boot on a bare-bones system (x86_64-linux).

* gnu/services/shepherd.scm (scm->go): New procedure.
(shepherd-configuration-file)[config]: Call it and use 'load-compiled'
instead of 'primitive-load'.
This commit is contained in:
Ludovic Courtès 2019-10-06 12:51:33 +02:00
parent 38b1ea0434
commit 63b0ce391f
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 44 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
gnu/services/shepherd.scm
View File

@ -255,6 +255,22 @@ stored."
#~(#$name #$doc #$proc))) #~(#$name #$doc #$proc)))
(shepherd-service-actions service)))))))) (shepherd-service-actions service))))))))
(define (scm->go file)
"Compile FILE, which contains code to be loaded by shepherd's config file,
and return the resulting '.go' file."
(with-extensions (list shepherd)
(computed-file (string-append (basename (scheme-file-name file) ".scm")
".go")
#~(begin
(use-modules (system base compile))
;; Do the same as the Shepherd's 'load-in-user-module'.
(let ((env (make-fresh-user-module)))
(module-use! env (resolve-interface '(oop goops)))
(module-use! env (resolve-interface '(shepherd service)))
(compile-file #$file #:output-file #$output
#:env env))))))
(define (shepherd-configuration-file services) (define (shepherd-configuration-file services)
"Return the shepherd configuration file for SERVICES." "Return the shepherd configuration file for SERVICES."
(assert-valid-graph services) (assert-valid-graph services)
@ -269,36 +285,37 @@ stored."
;; than a kernel panic. ;; than a kernel panic.
(call-with-error-handling (call-with-error-handling
(lambda () (lambda ()
(apply register-services (map primitive-load '#$files)) (apply register-services
(map load-compiled '#$(map scm->go files)))))
;; guix-daemon 0.6 aborts if 'PATH' is undefined, so work around ;; guix-daemon 0.6 aborts if 'PATH' is undefined, so work around
;; it. ;; it.
(setenv "PATH" "/run/current-system/profile/bin") (setenv "PATH" "/run/current-system/profile/bin")
(format #t "starting services...~%") (format #t "starting services...~%")
(for-each (lambda (service) (for-each (lambda (service)
;; In the Shepherd 0.3 the 'start' method can raise ;; In the Shepherd 0.3 the 'start' method can raise
;; '&action-runtime-error' if it fails, so protect ;; '&action-runtime-error' if it fails, so protect
;; against it. (XXX: 'action-runtime-error?' is not ;; against it. (XXX: 'action-runtime-error?' is not
;; exported is 0.3, hence 'service-error?'.) ;; exported is 0.3, hence 'service-error?'.)
(guard (c ((service-error? c) (guard (c ((service-error? c)
(format (current-error-port) (format (current-error-port)
"failed to start service '~a'~%" "failed to start service '~a'~%"
service))) service)))
(start service))) (start service)))
'#$(append-map shepherd-service-provision '#$(append-map shepherd-service-provision
(filter shepherd-service-auto-start? (filter shepherd-service-auto-start?
services))) services)))
;; Hang up stdin. At this point, we assume that 'start' methods ;; Hang up stdin. At this point, we assume that 'start' methods
;; that required user interaction on the console (e.g., ;; that required user interaction on the console (e.g.,
;; 'cryptsetup open' invocations, post-fsck emergency REPL) have ;; 'cryptsetup open' invocations, post-fsck emergency REPL) have
;; completed. User interaction becomes impossible after this ;; completed. User interaction becomes impossible after this
;; call; this avoids situations where services wrongfully lead ;; call; this avoids situations where services wrongfully lead
;; PID 1 to read from stdin (the console), which users may not ;; PID 1 to read from stdin (the console), which users may not
;; have access to (see <https://bugs.gnu.org/23697>). ;; have access to (see <https://bugs.gnu.org/23697>).
(redirect-port (open-input-file "/dev/null") (redirect-port (open-input-file "/dev/null")
(current-input-port)))))) (current-input-port))))
(scheme-file "shepherd.conf" config))) (scheme-file "shepherd.conf" config)))