From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Kost Subject: [PATCH 10/11] guix system: Rename 'dmd-graph' to 'shepherd-graph'. Date: Thu, 28 Jan 2016 00:10:35 +0300 Message-ID: <1453929036-10408-11-git-send-email-alezost@gmail.com> References: <1453929036-10408-1-git-send-email-alezost@gmail.com> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:46075) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOXMo-0008NM-Vd for guix-devel@gnu.org; Wed, 27 Jan 2016 16:11:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aOXMl-0006f3-DV for guix-devel@gnu.org; Wed, 27 Jan 2016 16:11:06 -0500 Received: from mail-lb0-x242.google.com ([2a00:1450:4010:c04::242]:35372) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOXMk-0006e4-VS for guix-devel@gnu.org; Wed, 27 Jan 2016 16:11:03 -0500 Received: by mail-lb0-x242.google.com with SMTP id dx9so893113lbc.2 for ; Wed, 27 Jan 2016 13:11:02 -0800 (PST) Received: from localhost.localdomain ([217.107.192.146]) by smtp.gmail.com with ESMTPSA id p66sm1045517lfe.42.2016.01.27.13.11.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 27 Jan 2016 13:11:01 -0800 (PST) In-Reply-To: <1453929036-10408-1-git-send-email-alezost@gmail.com> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org * doc/images/dmd-graph.dot: Rename to... * doc/images/shepherd-graph.dot: ... this. * doc.am (DOT_FILES): Adjust accordingly. * .gitignore: Likewise. * guix/scripts/system.scm (dmd-service-node-label) (dmd-service-node-type, export-dmd-graph): Rename to... (shepherd-service-node-label, shepherd-service-node-type) (export-shepherd-graph): ... this. (show-help, process-action, process-command): Rename 'dmd-graph' to 'shepherd-graph'. * emacs/guix-command.el (guix-command-additional-execute-arguments) (guix-command-special-executors): Likewise. * doc/guix.texi: Likewise. * doc/emacs.texi (Emacs Popup Interface): Likewise. --- .gitignore | 2 +- doc.am | 2 +- doc/emacs.texi | 2 +- doc/guix.texi | 10 +++--- doc/images/dmd-graph.dot | 75 ------------------------------------------- doc/images/shepherd-graph.dot | 75 +++++++++++++++++++++++++++++++++++++++++++ emacs/guix-command.el | 4 +-- guix/scripts/system.scm | 24 +++++++------- 8 files changed, 97 insertions(+), 97 deletions(-) delete mode 100644 doc/images/dmd-graph.dot create mode 100644 doc/images/shepherd-graph.dot diff --git a/.gitignore b/.gitignore index 098c9bb..63ade12 100644 --- a/.gitignore +++ b/.gitignore @@ -133,7 +133,7 @@ GTAGS /doc/images/service-graph.png /doc/images/service-graph.eps /doc/images/service-graph.pdf -/doc/images/dmd-graph.png +/doc/images/shepherd-graph.png /doc/images/bootstrap-packages.png /doc/images/bootstrap-packages.eps /doc/images/bootstrap-packages.pdf diff --git a/doc.am b/doc.am index f15efcc..446ce5b 100644 --- a/doc.am +++ b/doc.am @@ -26,7 +26,7 @@ DOT_FILES = \ doc/images/coreutils-graph.dot \ doc/images/coreutils-bag-graph.dot \ doc/images/service-graph.dot \ - doc/images/dmd-graph.dot + doc/images/shepherd-graph.dot DOT_VECTOR_GRAPHICS = \ $(DOT_FILES:%.dot=%.eps) \ diff --git a/doc/emacs.texi b/doc/emacs.texi index 8020e0a..92a9107 100644 --- a/doc/emacs.texi +++ b/doc/emacs.texi @@ -578,7 +578,7 @@ GNU Emacs Manual}). @end itemize -Several commands (@command{guix graph}, @command{guix system dmd-graph} +Several commands (@command{guix graph}, @command{guix system shepherd-graph} and @command{guix system extension-graph}) also have a ``View graph'' action, which allows you to view a generated graph using @command{dot} command (specified by @code{guix-dot-program} variable). By default a diff --git a/doc/guix.texi b/doc/guix.texi index 9882264..74a493a 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -9329,8 +9329,8 @@ $ guix system extension-graph @var{file} | dot -Tpdf > services.pdf produces a PDF file showing the extension relations among services. -@anchor{system-dmd-graph} -@item dmd-graph +@anchor{system-shepherd-graph} +@item shepherd-graph Emit in Dot/Graphviz format to standard output the @dfn{dependency graph} of Shepherd services of the operating system defined in @var{file}. @xref{Shepherd Services}, for more information and for an @@ -9775,11 +9775,11 @@ which in turn can only happen once all the file systems have been mounted. The simple operating system defined earlier (@pxref{Using the Configuration System}) results in a service graph like this: -@image{images/dmd-graph,,5in,Typical dmd service graph.} +@image{images/shepherd-graph,,5in,Typical shepherd service graph.} You can actually generate such a graph for any operating system -definition using the @command{guix system dmd-graph} command -(@pxref{system-dmd-graph, @command{guix system dmd-graph}}). +definition using the @command{guix system shepherd-graph} command +(@pxref{system-shepherd-graph, @command{guix system shepherd-graph}}). The @var{%shepherd-root-service} is a service object representing PID@tie{}1, of type @var{shepherd-root-service-type}; it can be extended diff --git a/doc/images/dmd-graph.dot b/doc/images/dmd-graph.dot deleted file mode 100644 index 220a2af..0000000 --- a/doc/images/dmd-graph.dot +++ /dev/null @@ -1,75 +0,0 @@ -digraph "Guix dmd-service" { - "user-file-systems" [label = "user-file-systems", shape = box, fontname = Helvetica]; - "user-processes" -> "user-file-systems" [color = red]; - "user-processes" [label = "user-processes", shape = box, fontname = Helvetica]; - "nscd" -> "user-processes" [color = red]; - "guix-daemon" -> "user-processes" [color = red]; - "syslogd" -> "user-processes" [color = red]; - "term-tty6" -> "user-processes" [color = red]; - "term-tty5" -> "user-processes" [color = red]; - "term-tty4" -> "user-processes" [color = red]; - "term-tty3" -> "user-processes" [color = red]; - "term-tty2" -> "user-processes" [color = red]; - "term-tty1" -> "user-processes" [color = red]; - "networking" -> "user-processes" [color = red]; - "nscd" [label = "nscd", shape = box, fontname = Helvetica]; - "guix-daemon" [label = "guix-daemon", shape = box, fontname = Helvetica]; - "syslogd" [label = "syslogd", shape = box, fontname = Helvetica]; - "ssh-daemon" -> "syslogd" [color = red]; - "ssh-daemon" [label = "ssh-daemon", shape = box, fontname = Helvetica]; - "term-tty6" [label = "term-tty6", shape = box, fontname = Helvetica]; - "console-font-tty6" -> "term-tty6" [color = red]; - "console-font-tty6" [label = "console-font-tty6", shape = box, fontname = Helvetica]; - "term-tty5" [label = "term-tty5", shape = box, fontname = Helvetica]; - "console-font-tty5" -> "term-tty5" [color = red]; - "console-font-tty5" [label = "console-font-tty5", shape = box, fontname = Helvetica]; - "term-tty4" [label = "term-tty4", shape = box, fontname = Helvetica]; - "console-font-tty4" -> "term-tty4" [color = red]; - "console-font-tty4" [label = "console-font-tty4", shape = box, fontname = Helvetica]; - "term-tty3" [label = "term-tty3", shape = box, fontname = Helvetica]; - "console-font-tty3" -> "term-tty3" [color = red]; - "console-font-tty3" [label = "console-font-tty3", shape = box, fontname = Helvetica]; - "term-tty2" [label = "term-tty2", shape = box, fontname = Helvetica]; - "console-font-tty2" -> "term-tty2" [color = red]; - "console-font-tty2" [label = "console-font-tty2", shape = box, fontname = Helvetica]; - "term-tty1" [label = "term-tty1", shape = box, fontname = Helvetica]; - "console-font-tty1" -> "term-tty1" [color = red]; - "console-font-tty1" [label = "console-font-tty1", shape = box, fontname = Helvetica]; - "networking" [label = "networking", shape = box, fontname = Helvetica]; - "ssh-daemon" -> "networking" [color = red]; - "root-file-system" [label = "root-file-system", shape = box, fontname = Helvetica]; - "file-system-/run/user" -> "root-file-system" [color = red]; - "file-system-/run/systemd" -> "root-file-system" [color = red]; - "file-system-/gnu/store" -> "root-file-system" [color = red]; - "file-system-/dev/shm" -> "root-file-system" [color = red]; - "file-system-/dev/pts" -> "root-file-system" [color = red]; - "user-processes" -> "root-file-system" [color = red]; - "udev" -> "root-file-system" [color = red]; - "file-system-/run/user" [label = "file-system-/run/user", shape = box, fontname = Helvetica]; - "user-processes" -> "file-system-/run/user" [color = red]; - "file-system-/run/systemd" [label = "file-system-/run/systemd", shape = box, fontname = Helvetica]; - "user-processes" -> "file-system-/run/systemd" [color = red]; - "file-system-/gnu/store" [label = "file-system-/gnu/store", shape = box, fontname = Helvetica]; - "user-processes" -> "file-system-/gnu/store" [color = red]; - "file-system-/dev/shm" [label = "file-system-/dev/shm", shape = box, fontname = Helvetica]; - "user-processes" -> "file-system-/dev/shm" [color = red]; - "file-system-/dev/pts" [label = "file-system-/dev/pts", shape = box, fontname = Helvetica]; - "user-processes" -> "file-system-/dev/pts" [color = red]; - "udev" [label = "udev", shape = box, fontname = Helvetica]; - "term-tty6" -> "udev" [color = red]; - "term-tty5" -> "udev" [color = red]; - "term-tty4" -> "udev" [color = red]; - "term-tty3" -> "udev" [color = red]; - "term-tty2" -> "udev" [color = red]; - "term-tty1" -> "udev" [color = red]; - "networking" -> "udev" [color = red]; - "host-name" [label = "host-name", shape = box, fontname = Helvetica]; - "term-tty6" -> "host-name" [color = red]; - "term-tty5" -> "host-name" [color = red]; - "term-tty4" -> "host-name" [color = red]; - "term-tty3" -> "host-name" [color = red]; - "term-tty2" -> "host-name" [color = red]; - "term-tty1" -> "host-name" [color = red]; - "loopback" [label = "loopback", shape = box, fontname = Helvetica]; - -} diff --git a/doc/images/shepherd-graph.dot b/doc/images/shepherd-graph.dot new file mode 100644 index 0000000..cc9aa44 --- /dev/null +++ b/doc/images/shepherd-graph.dot @@ -0,0 +1,75 @@ +digraph "Guix shepherd-service" { + "user-file-systems" [label = "user-file-systems", shape = box, fontname = Helvetica]; + "user-processes" -> "user-file-systems" [color = red]; + "user-processes" [label = "user-processes", shape = box, fontname = Helvetica]; + "nscd" -> "user-processes" [color = red]; + "guix-daemon" -> "user-processes" [color = red]; + "syslogd" -> "user-processes" [color = red]; + "term-tty6" -> "user-processes" [color = red]; + "term-tty5" -> "user-processes" [color = red]; + "term-tty4" -> "user-processes" [color = red]; + "term-tty3" -> "user-processes" [color = red]; + "term-tty2" -> "user-processes" [color = red]; + "term-tty1" -> "user-processes" [color = red]; + "networking" -> "user-processes" [color = red]; + "nscd" [label = "nscd", shape = box, fontname = Helvetica]; + "guix-daemon" [label = "guix-daemon", shape = box, fontname = Helvetica]; + "syslogd" [label = "syslogd", shape = box, fontname = Helvetica]; + "ssh-daemon" -> "syslogd" [color = red]; + "ssh-daemon" [label = "ssh-daemon", shape = box, fontname = Helvetica]; + "term-tty6" [label = "term-tty6", shape = box, fontname = Helvetica]; + "console-font-tty6" -> "term-tty6" [color = red]; + "console-font-tty6" [label = "console-font-tty6", shape = box, fontname = Helvetica]; + "term-tty5" [label = "term-tty5", shape = box, fontname = Helvetica]; + "console-font-tty5" -> "term-tty5" [color = red]; + "console-font-tty5" [label = "console-font-tty5", shape = box, fontname = Helvetica]; + "term-tty4" [label = "term-tty4", shape = box, fontname = Helvetica]; + "console-font-tty4" -> "term-tty4" [color = red]; + "console-font-tty4" [label = "console-font-tty4", shape = box, fontname = Helvetica]; + "term-tty3" [label = "term-tty3", shape = box, fontname = Helvetica]; + "console-font-tty3" -> "term-tty3" [color = red]; + "console-font-tty3" [label = "console-font-tty3", shape = box, fontname = Helvetica]; + "term-tty2" [label = "term-tty2", shape = box, fontname = Helvetica]; + "console-font-tty2" -> "term-tty2" [color = red]; + "console-font-tty2" [label = "console-font-tty2", shape = box, fontname = Helvetica]; + "term-tty1" [label = "term-tty1", shape = box, fontname = Helvetica]; + "console-font-tty1" -> "term-tty1" [color = red]; + "console-font-tty1" [label = "console-font-tty1", shape = box, fontname = Helvetica]; + "networking" [label = "networking", shape = box, fontname = Helvetica]; + "ssh-daemon" -> "networking" [color = red]; + "root-file-system" [label = "root-file-system", shape = box, fontname = Helvetica]; + "file-system-/run/user" -> "root-file-system" [color = red]; + "file-system-/run/systemd" -> "root-file-system" [color = red]; + "file-system-/gnu/store" -> "root-file-system" [color = red]; + "file-system-/dev/shm" -> "root-file-system" [color = red]; + "file-system-/dev/pts" -> "root-file-system" [color = red]; + "user-processes" -> "root-file-system" [color = red]; + "udev" -> "root-file-system" [color = red]; + "file-system-/run/user" [label = "file-system-/run/user", shape = box, fontname = Helvetica]; + "user-processes" -> "file-system-/run/user" [color = red]; + "file-system-/run/systemd" [label = "file-system-/run/systemd", shape = box, fontname = Helvetica]; + "user-processes" -> "file-system-/run/systemd" [color = red]; + "file-system-/gnu/store" [label = "file-system-/gnu/store", shape = box, fontname = Helvetica]; + "user-processes" -> "file-system-/gnu/store" [color = red]; + "file-system-/dev/shm" [label = "file-system-/dev/shm", shape = box, fontname = Helvetica]; + "user-processes" -> "file-system-/dev/shm" [color = red]; + "file-system-/dev/pts" [label = "file-system-/dev/pts", shape = box, fontname = Helvetica]; + "user-processes" -> "file-system-/dev/pts" [color = red]; + "udev" [label = "udev", shape = box, fontname = Helvetica]; + "term-tty6" -> "udev" [color = red]; + "term-tty5" -> "udev" [color = red]; + "term-tty4" -> "udev" [color = red]; + "term-tty3" -> "udev" [color = red]; + "term-tty2" -> "udev" [color = red]; + "term-tty1" -> "udev" [color = red]; + "networking" -> "udev" [color = red]; + "host-name" [label = "host-name", shape = box, fontname = Helvetica]; + "term-tty6" -> "host-name" [color = red]; + "term-tty5" -> "host-name" [color = red]; + "term-tty4" -> "host-name" [color = red]; + "term-tty3" -> "host-name" [color = red]; + "term-tty2" -> "host-name" [color = red]; + "term-tty1" -> "host-name" [color = red]; + "loopback" [label = "loopback", shape = box, fontname = Helvetica]; + +} diff --git a/emacs/guix-command.el b/emacs/guix-command.el index cf72b0e..ba6c3d2 100644 --- a/emacs/guix-command.el +++ b/emacs/guix-command.el @@ -620,7 +620,7 @@ command." (("size") ,(guix-command-make-argument :name "view" :char ?v :doc "View map")) - (("system" "dmd-graph") ,graph-arg) + (("system" "shepherd-graph") ,graph-arg) (("system" "extension-graph") ,graph-arg))) "Alist of guix commands and additional 'execute' action arguments.") @@ -646,7 +646,7 @@ command." ("view" . guix-run-view-graph)) (("size") ("view" . guix-run-view-size-map)) - (("system" "dmd-graph") + (("system" "shepherd-graph") ("view" . guix-run-view-graph)) (("system" "extension-graph") ("view" . guix-run-view-graph))) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index b0f8be7..e31eec6 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -312,17 +312,17 @@ list of services." (label service-node-label) (edges (lift1 (service-back-edges services) %store-monad)))) -(define (dmd-service-node-label service) +(define (shepherd-service-node-label service) "Return a label for a node representing a ." (string-join (map symbol->string (shepherd-service-provision service)))) -(define (dmd-service-node-type services) +(define (shepherd-service-node-type services) "Return a node type for SERVICES, a list of ." (node-type - (name "dmd-service") - (description "the dependency graph of dmd services") - (identifier (lift1 dmd-service-node-label %store-monad)) - (label dmd-service-node-label) + (name "shepherd-service") + (description "the dependency graph of shepherd services") + (identifier (lift1 shepherd-service-node-label %store-monad)) + (label shepherd-service-node-label) (edges (lift1 (shepherd-service-back-edges services) %store-monad)))) @@ -474,7 +474,7 @@ building anything." #:node-type (service-node-type services) #:reverse-edges? #t))) -(define (export-dmd-graph os port) +(define (export-shepherd-graph os port) "Export the graph of shepherd services of OS to PORT." (let* ((services (operating-system-services os)) (pid1 (fold-services services @@ -484,7 +484,7 @@ building anything." (null? (shepherd-service-requirement service))) shepherds))) (export-graph sinks (current-output-port) - #:node-type (dmd-service-node-type dmds) + #:node-type (shepherd-service-node-type shepherds) #:reverse-edges? #t))) @@ -517,7 +517,7 @@ Build the operating system declared in FILE according to ACTION.\n")) (display (_ "\ extension-graph emit the service extension graph in Dot format\n")) (display (_ "\ - dmd-graph emit the graph of dmd services in Dot format\n")) + shepherd-graph emit the graph of shepherd services in Dot format\n")) (show-build-options-help) (display (_ " @@ -637,8 +637,8 @@ resulting from command-line parsing." (case action ((extension-graph) (export-extension-graph os (current-output-port))) - ((dmd-graph) - (export-dmd-graph os (current-output-port))) + ((shepherd-graph) + (export-shepherd-graph os (current-output-port))) (else (perform-action action os #:dry-run? dry? @@ -678,7 +678,7 @@ argument list and OPTS is the option alist." (let ((action (string->symbol arg))) (case action ((build container vm vm-image disk-image reconfigure init - extension-graph dmd-graph list-generations) + extension-graph shepherd-graph list-generations) (alist-cons 'action action result)) (else (leave (_ "~a: unknown action~%") action)))))) -- 2.6.3