scsh-conservatory
/
scsh-0.5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed ! suffix from SET-INTERRUPT-HANDLER and SET-ENABLED-INTERRUPTS. 

I'm trying to be consistent on this issue, but not very successfully.
This commit is contained in:
shivers 1996-11-11 16:21:53 +00:00
parent d9bf36e0bd
commit c0ab08bd2c
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scsh/scsh-interfaces.scm
View File

@ -991,12 +991,12 @@
(with-enabled-interrupts :syntax) (with-enabled-interrupts :syntax)
with-enabled-interrupts* with-enabled-interrupts*
enabled-interrupts enabled-interrupts
set-enabled-interrupts! set-enabled-interrupts
set-interrupt-handler! set-interrupt-handler
interrupt-handler interrupt-handler
%set-unix-signal-handler! %set-unix-signal-handler
%unix-signal-handler %unix-signal-handler
interrupt/alrm interrupt/alarm interrupt/alrm interrupt/alarm

16
scsh/sighandlers.scm
View File

@ -26,7 +26,7 @@
;;; * Only during a F_SETLKW ;;; * Only during a F_SETLKW
;;; ;;;
;;; From rts/interrupt.scm (package interrupts, interface interrupts-interface) ;;; From rts/interrupt.scm (package interrupts, interface interrupts-interface)
;;; WITH-INTERRUPTS INTERRUPT-HANDLERS SET-ENABLED-INTERRUPTS! ;;; WITH-INTERRUPTS INTERRUPT-HANDLERS SET-ENABLED-INTERRUPTS
;;; ENABLED-INTERRUPTS ;;; ENABLED-INTERRUPTS
;;; Must define WITH-INTERRUPTS* and WITH-INTERRUPTS. ;;; Must define WITH-INTERRUPTS* and WITH-INTERRUPTS.
@ -125,7 +125,7 @@
;;; This handler does nothing -- used when the handler is #f. ;;; This handler does nothing -- used when the handler is #f.
(define (noop-sig-handler enabled-interrupts) #f) (define (noop-sig-handler enabled-interrupts) #f)
(define (set-interrupt-handler! int handler) (define (set-interrupt-handler int handler)
(let ((ohandler (interrupt-handler int))) (let ((ohandler (interrupt-handler int)))
(vector-set! interrupt-handlers int (vector-set! interrupt-handlers int
(case handler (case handler
@ -147,20 +147,20 @@
;;; Returns equivalent code, additionally 3 => other handler. ;;; Returns equivalent code, additionally 3 => other handler.
;;; Raises an error exception if there's a problem. ;;; Raises an error exception if there's a problem.
(define (%set-unix-signal-handler! sig handler-code) (define (%set-unix-signal-handler sig handler-code)
(check-arg (lambda (x) (and (integer? sig) (< 0 sig 32))) (check-arg (lambda (x) (and (integer? sig) (< 0 sig 32)))
sig sig
%set-unix-signal-handler!) %set-unix-signal-handler)
(check-arg (lambda (x) (and (integer? handler-code) (<= 0 handler-code 2))) (check-arg (lambda (x) (and (integer? handler-code) (<= 0 handler-code 2)))
handler-code handler-code
%set-unix-signal-handler!) %set-unix-signal-handler)
(let retry () (let retry ()
(receive (err old-hc) (%%set-unix-signal-handler! sig handler-code) (receive (err old-hc) (%%set-unix-signal-handler sig handler-code)
(cond ((not err) old-hc) (cond ((not err) old-hc)
((= err errno/intr) (retry)) ((= err errno/intr) (retry))
(else (errno-error err %set-unix-signal-handler! sig handler-code)))))) (else (errno-error err %set-unix-signal-handler sig handler-code))))))
(define-foreign %%set-unix-signal-handler! (define-foreign %%set-unix-signal-handler
(scsh_set_sig (fixnum sig) (fixnum hc) (fixnum flags)) (scsh_set_sig (fixnum sig) (fixnum hc) (fixnum flags))
desc ; #f or errno desc ; #f or errno
integer ; previous handler-code integer ; previous handler-code