X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fsb-bsd-sockets%2Fdefpackage.lisp;h=c329a819d6631365130f13e0ad93cf212c11a03f;hb=b4031d85bc80194c3cd44d8dee7c51d82098c193;hp=6779880b935551a0d5fdddf327a111ff6d66af52;hpb=4bc6b918bb99e8dcd17bbe6479a06e52b2d04a6c;p=sbcl.git
diff --git a/contrib/sb-bsd-sockets/defpackage.lisp b/contrib/sb-bsd-sockets/defpackage.lisp
index 6779880..c329a81 100644
--- a/contrib/sb-bsd-sockets/defpackage.lisp
+++ b/contrib/sb-bsd-sockets/defpackage.lisp
@@ -1,63 +1,48 @@
+#+(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" "SB-C-CALL"))
(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-name socket-peername socket-listen
socket-close socket-file-descriptor
- socket-family socket-protocol socket-type
- socket-make-stream get-protocol-by-name
+ socket-family socket-protocol socket-open-p
+ socket-type socket-make-stream get-protocol-by-name
get-host-by-name get-host-by-address
host-ent
host-ent-addresses host-ent-address
host-ent-aliases host-ent-name
name-service-error
+ getaddrinfo
;; not sure if these are really good names or not
netdb-internal-error
netdb-success-error
host-not-found-error
try-again-error
no-recovery-error
-
- ;; all socket options are also exported, by code in
- ;; sockopt.lisp
- socket-error
+ unknown-protocol
+
+ ;; all socket options are also exported, by code in
+ ;; sockopt.lisp
+
+ socket-error
+
+ ;; other errno-based socket errors are exported by code in
+ ;; sockets.lisp
- ;; other errno-based socket errors are exported by code in
- ;; sockets.lisp
-
make-inet-address
non-blocking-mode
@@ -76,55 +61,16 @@ arguments to fit Lisp style more closely.
"
))
-#||
-
-Contents
-
-
-- General concepts
-
- Methods applicable to all sockets
-
- Socket Options
-
- Methods applicable to a particular subclass
-
-- INET-SOCKET - Internet Protocol (TCP, UDP, raw) sockets
-
- Methods on LOCAL-SOCKET - Local-domain sockets
-
- - Name resolution (DNS, /etc/hosts, &c)
-
-
-General concepts
-
-Most of the functions are modelled on the BSD socket API. BSD sockets
-are widely supported, portably ("portable" by Unix standards, at least)
-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
-
-
-- 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 errno values
-
-
- We use multiple return values in many places where the C API would use
-pass-by-reference values
-
-
- We can often avoid supplying an explicit length argument to
-functions because we already know how long the argument is.
-
-
- IP addresses and ports are represented in slightly friendlier fashion
-than "network-endian integers". See the section on Internet domain sockets for details.
-
-
-
-|#
-
-(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))
+;;; 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
+#-(and x86-64 darwin)
+(let ((addr (sb-alien::find-dynamic-foreign-symbol-address "getaddrinfo")))
+ (when addr
+ (pushnew :sb-bsd-sockets-addrinfo *features*)))