From 6daed982c84c6679df360561d48e8817bf6ed583 Mon Sep 17 00:00:00 2001 From: Daniel Barlow Date: Wed, 26 Feb 2003 02:18:45 +0000 Subject: [PATCH] 0.7.13.2 Remove all #+mp/#-mp conditionals, and rid the world of the SB!MP package --- build-order.lisp-expr | 2 -- package-data-list.lisp-expr | 23 ----------------------- src/code/debug.lisp | 3 +-- src/code/fd-stream.lisp | 12 ++++-------- src/code/save.lisp | 2 +- src/code/serve-event.lisp | 3 +-- src/code/toplevel.lisp | 1 - src/cold/defun-load-or-cload-xcompiler.lisp | 1 - version.lisp-expr | 2 +- 9 files changed, 8 insertions(+), 41 deletions(-) diff --git a/build-order.lisp-expr b/build-order.lisp-expr index 126ac55..26cbf1c 100644 --- a/build-order.lisp-expr +++ b/build-order.lisp-expr @@ -265,8 +265,6 @@ ("src/code/weak" :not-host) ("src/code/final" :not-host) - #!+mp ("src/code/multi-proc" :not-host) - ("src/code/setf-funs" :not-host) ("src/code/stubs" :not-host) diff --git a/package-data-list.lisp-expr b/package-data-list.lisp-expr index 360df7f..78b17cb 100644 --- a/package-data-list.lisp-expr +++ b/package-data-list.lisp-expr @@ -1381,29 +1381,6 @@ is a good idea, but see SB-SYS re. blurring of boundaries." :use ("CL") :export ()) - #!+mp - #s(sb-cold:package-data - :name "SB!MP" - :doc "public (but unstable): multiprocessing support" - :export ("*ALL-PROCESSES*" "*CURRENT-PROCESS*" - "*CURRENT-STACK-GROUP*" "*INITIAL-STACK-GROUP*" - "*MULTI-PROCESSING*" "ALL-PROCESSES" - "ATOMIC-DECF" "ATOMIC-INCF" "ATOMIC-POP" - "ATOMIC-PUSH" "CURRENT-PROCESS" - "DESTROY-PROCESS" "DISABLE-PROCESS" - "ENABLE-PROCESS" "INIT-STACK-GROUPS" - "LOCK" "MAKE-STACK-GROUP" "MAKE-LOCK" - "MAKE-PROCESS" "PROCESS-ACTIVE-P" "PROCESS-ALIVE-P" - "PROCESS-IDLE-TIME" "PROCESS-INTERRUPT" - "PROCESS-NAME" "PROCESS-PRESET" - "PROCESS-REAL-TIME" "PROCESS-RUN-TIME" - "PROCESS-STATE" "PROCESS-WAIT-UNTIL-FD-USABLE" - "PROCESS-WAIT" "PROCESS-WAIT-WITH-TIMEOUT" - "PROCESS-WHOSTATE" "PROCESS-YIELD" "PROCESSP" - "RESTART-PROCESS" "SHOW-PROCESSES" - "STACK-GROUP-RESUME" "WITHOUT-SCHEDULING" - "WITH-LOCK-HELD")) - #s(sb-cold:package-data :name "SB!PCL" :doc diff --git a/src/code/debug.lisp b/src/code/debug.lisp index 3fa6b09..0e33618 100644 --- a/src/code/debug.lisp +++ b/src/code/debug.lisp @@ -814,8 +814,7 @@ reset to ~S." (*read-suppress* nil)) (unless (typep *debug-condition* 'step-condition) (clear-input *debug-io*)) - #!-mp (debug-loop) - #!+mp (sb!mp:without-scheduling (debug-loop)))) + (debug-loop))) ;;;; DEBUG-LOOP diff --git a/src/code/fd-stream.lisp b/src/code/fd-stream.lisp index 824636e..e053d17 100644 --- a/src/code/fd-stream.lisp +++ b/src/code/fd-stream.lisp @@ -457,10 +457,8 @@ (case count (1) (0 - (unless #!-mp (sb!sys:wait-until-fd-usable - fd :input (fd-stream-timeout stream)) - #!+mp (sb!mp:process-wait-until-fd-usable - fd :input (fd-stream-timeout stream)) + (unless (sb!sys:wait-until-fd-usable + fd :input (fd-stream-timeout stream)) (error 'io-timeout :stream stream :direction :read))) (t (simple-stream-perror "couldn't check whether ~S is readable" @@ -473,10 +471,8 @@ (cond ((null count) (if (eql errno sb!unix:ewouldblock) (progn - (unless #!-mp (sb!sys:wait-until-fd-usable - fd :input (fd-stream-timeout stream)) - #!+mp (sb!mp:process-wait-until-fd-usable - fd :input (fd-stream-timeout stream)) + (unless (sb!sys:wait-until-fd-usable + fd :input (fd-stream-timeout stream)) (error 'io-timeout :stream stream :direction :read)) (frob-input stream)) (simple-stream-perror "couldn't read from ~S" stream errno))) diff --git a/src/code/save.lisp b/src/code/save.lisp index 1c0c79e..f1ed1e9 100644 --- a/src/code/save.lisp +++ b/src/code/save.lisp @@ -74,7 +74,7 @@ This is reinitialized to reflect the working directory where the saved core is loaded." - #!+mp (sb!mp::shutdown-multi-processing) + ;; FIXME (sb!mp::shutdown-multi-processing) ;; FIXME: What is this for? Explain. (when (fboundp 'cancel-finalization) (cancel-finalization sb!sys:*tty*)) diff --git a/src/code/serve-event.lisp b/src/code/serve-event.lisp index a6cb763..7b1b4e9 100644 --- a/src/code/serve-event.lisp +++ b/src/code/serve-event.lisp @@ -282,8 +282,7 @@ ;;; polling function if it does time out. One important use of this ;;; is to periodically call process-yield. (declaim (type (or null function) *periodic-polling-function*)) -(defvar *periodic-polling-function* - #!-mp nil #!+mp #'sb!mp:process-yield) +(defvar *periodic-polling-function* nil) (declaim (type (unsigned-byte 29) *max-event-to-sec* *max-event-to-usec*)) (defvar *max-event-to-sec* 1) (defvar *max-event-to-usec* 0) diff --git a/src/code/toplevel.lisp b/src/code/toplevel.lisp index 2242b33..2b76918 100644 --- a/src/code/toplevel.lisp +++ b/src/code/toplevel.lisp @@ -126,7 +126,6 @@ ;;;; miscellaneous external functions -#!-mp ; The multi-processing version is defined in multi-proc.lisp. (defun sleep (n) #!+sb-doc "This function causes execution to be suspended for N seconds. N may diff --git a/src/cold/defun-load-or-cload-xcompiler.lisp b/src/cold/defun-load-or-cload-xcompiler.lisp index c83c01e..55bb02a 100644 --- a/src/cold/defun-load-or-cload-xcompiler.lisp +++ b/src/cold/defun-load-or-cload-xcompiler.lisp @@ -143,7 +143,6 @@ "SB!INT" "SB!KERNEL" "SB!LOOP" - #!+mp "SB!MP" "SB!PCL" "SB!PRETTY" "SB!PROFILE" diff --git a/version.lisp-expr b/version.lisp-expr index c283bb9..e95ba52 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -18,4 +18,4 @@ ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.7.13.1" +"0.7.13.2" -- 1.7.10.4