From 046077eeceebe41a78be5a114b7b4a3b630c100d Mon Sep 17 00:00:00 2001 From: Stelian Ionescu Date: Sun, 20 Jan 2008 20:12:33 +0100 Subject: [PATCH] More changes in system definitions, some renames. Signed-off-by: Stelian Ionescu --- io.multiplex.asd | 43 ++++++++++------------ {io-multiplex => io.multiplex}/TODO | 0 {io-multiplex => io.multiplex}/detect.lisp | 0 {io-multiplex => io.multiplex}/epoll.lisp | 0 {io-multiplex => io.multiplex}/event-loop.lisp | 2 -- {io-multiplex => io.multiplex}/fd-entry.lisp | 2 -- {io-multiplex => io.multiplex}/fd-wait.lisp | 0 {io-multiplex => io.multiplex}/kqueue.lisp | 0 {io-multiplex => io.multiplex}/multiplexer.lisp | 0 {io-multiplex => io.multiplex}/pkgdcl.lisp | 0 {io-multiplex => io.multiplex}/poll.lisp | 0 {io-multiplex => io.multiplex}/queue.lisp | 0 {io-multiplex => io.multiplex}/scheduler.lisp | 0 {io-multiplex => io.multiplex}/select.lisp | 0 {io-multiplex => io.multiplex}/time.lisp | 0 {io-multiplex => io.multiplex}/timers.lisp | 0 {io-multiplex => io.multiplex}/utils.lisp | 0 io.streams.asd | 16 ++++----- net.sockets.asd | 44 ++++++++++------------- {sockets => net.sockets}/TODO | 0 {sockets => net.sockets}/address-predicates.lisp | 0 {sockets => net.sockets}/address.lisp | 0 {sockets => net.sockets}/base-sockets.lisp | 0 {sockets => net.sockets}/bsd.lisp | 0 {sockets => net.sockets}/common.lisp | 0 {sockets => net.sockets}/conditions.lisp | 0 {sockets => net.sockets}/config.lisp | 0 {sockets => net.sockets}/dns/common.lisp | 0 {sockets => net.sockets}/dns/conditions.lisp | 0 {sockets => net.sockets}/dns/dynamic-buffer.lisp | 0 {sockets => net.sockets}/dns/lookup.lisp | 0 {sockets => net.sockets}/dns/message.lisp | 0 {sockets => net.sockets}/dns/nameservers.lisp | 0 {sockets => net.sockets}/dns/query.lisp | 0 {sockets => net.sockets}/grovel.lisp | 0 {sockets => net.sockets}/iface.lisp | 0 {sockets => net.sockets}/make-socket.lisp | 0 {sockets => net.sockets}/namedb/etc-files.lisp | 0 {sockets => net.sockets}/namedb/file-monitor.lisp | 0 {sockets => net.sockets}/namedb/hosts.lisp | 0 {sockets => net.sockets}/namedb/protocols.lisp | 0 {sockets => net.sockets}/namedb/services.lisp | 0 {sockets => net.sockets}/pkgdcl.lisp | 0 {sockets => net.sockets}/socket-methods.lisp | 0 {sockets => net.sockets}/socket-options.lisp | 0 {sockets => net.sockets}/trivial-sockets.lisp | 0 46 files changed, 45 insertions(+), 62 deletions(-) rename {io-multiplex => io.multiplex}/TODO (100%) rename {io-multiplex => io.multiplex}/detect.lisp (100%) rename {io-multiplex => io.multiplex}/epoll.lisp (100%) rename {io-multiplex => io.multiplex}/event-loop.lisp (99%) rename {io-multiplex => io.multiplex}/fd-entry.lisp (98%) rename {io-multiplex => io.multiplex}/fd-wait.lisp (100%) rename {io-multiplex => io.multiplex}/kqueue.lisp (100%) rename {io-multiplex => io.multiplex}/multiplexer.lisp (100%) rename {io-multiplex => io.multiplex}/pkgdcl.lisp (100%) rename {io-multiplex => io.multiplex}/poll.lisp (100%) rename {io-multiplex => io.multiplex}/queue.lisp (100%) rename {io-multiplex => io.multiplex}/scheduler.lisp (100%) rename {io-multiplex => io.multiplex}/select.lisp (100%) rename {io-multiplex => io.multiplex}/time.lisp (100%) rename {io-multiplex => io.multiplex}/timers.lisp (100%) rename {io-multiplex => io.multiplex}/utils.lisp (100%) rename {sockets => net.sockets}/TODO (100%) rename {sockets => net.sockets}/address-predicates.lisp (100%) rename {sockets => net.sockets}/address.lisp (100%) rename {sockets => net.sockets}/base-sockets.lisp (100%) rename {sockets => net.sockets}/bsd.lisp (100%) rename {sockets => net.sockets}/common.lisp (100%) rename {sockets => net.sockets}/conditions.lisp (100%) rename {sockets => net.sockets}/config.lisp (100%) rename {sockets => net.sockets}/dns/common.lisp (100%) rename {sockets => net.sockets}/dns/conditions.lisp (100%) rename {sockets => net.sockets}/dns/dynamic-buffer.lisp (100%) rename {sockets => net.sockets}/dns/lookup.lisp (100%) rename {sockets => net.sockets}/dns/message.lisp (100%) rename {sockets => net.sockets}/dns/nameservers.lisp (100%) rename {sockets => net.sockets}/dns/query.lisp (100%) rename {sockets => net.sockets}/grovel.lisp (100%) rename {sockets => net.sockets}/iface.lisp (100%) rename {sockets => net.sockets}/make-socket.lisp (100%) rename {sockets => net.sockets}/namedb/etc-files.lisp (100%) rename {sockets => net.sockets}/namedb/file-monitor.lisp (100%) rename {sockets => net.sockets}/namedb/hosts.lisp (100%) rename {sockets => net.sockets}/namedb/protocols.lisp (100%) rename {sockets => net.sockets}/namedb/services.lisp (100%) rename {sockets => net.sockets}/pkgdcl.lisp (100%) rename {sockets => net.sockets}/socket-methods.lisp (100%) rename {sockets => net.sockets}/socket-options.lisp (100%) rename {sockets => net.sockets}/trivial-sockets.lisp (100%) diff --git a/io.multiplex.asd b/io.multiplex.asd index 61b72e9..3796357 100644 --- a/io.multiplex.asd +++ b/io.multiplex.asd @@ -2,7 +2,7 @@ ;;; ;;; io-multiplex.asd --- ASDF system definition. ;;; -;;; Copyright (C) 2006-2007, Stelian Ionescu +;;; Copyright (C) 2006-2008, Stelian Ionescu ;;; ;;; This code is free software; you can redistribute it and/or ;;; modify it under the terms of the version 2.1 of @@ -25,37 +25,30 @@ ;;; Need trivial-features to correctly handle the reader conditionals ;;; in the system definition form. -(eval-when (:load-toplevel :execute) +(eval-when (:load-toplevel) (asdf:oos 'asdf:load-op :trivial-features)) -(defpackage #:io.multiplex-system - (:use #:common-lisp)) - -(in-package #:io.multiplex-system) - (asdf:defsystem :io.multiplex :description "I/O multiplexing library for SBCL." :author "Stelian Ionescu " :maintainer "Stelian Ionescu " :licence "LLGPL-2.1" :depends-on (:osicat :alexandria :bordeaux-threads :series) - :pathname (merge-pathnames - (make-pathname :directory '(:relative "io-multiplex")) - *load-truename*) - :serial t + :pathname (merge-pathnames #p"io.multiplex/" *load-truename*) :components ((:file "pkgdcl") - (:file "time") - (:file "timers") - (:file "queue") - (:file "scheduler") - (:file "utils") - (:file "multiplexer") - (:file "fd-entry") - (:file "event-loop") - (:file "fd-wait") - (:file "select") -;;; (:file "poll") - #+linux (:file "epoll") - #+bsd (:file "kqueue") - (:file "detect"))) + (:file "time" :depends-on ("pkgdcl")) + (:file "utils" :depends-on ("pkgdcl" "time")) + (:file "timers" :depends-on ("pkgdcl" "time")) + (:file "queue" :depends-on ("pkgdcl")) + (:file "scheduler" :depends-on ("pkgdcl" "timers" "queue")) + (:file "multiplexer" :depends-on ("pkgdcl" "utils")) + (:file "fd-entry" :depends-on ("pkgdcl")) + (:file "event-loop" + :depends-on ("pkgdcl" "time" "timers" "queue" "scheduler" "multiplexer")) + (:file "fd-wait" :depends-on ("pkgdcl" "utils")) + (:file "select" :depends-on ("pkgdcl" "utils" "multiplexer")) + #+linux (:file "epoll" :depends-on ("pkgdcl" "utils" "multiplexer")) + #+bsd (:file "kqueue" :depends-on ("pkgdcl" "utils" "multiplexer")) + (:file "detect" :depends-on ("pkgdcl" "multiplexer" "select" + #+linux "epoll" #+bsd "kqueue")))) diff --git a/io-multiplex/TODO b/io.multiplex/TODO similarity index 100% rename from io-multiplex/TODO rename to io.multiplex/TODO diff --git a/io-multiplex/detect.lisp b/io.multiplex/detect.lisp similarity index 100% rename from io-multiplex/detect.lisp rename to io.multiplex/detect.lisp diff --git a/io-multiplex/epoll.lisp b/io.multiplex/epoll.lisp similarity index 100% rename from io-multiplex/epoll.lisp rename to io.multiplex/epoll.lisp diff --git a/io-multiplex/event-loop.lisp b/io.multiplex/event-loop.lisp similarity index 99% rename from io-multiplex/event-loop.lisp rename to io.multiplex/event-loop.lisp index 3b4627f..a252eba 100644 --- a/io-multiplex/event-loop.lisp +++ b/io.multiplex/event-loop.lisp @@ -23,8 +23,6 @@ (in-package :io.multiplex) -(declaim (optimize (debug 3) (safety 3))) - ;;;; EVENT-BASE diff --git a/io-multiplex/fd-entry.lisp b/io.multiplex/fd-entry.lisp similarity index 98% rename from io-multiplex/fd-entry.lisp rename to io.multiplex/fd-entry.lisp index 51140db..9b83b80 100644 --- a/io-multiplex/fd-entry.lisp +++ b/io.multiplex/fd-entry.lisp @@ -25,8 +25,6 @@ (in-package :io.multiplex) -(declaim (optimize (debug 3) (safety 3))) - ;;;; EVENT (deftype fd-event-type () diff --git a/io-multiplex/fd-wait.lisp b/io.multiplex/fd-wait.lisp similarity index 100% rename from io-multiplex/fd-wait.lisp rename to io.multiplex/fd-wait.lisp diff --git a/io-multiplex/kqueue.lisp b/io.multiplex/kqueue.lisp similarity index 100% rename from io-multiplex/kqueue.lisp rename to io.multiplex/kqueue.lisp diff --git a/io-multiplex/multiplexer.lisp b/io.multiplex/multiplexer.lisp similarity index 100% rename from io-multiplex/multiplexer.lisp rename to io.multiplex/multiplexer.lisp diff --git a/io-multiplex/pkgdcl.lisp b/io.multiplex/pkgdcl.lisp similarity index 100% rename from io-multiplex/pkgdcl.lisp rename to io.multiplex/pkgdcl.lisp diff --git a/io-multiplex/poll.lisp b/io.multiplex/poll.lisp similarity index 100% rename from io-multiplex/poll.lisp rename to io.multiplex/poll.lisp diff --git a/io-multiplex/queue.lisp b/io.multiplex/queue.lisp similarity index 100% rename from io-multiplex/queue.lisp rename to io.multiplex/queue.lisp diff --git a/io-multiplex/scheduler.lisp b/io.multiplex/scheduler.lisp similarity index 100% rename from io-multiplex/scheduler.lisp rename to io.multiplex/scheduler.lisp diff --git a/io-multiplex/select.lisp b/io.multiplex/select.lisp similarity index 100% rename from io-multiplex/select.lisp rename to io.multiplex/select.lisp diff --git a/io-multiplex/time.lisp b/io.multiplex/time.lisp similarity index 100% rename from io-multiplex/time.lisp rename to io.multiplex/time.lisp diff --git a/io-multiplex/timers.lisp b/io.multiplex/timers.lisp similarity index 100% rename from io-multiplex/timers.lisp rename to io.multiplex/timers.lisp diff --git a/io-multiplex/utils.lisp b/io.multiplex/utils.lisp similarity index 100% rename from io-multiplex/utils.lisp rename to io.multiplex/utils.lisp diff --git a/io.streams.asd b/io.streams.asd index 70718d6..2df0192 100644 --- a/io.streams.asd +++ b/io.streams.asd @@ -2,7 +2,7 @@ ;;; ;;; fd-streams.asd --- ASDF system definition. ;;; -;;; Copyright (C) 2006-2007, Stelian Ionescu +;;; Copyright (C) 2006-2008, Stelian Ionescu ;;; ;;; This code is free software; you can redistribute it and/or ;;; modify it under the terms of the version 2.1 of @@ -21,17 +21,17 @@ ;;; Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ;;; Boston, MA 02110-1301, USA +(in-package :common-lisp-user) + (asdf:defsystem :io.streams :description "Gray streams." :maintainer "Stelian Ionescu " :licence "LLGPL-2.1" :depends-on (:cffi :osicat :io.multiplex :trivial-gray-streams :alexandria) - :pathname (merge-pathnames (make-pathname :directory '(:relative "io.streams")) - *load-truename*) - :serial t + :pathname (merge-pathnames #p"io.streams/" *load-truename*) :components ((:file "pkgdcl") - (:file "classes") - (:file "buffer") - (:file "fd-mixin") - (:file "gray-stream-methods"))) + (:file "classes" :depends-on ("pkgdcl")) + (:file "buffer" :depends-on ("pkgdcl" "classes")) + (:file "fd-mixin" :depends-on ("pkgdcl" "classes")) + (:file "gray-stream-methods" :depends-on ("pkgdcl" "classes" "buffer" "fd-mixin")))) diff --git a/net.sockets.asd b/net.sockets.asd index 368f8d7..694b020 100644 --- a/net.sockets.asd +++ b/net.sockets.asd @@ -2,7 +2,7 @@ ;;; ;;; net.sockets.asd --- ASDF system definition. ;;; -;;; Copyright (C) 2006-2007, Stelian Ionescu +;;; Copyright (C) 2006-2008, Stelian Ionescu ;;; ;;; This code is free software; you can redistribute it and/or ;;; modify it under the terms of the version 2.1 of @@ -23,14 +23,9 @@ (in-package :common-lisp-user) -(eval-when (:load-toplevel :execute) +(eval-when (:load-toplevel) (asdf:oos 'asdf:load-op :cffi-grovel)) -(defpackage #:net.sockets-system - (:use #:common-lisp :cffi-grovel)) - -(in-package #:net.sockets-system) - (asdf:defsystem :net.sockets :description "Socket library." :author "Stelian Ionescu " @@ -38,11 +33,10 @@ :licence "LLGPL-2.1" :depends-on (:osicat :babel :bordeaux-threads :series :io.streams :alexandria :split-sequence) - :pathname (merge-pathnames (make-pathname :directory '(:relative "sockets")) - *load-truename*) + :pathname (merge-pathnames #p"net.sockets/" *load-truename*) :components ((:file "pkgdcl") - (:grovel-file "grovel" :depends-on ("pkgdcl")) + (cffi-grovel:grovel-file "grovel" :depends-on ("pkgdcl")) (:file "conditions" :depends-on ("pkgdcl" "grovel")) (:file "bsd" :depends-on ("pkgdcl" "grovel" "conditions")) (:file "common" :depends-on ("pkgdcl" "grovel" "bsd")) @@ -60,14 +54,14 @@ (:file "etc-files" :pathname #p"namedb/etc-files" :depends-on ("pkgdcl")) (:file "file-monitor" :pathname #p"namedb/file-monitor" - :depends-on ("pkgdcl")) + :depends-on ("pkgdcl")) (:file "protocols" :pathname #p"namedb/protocols" - :depends-on ("pkgdcl" "common" "etc-files" "file-monitor")) + :depends-on ("pkgdcl" "common" "etc-files" "file-monitor")) (:file "services" :pathname #p"namedb/services" - :depends-on ("pkgdcl" "common" "etc-files" "file-monitor")) + :depends-on ("pkgdcl" "common" "etc-files" "file-monitor")) (:file "hosts" :pathname #p"namedb/hosts" - :depends-on ("pkgdcl" "address" "address-predicates" "etc-files" - "file-monitor")) + :depends-on ("pkgdcl" "address" "address-predicates" "etc-files" + "file-monitor")) (:file "socket-methods" :depends-on ("pkgdcl" "grovel" "conditions" "bsd" "common" "config" "address" @@ -77,19 +71,19 @@ "socket-options" "services" "socket-methods")) (:file "dns-common" :pathname #p"dns/common" - :depends-on ("pkgdcl" "common")) + :depends-on ("pkgdcl" "common")) (:file "nameservers" :pathname #p"dns/nameservers" - :depends-on ("pkgdcl" "address" "etc-files" "file-monitor")) + :depends-on ("pkgdcl" "address" "etc-files" "file-monitor")) (:file "dynamic-buffer" :pathname #p"dns/dynamic-buffer" - :depends-on ("pkgdcl")) + :depends-on ("pkgdcl")) (:file "message" :pathname #p"dns/message" - :depends-on ("pkgdcl" "common" "dns-common" "dynamic-buffer")) + :depends-on ("pkgdcl" "common" "dns-common" "dynamic-buffer")) (:file "query" :pathname #p"dns/query" - :depends-on ("pkgdcl" "conditions" "address" "address-predicates" - "socket-options" "socket-methods" "make-socket" "dns-common" - "nameservers" "dynamic-buffer" "message")) + :depends-on ("pkgdcl" "conditions" "address" "address-predicates" + "socket-options" "socket-methods" "make-socket" "dns-common" + "nameservers" "dynamic-buffer" "message")) (:file "dns-conditions" :pathname #p"dns/conditions" - :depends-on ("pkgdcl")) + :depends-on ("pkgdcl")) (:file "lookup" :pathname #p"dns/lookup" - :depends-on ("pkgdcl" "address" "address-predicates" "file-monitor" "hosts" - "nameservers" "message" "query" "dns-conditions")))) + :depends-on ("pkgdcl" "address" "address-predicates" "file-monitor" "hosts" + "nameservers" "message" "query" "dns-conditions")))) diff --git a/sockets/TODO b/net.sockets/TODO similarity index 100% rename from sockets/TODO rename to net.sockets/TODO diff --git a/sockets/address-predicates.lisp b/net.sockets/address-predicates.lisp similarity index 100% rename from sockets/address-predicates.lisp rename to net.sockets/address-predicates.lisp diff --git a/sockets/address.lisp b/net.sockets/address.lisp similarity index 100% rename from sockets/address.lisp rename to net.sockets/address.lisp diff --git a/sockets/base-sockets.lisp b/net.sockets/base-sockets.lisp similarity index 100% rename from sockets/base-sockets.lisp rename to net.sockets/base-sockets.lisp diff --git a/sockets/bsd.lisp b/net.sockets/bsd.lisp similarity index 100% rename from sockets/bsd.lisp rename to net.sockets/bsd.lisp diff --git a/sockets/common.lisp b/net.sockets/common.lisp similarity index 100% rename from sockets/common.lisp rename to net.sockets/common.lisp diff --git a/sockets/conditions.lisp b/net.sockets/conditions.lisp similarity index 100% rename from sockets/conditions.lisp rename to net.sockets/conditions.lisp diff --git a/sockets/config.lisp b/net.sockets/config.lisp similarity index 100% rename from sockets/config.lisp rename to net.sockets/config.lisp diff --git a/sockets/dns/common.lisp b/net.sockets/dns/common.lisp similarity index 100% rename from sockets/dns/common.lisp rename to net.sockets/dns/common.lisp diff --git a/sockets/dns/conditions.lisp b/net.sockets/dns/conditions.lisp similarity index 100% rename from sockets/dns/conditions.lisp rename to net.sockets/dns/conditions.lisp diff --git a/sockets/dns/dynamic-buffer.lisp b/net.sockets/dns/dynamic-buffer.lisp similarity index 100% rename from sockets/dns/dynamic-buffer.lisp rename to net.sockets/dns/dynamic-buffer.lisp diff --git a/sockets/dns/lookup.lisp b/net.sockets/dns/lookup.lisp similarity index 100% rename from sockets/dns/lookup.lisp rename to net.sockets/dns/lookup.lisp diff --git a/sockets/dns/message.lisp b/net.sockets/dns/message.lisp similarity index 100% rename from sockets/dns/message.lisp rename to net.sockets/dns/message.lisp diff --git a/sockets/dns/nameservers.lisp b/net.sockets/dns/nameservers.lisp similarity index 100% rename from sockets/dns/nameservers.lisp rename to net.sockets/dns/nameservers.lisp diff --git a/sockets/dns/query.lisp b/net.sockets/dns/query.lisp similarity index 100% rename from sockets/dns/query.lisp rename to net.sockets/dns/query.lisp diff --git a/sockets/grovel.lisp b/net.sockets/grovel.lisp similarity index 100% rename from sockets/grovel.lisp rename to net.sockets/grovel.lisp diff --git a/sockets/iface.lisp b/net.sockets/iface.lisp similarity index 100% rename from sockets/iface.lisp rename to net.sockets/iface.lisp diff --git a/sockets/make-socket.lisp b/net.sockets/make-socket.lisp similarity index 100% rename from sockets/make-socket.lisp rename to net.sockets/make-socket.lisp diff --git a/sockets/namedb/etc-files.lisp b/net.sockets/namedb/etc-files.lisp similarity index 100% rename from sockets/namedb/etc-files.lisp rename to net.sockets/namedb/etc-files.lisp diff --git a/sockets/namedb/file-monitor.lisp b/net.sockets/namedb/file-monitor.lisp similarity index 100% rename from sockets/namedb/file-monitor.lisp rename to net.sockets/namedb/file-monitor.lisp diff --git a/sockets/namedb/hosts.lisp b/net.sockets/namedb/hosts.lisp similarity index 100% rename from sockets/namedb/hosts.lisp rename to net.sockets/namedb/hosts.lisp diff --git a/sockets/namedb/protocols.lisp b/net.sockets/namedb/protocols.lisp similarity index 100% rename from sockets/namedb/protocols.lisp rename to net.sockets/namedb/protocols.lisp diff --git a/sockets/namedb/services.lisp b/net.sockets/namedb/services.lisp similarity index 100% rename from sockets/namedb/services.lisp rename to net.sockets/namedb/services.lisp diff --git a/sockets/pkgdcl.lisp b/net.sockets/pkgdcl.lisp similarity index 100% rename from sockets/pkgdcl.lisp rename to net.sockets/pkgdcl.lisp diff --git a/sockets/socket-methods.lisp b/net.sockets/socket-methods.lisp similarity index 100% rename from sockets/socket-methods.lisp rename to net.sockets/socket-methods.lisp diff --git a/sockets/socket-options.lisp b/net.sockets/socket-options.lisp similarity index 100% rename from sockets/socket-options.lisp rename to net.sockets/socket-options.lisp diff --git a/sockets/trivial-sockets.lisp b/net.sockets/trivial-sockets.lisp similarity index 100% rename from sockets/trivial-sockets.lisp rename to net.sockets/trivial-sockets.lisp -- 2.11.4.GIT