Commit 7908f91318adfab2046b5e1401053a9286817e50
2018-02-06T16:28:34
Split one file per class.
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 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295
diff --git a/unistd-input-stream.lisp b/unistd-input-stream.lisp
new file mode 100644
index 0000000..1039456
--- /dev/null
+++ b/unistd-input-stream.lisp
@@ -0,0 +1,43 @@
+
+(in-package :unistd-stream)
+
+(defclass unistd-input-stream (unistd-stream buffered-input-stream)
+ ()
+ (:documentation "A buffered input stream using UNISTD:READ."))
+
+(defmethod make-stream-input-buffer ((stream unistd-input-stream))
+ (cffi:foreign-alloc :unsigned-char
+ :count (stream-input-buffer-size stream)))
+
+(defmethod discard-stream-input-buffer ((stream unistd-input-stream))
+ (cffi:foreign-free (stream-input-buffer stream))
+ (setf (stream-input-buffer stream) nil))
+
+(defmethod stream-fill-input-buffer ((stream unistd-input-stream))
+ (let* ((buffer (stream-input-buffer stream))
+ (length (stream-input-length stream))
+ (fd (stream-fd stream))
+ (buf (cffi:mem-aptr buffer :unsigned-char length))
+ (buflen (- (stream-input-buffer-size stream) length))
+ (r (if (stream-blocking-p stream)
+ (unistd:read fd buf buflen)
+ (unistd:read-non-blocking fd buf buflen))))
+ (cond ((eq :non-blocking r)
+ :non-blocking)
+ ((= r 0)
+ :eof)
+ ((< r 0)
+ (error 'stream-input-error :stream stream))
+ (t
+ (incf (stream-input-length stream) r)
+ nil))))
+
+(defmethod stream-read-element-from-buffer ((stream unistd-input-stream))
+ (let ((element (cffi:mem-aref (stream-input-buffer stream) :unsigned-char
+ (stream-input-index stream))))
+ (incf (stream-input-index stream))
+ (values element nil)))
+
+(defun unistd-input-stream (fd)
+ "Creates a buffered input stream for file descriptor FD."
+ (make-instance 'unistd-input-stream :fd fd))
diff --git a/unistd-io-stream.lisp b/unistd-io-stream.lisp
new file mode 100644
index 0000000..e34d46c
--- /dev/null
+++ b/unistd-io-stream.lisp
@@ -0,0 +1,16 @@
+
+(in-package :unistd-stream)
+
+(defclass unistd-io-stream (unistd-input-stream unistd-output-stream)
+ ()
+ (:documentation "A buffered input/output stream using
+UNISTD:READ and UNISTD:WRITE."))
+
+(defmethod stream-close ((stream unistd-io-stream))
+ (call-next-method)
+ (cffi:foreign-free (stream-input-buffer stream))
+ (cffi:foreign-free (stream-output-buffer stream)))
+
+(defun unistd-io-stream (fd)
+ "Creates a buffered input/output stream for file descriptor FD."
+ (make-instance 'unistd-io-stream :fd fd))
diff --git a/unistd-output-stream.lisp b/unistd-output-stream.lisp
new file mode 100644
index 0000000..e85e3b2
--- /dev/null
+++ b/unistd-output-stream.lisp
@@ -0,0 +1,49 @@
+
+(in-package :unistd-stream)
+
+(defclass unistd-output-stream (unistd-stream buffered-output-stream)
+ ()
+ (:documentation "A buffered output stream using UNISTD:WRITE."))
+
+(defmethod make-stream-output-buffer ((stream unistd-output-stream))
+ (cffi:foreign-alloc :unsigned-char
+ :count (stream-output-buffer-size stream)))
+
+(defmethod discard-stream-output-buffer ((stream unistd-output-stream))
+ (cffi:foreign-free (stream-output-buffer stream))
+ (setf (stream-output-buffer stream) nil))
+
+(defmethod stream-flush-output-buffer ((stream unistd-output-stream))
+ (let ((buffer (stream-output-buffer stream)))
+ (let* ((fd (stream-fd stream))
+ (index (stream-output-index stream))
+ (buf (cffi:mem-aptr buffer :unsigned-char index))
+ (buflen (- (stream-output-length stream) index))
+ (r (if (stream-blocking-p stream)
+ (unistd:write fd buf buflen)
+ (unistd:write-non-blocking fd buf buflen))))
+ (cond ((eq :non-blocking r)
+ :non-blocking)
+ ((= 0 r)
+ :eof)
+ ((< r 0)
+ (error 'stream-output-error :stream stream))
+ (t
+ (incf (stream-output-index stream) r)
+ (when (= (stream-output-index stream)
+ (stream-output-length stream))
+ (setf (stream-output-index stream) 0
+ (stream-output-length stream) 0))
+ nil)))))
+
+(defmethod stream-write-element-to-buffer ((stream unistd-output-stream)
+ element)
+ (setf (cffi:mem-aref (stream-output-buffer stream) :unsigned-char
+ (stream-output-length stream))
+ element)
+ (incf (stream-output-length stream))
+ nil)
+
+(defun unistd-output-stream (fd)
+ "Creates a buffered output stream for file descriptor FD."
+ (make-instance 'unistd-output-stream :fd fd))
diff --git a/unistd-stream-open.lisp b/unistd-stream-open.lisp
new file mode 100644
index 0000000..d993f83
--- /dev/null
+++ b/unistd-stream-open.lisp
@@ -0,0 +1,35 @@
+
+(in-package :unistd-stream)
+
+(defun compute-flags (read write append non-blocking create)
+ (logior (if append fcntl:+o-append+ 0)
+ (if non-blocking fcntl:+o-nonblock+ 0)
+ (if create fcntl:+o-creat+ 0)
+ (cond ((and read write) fcntl:+o-rdwr+)
+ (read fcntl:+o-rdonly+)
+ (write fcntl:+o-wronly+)
+ (t 0))))
+
+(defun compute-class (read write)
+ (cond ((and read write) 'unistd-io-stream)
+ (read 'unistd-input-stream)
+ (write 'unistd-output-stream)))
+
+(defun unistd-stream-open (pathname &key
+ read write append
+ non-blocking
+ (create #o777)
+ (input-buffer-size
+ *stream-default-buffer-size*)
+ (output-buffer-size
+ *stream-default-buffer-size*))
+ (assert (or read write)
+ (read write)
+ "Open not for reading nor writing.")
+ (let* ((flags (compute-flags read write append non-blocking create))
+ (fd (fcntl:open pathname flags (or create 0)))
+ (class (compute-class read write)))
+ (make-instance class
+ :fd fd
+ :input-buffer-size input-buffer-size
+ :output-buffer-size output-buffer-size)))
diff --git a/unistd-stream.asd b/unistd-stream.asd
index be1414f..47d9d69 100644
--- a/unistd-stream.asd
+++ b/unistd-stream.asd
@@ -33,4 +33,9 @@
"cl-stream")
:components
((:file "package")
- (:file "unistd-stream" :depends-on ("package"))))
+ (:file "unistd-input-stream" :depends-on ("unistd-stream"))
+ (:file "unistd-io-stream" :depends-on ("unistd-input-stream"
+ "unistd-output-stream"))
+ (:file "unistd-output-stream" :depends-on ("unistd-stream"))
+ (:file "unistd-stream" :depends-on ("package"))
+ (:file "unistd-stream-open" :depends-on ("unistd-io-stream"))))
diff --git a/unistd-stream.lisp b/unistd-stream.lisp
index 5fa8423..f65df73 100644
--- a/unistd-stream.lisp
+++ b/unistd-stream.lisp
@@ -58,108 +58,6 @@
(unistd:close (stream-fd stream))
(call-next-method))
-(defclass unistd-input-stream (unistd-stream buffered-input-stream)
- ()
- (:documentation "A buffered input stream using UNISTD:READ."))
-
-(defmethod make-stream-input-buffer ((stream unistd-input-stream))
- (cffi:foreign-alloc :unsigned-char
- :count (stream-input-buffer-size stream)))
-
-(defmethod discard-stream-input-buffer ((stream unistd-input-stream))
- (cffi:foreign-free (stream-input-buffer stream))
- (setf (stream-input-buffer stream) nil))
-
-(defmethod stream-fill-input-buffer ((stream unistd-input-stream))
- (let* ((buffer (stream-input-buffer stream))
- (length (stream-input-length stream))
- (fd (stream-fd stream))
- (buf (cffi:mem-aptr buffer :unsigned-char length))
- (buflen (- (stream-input-buffer-size stream) length))
- (r (if (stream-blocking-p stream)
- (unistd:read fd buf buflen)
- (unistd:read-non-blocking fd buf buflen))))
- (cond ((eq :non-blocking r)
- :non-blocking)
- ((= r 0)
- :eof)
- ((< r 0)
- (error 'stream-input-error :stream stream))
- (t
- (incf (stream-input-length stream) r)
- nil))))
-
-(defmethod stream-read-element-from-buffer ((stream unistd-input-stream))
- (let ((element (cffi:mem-aref (stream-input-buffer stream) :unsigned-char
- (stream-input-index stream))))
- (incf (stream-input-index stream))
- (values element nil)))
-
-(defun unistd-input-stream (fd)
- "Creates a buffered input stream for file descriptor FD."
- (make-instance 'unistd-input-stream :fd fd))
-
-(defclass unistd-output-stream (unistd-stream buffered-output-stream)
- ()
- (:documentation "A buffered output stream using UNISTD:WRITE."))
-
-(defmethod make-stream-output-buffer ((stream unistd-output-stream))
- (cffi:foreign-alloc :unsigned-char
- :count (stream-output-buffer-size stream)))
-
-(defmethod discard-stream-output-buffer ((stream unistd-output-stream))
- (cffi:foreign-free (stream-output-buffer stream))
- (setf (stream-output-buffer stream) nil))
-
-(defmethod stream-flush-output-buffer ((stream unistd-output-stream))
- (let ((buffer (stream-output-buffer stream)))
- (let* ((fd (stream-fd stream))
- (index (stream-output-index stream))
- (buf (cffi:mem-aptr buffer :unsigned-char index))
- (buflen (- (stream-output-length stream) index))
- (r (if (stream-blocking-p stream)
- (unistd:write fd buf buflen)
- (unistd:write-non-blocking fd buf buflen))))
- (cond ((eq :non-blocking r)
- :non-blocking)
- ((= 0 r)
- :eof)
- ((< r 0)
- (error 'stream-output-error :stream stream))
- (t
- (incf (stream-output-index stream) r)
- (when (= (stream-output-index stream)
- (stream-output-length stream))
- (setf (stream-output-index stream) 0
- (stream-output-length stream) 0))
- nil)))))
-
-(defmethod stream-write-element-to-buffer ((stream unistd-output-stream)
- element)
- (setf (cffi:mem-aref (stream-output-buffer stream) :unsigned-char
- (stream-output-length stream))
- element)
- (incf (stream-output-length stream))
- nil)
-
-(defun unistd-output-stream (fd)
- "Creates a buffered output stream for file descriptor FD."
- (make-instance 'unistd-output-stream :fd fd))
-
-(defclass unistd-io-stream (unistd-input-stream unistd-output-stream)
- ()
- (:documentation "A buffered input/output stream using
-UNISTD:READ and UNISTD:WRITE."))
-
-(defmethod stream-close ((stream unistd-io-stream))
- (call-next-method)
- (cffi:foreign-free (stream-input-buffer stream))
- (cffi:foreign-free (stream-output-buffer stream)))
-
-(defun unistd-io-stream (fd)
- "Creates a buffered input/output stream for file descriptor FD."
- (make-instance 'unistd-io-stream :fd fd))
-
(defun compute-flags (read write append non-blocking create)
(logior (if append fcntl:+o-append+ 0)
(if non-blocking fcntl:+o-nonblock+ 0)