Commit ddfa2d41d2bc1db77689ffc8eb53b1286da80151
2018-06-16T14:18:49
thot-simple -> thot-select
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174
diff --git a/README b/README
index ffc1e8d..7219d25 100644
--- a/README
+++ b/README
@@ -1,6 +1,14 @@
+Threaded HTTP server supporting EPOLL in Common Lisp
-(asdf:load-system :thot)
+Thot has the following acceptor loops :
+ epoll unthreaded, using epoll(7) on Linux
+ select unthreaded, using select(2)
+ threaded threaded defaults to 8 threads, see *INIT-THREADS*
-(thot:start)
+The threaded loop has the following worker loops :
+ epoll using epoll(7) on Linux
+ select using select(2)
-(thot:start :port 8000)
+Usage :
+ (asdf:load-system :thot)
+ (thot:start)
diff --git a/thot-select.lisp b/thot-select.lisp
new file mode 100644
index 0000000..0660be2
--- /dev/null
+++ b/thot-select.lisp
@@ -0,0 +1,61 @@
+;;
+;; Thot - http web server
+;; Copyright 2017,2018 Thomas de Grivel <thoxdg@gmail.com> 0614550127
+;;
+
+(in-package :thot)
+
+(defun request-loop-simple (request-stream reply-stream)
+ (loop
+ (when *stop*
+ (return))
+ (handler-case
+ (let* ((req (make-instance 'request :stream request-stream))
+ (reply (make-instance 'reply :stream reply-stream))
+ (reader (request-reader req reply))
+ (result (funcall (the function reader))))
+ (unless (eq :keep-alive result)
+ (return)))
+ (warning (w)
+ (msg warn w)
+ (continue))
+ (error (e)
+ (msg error e)
+ (return)))))
+
+(defun fd= (a b)
+ (= (the unistd:file-descriptor a) (the unistd:file-descriptor b)))
+
+(defun acceptor-loop-select (fd &optional pipe)
+ (declare (type unistd:file-descriptor fd))
+ (let ((readfds))
+ (push fd readfds)
+ (when pipe
+ (push (the unistd:file-descriptor pipe) readfds))
+ (loop
+ (when *stop*
+ (return))
+ (unistd:with-selected (readfds () () 100)
+ (readable writable errors)
+ (when (and pipe
+ (find pipe readable :test #'fd=))
+ (return))
+ (when (find fd readable :test #'fd=)
+ (socket:with-accept (clientfd) fd
+ (let ((request-stream
+ (babel-input-stream
+ (unistd-input-stream clientfd)))
+ (reply-stream
+ (babel-output-stream
+ (multi-buffered-output-stream
+ (unistd-output-stream clientfd)))))
+ (request-loop-simple request-stream
+ reply-stream))))))))
+
+(defun configure-select ()
+ (setf *acceptor-loop* #'acceptor-loop-select))
+
+(eval-when (:load-toplevel :execute)
+ (configure-select))
+
+;(trace acceptor-loop-select request-loop-simple cffi-socket:accept unistd:write stream-flush stream-flush-output unistd:close)
diff --git a/thot-simple.lisp b/thot-simple.lisp
deleted file mode 100644
index 3b8ae47..0000000
--- a/thot-simple.lisp
+++ /dev/null
@@ -1,38 +0,0 @@
-;;
-;; Thot - http web server
-;; Copyright 2017,2018 Thomas de Grivel <thoxdg@gmail.com> 0614550127
-;;
-
-(in-package :thot)
-
-(defun acceptor-loop-simple (fd &optional pipe)
- (declare (type (unsigned-byte 31) fd))
- (let ((readfds))
- (push fd readfds)
- (when pipe
- (push pipe readfds))
- (labels ((acceptor-loop-simple-fun ()
- (loop
- (when *stop*
- (return))
- (unistd:with-selected (readfds () () 100)
- (readable writable errors)
- (when (and pipe (find pipe readable))
- (return))
- (when (find fd readable)
- (socket:with-accept (clientfd) fd
- (let ((request-stream
- (babel-input-stream
- (unistd-input-stream clientfd)))
- (reply-stream
- (babel-output-stream
- (multi-buffered-output-stream
- (unistd-output-stream clientfd)))))
- (request-loop request-stream
- reply-stream))))))))
- #'acceptor-loop-simple-fun)))
-
-(eval-when (:load-toplevel :execute)
- (setq *acceptor-loop* 'acceptor-loop-simple))
-
-;(trace acceptor-loop-simple request-loop cffi-socket:accept unistd:write stream-flush stream-flush-output unistd:close)
diff --git a/thot.asd b/thot.asd
index 70a829d..482b7cc 100644
--- a/thot.asd
+++ b/thot.asd
@@ -30,6 +30,6 @@
((:file "package")
(:file "mime" :depends-on ("package"))
(:file "thot" :depends-on ("mime"))
- (:file "thot-simple" :depends-on ("thot"))
- (:file "thot-threaded" :depends-on ("thot-simple"))
- #+linux (:file "thot-epoll" :depends-on ("thot-threaded"))))
+ (:file "thot-select" :depends-on ("thot"))
+ (:file "thot-threaded" :depends-on ("thot"))
+ #+linux (:file "thot-epoll" :depends-on ("thot"))))
diff --git a/thot.lisp b/thot.lisp
index 227984d..fcc7f09 100644
--- a/thot.lisp
+++ b/thot.lisp
@@ -552,22 +552,6 @@ The requested url "
(defvar *stop* nil)
-(defun request-loop (request-stream reply-stream)
- (loop
- (when *stop*
- (return))
- (handler-case
- (let* ((req (make-instance 'request :stream request-stream))
- (reply (make-instance 'reply :stream reply-stream))
- (reader (request-reader req reply #'request-cont))
- (result (funcall reader)))
- (unless (eq :keep-alive result)
- (return)))
- (warning (w)
- (format t "WARN ~A" w)
- (force-output)
- (continue)))))
-
(defvar *acceptor-loop*)
(defvar *host*)