Navigation Menu

Skip to content

Commit

Permalink
0.7.13.2
Browse files Browse the repository at this point in the history
	Remove all #+mp/#-mp conditionals, and rid the world of the
	SB!MP package
  • Loading branch information
telent committed Feb 26, 2003
1 parent 31fb283 commit 6daed98
Show file tree
Hide file tree
Showing 9 changed files with 8 additions and 41 deletions.
2 changes: 0 additions & 2 deletions build-order.lisp-expr
Expand Up @@ -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)
Expand Down
23 changes: 0 additions & 23 deletions package-data-list.lisp-expr
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions src/code/debug.lisp
Expand Up @@ -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

Expand Down
12 changes: 4 additions & 8 deletions src/code/fd-stream.lisp
Expand Up @@ -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"
Expand All @@ -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)))
Expand Down
2 changes: 1 addition & 1 deletion src/code/save.lisp
Expand Up @@ -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*))
Expand Down
3 changes: 1 addition & 2 deletions src/code/serve-event.lisp
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion src/code/toplevel.lisp
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/cold/defun-load-or-cload-xcompiler.lisp
Expand Up @@ -143,7 +143,6 @@
"SB!INT"
"SB!KERNEL"
"SB!LOOP"
#!+mp "SB!MP"
"SB!PCL"
"SB!PRETTY"
"SB!PROFILE"
Expand Down
2 changes: 1 addition & 1 deletion version.lisp-expr
Expand Up @@ -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"

0 comments on commit 6daed98

Please sign in to comment.