r10151: updates

diff --git a/io.lisp b/io.lisp
index aedca9942a166d716bf11f44c227d711176ee105..4f896ed7584219f32fd425f0fcab74b7cdf5a41b 100644 (file)
--- a/io.lisp
+++ b/io.lisp
@@ -45,7 +45,7 @@
 
 (defun read-file-to-usb8-array (file)
   "Opens a reads a file. Returns the contents as single unsigned-byte array"
-  (with-open-file (in file :direction :input)
+  (with-open-file (in file :direction :input :element-type '(unsigned-byte 8))
     (let* ((file-len (file-length in))
           (usb8 (make-array file-len :element-type '(unsigned-byte 8)))
           (pos (read-sequence usb8 in)))
@@ -322,7 +322,7 @@
     (write-char #\: stream)
     (write-string (aref +datetime-number-strings+ minute) stream)))
 
-(defun copy-binary-stream (in out &key (chunk-size 4096))
+(defun copy-binary-stream (in out &key (chunk-size 16384))
   (do* ((buf (make-array chunk-size :element-type '(unsigned-byte 8)))
        (pos (read-sequence buf in) (read-sequence buf in)))
       ((zerop pos))

diff --git a/lists.lisp b/lists.lisp
index c18fe7e1982bf7ba03041b05315b34df815fcd54..dfa9d386d25d5c9f100c317372442b3ef15adcff 100644 (file)
--- a/lists.lisp
+++ b/lists.lisp
@@ -199,3 +199,5 @@
        (unless (find value uniq :test test)
          (push value uniq))))))
 
+
+

diff --git a/processes.lisp b/processes.lisp
index f89d010931b1a3f8e8eabe77b123ada76954c2c7..88aa05113da3613e973a863dd318fc2d4d275be9 100644 (file)
--- a/processes.lisp
+++ b/processes.lisp
@@ -43,7 +43,7 @@
   #+lispworks
   `(mp:with-lock (,lock) ,@body)
   #+sb-thread
-  `(sb-thread:with-recursive-lock (,lock) ,@body)
+  `(sb-thread:with-mutex (,lock) ,@body)
   #-(or allegro cmu lispworks sb-thread)
   `(progn ,@body)
   )

diff --git a/sockets.lisp b/sockets.lisp
index 2fa854759bcfbfe1e4ec8113df8ba34e87817da8..f105501777be5e122c3cdf012c5c44ff6ca0b1e9 100644 (file)
--- a/sockets.lisp
+++ b/sockets.lisp
@@ -117,7 +117,6 @@ setsockopt SO_REUSEADDR if :reuse is not nil"
 (defun close-active-socket (socket)
   (close socket))
 
-#+sbcl
 (defun ipaddr-to-dotted (ipaddr &key values)
   "Convert from 32-bit integer to dotted string."
   (declare (type (unsigned-byte 32) ipaddr))
@@ -129,7 +128,6 @@ setsockopt SO_REUSEADDR if :reuse is not nil"
        (values a b c d)
       (format nil "~d.~d.~d.~d" a b c d))))
 
-#+sbcl
 (defun dotted-to-ipaddr (dotted &key (errorp t))
   "Convert from dotted string to 32-bit integer."
   (declare (string dotted))