Changeset 10636 for trunk/source/level-1

Timestamp:

Sep 8, 2008, 5:57:04 AM (12 years ago)

Author:

gb

Message:

Don't use syscall interfaces (in the few places that we did).
Conditionalize for Windows.

File:

• trunk/source/level-1/l1-streams.lisp (modified) (7 diffs)

trunk/source/level-1/l1-streams.lisp

@@ -17 +17 @@
 
 (in-package "CCL")
-
-(eval-when (:compile-toplevel :execute)
-  #+linuxppc-target
-  (require "PPC-LINUX-SYSCALLS")
-  #+linuxx8664-target
-  (require "X8664-LINUX-SYSCALLS")
-  #+darwinppc-target
-  (require "DARWINPPC-SYSCALLS")
-  #+darwinx8632-target
-  (require "DARWINX8632-SYSCALLS")
-  #+darwinx8664-target
-  (require "DARWINX8664-SYSCALLS")
-  #+freebsdx8664-target
-  (require "X8664-FREEBSD-SYSCALLS")
-  #+solarisx8664-target
-  (require "X8664-SOLARIS-SYSCALLS"))
-
 ;;;
 
@@ -3316 +3299 @@
 
 (defun optimal-buffer-size (fd element-type)
-  (let* ((nominal (or (nth-value 6 (%fstat fd)) *elements-per-buffer*))
-         (octets (case (%unix-fd-kind fd)
+  #+windows-target (declare (ignore fd))
+  (let* ((nominal #-windows-target (or (nth-value 6 (%fstat fd)) *elements-per-buffer*))
+         (octets #+windows-target #$BUFSIZ
+                 #-windows-target
+                 (case (%unix-fd-kind fd)
                    (:pipe (#_fpathconf fd #$_PC_PIPE_BUF))
                    (:socket
@@ -5274 +5260 @@
   #-freebsd-target
   (rlet ((arg (* :char) (%null-ptr)))
-    (when (zerop (syscall syscalls::ioctl fd #$FIONREAD arg))
+    (when (zerop (int-errno-call (#_ioctl fd #$FIONREAD :address arg)))
       (let* ((avail (pref arg :long)))
         (and (> avail 0) avail)))))
@@ -5314 +5300 @@
 
 (defun process-input-would-block (fd)
+  #+windows-target (declare (ignore fd))
+  #+windows-target t
+  #-windows-target
   (if (logtest #$O_NONBLOCK (the fixnum (fd-get-flags fd)))
     (process-input-wait fd)
@@ -5346 +5335 @@
 
 (defun process-output-would-block (fd)
+  #+windows-target (declare (ignore fd))
+  #+windows-target t
+  #-windows-target
   (if (logtest #$O_NONBLOCK (the fixnum (fd-get-flags fd)))
     (process-output-wait fd)
@@ -5389 +5381 @@
     (setf (pref (paref pollfds (:* (:struct :pollfd)) 0) :pollfd.fd) fd
           (pref (paref pollfds (:* (:struct :pollfd)) 0) :pollfd.events) #$POLLIN)
-    (let* ((res (syscall syscalls::poll pollfds 1 (or milliseconds -1))))
+    (let* ((res (int-errno-call (#_poll pollfds 1 (or milliseconds -1)))))
       (declare (fixnum res))
       (values (> res 0) res))))
@@ -5398 +5390 @@
     (setf (pref (paref pollfds (:* (:struct :pollfd)) 0) :pollfd.fd) fd
           (pref (paref pollfds (:* (:struct :pollfd)) 0) :pollfd.events) #$POLLOUT)
-    (let* ((res (syscall syscalls::poll pollfds 1 (or milliseconds -1))))
+    (let* ((res (int-errno-call (#_poll pollfds 1 (or milliseconds -1)))))
       (declare (fixnum res))
       (values (> res 0)  res))))