guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[shepherd] 30/32: Avoid Guile run-time warning about overridden 'sleep'


From: Ludovic Courtès
Subject: [shepherd] 30/32: Avoid Guile run-time warning about overridden 'sleep' binding.
Date: Wed, 30 Mar 2022 11:01:35 -0400 (EDT)

civodul pushed a commit to branch master
in repository shepherd.

commit f1b61f9a588b0707670a108c2c9ed1991d6ef8e3
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Wed Mar 30 12:22:20 2022 +0200

    Avoid Guile run-time warning about overridden 'sleep' binding.
    
    * modules/shepherd.scm: Hide 'sleep' from (fibers) and define it
    locally.
    * modules/shepherd/service.scm: Likewise.
---
 modules/shepherd.scm         | 4 +++-
 modules/shepherd/service.scm | 6 +++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/shepherd.scm b/modules/shepherd.scm
index 80ce642..61d0402 100644
--- a/modules/shepherd.scm
+++ b/modules/shepherd.scm
@@ -20,7 +20,8 @@
 ;; along with the GNU Shepherd.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (shepherd)
-  #:use-module (fibers)
+  #:use-module ((fibers)
+                #:hide (sleep))                   ;avoid Guile warning
   #:use-module (ice-9 match)
   #:use-module (ice-9 format)
   #:use-module (ice-9 rdelim)   ;; Line-based I/O.
@@ -38,6 +39,7 @@
   #:export (main))
 
 
+(define sleep (@ (fibers) sleep))
 
 (define (open-server-socket file-name)
   "Open a socket at FILE-NAME, and listen for connections there."
diff --git a/modules/shepherd/service.scm b/modules/shepherd/service.scm
index d0d6159..14d5d2e 100644
--- a/modules/shepherd/service.scm
+++ b/modules/shepherd/service.scm
@@ -24,7 +24,8 @@
 ;; along with the GNU Shepherd.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (shepherd service)
-  #:use-module (fibers)
+  #:use-module ((fibers)
+                #:hide (sleep))
   #:use-module (fibers scheduler)
   #:use-module (oop goops)
   #:use-module (srfi srfi-1)
@@ -131,6 +132,9 @@
 
             condition->sexp))
 
+
+(define sleep (@ (fibers) sleep))
+
 ;; Keep track of lazy initialization of SIGCHLD handler
 (define %sigchld-handler-installed? #f)
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]