Commit 40b40bfc6a882bef90227b6b582bc51a9b8230ec
2017-06-19T14:34:57
untabify
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 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248
diff --git a/thot-epoll.lisp b/thot-epoll.lisp
index 21aa89a..4deee4b 100644
--- a/thot-epoll.lisp
+++ b/thot-epoll.lisp
@@ -32,21 +32,21 @@
(set-nonblocking fd)
(setf (get-agent fd) agent)
(epoll:add *epoll-fd* fd
- (agent-epoll-events agent)
- :data-fd fd)))
+ (agent-epoll-events agent)
+ :data-fd fd)))
;; Worker agent
(defclass worker (agent)
((stream :reader worker-stream
- :type stream)
+ :type stream)
(addr :initarg :addr
- :reader worker-addr)
+ :reader worker-addr)
(request :initform nil
- :accessor worker-request
- :type (or null request))
+ :accessor worker-request
+ :type (or null request))
(reply :initform nil
- :accessor worker-reply)))
+ :accessor worker-reply)))
(defmethod agent-epoll-events ((agent worker))
(logior epoll:+in+ epoll:+out+ epoll:+err+))
@@ -69,8 +69,8 @@
(define-condition accept-error (error)
((acceptor :initarg acceptor
- :reader accept-error-acceptor
- :type acceptor)))
+ :reader accept-error-acceptor
+ :type acceptor)))
(defmethod agent-error ((agent acceptor))
(error 'accept-error :acceptor agent))
@@ -89,12 +89,12 @@
(epoll-add acceptor))
(epoll:wait (events fd *epoll-fd*)
(let ((agent (get-agent fd)))
- (cond ((not (= 0 (logand epoll:+err+ events)))
- (agent-error agent))
- ((not (= 0 (logand epoll:+in+ events)))
- (agent-in agent))
- ((not (= 0 (logand epoll:+out+ events)))
- (agent-out agent)))))))
+ (cond ((not (= 0 (logand epoll:+err+ events)))
+ (agent-error agent))
+ ((not (= 0 (logand epoll:+in+ events)))
+ (agent-in agent))
+ ((not (= 0 (logand epoll:+out+ events)))
+ (agent-out agent)))))))
;;
(defun acceptor-loop-epoll (fd)
diff --git a/thot-threaded.lisp b/thot-threaded.lisp
index e3b6d10..5666039 100644
--- a/thot-threaded.lisp
+++ b/thot-threaded.lisp
@@ -22,14 +22,14 @@
(when (<= n (length *worker-threads*))
(return))
(let ((thread (bordeaux-threads:make-thread 'worker-thread
- :name "worker")))
+ :name "worker")))
(push thread *worker-threads*))))
(defun join-worker-threads ()
(setq *stop* t)
(bordeaux-set:set-each (lambda (sockfd)
- (cffi-socket:shutdown sockfd t t))
- *worker-sockfds*)
+ (cffi-socket:shutdown sockfd t t))
+ *worker-sockfds*)
(loop
(when (endp *worker-threads*)
(return))
@@ -38,7 +38,7 @@
(defmacro with-worker-threads (count &body body)
`(let ((*worker-threads* ())
- (*worker-sockfds* (make-instance 'bordeaux-set:set)))
+ (*worker-sockfds* (make-instance 'bordeaux-set:set)))
(init-worker-threads ,count)
(unwind-protect (progn ,@body)
(join-worker-threads))))
diff --git a/thot.asd b/thot.asd
index c828758..8a388be 100644
--- a/thot.asd
+++ b/thot.asd
@@ -8,12 +8,12 @@
(defsystem "thot"
:depends-on ("babel"
- "bordeaux-queue"
- "bordeaux-set"
- "bordeaux-threads"
+ "bordeaux-queue"
+ "bordeaux-set"
+ "bordeaux-threads"
"babel-stream"
"cffi-socket"
- "cl-debug"
+ "cl-debug"
"cl-stream"
"fd-stream")
:components
diff --git a/thot.lisp b/thot.lisp
index 9c2bce5..bb7b1dd 100644
--- a/thot.lisp
+++ b/thot.lisp
@@ -12,11 +12,11 @@
(defclass request ()
((stream :initarg :stream
- :reader request-stream%
- :type stream)
+ :reader request-stream%
+ :type stream)
(method :initarg :method
- :accessor request-method%
- :type symbol)
+ :accessor request-method%
+ :type symbol)
(target :initarg :target
:accessor request-target%
:type string)
@@ -24,13 +24,13 @@
:accessor request-http-version%
:type string)
(headers :initform (make-hash-table :test 'equalp :size 32)
- :reader request-headers%
- :type hash-table)
+ :reader request-headers%
+ :type hash-table)
(uri :accessor request-uri%
- :type string)
+ :type string)
(query :initform nil
- :accessor request-query%
- :type string)))
+ :accessor request-query%
+ :type string)))
(defvar *request*)
@@ -57,15 +57,15 @@
(defun split-request-uri-and-query (request)
(declare (type request request))
(let* ((target (request-target% request))
- (target-? (position #\? target))
- (uri (if target-?
- (subseq target 0 target-?)
- target))
- (query (if target-?
- (subseq target target-?)
- nil)))
+ (target-? (position #\? target))
+ (uri (if target-?
+ (subseq target 0 target-?)
+ target))
+ (query (if target-?
+ (subseq target target-?)
+ nil)))
(setf (request-uri% request) uri
- (request-query% request) query)))
+ (request-query% request) query)))
(defun request-uri (&optional (request *request*))
(declare (type request request))
@@ -180,11 +180,11 @@
(defclass reply ()
((status :initform nil
- :accessor reply-status%)
+ :accessor reply-status%)
(headers :initform nil
- :accessor reply-headers%)
+ :accessor reply-headers%)
(headers-sent :initform nil
- :accessor reply-headers-sent%
+ :accessor reply-headers-sent%
:type boolean)))
(defvar *reply*)
@@ -236,12 +236,12 @@
(status "200 OK"))
(let ((headers (reply-headers)))
(if (endp headers)
- (setf (reply-headers) (list line))
- (loop
- (when (endp (rest headers))
- (setf (rest headers) (list line))
- (return))
- (pop headers))))
+ (setf (reply-headers) (list line))
+ (loop
+ (when (endp (rest headers))
+ (setf (rest headers) (list line))
+ (return))
+ (pop headers))))
(let ((stream (request-stream)))
(write-sequence stream line)
(write-sequence stream +crlf+)))
@@ -261,7 +261,7 @@
(content (format nil "404 Not found
The requested url ~S was not found on this server."
- (request-target))))
+ (request-target))))
(defun 404-not-found-handler ()
'404-not-found)
@@ -272,18 +272,18 @@ The requested url ~S was not found on this server."
(defun request-cont (request)
(let ((handlers *url-handlers*)
(*request* request)
- (*reply* (make-instance 'reply)))
+ (*reply* (make-instance 'reply)))
(loop
(when (endp handlers)
- (return))
+ (return))
(let* ((handler-func (pop handlers))
- (handler (funcall handler-func)))
- (when handler
- (when (debug-p (or :thot :http))
- (format t "~&~S -> ~S~%" handler-func handler))
- (funcall handler)
+ (handler (funcall handler-func)))
+ (when handler
+ (when (debug-p (or :thot :http))
+ (format t "~&~S -> ~S~%" handler-func handler))
+ (funcall handler)
(flush (request-stream))
- (return))))
+ (return))))
(if (string-equal "keep-alive" (request-header 'connection))
:keep-alive
nil)))