From: Mathieu Othacehe <m.othacehe@gmail.com>
To: 26341@debbugs.gnu.org
Subject: bug#26341: [PATCH 1/5] build: syscalls: Add reboot.
Date: Sat, 8 Apr 2017 18:03:25 +0200 [thread overview]
Message-ID: <20170408160329.4068-2-m.othacehe@gmail.com> (raw)
In-Reply-To: <20170408160329.4068-1-m.othacehe@gmail.com>
* guix/build/syscalls.scm (static-or-ffi): New macro. Used to dispatch between
static Guile core implementation and FFI version.
(reboot): New export procedure. Reimplemented from guile-linux-syscalls.patch.
(RB_AUTOBOOT, ..., RB_KEXEC): New exported flags replacing static Guile flags.
---
guix/build/syscalls.scm | 36 +++++++++++++++++++++++++++++++++++-
1 file changed, 35 insertions(+), 1 deletion(-)
diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm
index 4bcb2a871..af5ec4b6a 100644
--- a/guix/build/syscalls.scm
+++ b/guix/build/syscalls.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 David Thompson <davet@gnu.org>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -144,7 +145,15 @@
utmpx-address
login-type
utmpx-entries
- (read-utmpx-from-port . read-utmpx)))
+ (read-utmpx-from-port . read-utmpx))
+ #:replace (RB_AUTOBOOT
+ RB_HALT_SYSTEM
+ RB_ENABLED_CAD
+ RB_DISABLE_CAD
+ RB_POWER_OFF
+ RB_SW_SUSPEND
+ RB_KEXEC
+ reboot))
;;; Commentary:
;;;
@@ -409,6 +418,13 @@ the returned procedure is called."
(error (format #f "~a: syscall->procedure failed: ~s"
name args))))))
+(define-syntax-rule (static-or-ffi symbol ffi-procedure)
+ "If SYMBOL is defined in the core Guile module, return the associated
+procedure, otherwise return FFI-PROCEDURE."
+ (if (module-defined? the-scm-module symbol)
+ (module-ref the-scm-module symbol)
+ ffi-procedure))
+
\f
;;;
;;; File systems.
@@ -547,6 +563,24 @@ constants from <sys/mount.h>."
(list device (strerror err))
(list err)))))))
+(define RB_AUTOBOOT #x01234567)
+(define RB_HALT_SYSTEM #xcdef0123)
+(define RB_ENABLED_CAD #x89abcdef)
+(define RB_DISABLE_CAD 0)
+(define RB_POWER_OFF #x4321fedc)
+(define RB_SW_SUSPEND #xd000fce2)
+(define RB_KEXEC #x45584543)
+
+(define reboot
+ (static-or-ffi
+ 'reboot
+ (let ((proc (syscall->procedure int "reboot" (list int))))
+ (lambda* (#:optional (cmd RB_AUTOBOOT))
+ (let-values (((ret err) (proc cmd)))
+ (unless (zero? ret)
+ (throw 'system-error "reboot" "~S: ~A"
+ (list cmd (strerror err))
+ (list err))))))))
(define (kernel? pid)
"Return #t if PID designates a \"kernel thread\" rather than a normal
user-land process."
--
2.12.2
next prev parent reply other threads:[~2017-04-08 16:04 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-02 15:01 bug#26341: [PATCH] build: vm: Add missing module Mathieu Othacehe
2017-04-04 12:41 ` Ludovic Courtès
2017-04-05 10:30 ` Mathieu Othacehe
2017-04-05 10:32 ` Mathieu Othacehe
2017-04-05 21:39 ` Ludovic Courtès
2017-04-06 6:55 ` Mathieu Othacehe
2017-04-06 8:10 ` Ludovic Courtès
2017-04-07 21:36 ` Ludovic Courtès
2017-04-08 9:24 ` Mathieu Othacehe
2017-04-05 21:35 ` Ludovic Courtès
2017-04-06 6:55 ` bug#26341: [PATCH 1/2] build: syscalls: Allow mount and umount use from static Guile Mathieu Othacehe
2017-04-06 6:55 ` bug#26341: [PATCH 2/2] build: vm: Add missing module Mathieu Othacehe
2017-04-08 16:03 ` bug#26341: [PATCH 0/5] Fix warnings related to syscalls in static Guile Mathieu Othacehe
2017-04-08 16:03 ` Mathieu Othacehe [this message]
2017-04-10 9:42 ` bug#26341: [PATCH 1/5] build: syscalls: Add reboot Ludovic Courtès
2017-04-10 13:18 ` Mathieu Othacehe
2017-04-10 13:41 ` Ludovic Courtès
2017-04-10 17:18 ` Mathieu Othacehe
2017-04-08 16:03 ` bug#26341: [PATCH 2/5] build: syscalls: Allow use to network-interface syscalls independently of calling context Mathieu Othacehe
2017-04-08 16:03 ` bug#26341: [PATCH 3/5] build: syscalls: Add mount and umount to #:replace list Mathieu Othacehe
2017-04-08 16:03 ` bug#26341: [PATCH 4/5] build: syscalls: Add load-linux-module Mathieu Othacehe
2017-04-08 16:03 ` bug#26341: [PATCH 5/5] build: Fix compilation warnings Mathieu Othacehe
2017-04-10 17:18 ` bug#26341: [PATCH 1/5] build: syscalls: Add reboot Mathieu Othacehe
2017-04-10 17:18 ` bug#26341: [PATCH 2/5] build: syscalls: Use define-as-needed for mount and umount Mathieu Othacehe
2017-04-10 17:18 ` bug#26341: [PATCH 3/5] build: syscalls: Use define-as-needed for network-interface syscalls Mathieu Othacehe
2017-04-10 17:18 ` bug#26341: [PATCH 4/5] build: syscalls: Add load-linux-module Mathieu Othacehe
2017-04-10 17:18 ` bug#26341: [PATCH 5/5] build: Fix compilation warnings Mathieu Othacehe
2017-04-11 9:15 ` bug#26341: [PATCH 1/5] build: syscalls: Add reboot Ludovic Courtès
2017-04-11 11:39 ` Mathieu Othacehe
2017-04-11 12:20 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170408160329.4068-2-m.othacehe@gmail.com \
--to=m.othacehe@gmail.com \
--cc=26341@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.