Allow multithread write

.travis.yml

@@ -21,7 +21,7 @@ addons:
 
 install:
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install libev; fi
-  - curl -L https://raw.githubusercontent.com/snmsts/roswell/$ROSWELL_BRANCH/scripts/install-for-ci.sh | sh
+  - curl -L https://raw.githubusercontent.com/roswell/roswell/$ROSWELL_BRANCH/scripts/install-for-ci.sh | sh
   # for thread-support on OS X
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then ros install sbcl; fi
 

clack-handler-woo.asd

@@ -1,7 +1,2 @@
-(in-package :cl-user)
-(defpackage clack-handler-woo-asd
-  (:use :cl :asdf))
-(in-package :clack-handler-woo-asd)
-
-(defsystem clack-handler-woo
-  :depends-on (:woo))
+(defsystem "clack-handler-woo"
+  :depends-on ("woo"))

src/ev/socket.lisp

@@ -38,6 +38,8 @@
                 :with-pointer-to-vector-data
                 :incf-pointer
                 :foreign-free)
+  (:import-from :alexandria
+                :once-only)
   (:export :socket
            :make-socket
            :socket-read-watcher
@@ -79,7 +81,8 @@
   (buffer (make-output-buffer))
   (sendfile-fd nil :type (or null fixnum))
   (sendfile-size nil :type (or null integer))
-  (sendfile-offset 0 :type (or null integer)))
+  (sendfile-offset 0 :type (or null integer))
+  (thread (bt:current-thread)))
 
 (defun buffer-empty-p (socket)
   (declare (optimize (speed 3) (safety 0) (debug 0)))
@@ -292,13 +295,17 @@
     (async-write socket)))
 
 (defmacro with-async-writing ((socket &key write-cb force-streaming) &body body)
-  `(progn
-     ,@body
-     (setf (socket-write-cb ,socket) ,write-cb)
-     ,(if force-streaming
-          `(unless (async-write ,socket)
-             (lev:ev-io-start *evloop* (socket-write-watcher ,socket)))
-          `(lev:ev-io-start *evloop* (socket-write-watcher ,socket)))))
+  (once-only (socket)
+    `(progn
+       ,@body
+       (setf (socket-write-cb ,socket) ,write-cb)
+       (bt:interrupt-thread
+        (socket-thread ,socket)
+        (lambda ()
+          ,(if force-streaming
+               `(unless (async-write ,socket)
+                  (lev:ev-io-start *evloop* (socket-write-watcher ,socket)))
+               `(lev:ev-io-start *evloop* (socket-write-watcher ,socket))))))))
 
 (defun send-static-file (socket fd size)
   (with-slots (sendfile-fd sendfile-size sendfile-offset) socket

woo-test.asd

@@ -1,14 +1,8 @@
-(in-package :cl-user)
-(defpackage woo-test-asd
-  (:use :cl :asdf))
-(in-package :woo-test-asd)
-
-(defsystem woo-test
-  :defsystem-depends-on (:prove-asdf)
-  :depends-on (:woo
-               :clack-test)
+(defsystem "woo-test"
+  :defsystem-depends-on ("prove-asdf")
+  :depends-on ("woo"
+               "clack-test")
   :components
   ((:test-file "t/woo")
    (:test-file "t/ipv6"))
-  :perform (test-op :after (op c)
-                    (funcall (intern #.(string :run-test-system) :prove) c)))
+  :perform (test-op (op c) (symbol-call :prove-asdf :run-test-system c)))