X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fsb-bsd-sockets%2Fdefpackage.lisp;h=0c865527ba2b7e299cf460749536e241a3bf261f;hb=315285fcf8bf1f7e732da307cfaf31f18f412811;hp=e431cf36086c97b6e22eb741e7566100d3133c42;hpb=c03ebb54770cfa613d4b706a80e5be231786a5d0;p=sbcl.git

diff --git a/contrib/sb-bsd-sockets/defpackage.lisp b/contrib/sb-bsd-sockets/defpackage.lisp
index e431cf3..0c86552 100644
--- a/contrib/sb-bsd-sockets/defpackage.lisp
+++ b/contrib/sb-bsd-sockets/defpackage.lisp
@@ -1,44 +1,14 @@
-#+(and sbcl win32)
-(defpackage "SB-WIN32-SOCKETS-INTERNAL"
-  (:nicknames "WIN32SOCKINT")
-  (:shadow close listen)
-  (:use "COMMON-LISP" "SB-ALIEN" "SB-EXT" "SB-C-CALL"))
-
 (defpackage "SB-BSD-SOCKETS-INTERNAL"
   (:nicknames "SOCKINT")
   (:shadow close listen)
-  #+cmu (:shadowing-import-from "CL" with-array-data)
-  #+sbcl (:shadowing-import-from "SB-KERNEL" with-array-data)
-  #+cmu (:use "COMMON-LISP" "ALIEN" "SYSTEM" "EXT" "C-CALL")
-  #+sbcl (:use "COMMON-LISP" "SB-ALIEN" #+nil "SB-SYSTEM" "SB-EXT" "SB-C-CALL"))
-
-;;; SBCL changes a lot of package prefixes.  To avoid littering the
-;;; code with conditionals, we use the SBCL package prefixes
-;;; throughout.  This means that we need to create said packages
-;;; first, if we're using CMUCL
-
-;;; One thing that this exercise really has made clear is just how much
-;;; of the alien stuff is scattered around the cmucl package space
-;;; seemingly at random.  Hmm.
-
-#+cmu
-(eval-when (:compile-toplevel :load-toplevel)
-  (defun add-package-nickname (name nickname)
-    (let ((p (find-package name)))
-      (rename-package p (package-name p)
-                      (cons nickname (package-nicknames name)))))
-  (add-package-nickname "EXT" "SB-EXT")
-  (add-package-nickname "ALIEN" "SB-ALIEN")
-  (add-package-nickname "UNIX" "SB-UNIX")
-  (add-package-nickname "C-CALL" "SB-C-CALL")
-  (add-package-nickname "KERNEL" "SB-KERNEL")
-  (add-package-nickname "SYSTEM" "SB-SYS"))
+  (:shadowing-import-from "SB-KERNEL" with-array-data)
+  (:use "COMMON-LISP" "SB-ALIEN" "SB-EXT"))
 
 (defpackage "SB-BSD-SOCKETS"
-  (:export socket local-socket inet-socket
+  (:export socket local-socket local-abstract-socket inet-socket
            make-local-socket make-inet-socket
            socket-bind socket-accept socket-connect
-           socket-send socket-receive socket-recv
+           socket-send socket-receive
            socket-name socket-peername socket-listen
            socket-close socket-file-descriptor
            socket-family socket-protocol socket-open-p
@@ -68,71 +38,26 @@
 
            make-inet-address
 
-           non-blocking-mode
-           )
+           non-blocking-mode)
   (:use "COMMON-LISP" "SB-BSD-SOCKETS-INTERNAL")
   (:import-from "SB-INT" "UNSUPPORTED-OPERATOR" "FEATUREP")
   (:documentation
-   "
-
-A thinly-disguised BSD socket API for SBCL.  Ideas stolen from the BSD
+   "A thinly-disguised BSD socket API for SBCL.  Ideas stolen from the BSD
 socket API for C and Graham Barr's IO::Socket classes for Perl.
 
 We represent sockets as CLOS objects, and rename a lot of methods and
-arguments to fit Lisp style more closely.
-
-"
-   ))
-
-#||
-
-<h2>Contents</h2>
-
-<ol>
-<li> General concepts
-<li> Methods applicable to all <a href="#socket">sockets</a>
-<li> <a href="#sockopt">Socket Options</a>
-<li> Methods applicable to a particular subclass
-<ol>
-<li> <a href="#internet">INET-SOCKET</a> - Internet Protocol (TCP, UDP, raw) sockets
-<li> Methods on <a href="#LOCAL-SOCKET">LOCAL-SOCKET</a> - Local-domain sockets
-</ol>
-<li> <a href="#name-service">Name resolution</a> (DNS, /etc/hosts, &amp;c)
-</ol>
-
-<h2>General concepts</h2>
-
-<p>Most of the functions are modelled on the BSD socket API.  BSD sockets
-are widely supported, portably <i>("portable" by Unix standards, at least)</i>
-available on a variety of systems, and documented.  There are some
-differences in approach where we have taken advantage of some of the more useful features of Common Lisp - briefly
-
-<ul>
-<li> Where the C API would typically return -1 and set errno, we
-signal an error.  All the errors are subclasses of SOCKET-CONDITION
-and generally correspond one for one with possible <tt>errno</tt> values
-
-<li> We use multiple return values in many places where the C API would use
-pass-by-reference values
-
-<li> We can often avoid supplying an explicit <i>length</i> argument to
-functions because we already know how long the argument is.
-
-<li> IP addresses and ports are represented in slightly friendlier fashion
-than "network-endian integers".  See the section on <a href="#internet"
->Internet domain</a> sockets for details.
-</ul>
-
-
-|#
-
-(in-package :sb-bsd-sockets)
-
-(defmethod asdf:hyperdocumentation
-    ((package (eql #.*package*)) symbol kind)
-  (declare (ignore kind))
-  (format nil "file://~A#~A"
-          #.(namestring
-             (merge-pathnames "index.html"
-                              (or *load-pathname* *compile-file-pathname*)))
-          symbol))
+arguments to fit Lisp style more closely."))
+
+;;; gethostbyname/gethostbyaddr are generally not thread safe. POSIX
+;;; 1003.1-2003 defines an alternative API, which is specified in the
+;;; RFC to be thread-safe. If it seems to be available, use it.
+;;;
+;;; Unfortunately the manual page claims that these functions are not
+;;; thread-safe on OS X, but they probably can't be any worse than
+;;; gethostbyname and gethostbyaddr.
+;;;
+;;; CLH: getaddrinfo seems to be broken is broken on x86-64/darwin
+#-(or win32 (and x86-64 darwin))
+(let ((addr (sb-alien::find-dynamic-foreign-symbol-address "getaddrinfo")))
+  (when addr
+    (pushnew :sb-bsd-sockets-addrinfo *features*)))