From d5ab9743526eab03e7e19469c2c861badd3d152f Mon Sep 17 00:00:00 2001 From: Stelian Ionescu Date: Tue, 23 Oct 2012 11:10:19 +0900 Subject: [PATCH] Add package locks for SBCL --- examples/package.lisp | 2 ++ src/base/asdf.lisp | 4 +++- src/new-cl/conduits.lisp | 7 ++++++- tests/pkgdcl.lisp | 2 ++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/examples/package.lisp b/examples/package.lisp index e154b53..7658c45 100644 --- a/examples/package.lisp +++ b/examples/package.lisp @@ -3,6 +3,8 @@ (defpackage :iolib.examples (:use :cl :iolib :bordeaux-threads) + #+sb-package-locks + (:lock t) (:export :run-ex1-client :run-ex2-client :run-ex3-client diff --git a/src/base/asdf.lisp b/src/base/asdf.lisp index 03676cd..78d6ef1 100644 --- a/src/base/asdf.lisp +++ b/src/base/asdf.lisp @@ -4,7 +4,9 @@ ;;; (defpackage :iolib.asdf - (:use :common-lisp)) + (:use :common-lisp) + #+sb-package-locks + (:lock t)) (in-package :iolib.asdf) (defclass :iolib-muffled-source-file (asdf:cl-source-file) ()) diff --git a/src/new-cl/conduits.lisp b/src/new-cl/conduits.lisp index 5f01fa7..e2b8c0f 100644 --- a/src/new-cl/conduits.lisp +++ b/src/new-cl/conduits.lisp @@ -27,6 +27,8 @@ (cl:defpackage :iolib.internal.conduits (:use :common-lisp) + #+sb-package-locks + (:lock t) ;; redefined CL names (:shadow #:export #:unexport #:defpackage #:delete-package #:rename-package) (:export #:export #:unexport #:defpackage #:delete-package #:rename-package) @@ -355,7 +357,10 @@ As with extending you probably want to specify (:USE) when cloning." (clone-packages-to-package ',cpcs ',name)))) (t `(progn - (cl:defpackage ,name ,@(nreverse dpcs)) + (cl:defpackage ,name + #+sb-package-locks + (:lock t) + ,@(nreverse dpcs)) (recompute-conduits-for ',name)))))) (defun delete-package (pack/name) diff --git a/tests/pkgdcl.lisp b/tests/pkgdcl.lisp index 0f5a75d..7284087 100644 --- a/tests/pkgdcl.lisp +++ b/tests/pkgdcl.lisp @@ -7,4 +7,6 @@ (defpackage #:iolib-tests (:use :5am :iolib.base :iolib :iolib.pathnames) + #+sb-package-locks + (:lock t) (:export #:*echo-address* #:*echo-port*)) -- 2.11.4.GIT