From 4e4da452cea662846ebccc99f4bade916355a851 Mon Sep 17 00:00:00 2001 From: Stelian Ionescu Date: Mon, 6 Aug 2007 20:10:02 +0200 Subject: [PATCH] Converted code to use OSICAT. Signed-off-by: Stelian Ionescu --- io-multiplex/common.lisp | 8 ++++---- io-multiplex/epoll.lisp | 7 +++---- io-multiplex/kqueue.lisp | 4 ++-- io-multiplex/time.lisp | 2 +- io.multiplex.asd | 2 +- io.streams.asd | 9 +-------- io.streams/buffer.lisp | 6 +++--- iolib.asd | 10 +--------- net.sockets.asd | 2 +- sockets/conditions.lisp | 10 +++++----- sockets/iface.lisp | 8 ++++---- sockets/pkgdcl.lisp | 9 +++++---- 12 files changed, 31 insertions(+), 46 deletions(-) diff --git a/io-multiplex/common.lisp b/io-multiplex/common.lisp index 452dde8..1b36f38 100644 --- a/io-multiplex/common.lisp +++ b/io-multiplex/common.lisp @@ -205,7 +205,7 @@ (call-next-method event-base :only-once only-once)) (defun recalculate-timeouts (timeouts) - (let ((now (nix:get-monotonic-time))) + (let ((now (osicat:get-monotonic-time))) (dolist (ev (queue-head timeouts)) (event-recalc-abs-timeout ev now)))) @@ -233,7 +233,7 @@ (and only-once (setf exit-p t))) (setf (values deletion-list dispatch-list) (filter-expired-events (expired-events timeouts - (nix:get-monotonic-time)))) + (osicat:get-monotonic-time)))) (dispatch-timeouts dispatch-list) (remove-events event-base deletion-list) (queue-sort timeouts #'< #'event-abs-timeout))))) @@ -284,7 +284,7 @@ have been received, NIL otherwise." (values deletion-list dispatch-list))) (defun events-calc-min-rel-timeout (timeouts) - (let* ((now (nix:get-monotonic-time)) + (let* ((now (osicat:get-monotonic-time)) (first-valid-event (find-if #'(lambda (to) (or (null to) (< now to))) (queue-head timeouts) @@ -553,7 +553,7 @@ of a file descriptor.")) nix::pollout nix::pollhup)))) (poll-error (unix-err) (error 'poll-error :fd fd - :identifier (nix:system-error-identifier unix-err)))) + :identifier (osicat-sys:system-error-identifier unix-err)))) (let ((readp nil) (writep nil)) (with-foreign-object (pollfd 'nix::pollfd) (nix:bzero pollfd nix::size-of-pollfd) diff --git a/io-multiplex/epoll.lisp b/io-multiplex/epoll.lisp index c052b8c..f4b7b02 100644 --- a/io-multiplex/epoll.lisp +++ b/io-multiplex/epoll.lisp @@ -51,7 +51,7 @@ (let ((flags (calc-epoll-flags fd-entry)) (fd (fd-entry-fd fd-entry))) (with-foreign-object (ev 'nix::epoll-event) - (cl-posix-ffi:memset ev 0 nix::size-of-epoll-event) + (nix:bzero ev nix::size-of-epoll-event) (setf (foreign-slot-value ev 'nix::epoll-event 'nix::events) flags) (setf (foreign-slot-value @@ -70,7 +70,7 @@ (let ((flags (calc-epoll-flags fd-entry)) (fd (fd-entry-fd fd-entry))) (with-foreign-object (ev 'nix::epoll-event) - (cl-posix-ffi:memset ev 0 nix::size-of-epoll-event) + (nix:bzero ev nix::size-of-epoll-event) (setf (foreign-slot-value ev 'nix::epoll-event 'nix::events) flags) (setf (foreign-slot-value @@ -99,8 +99,7 @@ (defmethod harvest-events ((mux epoll-multiplexer) timeout) (with-foreign-object (events 'nix::epoll-event *epoll-max-events*) - (cl-posix-ffi:memset events 0 - (* *epoll-max-events* nix::size-of-epoll-event)) + (nix:bzero events (* *epoll-max-events* nix::size-of-epoll-event)) (let (ready-fds) (nix:repeat-upon-condition-decreasing-timeout ((nix:eintr) tmp-timeout timeout) diff --git a/io-multiplex/kqueue.lisp b/io-multiplex/kqueue.lisp index ae357df..101463d 100644 --- a/io-multiplex/kqueue.lisp +++ b/io-multiplex/kqueue.lisp @@ -40,7 +40,7 @@ (defun do-kqueue-event-request (kqueue-fd fd-entry filter request-type) (let ((fd (fd-entry-fd fd-entry))) (with-foreign-object (kev 'nix::kevent) - (cl-posix-ffi:memset kev 0 nix::size-of-kevent) + (nix:bzero kev nix::size-of-kevent) (nix:ev-set kev fd filter request-type 0 0 (null-pointer)) (nix:kevent kqueue-fd kev 1 @@ -100,7 +100,7 @@ (defmethod harvest-events ((mux kqueue-multiplexer) timeout) (with-foreign-objects ((events 'nix::kevent *kqueue-max-events*) (ts 'nix::timespec)) - (cl-posix-ffi:memset events 0 (* *kqueue-max-events* nix::size-of-kevent)) + (nix:bzero events (* *kqueue-max-events* nix::size-of-kevent)) (let (ready-fds) (nix:repeat-upon-condition-decreasing-timeout ((nix:eintr) tmp-timeout timeout) diff --git a/io-multiplex/time.lisp b/io-multiplex/time.lisp index 45d9150..5c00f6c 100644 --- a/io-multiplex/time.lisp +++ b/io-multiplex/time.lisp @@ -49,7 +49,7 @@ (defun abs-timeout (timeout) (when timeout - (+ (nix:get-monotonic-time) (normalize-timeout timeout)))) + (+ (osicat:get-monotonic-time) (normalize-timeout timeout)))) (defun calc-min-timeout (t1 t2) (if t1 diff --git a/io.multiplex.asd b/io.multiplex.asd index 672b1f5..dae815c 100644 --- a/io.multiplex.asd +++ b/io.multiplex.asd @@ -38,7 +38,7 @@ :author "Stelian Ionescu " :maintainer "Stelian Ionescu " :licence "LLGPL-2.1" - :depends-on (:cl-posix :alexandria) + :depends-on (:osicat :alexandria) :pathname (merge-pathnames (make-pathname :directory '(:relative "io-multiplex")) *load-truename*) :serial t diff --git a/io.streams.asd b/io.streams.asd index 1aebeaa..70718d6 100644 --- a/io.streams.asd +++ b/io.streams.asd @@ -21,18 +21,11 @@ ;;; Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ;;; Boston, MA 02110-1301, USA -(in-package :common-lisp-user) - -(defpackage #:io.streams.system - (:use #:common-lisp)) - -(in-package #:io.streams.system) - (asdf:defsystem :io.streams :description "Gray streams." :maintainer "Stelian Ionescu " :licence "LLGPL-2.1" - :depends-on (:cl-posix :io.multiplex :cffi :trivial-gray-streams :alexandria) + :depends-on (:cffi :osicat :io.multiplex :trivial-gray-streams :alexandria) :pathname (merge-pathnames (make-pathname :directory '(:relative "io.streams")) *load-truename*) :serial t diff --git a/io.streams/buffer.lisp b/io.streams/buffer.lisp index 6f4928d..adefd54 100644 --- a/io.streams/buffer.lisp +++ b/io.streams/buffer.lisp @@ -82,7 +82,7 @@ (defun iobuf-copy-data-to-start (iobuf) (declare (type iobuf iobuf)) - (cl-posix-ffi:memmove + (nix:memmove (iobuf-data iobuf) (inc-pointer (iobuf-data iobuf) (iobuf-start iobuf)) @@ -109,7 +109,7 @@ (type buffer-index soff doff length)) (let ((dst-ptr (iobuf-data dst))) (with-pointer-to-vector-data (src-ptr src) - (cl-posix-ffi:memcpy + (nix:memcpy (inc-pointer dst-ptr doff) (inc-pointer src-ptr soff) length)))) @@ -120,7 +120,7 @@ (type buffer-index soff doff length)) (let ((src-ptr (iobuf-data src))) (with-pointer-to-vector-data (dst-ptr dst) - (cl-posix-ffi:memcpy + (nix:memcpy (inc-pointer dst-ptr doff) (inc-pointer src-ptr soff) length)))) diff --git a/iolib.asd b/iolib.asd index 75cb658..3c402de 100644 --- a/iolib.asd +++ b/iolib.asd @@ -1,20 +1,12 @@ ;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp -*- -(in-package :common-lisp-user) - -(defpackage #:iolib-system - (:use #:common-lisp)) - -(in-package #:iolib-system) - (asdf:defsystem :iolib :description "I/O library for SBCL." :author "Stelian Ionescu " :maintainer "Stelian Ionescu " :version "0.5.4" :licence "LLGPL-2.1" - :depends-on (:cl-posix - :net.sockets + :depends-on (:net.sockets ;; comment out until it's brought back up to date ;; :net.dns-client )) diff --git a/net.sockets.asd b/net.sockets.asd index 63f680b..89dac79 100644 --- a/net.sockets.asd +++ b/net.sockets.asd @@ -36,7 +36,7 @@ :author "Stelian Ionescu " :maintainer "Stelian Ionescu " :licence "LLGPL-2.1" - :depends-on (:cl-posix + :depends-on (:osicat :babel :io.streams :alexandria diff --git a/sockets/conditions.lisp b/sockets/conditions.lisp index e6351cd..b8ea821 100644 --- a/sockets/conditions.lisp +++ b/sockets/conditions.lisp @@ -32,17 +32,17 @@ (defgeneric error-code (err)) (defmethod error-code ((err system-error)) - (nix:system-error-code err)) + (osicat-sys:system-error-code err)) (defgeneric error-identifier (err)) (defmethod error-identifier ((err system-error)) - (nix:system-error-identifier err)) + (osicat-sys:system-error-identifier err)) (defgeneric error-message (err)) (defmethod error-message ((err system-error)) - (nix:system-error-message err)) + (osicat-sys:system-error-message err)) (defun print-message-if-not-null (condition stream &optional (eof-place :before)) @@ -64,10 +64,10 @@ (defmethod print-object ((socket-error socket-error) stream) (print-unreadable-object (socket-error stream :type t :identity nil) - (let ((code (nix:system-error-code socket-error))) + (let ((code (osicat-sys:system-error-code socket-error))) (format stream "~S ~S ~S" (or code "[No code]") - (nix:system-error-identifier socket-error) + (osicat-sys:system-error-identifier socket-error) (or #-windows (nix:strerror code) #+windows (get-wsa-error-string code) "[Can't get error string.]"))))) diff --git a/sockets/iface.lisp b/sockets/iface.lisp index 6556049..9079e03 100644 --- a/sockets/iface.lisp +++ b/sockets/iface.lisp @@ -77,8 +77,8 @@ (setf retval (if-indextoname index buff)) (nix:enxio (err) (error 'unknown-interface - :code (nix:system-error-code err) - :identifier (nix:system-error-identifier err) + :code (osicat-sys:system-error-code err) + :identifier (osicat-sys:system-error-identifier err) :index index))) (make-interface (copy-seq retval) index)))) @@ -89,8 +89,8 @@ (setf retval (if-nametoindex name)) (nix:enodev (err) (error 'unknown-interface - :code (nix:system-error-code err) - :identifier (nix:system-error-identifier err) + :code (osicat-sys:system-error-code err) + :identifier (osicat-sys:system-error-identifier err) :name name))) (make-interface (copy-seq name) retval))) diff --git a/sockets/pkgdcl.lisp b/sockets/pkgdcl.lisp index 31a9e81..4ea3845 100644 --- a/sockets/pkgdcl.lisp +++ b/sockets/pkgdcl.lisp @@ -25,10 +25,11 @@ (defpackage :net.sockets (:nicknames #:sockets) - (:use #:common-lisp :cffi :alexandria :split-sequence :io.streams :cl-posix-ffi) - (:import-from #:cl-posix #:system-error #:posix-error #:system-error-message - #:pid #:gid #:uid #:size #:ssize) - (:import-from #:cl-posix-ffi #:size-of-int #:bzero) + (:use #:common-lisp :cffi :alexandria :split-sequence :io.streams) + (:import-from #:osicat-posix #:system-error #:posix-error + #:system-error-message #:errno-wrapper + #:pid #:gid #:uid #:size #:ssize #:bzero) + (:import-from #:osicat-sys #:size-of-int) (:shadow #:listen) (:export ;; Conditions -- 2.11.4.GIT