September 2010 - usocket-cvs@common-lisp.net

[usocket-cvs] r567 - usocket/trunk
by Chun Tian 30 Sep '10

30 Sep '10

Author: ctian Date: Thu Sep 30 04:45:35 2010 New Revision: 567 Log: Export +max-datagram-packet-size+ Modified: usocket/trunk/package.lisp Modified: usocket/trunk/package.lisp ============================================================================== --- usocket/trunk/package.lisp (original) +++ usocket/trunk/package.lisp Thu Sep 30 04:45:35 2010 @@ -13,6 +13,8 @@ #:*remote-host* ; special variables (udp) #:*remote-port* + #:+max-datagram-packet-size+ + #:socket-connect ; socket constructors and methods #:socket-listen #:socket-accept

1 0

[usocket-cvs] r566 - in usocket/branches/0.3.x: . backend
by Chun Tian 28 Sep '10

28 Sep '10

Author: ctian Date: Tue Sep 28 05:17:06 2010 New Revision: 566 Log: Fixed non-exist confition class: ns-try-again-condition. Thanks to Stas Boukarev <stassats(a)gmail.com> Modified: usocket/branches/0.3.x/backend/cmucl.lisp usocket/branches/0.3.x/condition.lisp Modified: usocket/branches/0.3.x/backend/cmucl.lisp ============================================================================== --- usocket/branches/0.3.x/backend/cmucl.lisp (original) +++ usocket/branches/0.3.x/backend/cmucl.lisp Tue Sep 28 05:17:06 2010 @@ -144,10 +144,10 @@ ;; constants mentioned in C (let ((exception (second (assoc errno - '((1 ns-host-not-found-error) ;; HOST_NOT_FOUND - (2 ns-no-recovery-error) ;; NO_DATA - (3 ns-no-recovery-error) ;; NO_RECOVERY - (4 ns-try-again)))))) ;; TRY_AGAIN + '((1 ns-host-not-found-error) ;; HOST_NOT_FOUND + (2 ns-no-recovery-error) ;; NO_DATA + (3 ns-no-recovery-error) ;; NO_RECOVERY + (4 ns-try-again-condition)))))) ;; TRY_AGAIN (when exception (error exception)))))) Modified: usocket/branches/0.3.x/condition.lisp ============================================================================== --- usocket/branches/0.3.x/condition.lisp (original) +++ usocket/branches/0.3.x/condition.lisp Tue Sep 28 05:17:06 2010 @@ -90,7 +90,7 @@ (define-usocket-condition-classes - (ns-try-again) + (ns-try-again-condition) (ns-condition)) (define-condition ns-unknown-condition (ns-condition)

1 0

[usocket-cvs] r565 - in usocket/branches/0.4.x: . backend
by Chun Tian 28 Sep '10

28 Sep '10

Author: ctian Date: Tue Sep 28 05:16:01 2010 New Revision: 565 Log: Fixed non-exist confition class: ns-try-again-condition. Thanks to Stas Boukarev <stassats(a)gmail.com> Modified: usocket/branches/0.4.x/backend/cmucl.lisp usocket/branches/0.4.x/condition.lisp Modified: usocket/branches/0.4.x/backend/cmucl.lisp ============================================================================== --- usocket/branches/0.4.x/backend/cmucl.lisp (original) +++ usocket/branches/0.4.x/backend/cmucl.lisp Tue Sep 28 05:16:01 2010 @@ -163,10 +163,10 @@ ;; constants mentioned in C (let ((exception (second (assoc errno - '((1 ns-host-not-found-error) ;; HOST_NOT_FOUND - (2 ns-no-recovery-error) ;; NO_DATA - (3 ns-no-recovery-error) ;; NO_RECOVERY - (4 ns-try-again)))))) ;; TRY_AGAIN + '((1 ns-host-not-found-error) ;; HOST_NOT_FOUND + (2 ns-no-recovery-error) ;; NO_DATA + (3 ns-no-recovery-error) ;; NO_RECOVERY + (4 ns-try-again-condition)))))) ;; TRY_AGAIN (when exception (error exception)))))) Modified: usocket/branches/0.4.x/condition.lisp ============================================================================== --- usocket/branches/0.4.x/condition.lisp (original) +++ usocket/branches/0.4.x/condition.lisp Tue Sep 28 05:16:01 2010 @@ -131,7 +131,7 @@ error available.")) (define-usocket-condition-classes - (ns-try-again) + (ns-try-again-condition) (ns-condition)) (define-condition ns-unknown-condition (ns-condition)

1 0

[usocket-cvs] r564 - in usocket/trunk: . backend
by Chun Tian 28 Sep '10

28 Sep '10

Author: ctian Date: Tue Sep 28 05:15:13 2010 New Revision: 564 Log: Fixed non-exist confition class: ns-try-again-condition. Thanks to Stas Boukarev <stassats(a)gmail.com> Modified: usocket/trunk/backend/cmucl.lisp usocket/trunk/condition.lisp Modified: usocket/trunk/backend/cmucl.lisp ============================================================================== --- usocket/trunk/backend/cmucl.lisp (original) +++ usocket/trunk/backend/cmucl.lisp Tue Sep 28 05:15:13 2010 @@ -209,10 +209,10 @@ ;; constants mentioned in C (let ((exception (second (assoc errno - '((1 ns-host-not-found-error) ;; HOST_NOT_FOUND - (2 ns-no-recovery-error) ;; NO_DATA - (3 ns-no-recovery-error) ;; NO_RECOVERY - (4 ns-try-again)))))) ;; TRY_AGAIN + '((1 ns-host-not-found-error) ;; HOST_NOT_FOUND + (2 ns-no-recovery-error) ;; NO_DATA + (3 ns-no-recovery-error) ;; NO_RECOVERY + (4 ns-try-again-condition)))))) ;; TRY_AGAIN (when exception (error exception)))))) Modified: usocket/trunk/condition.lisp ============================================================================== --- usocket/trunk/condition.lisp (original) +++ usocket/trunk/condition.lisp Tue Sep 28 05:15:13 2010 @@ -132,7 +132,7 @@ error available.")) (define-usocket-condition-classes - (ns-try-again) + (ns-try-again-condition) (ns-condition)) (define-condition ns-unknown-condition (ns-condition)

1 0

[usocket-cvs] r563 - public_html
by Chun Tian 24 Sep '10

24 Sep '10

Author: ctian Date: Fri Sep 24 11:16:20 2010 New Revision: 563 Log: Fixed HTML title (USOCKET) when editing pages using Mozilla Composer Modified: public_html/feature-comparison.shtml public_html/implementation-comparison.shtml public_html/index.shtml Modified: public_html/feature-comparison.shtml ============================================================================== --- public_html/feature-comparison.shtml (original) +++ public_html/feature-comparison.shtml Fri Sep 24 11:16:20 2010 @@ -1,19 +1,21 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xml:lang="en" xmlns="http://www.w3.org/1999/xhtml" lang="en"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> - <title></title> + <title>USOCKET</title> <link rel="stylesheet" type="text/css" href="style.css"> <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> </head> <body> <div class="header"> -<h1></h1> +<h1>USOCKET</h1> </div> <h2>Comparison to "trivial-sockets"</h2> <p><em>usocket</em> supports more backends than <em>trivial-sockets</em>. -The latter implements different feature-sets for different backends +The +latter +implements different feature-sets for different backends while the former supplies consistent functionality for all backends.</p> <div style="border: 3px solid black; margin: 0px; padding: 2px;"> <table style="border: 1px solid black;" border="1" cellspacing="1"> Modified: public_html/implementation-comparison.shtml ============================================================================== --- public_html/implementation-comparison.shtml (original) +++ public_html/implementation-comparison.shtml Fri Sep 24 11:16:20 2010 @@ -1,14 +1,14 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xml:lang="en" xmlns="http://www.w3.org/1999/xhtml" lang="en"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> - <title></title> + <title>USOCKET</title> <link rel="stylesheet" type="text/css" href="style.css"> <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> </head> <body> <div class="header"> -<h1></h1> +<h1>USOCKET</h1> </div> <h2>Supported implementations comparison</h2> <p>Different projects aim at providing TCP/IP sockets portably Modified: public_html/index.shtml ============================================================================== --- public_html/index.shtml (original) +++ public_html/index.shtml Fri Sep 24 11:16:20 2010 @@ -1,14 +1,14 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<html xml:lang="en" xmlns="http://www.w3.org/1999/xhtml" lang="en"> <head> - <title></title> + <title>USOCKET</title> <link rel="stylesheet" type="text/css" href="style.css"> <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> </head> <body> <div class="header"> -<h1></h1> +<h1>USOCKET</h1> </div> <ul> <li><a href="#goal">Goal</a></li> @@ -96,7 +96,9 @@ kept up to date, please <a href="http://common-lisp.net/cgi-bin/mailman/listinfo/usocket-devel">subscribe to -the commit message mailing list</a>. To use the latest development +the +commit +message mailing list</a>. To use the latest development version, make sure you have <a href="http://subversion.tigris.org/">Subversion</a> installed and execute this command: </p> <pre> $ svn checkout svn://common-lisp.net/project/usocket/svn/usocket/trunk usocket-svn<br> </pre> @@ -124,6 +126,8 @@ <th><a href="http://common-lisp.net/websvn/filedetails.php?repname=usocket&path=%2Fu…">Allegro + + <br> </a></th> <th><a @@ -297,7 +301,8 @@ in one function call (select() like behaviour).</td> <td><a href="http://trac.common-lisp.net/usocket/wiki/SocketSelect">Investigate -interfaces provided</a></td> +interfaces +provided</a></td> <td class="DONE">DONE</td> <td class="DONE">DONE</td> <td class="DONE">DONE</td> @@ -353,7 +358,8 @@ <td rowspan="2">Implement udp socket support.</td> <td><a href="http://trac.common-lisp.net/usocket/wiki/DatagramSockets">Investigate -API's provided</a></td> +API's +provided</a></td> <td class="DONE">DONE</td> <td class="DONE">DONE</td> <td class="DONE">DONE</td> @@ -485,6 +491,8 @@ <td>Add support for <a href="http://www.scieneer.com/scl/index.html">Scieneer Common Lisp</a>, fix + + <a href="http://trac.common-lisp.net/usocket/ticket/6">issue #6</a> and API preparation for server side sockets (not in this release)</td> </tr>

1 0

[usocket-cvs] r562 - in usocket/trunk: . backend
by Chun Tian 15 Sep '10

15 Sep '10

Author: ctian Date: Wed Sep 15 02:26:32 2010 New Revision: 562 Log: ABCL: bugfix for socket-accept, now socker-server confirmed works. Modified: usocket/trunk/backend/abcl.lisp usocket/trunk/server.lisp Modified: usocket/trunk/backend/abcl.lisp ============================================================================== --- usocket/trunk/backend/abcl.lisp (original) +++ usocket/trunk/backend/abcl.lisp Wed Sep 15 02:26:32 2010 @@ -249,9 +249,9 @@ ;;; SOCKET-ACCEPT -(defmethod socket-accept ((socket stream-server-usocket) &key (element-type 'character)) - (with-mapped-conditions (socket) - (let* ((client-socket (jcall $@accept/0 socket)) +(defmethod socket-accept ((usocket stream-server-usocket) &key (element-type 'character)) + (with-mapped-conditions (usocket) + (let* ((client-socket (jcall $@accept/0 (socket usocket))) (stream (ext:get-socket-stream client-socket :element-type element-type))) (make-stream-socket :stream stream :socket client-socket)))) Modified: usocket/trunk/server.lisp ============================================================================== --- usocket/trunk/server.lisp (original) +++ usocket/trunk/server.lisp Wed Sep 15 02:26:32 2010 @@ -9,7 +9,7 @@ (timeout 1) (max-buffer-size +max-datagram-packet-size+) ;; for tcp element-type reuse-address multi-threading) - (let* ((real-host (or host #(0 0 0 0))) + (let* ((real-host (or host *wildcard-host*)) (socket (ecase protocol (:stream (apply #'socket-listen

1 0

[usocket-cvs] r561 - usocket/trunk/vendor
by Chun Tian 15 Sep '10

15 Sep '10

Author: ctian Date: Wed Sep 15 02:14:59 2010 New Revision: 561 Log: ABCL: spawn-thread now works in ABCL. Modified: usocket/trunk/vendor/spawn-thread.lisp Modified: usocket/trunk/vendor/spawn-thread.lisp ============================================================================== --- usocket/trunk/vendor/spawn-thread.lisp (original) +++ usocket/trunk/vendor/spawn-thread.lisp Wed Sep 15 02:14:59 2010 @@ -65,6 +65,9 @@ #+scl (mp:make-process #'(lambda () (apply function args)) :name name) + #+abcl + (threads:make-thread #'(lambda () (apply function args)) + :name name) #+threads-not-available (declare (ignore name function args)) #+threads-not-available

1 0

[usocket-cvs] r560 - in usocket/trunk: . backend
by Chun Tian 15 Sep '10

15 Sep '10

Author: ctian Date: Wed Sep 15 00:19:01 2010 New Revision: 560 Log: Fixed legacy reuseaddress argument for MCL and ABCL; Add CHANGES; Update TODO. Added: usocket/trunk/CHANGES Modified: usocket/trunk/TODO usocket/trunk/backend/abcl.lisp usocket/trunk/backend/mcl.lisp usocket/trunk/usocket-test.asd Added: usocket/trunk/CHANGES ============================================================================== --- (empty file) +++ usocket/trunk/CHANGES Wed Sep 15 00:19:01 2010 @@ -0,0 +1,7 @@ +0.5.0: + +* New supported platform: Macintosh Common Lisp (5.0 and up, plus RMCL) +* Support for UDP (datagram-usocket) was added (for all supported platform except MCL) +* Add WAIT-FOR-INPUT support for SBCL and ECL on win32. +* Simple TCP and UDP server API: SOCKET-SERVER +* Lots of bug fixed since 0.4.1 Modified: usocket/trunk/TODO ============================================================================== --- usocket/trunk/TODO (original) +++ usocket/trunk/TODO Wed Sep 15 00:19:01 2010 @@ -1,17 +1,4 @@ - -- Implement wait-for-input-internal for - * SBCL Win32 - -- Implement errors for (the alien interface code of) - * SBCL Unix - * CMUCL Unix - * OpenMCL - - -- Extend ABCL socket support with the 4 java errors in java.net.* - so that they can map to our usocket errors instead of mapping - all errors to unknown-error. - +- Fix condition systems (make all implementation generate same error) - Add INET6 support. For more TODO items, see http://trac.common-lisp.net/usocket/report. Modified: usocket/trunk/backend/abcl.lisp ============================================================================== --- usocket/trunk/backend/abcl.lisp (original) +++ usocket/trunk/backend/abcl.lisp Wed Sep 15 00:19:01 2010 @@ -231,15 +231,16 @@ ;;; SOCKET-LISTEN -(defun socket-listen (host port &key (element-type 'character) +(defun socket-listen (host port &key reuseaddress (reuse-address nil reuse-address-supplied-p) - (backlog 5 backlog-supplied-p)) + (backlog 5 backlog-supplied-p) + (element-type 'character)) (declare (type boolean reuse-address)) - (let* ((channel (jstatic $@open/ServerSocketChannel/0 $*ServerSocketChannel)) + (let* ((reuseaddress (if reuse-address-supplied-p reuse-address reuseaddress)) + (channel (jstatic $@open/ServerSocketChannel/0 $*ServerSocketChannel)) (socket (jcall $@socket/ServerSocketChannel/0 channel)) (endpoint (jnew $%InetSocketAddress/2 (host-to-inet4 host) (or port 0)))) - (when reuse-address-supplied-p - (jcall $@setReuseAddress/1 socket (if reuse-address +java-true+ +java-false+))) + (jcall $@setReuseAddress/1 socket (if reuseaddress +java-true+ +java-false+)) (with-mapped-conditions (socket) (if backlog-supplied-p (jcall $@bind/ServerSocket/2 socket endpoint backlog) Modified: usocket/trunk/backend/mcl.lisp ============================================================================== --- usocket/trunk/backend/mcl.lisp (original) +++ usocket/trunk/backend/mcl.lisp Wed Sep 15 00:19:01 2010 @@ -94,13 +94,13 @@ (reuse-address nil reuse-address-supplied-p) (backlog 5) (element-type 'character)) - (declare (ignore reuseaddress reuse-address-supplied-p)) - (let ((socket (with-mapped-conditions () - (make-instance 'passive-socket - :local-port port - :local-host host - :reuse-address reuse-address - :backlog backlog)))) + (let* ((reuseaddress (if reuse-address-supplied-p reuse-address reuseaddress)) + (socket (with-mapped-conditions () + (make-instance 'passive-socket + :local-port port + :local-host host + :reuse-address reuseaddress + :backlog backlog)))) (make-stream-server-socket socket :element-type element-type))) (defmethod socket-accept ((usocket stream-server-usocket) &key element-type) Modified: usocket/trunk/usocket-test.asd ============================================================================== --- usocket/trunk/usocket-test.asd (original) +++ usocket/trunk/usocket-test.asd Wed Sep 15 00:19:01 2010 @@ -23,7 +23,9 @@ :components ((:module "test" :components ((:file "package") (:file "test-usocket" - :depends-on ("package")))))) + :depends-on ("package")) + (:file "test-condition" + :depends-on ("test-usocket")))))) (defmethod perform ((op test-op) (c (eql (find-system :usocket-test)))) (funcall (intern "DO-TESTS" "USOCKET-TEST")))

1 0

[usocket-cvs] r559 - public_html
by Chun Tian 15 Sep '10

15 Sep '10

Author: ctian Date: Wed Sep 15 00:06:05 2010 New Revision: 559 Log: Update other Web pages with new progress. Modified: public_html/feature-comparison.shtml public_html/implementation-comparison.shtml public_html/index.shtml Modified: public_html/feature-comparison.shtml ============================================================================== --- public_html/feature-comparison.shtml (original) +++ public_html/feature-comparison.shtml Wed Sep 15 00:06:05 2010 @@ -1,154 +1,163 @@ -<?xml version="1.0"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xml:lang="en" xmlns="http://www.w3.org/1999/xhtml" lang="en"> <head> - <title></title> - <link rel="stylesheet" type="text/css" href="style.css"/> - <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> + <title></title> + <link rel="stylesheet" type="text/css" href="style.css"> + <meta http-equiv="Content-Type" + content="text/html; charset=ISO-8859-1"> </head> - <body> - <div class="header"> - <h1></h1> - </div> - -<h2>Comparison to "trivial-sockets"</h2> - +<div class="header"> +<h1></h1> +</div> +<h2>Comparison to "trivial-sockets"</h2> <p><em>usocket</em> supports more backends than <em>trivial-sockets</em>. - The latter implements different feature-sets for different backends while - the former supplies consistent functionality for all backends.</p> - -<div style="border:3px solid black;padding: 2px; margin: 0px"> -<table style="border:1px solid black;" border="1" cellspacing="1"> -<tbody> -<tr><th colspan="2">Feature</th> - <th colspan="8">In trivial-sockets?</th><th rowspan="2">In usocket?</th></tr> -<tr><th colspan="2"></th><th title="ArmedBear">ABCL</th> - <th title="Allegro">ACL</th> - <th>clisp</th> - <th>CMUCL</th> - <th>LispWorks</th> - <th>OpenMCL</th> - <th>SBCL</th> - <th>overall</th> - </tr> -<tr><th rowspan="3">Client side tcp streams</th><th>:element-type</th> - <td>Yes</td>  - <td title="bivalent streams">Yes*</td> - <td>Yes</td> - <td>Yes</td> - <td>Yes</td> - <td title="bivalent streams">Yes*</td> - <td>Yes</td> - <td>Yes</td> - <td>Yes</td> - - </tr> -<tr><th>:external-format</th> - <td>No</td> - <td>No</td> - <td>Yes</td> - <td>No</td> - <td>No</td> - <td>No</td> - <td>No</td> - <td>No</td> - <td>No</td> -</tr> -<tr><th>binding local interface/port</th> - <td>No</td> - <td>Yes</td> - <td>No</td> - <td>No</td> - <td>No</td> - <td>Yes</td> - <td>Yes</td> - <td>No</td> - <td>No</td> -</tr> -<tr><th rowspan="5">Server socket creation</th> - <th>Binding specific local port</th> - <td colspan="9">Yes</td> -</tr> -<tr><th>Binding specific local interface</th> - <td>No</td> - <td>Yes</td> - <td>No</td> - <td>Yes</td> - <td>No</td> - <td>Yes</td> - <td>Yes</td> - <td>No</td> - <td>Yes</td> -</tr> -<tr><th>Selectable backlog length</th> - <td>No</td> - <td>Yes</td> - <td>No</td> - <td>Yes</td> - <td>No</td> - <td>Yes</td> - <td>Yes</td> - <td>No</td> - <td>Yes</td> -</tr> -<tr><th>reuse-address</th> - <td>Yes</td> - <td>Yes</td> - <td>No*</td> - <td>Yes</td> - <td>Yes</td> - <td>Yes</td> - <td>Yes</td> - <td>No*</td> - <td>Yes*</td> -</tr> -<tr><th>:element-type for created connections</th> - <td colspan="8">No</td> - <td>Yes</td> -</tr> -<tr><th rowspan="5">Accepting connections</th> - <th>:element-type for created stream</th> - <td>Yes</td> - <td>Yes*</td> - <td>Yes</td> - <td>Yes</td> - <td>Yes</td> - <td>Yes*</td> - <td>Yes</td> - <td>Yes</td> - <td>Yes*</td> -</tr> -<tr><th>:external-format for created stream</th> - <td>No</td> - <td>No</td> - <td>Yes</td> - <td>No</td> - <td>No</td> - <td>No</td> - <td>No</td> - <td>No</td> - <td>No</td> - -</tr> -</tbody> +The latter implements different feature-sets for different backends +while the former supplies consistent functionality for all backends.</p> +<div style="border: 3px solid black; margin: 0px; padding: 2px;"> +<table style="border: 1px solid black;" border="1" cellspacing="1"> + <tbody> + <tr> + <th colspan="2">Feature</th> + <th colspan="8">In trivial-sockets?</th> + <th rowspan="2">In usocket?</th> + </tr> + <tr> + <th colspan="2"><br> + </th> + <th title="ArmedBear">ABCL</th> + <th title="Allegro">ACL</th> + <th>clisp</th> + <th>CMUCL</th> + <th>LispWorks</th> + <th>OpenMCL</th> + <th>SBCL</th> + <th>overall</th> + </tr> + <tr> + <th rowspan="3">Client side tcp streams</th> + <th>:element-type</th> + <td>Yes</td> + <td title="bivalent streams">Yes*</td> + <td>Yes</td> + <td>Yes</td> + <td>Yes</td> + <td title="bivalent streams">Yes*</td> + <td>Yes</td> + <td>Yes</td> + <td>Yes</td> + </tr> + <tr> + <th>:external-format</th> + <td>No</td> + <td>No</td> + <td>Yes</td> + <td>No</td> + <td>No</td> + <td>No</td> + <td>No</td> + <td>No</td> + <td>No</td> + </tr> + <tr> + <th>binding local interface/port</th> + <td>No</td> + <td>Yes</td> + <td>No</td> + <td>No</td> + <td>No</td> + <td>Yes</td> + <td>Yes</td> + <td>No</td> + <td>Yes</td> + </tr> + <tr> + <th rowspan="5">Server socket creation</th> + <th>Binding specific local port</th> + <td colspan="9">Yes</td> + </tr> + <tr> + <th>Binding specific local interface</th> + <td>No</td> + <td>Yes</td> + <td>No</td> + <td>Yes</td> + <td>No</td> + <td>Yes</td> + <td>Yes</td> + <td>No</td> + <td>Yes</td> + </tr> + <tr> + <th>Selectable backlog length</th> + <td>No</td> + <td>Yes</td> + <td>No</td> + <td>Yes</td> + <td>No</td> + <td>Yes</td> + <td>Yes</td> + <td>No</td> + <td>Yes</td> + </tr> + <tr> + <th>reuse-address</th> + <td>Yes</td> + <td>Yes</td> + <td>No*</td> + <td>Yes</td> + <td>Yes</td> + <td>Yes</td> + <td>Yes</td> + <td>No*</td> + <td>Yes*</td> + </tr> + <tr> + <th>:element-type for created connections</th> + <td colspan="8">No</td> + <td>Yes</td> + </tr> + <tr> + <th rowspan="5">Accepting connections</th> + <th>:element-type for created stream</th> + <td>Yes</td> + <td>Yes*</td> + <td>Yes</td> + <td>Yes</td> + <td>Yes</td> + <td>Yes*</td> + <td>Yes</td> + <td>Yes</td> + <td>Yes*</td> + </tr> + <tr> + <th>:external-format for created stream</th> + <td>No</td> + <td>No</td> + <td>Yes</td> + <td>No</td> + <td>No</td> + <td>No</td> + <td>No</td> + <td>No</td> + <td>No</td> + </tr> + </tbody> </table> </div> - -<p>In summary: there are only a very limited number of features you can depend +<p>In summary: there are only a very limited number of features you can +depend on to work on all platforms supported by trivial-sockets. While usocket -doesn't support all features, you can depend on the features to be available. +doesn't support all features, you can depend on the features to be +available. </p> - -<hr /> - -<div style="float:left;font-size:x-small;font-weight:bold"> -Back to <a href="http://common-lisp.net/">Common-lisp.net</a>. +<hr> +<div style="float: left; font-size: x-small; font-weight: bold;">Back +to <a href="http://common-lisp.net/">Common-lisp.net</a>. +</div> +<div class="check" style="float: right;"> <a + href="http://validator.w3.org/check/referer">Valid XHTML 1.0 Strict</a> </div> - <div class="check" style="float:right"> - <a href="http://validator.w3.org/check/referer">Valid XHTML 1.0 Strict</a> - </div> </body> </html> Modified: public_html/implementation-comparison.shtml ============================================================================== --- public_html/implementation-comparison.shtml (original) +++ public_html/implementation-comparison.shtml Wed Sep 15 00:06:05 2010 @@ -1,68 +1,155 @@ -<?xml version="1.0"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xml:lang="en" xmlns="http://www.w3.org/1999/xhtml" lang="en"> <head> - <title></title> - <link rel="stylesheet" type="text/css" href="style.css"/> - <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> + <title></title> + <link rel="stylesheet" type="text/css" href="style.css"> + <meta http-equiv="Content-Type" + content="text/html; charset=ISO-8859-1"> </head> - <body> - <div class="header"> - <h1></h1> - </div> - +<div class="header"> +<h1></h1> +</div> <h2>Supported implementations comparison</h2> - <p>Different projects aim at providing TCP/IP sockets portably -across Common Lisp implementations. The table below summarizes +across Common Lisp implementations. The table below summarizes the state of several of these libraries.</p> - <table> -<caption>Supported implementations comparison</caption> -<thead> -<tr><th>Implementation</th><th>trivial-sockets</th><th>ACL-COMPAT</th> - <th>s-sysdeps</th><th>usocket</th><th>kmrcl</th><th>IOLib</th></tr> -</thead> -<tbody> -<tr><th>SBCL</th><td>yes</td><td>yes</td><td>yes</td><td>yes</td><td>yes</td><td>yes</td> -</tr> -<tr><th>CMUCL</th><td>yes</td><td>yes</td><td>yes</td><td>yes</td><td>yes</td><td>yes</td> -</tr> -<tr style="background-color:#eef"><th>ArmedBear</th><td>yes</td><td>no</td><td>no</td><td>yes</td><td>no</td><td>no</td> -</tr> -<tr><th>clisp</th><td>yes</td><td>yes</td><td>no</td><td>yes</td><td>yes</td><td>yes</td> -</tr> -<tr><th>Allegro</th><td>yes</td><td>not relevant</td><td>no</td><td>yes</td><td>yes</td><td>no</td> -</tr> -<tr style="background-color:#eef"><th>LispWorks</th><td>yes</td><td>yes</td><td>yes</td><td>yes</td><td>yes</td><td>no</td> -</tr> -<tr><th>OpenMCL</th><td>yes</td><td>yes</td><td>yes</td><td>yes</td><td>yes</td><td>no</td> -</tr> -<tr><th>ECL</th><td>no</td><td>no</td><td>no</td><td>yes</td><td>no</td><td>no</td> -</tr> -<tr style="background-color:#eef"><th>Scieneer</th><td>no</td><td>yes</td><td>no</td><td>yes</td><td>no</td><td>no</td> -</tr> -<tr><th>GCL</th><td>no</td><td>no</td><td>no</td><td>no (to come)</td><td>no</td><td>no</td> -</tr> -<tr><th>Corman</th><td>no</td><td>yes</td><td>no</td><td>no (to come)</td><td>no</td><td>no</td> -</tr> -<tr style="background-color:#efe"><th>Total #</th><td>8</td><td>7(+1)</td><td>4</td><td>9</td><td>6</td><td>3</td> -</tr> -</tbody> - - + <caption>Supported implementations comparison</caption> <thead><tr> + <th>Implementation</th> + <th>trivial-sockets</th> + <th>ACL-COMPAT</th> + <th>s-sysdeps</th> + <th>usocket</th> + <th>kmrcl</th> + <th>IOLib</th> + </tr> + </thead> <tbody> + <tr> + <th>SBCL</th> + <td>yes</td> + <td>yes</td> + <td>yes</td> + <td>yes</td> + <td>yes</td> + <td>yes</td> + </tr> + <tr> + <th>CMUCL</th> + <td>yes</td> + <td>yes</td> + <td>yes</td> + <td>yes</td> + <td>yes</td> + <td>yes</td> + </tr> + <tr style="background-color: rgb(238, 238, 255);"> + <th>ArmedBear</th> + <td>yes</td> + <td>no</td> + <td>no</td> + <td>yes</td> + <td>no</td> + <td>no</td> + </tr> + <tr> + <th>clisp</th> + <td>yes</td> + <td>yes</td> + <td>no</td> + <td>yes</td> + <td>yes</td> + <td>yes</td> + </tr> + <tr> + <th>Allegro</th> + <td>yes</td> + <td>not relevant</td> + <td>no</td> + <td>yes</td> + <td>yes</td> + <td>no</td> + </tr> + <tr style="background-color: rgb(238, 238, 255);"> + <th>LispWorks</th> + <td>yes</td> + <td>yes</td> + <td>yes</td> + <td>yes</td> + <td>yes</td> + <td>no</td> + </tr> + <tr> + <th>OpenMCL</th> + <td>yes</td> + <td>yes</td> + <td>yes</td> + <td>yes</td> + <td>yes</td> + <td>no</td> + </tr> + <tr> + <th>ECL</th> + <td>no</td> + <td>no</td> + <td>no</td> + <td>yes</td> + <td>no</td> + <td>no</td> + </tr> + <tr style="background-color: rgb(238, 238, 255);"> + <th>Scieneer</th> + <td>no</td> + <td>yes</td> + <td>no</td> + <td>yes</td> + <td>no</td> + <td>no</td> + </tr> + <tr> + <th>GCL</th> + <td>no</td> + <td>no</td> + <td>no</td> + <td>no (to come)</td> + <td>no</td> + <td>no</td> + </tr> + <tr> + <th>Corman</th> + <td>no</td> + <td>yes</td> + <td>no</td> + <td>no (to come)</td> + <td>no</td> + <td>no</td> + </tr> + <tr> + <th>Digitool MCL</th> + <td>no</td> + <td>no</td> + <td>no</td> + <td style="color: rgb(255, 0, 0);">yes</td> + <td>no</td> + <td>no</td> + </tr> + <tr style="background-color: rgb(238, 255, 238);"> + <th>Total #</th> + <td>8</td> + <td>7(+1)</td> + <td>4</td> + <td style="color: rgb(255, 0, 0);">10</td> + <td>6</td> + <td>3</td> + </tr> + </tbody> </table> - - -<hr /> - -<div style="float:left;font-size:x-small;font-weight:bold"> -Back to <a href="http://common-lisp.net/">Common-lisp.net</a>. +<hr> +<div style="float: left; font-size: x-small; font-weight: bold;">Back +to <a href="http://common-lisp.net/">Common-lisp.net</a>. +</div> +<div class="check" style="float: right;"> <a + href="http://validator.w3.org/check/referer">Valid XHTML 1.0 Strict</a> </div> - <div class="check" style="float:right"> - <a href="http://validator.w3.org/check/referer">Valid XHTML 1.0 Strict</a> - </div> </body> </html> Modified: public_html/index.shtml ============================================================================== --- public_html/index.shtml (original) +++ public_html/index.shtml Wed Sep 15 00:06:05 2010 @@ -1,171 +1,160 @@ -<?xml version="1.0"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> - <title></title> - <link rel="stylesheet" type="text/css" href="style.css"/> - <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> + <title></title> + <link rel="stylesheet" type="text/css" href="style.css"> + <meta http-equiv="Content-Type" + content="text/html; charset=ISO-8859-1"> </head> - <body> - <div class="header"> - <h1></h1> - </div> - +<div class="header"> +<h1></h1> +</div> <ul> -<li><a href="#goal">Goal</a></li> -<li><a href="#documentation">Documentation</a></li> -<li><a href="api-docs.shtml#faqs"><i>FAQ</i></a></li> -<li><a href="#implementations">Supported implementations</a></li> -<li><a href="#community">Community</a></li> -<li><a href="#development">Development</a></li> -<li><a href="#guarantees">Interface guarantees</a></li> -<li><a href="#releases">Releases</a></li> -<li><a href="#history">Project history</a></li> + <li><a href="#goal">Goal</a></li> + <li><a href="#documentation">Documentation</a></li> + <li><a href="api-docs.shtml#faqs"><i>FAQ</i></a></li> + <li><a href="#implementations">Supported implementations</a></li> + <li><a href="#community">Community</a></li> + <li><a href="#development">Development</a></li> + <li><a href="#guarantees">Interface guarantees</a></li> + <li><a href="#releases">Releases</a></li> + <li><a href="#history">Project history</a></li> </ul> - <h2><a name="goal">Goal</a></h2> - -<p>The project wants to provide a portable TCP/IP (and later on maybe -UDP) socket interface for as many Common Lisp implementations as +<p>The project wants to provide a portable TCP/IP and UDP/IP socket +interface for as many Common Lisp implementations as possible, while keeping the abstraction and portability layer as thin as possible. </p> - <p>Because <a href="http://cliki.net/trivial-sockets">trivial-sockets</a> has been declared dead and its author has said he will declare usocket -its successor if there is a zero effort path of migration, I'm <b>also working -on <em>trivial-usocket</em></b> which is supposed to be a sub-optimal, but zero +its successor if there is a zero effort path of migration, I'm <b>also +working +on <em>trivial-usocket</em></b> which is supposed to be a sub-optimal, +but zero effort migration from trivial-sockets.</p> - <p>If your lisp isn't mentioned in the list below, please feel free to submit a request for it at the mailing list mentioned below.</p> - <h3>Comparison to other socket libraries</h3> - -<p>Since usocket is effectively the succesor to trivial-sockets, see the - <a href="feature-comparison.shtml">feature comparison</a> with - trivial-sockets in order to find out which one you should use.</p> - +<p>Since usocket is effectively the succesor to trivial-sockets, see +the <a href="feature-comparison.shtml">feature comparison</a> with +trivial-sockets in order to find out which one you should use.</p> <p>After starting the project, many others turned out to have worked on - something alike, many times as part of a broader project or library. - Some of them were known at the start of this project, others have - been conceived after the usocket project already started. Not all of - them have exactly the same portability goal.</p> - +something alike, many times as part of a broader project or library. +Some of them were known at the start of this project, others have been +conceived after the usocket project already started. Not all of them +have exactly the same portability goal.</p> <p>See the <a href="implementation-comparison.shtml">Implementation - comparison</a> page for a comparison of the portability of other - libaries and how that relates to usocket.</p> - - +comparison</a> page for a comparison of the portability of other +libaries and how that relates to usocket.</p> <h2><a name="documentation">Documentation</a></h2> - -<p>See the documentation page for the <a href="./api-docs.shtml">API description</a>.</p> - +<p>See the documentation page for the <a href="./api-docs.shtml">API +description</a>.</p> <h2><a name="implementations">Supported implementations</a></h2> - <p>Currently these implementations are supported:</p> - <ul> <li>SBCL</li> <li>CMUCL</li> - <li>Armedbear (0.0.10 and up)</li> - <li>clisp</li> - <li>Allegro</li> + <li>ABCL (Armedbear)<br> + </li> + <li>GNU CLISP<br> + </li> + <li>Allegro CL<br> + </li> <li>LispWorks (5.0 and up)</li> - <li>OpenMCL</li> + <li>Clozure CL (aka OpenMCL)</li> <li>ECL</li> - <li>Scieneer</li> + <li>Scieneer CL<br> + </li> + <li>Digitool MCL (5.0 and up)<br> + </li> </ul> - <h2><a name="community">Community</a></h2> - - <p>This project has started Januari 2006. There isn't much of a community - yet, though I'd like there to be one. So, you're invited to join - the mailing list, announce yourself and even join the effort! - </p> - - - <p>Development discussion takes place on - <a href="http://common-lisp.net/cgi-bin/mailman/listinfo/usocket-devel">usocket-devel(a)common-lisp.net</a>. - </p> - -<p>Project tracking happens in the <a href="http://trac.common-lisp.net/usocket"> - project's Trac setup</a>. Please take note of the guidelines before - entering a bug or enhancement request into the database.</p> - - +<p>This project has started Januari 2006. There isn't much of a +community yet, though I'd like there to be one. So, you're invited to +join the mailing list, announce yourself and even join the effort! </p> +<p>Development discussion takes place on <a + href="http://common-lisp.net/cgi-bin/mailman/listinfo/usocket-devel">usocket-devel(a)common-lisp.net</a>. +</p> +<p>Project tracking happens in the <a + href="http://trac.common-lisp.net/usocket"> project's Trac setup</a>. +Please take note of the guidelines before entering a bug or enhancement +request into the database.</p> <div class="roadmap"> - <h2><a name="development">Development</a></h2> - - <p>Development will at least follow the steps outlined below. - Yet to be determined is whether the currently mentioned steps will - be enough to release version 1.0. Possibly, UDP sockets remain to be - addressed before doing 1.0; that will depend on your reactions :-) - </p> - <p>The targeted implementations listed in the status table below are not - a final list: others can be added if/when the need or interest arrises. - </p> - <p><a href="http://common-lisp.net/websvn/log.php?repname=usocket&path=%2Fusocket%2…" - >Active development</a> is taking place in the - <a href="http://subversion.tigris.org/">Subversion</a> repository. - To be kept up to date, please - <a href="http://common-lisp.net/cgi-bin/mailman/listinfo/usocket-devel" - >subscribe to the commit message mailing list</a>. To use the latest - development version, make sure you have <a - href="http://subversion.tigris.org/">Subversion</a> installed and - execute this command: - </p> - - <pre> - $ svn checkout svn://common-lisp.net/project/usocket/svn/usocket/trunk usocket-svn - </pre> - - <p>Please send patches, bug reports and suggestions to the development - mailing list address given above. The table below indicates the - current state of development. - </p> - -<table rules="all" border="1" cellpadding="3" style="font-size:small"> - <caption style="font-weight:bold;font-size:large">Status for the currently targeted backends</caption> - <thead class="roadmap-head"> - <tr> - <th colspan="2">Major steps</th> - <th colspan="9">Socket implementations</th> - </tr> - <tr> - <th></th> - <th>Minor steps</th> - <th><a href="http://common-lisp.net/websvn/filedetails.php?repname=usocket&path=%2Fu…">SBCL</a></th> - <th><a href="http://common-lisp.net/websvn/filedetails.php?repname=usocket&path=%2Fu…">CMUCL</a></th> - <th><a href="http://common-lisp.net/websvn/filedetails.php?repname=usocket&path=%2Fu…">ABCL</a></th> - <th><a href="http://common-lisp.net/websvn/filedetails.php?repname=usocket&path=%2Fu…">clisp</a></th> - <th><a href="http://common-lisp.net/websvn/filedetails.php?repname=usocket&path=%2Fu…">Allegro</a></th> - <th><a href="http://common-lisp.net/websvn/filedetails.php?repname=usocket&path=%2Fu…">LispWorks</a></th> - <th><a href="http://common-lisp.net/websvn/filedetails.php?repname=usocket&path=%2Fu…">OpenMCL</a></th> - <th>ECL</th> - <th>Scieneer</th> - </tr> - </thead> - <tbody> - <tr style="border-width:2px;border-color:#000;"> - <td rowspan="5">Minimal active sockets support - at the same level as provided by - <a href="http://cliki.net/trivial-sockets">trivial-sockets</a>.<br /> - (Meaning streamed tcp traffic on connected sockets.)</td> - <td><a href="http://common-lisp.net/websvn/filedetails.php?repname=usocket&path=%2Fu…" - >Investigate interfaces provided.</a></td> - <td class="DONE">DONE</td>  - <td class="DONE">DONE</td>  - <td class="DONE">DONE</td>  - <td class="DONE">DONE</td>  - <td class="DONE">DONE</td>  - <td class="DONE">DONE</td>  - <td class="DONE">DONE</td>  - <td class="DONE">DONE</td>  - <td class="DONE">DONE</td>  - </tr> - +<h2><a name="development">Development</a></h2> +<p>Development will at least follow the steps outlined below. Yet to be +determined is whether the currently mentioned steps will be enough to +release version 1.0. Possibly, UDP sockets remain to be addressed +before doing 1.0; that will depend on your reactions :-) </p> +<p>The targeted implementations listed in the status table below are +not a final list: others can be added if/when the need or interest +arrises. </p> +<p><a + href="http://common-lisp.net/websvn/log.php?repname=usocket&path=%2Fusocket%2…">Active +development</a> is taking place in the <a + href="http://subversion.tigris.org/">Subversion</a> repository. To be +kept up to date, please <a + href="http://common-lisp.net/cgi-bin/mailman/listinfo/usocket-devel">subscribe +to +the commit message mailing list</a>. To use the latest development +version, make sure you have <a href="http://subversion.tigris.org/">Subversion</a> +installed and execute this command: </p> +<pre> $ svn checkout svn://common-lisp.net/project/usocket/svn/usocket/trunk usocket-svn<br> </pre> +<p>Please send patches, bug reports and suggestions to the development +mailing list address given above. The table below indicates the current +state of development. </p> +<table style="font-size: small;" border="1" cellpadding="3" rules="all"> + <caption style="font-weight: bold; font-size: large;">Status for the +currently targeted backends</caption> <thead class="roadmap-head"> <tr> + <th colspan="2">Major steps</th> + <th colspan="10">Socket implementations</th> + </tr> + <tr> + <th><br> + </th> + <th>Minor steps</th> + <th><a + href="http://common-lisp.net/websvn/filedetails.php?repname=usocket&path=%2Fu…">SBCL</a></th> + <th><a + href="http://common-lisp.net/websvn/filedetails.php?repname=usocket&path=%2Fu…">CMUCL</a></th> + <th><a + href="http://common-lisp.net/websvn/filedetails.php?repname=usocket&path=%2Fu…">ABCL</a></th> + <th><a + href="http://common-lisp.net/websvn/filedetails.php?repname=usocket&path=%2Fu…">CLISP</a></th> + <th><a + href="http://common-lisp.net/websvn/filedetails.php?repname=usocket&path=%2Fu…">Allegro + + <br> + </a></th> + <th><a + href="http://common-lisp.net/websvn/filedetails.php?repname=usocket&path=%2Fu…">LispWorks</a></th> + <th><a + href="http://common-lisp.net/websvn/filedetails.php?repname=usocket&path=%2Fu…">CCL</a></th> + <th>ECL</th> + <th>Scieneer</th> + <th>MCL </th> + </tr> + </thead> <tbody> + <tr style="border-color: rgb(0, 0, 0); border-width: 2px;"> + <td rowspan="5">Minimal active sockets support at the same level +as provided by <a href="http://cliki.net/trivial-sockets">trivial-sockets</a>.<br> +(Meaning streamed tcp traffic on connected sockets.)</td> + <td><a + href="http://common-lisp.net/websvn/filedetails.php?repname=usocket&path=%2Fu…">Investigate +interfaces +provided.</a></td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td style="vertical-align: top; background-color: rgb(0, 153, 0);">DONE<br> + </td> + </tr> <tr> <td>Identify socket errors generated.</td> <td class="DONE" title="Implemented">DONE</td> @@ -177,6 +166,7 @@ <td class="DONE" title="Implemented">DONE</td> <td class="DONE" title="Implemented">DONE</td> <td class="DONE" title="Implemented">DONE</td> + <td class="DONE">DONE</td> </tr> <tr> <td>Implement active socket support.</td> @@ -189,6 +179,7 @@ <td class="DONE">DONE</td> <td class="DONE">DONE</td> <td class="DONE">DONE</td> + <td class="DONE">DONE</td> </tr> <tr> <td>Implement remapping of implementation defined errors.</td> @@ -201,6 +192,7 @@ <td class="DONE">DONE</td> <td class="DONE">DONE</td> <td class="DONE">DONE</td> + <td class="DONE">DONE</td> </tr> <tr> <td>Implementation test-suite status</td> @@ -213,22 +205,26 @@ <td class="PASS">PASS</td> <td class="PASS">PASS</td> <td class="PASS">PASS</td> + <td class="DONE">PASS</td> </tr> <tr> - <td rowspan="3">Add functions to retrieve socket properties:<br /> - Local and remote IP address and port.</td> - <td><a href="http://common-lisp.net/websvn/filedetails.php?repname=usocket&path=%2Fu…" - >Investigate interfaces provided</a></td> - <td class="DONE">DONE</td>  - <td class="DONE">DONE</td>  - <td class="DONE">DONE</td>  - <td class="DONE">DONE</td>  - <td class="DONE">DONE</td>  - <td class="DONE">DONE</td>  - <td class="DONE">DONE</td>  - <td class="DONE">DONE</td>  - <td class="DONE">DONE</td>  - </tr> + <td rowspan="3">Add functions to retrieve socket properties:<br> +Local and remote IP address and port.</td> + <td><a + href="http://common-lisp.net/websvn/filedetails.php?repname=usocket&path=%2Fu…">Investigate +interfaces +provided</a></td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + </tr> <tr> <td>Implement it.</td> <td class="DONE">DONE</td> @@ -240,6 +236,7 @@ <td class="DONE">DONE</td> <td class="DONE">DONE</td> <td class="DONE">DONE</td> + <td class="DONE">DONE</td> </tr> <tr> <td>Implementation test-suite status</td> @@ -252,20 +249,22 @@ <td class="PASS">PASS</td> <td class="PASS">PASS</td> <td class="PASS">PASS</td> + <td class="DONE">PASS</td> </tr> <tr> - <td rowspan="3">Add support for passive (connection-accepting/server) - sockets.</td> + <td rowspan="3">Add support for passive +(connection-accepting/server) sockets.</td> <td>Investigate interfaces provided</td> - <td class="WIP">WIP</td> - <td class="WIP">WIP</td> - <td class="WIP">WIP</td> - <td class="WIP">WIP</td> - <td class="WIP">WIP</td> - <td class="WIP">WIP</td> - <td class="WIP">WIP</td> - <td class="WIP">WIP</td> - <td class="WIP">WIP</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> </tr> <tr> <td>Implement api calls listen and accept</td> @@ -278,6 +277,7 @@ <td class="DONE">DONE</td> <td class="DONE">DONE</td> <td class="DONE">DONE</td> + <td class="DONE">DONE</td> </tr> <tr> <td>Implement api calls get- and setsockopt (or equivalent).</td> @@ -290,19 +290,21 @@ <td class="WIP">WIP</td> <td class="WIP">WIP</td> <td class="WIP">WIP</td> + <td class="WIP">WIP</td> </tr> <tr> <td rowspan="2">Implement efficient waiting for multiple sockets - in one function call (select() like behaviour).</td> - <td><a href="http://trac.common-lisp.net/usocket/wiki/SocketSelect"> - Investigate interfaces provided</a></td> - +in one function call (select() like behaviour).</td> + <td><a + href="http://trac.common-lisp.net/usocket/wiki/SocketSelect">Investigate +interfaces provided</a></td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> <td class="DONE">DONE</td> <td class="DONE">DONE</td> <td class="DONE">DONE</td> <td class="DONE">DONE</td> <td class="DONE">DONE</td> - <td class="DONE" title="missing on Win32">done</td> <td class="DONE">DONE</td> <td class="DONE">DONE</td> <td class="DONE">DONE</td> @@ -314,16 +316,16 @@ <td class="DONE">DONE</td> <td class="DONE">DONE</td> <td class="DONE">DONE</td> - <td class="DONE" title="missing on Win32">done</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> <td class="DONE">DONE</td> <td class="DONE">DONE</td> <td class="DONE">DONE</td> </tr> <tr> - <td rowspan="2">Implement more uncommon api calls - for tcp streams.</td> + <td rowspan="2">Implement more uncommon api calls for tcp streams.</td> <td>send, recv</td> - + <td class="TODO">TODO</td> <td class="TODO">TODO</td> <td class="TODO">TODO</td> <td class="TODO">TODO</td> @@ -345,134 +347,174 @@ <td class="TODO">TODO</td> <td class="TODO">TODO</td> <td class="TODO">TODO</td> + <td class="TODO">TODO</td> </tr> <tr> <td rowspan="2">Implement udp socket support.</td> - <td><a href="http://trac.common-lisp.net/usocket/wiki/DatagramSockets"> - Investigate API's provided</a></td> - <td class="WIP">WIP</td> - <td class="WIP">WIP</td> - <td class="WIP">WIP</td> - <td class="WIP">WIP</td> - <td class="WIP">WIP</td> - <td class="WIP">WIP</td> - <td class="WIP">WIP</td> - <td class="WIP">WIP</td> + <td><a + href="http://trac.common-lisp.net/usocket/wiki/DatagramSockets">Investigate +API's provided</a></td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> <td class="WIP">WIP</td> </tr> <tr> <td>Build on top of that (or custom ffi).</td> - <td class="WIP">WIP</td> - <td class="WIP">WIP</td> - <td class="WIP">WIP</td> - <td class="WIP">WIP</td> - <td class="WIP">WIP</td> - <td class="WIP">WIP</td> - <td class="WIP">WIP</td> - <td class="WIP">WIP</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> <td class="WIP">WIP</td> </tr> </tbody> </table> </div> - <h2><a name="guarantees">Interface guarantees</a></h2> - <p>The interfaces currently published in the :export part of the package definition are guaranteed to stay compatible for the -entire 0.x lifecycle. Extention in a backward compatible way is +entire 0.x lifecycle. Extention in a backward compatible way is ofcourse valid, as is the addition of new interface functions.</p> - <h2><a name="releases">Releases</a></h2> - <h3>Current release</h3> <p>Releases are uploaded to the <a href="releases/">releases/</a> - directory. You can find short descriptions in the table below:</p> - +directory. You can find short descriptions in the table below:</p> <table> -<caption>Release history</caption> -<tr><th>Date</th><th>Release</th><th>Summary</th></tr> -<tr><td>Dec 27, 2008</td> - <td>0.4.1</td> - <td>fixes for ECL, LispWorks, SBCL, SCL</td></tr> -<tr><td>Oct 28, 2008</td> - <td><b>0.4.0</b></td> - <td><b>select()-like api</b>: make a single thread wait for multiple sockets.<br /> - <b>various socket options</b> for socket-creation with SOCKET-CONNECT. - </td></tr> -<tr><td>Jun 21, 2008</td> - <td>0.3.6</td> - <td>Code fixups based on advice from the ECL and OpenMCL maintainers. - New exported symbols: WITH-MAPPED-CONDITIONS, NS-CONDITION, - NS-ERROR, NS-UNKNOWN-ERROR and NS-UNKNOWN-CONDITION.</td></tr> -<tr><td>Jul 25, 2007</td> - <td>0.3.4</td> - <td>Fix clisp get-host-name, multiple ECL fixes.</td></tr> -<tr><td>Jun 05, 2007</td> - <td>0.3.3</td> - <td>Fix where host resolution routine was unable to resolve would return - NIL instead of erroring.</td></tr> -<tr><td>Mar 04, 2007</td> - <td>0.3.2</td> - <td>Fixes for many backends related to closing sockets. - LispWorks fix for broken server sockets. - API guarantee adjustments in preparation of porting Drakma.</td></tr> -<tr><td>Feb 28, 2007</td> - <td>0.3.1</td> - <td>fixed with-server-socket; prevent creation of invalid sockets; - 2 more convenience macros.</td></tr> -<tr><td>Feb 26, 2007</td> - <td>re-release</td> - <td>Re-release of 0.2.3, 0.2.4, 0.2.5 and 0.3.0 tarballs - because the originals included Subversion administration areas.</td></tr> -<tr><td>Jan 21, 2007</td> - <td><b>0.3.0</b></td><td><b>Server sockets</b></td></tr> -<tr><td>Jan 19, 2007</td> - <td>0.2.5</td><td>Allegro compilation fix.</td></tr> -<tr><td>Jan 17, 2007</td> - <td>0.2.4</td><td>Various fixes for CMUCL, OpenMCL, Allegro and LispWorks. - </td></tr> -<tr><td>Jan 04, 2007</td> - <td>0.2.3</td><td>Add :element-type support to support stacking - flexi-streams on socket streams for portable :external-format - support.</td></tr> -<tr><td>Jan 03, 2007</td> - <td>0.2.2</td><td>Add ECL support and a small SBCL bugfix.</td></tr> -<tr><td>Dec 21, 2006</td> - <td>0.2.1</td><td>Remove 'open-stream' interface which is supposed - to be provided by the 'trivial-usocket' package.</td></tr> -<tr><td>Dec 18, 2006</td> - <td>0.2.0</td><td>Add support for - <a href="http://www.scieneer.com/scl/index.html">Scieneer - Common Lisp</a>, fix <a - href="http://trac.common-lisp.net/usocket/ticket/6">issue #6</a> and - API preparation for server side sockets (not in this release)</td></tr> -<tr><td>Feb 13, 2006</td> -<td>0.1.0</td><td>Initial release</td></tr> + <caption>Release history</caption> <tbody> + <tr> + <th>Date</th> + <th>Release</th> + <th>Summary</th> + </tr> + <tr> + <td>Dec 27, 2008</td> + <td>0.4.1</td> + <td>fixes for ECL, LispWorks, SBCL, SCL</td> + </tr> + <tr> + <td>Oct 28, 2008</td> + <td><b>0.4.0</b></td> + <td><b>select()-like api</b>: make a single thread wait for +multiple sockets.<br> + <b>various socket options</b> for socket-creation with +SOCKET-CONNECT. </td> + </tr> + <tr> + <td>Jun 21, 2008</td> + <td>0.3.6</td> + <td>Code fixups based on advice from the ECL and OpenMCL +maintainers. New exported symbols: WITH-MAPPED-CONDITIONS, +NS-CONDITION, NS-ERROR, NS-UNKNOWN-ERROR and NS-UNKNOWN-CONDITION.</td> + </tr> + <tr> + <td>Jul 25, 2007</td> + <td>0.3.4</td> + <td>Fix clisp get-host-name, multiple ECL fixes.</td> + </tr> + <tr> + <td>Jun 05, 2007</td> + <td>0.3.3</td> + <td>Fix where host resolution routine was unable to resolve would +return NIL instead of erroring.</td> + </tr> + <tr> + <td>Mar 04, 2007</td> + <td>0.3.2</td> + <td>Fixes for many backends related to closing sockets. LispWorks +fix for broken server sockets. API guarantee adjustments in preparation +of porting Drakma.</td> + </tr> + <tr> + <td>Feb 28, 2007</td> + <td>0.3.1</td> + <td>fixed with-server-socket; prevent creation of invalid +sockets; 2 more convenience macros.</td> + </tr> + <tr> + <td>Feb 26, 2007</td> + <td>re-release</td> + <td>Re-release of 0.2.3, 0.2.4, 0.2.5 and 0.3.0 tarballs because +the originals included Subversion administration areas.</td> + </tr> + <tr> + <td>Jan 21, 2007</td> + <td><b>0.3.0</b></td> + <td><b>Server sockets</b></td> + </tr> + <tr> + <td>Jan 19, 2007</td> + <td>0.2.5</td> + <td>Allegro compilation fix.</td> + </tr> + <tr> + <td>Jan 17, 2007</td> + <td>0.2.4</td> + <td>Various fixes for CMUCL, OpenMCL, Allegro and LispWorks. </td> + </tr> + <tr> + <td>Jan 04, 2007</td> + <td>0.2.3</td> + <td>Add :element-type support to support stacking flexi-streams +on socket streams for portable :external-format support.</td> + </tr> + <tr> + <td>Jan 03, 2007</td> + <td>0.2.2</td> + <td>Add ECL support and a small SBCL bugfix.</td> + </tr> + <tr> + <td>Dec 21, 2006</td> + <td>0.2.1</td> + <td>Remove 'open-stream' interface which is supposed to be +provided by the 'trivial-usocket' package.</td> + </tr> + <tr> + <td>Dec 18, 2006</td> + <td>0.2.0</td> + <td>Add support for <a + href="http://www.scieneer.com/scl/index.html">Scieneer Common Lisp</a>, +fix + <a href="http://trac.common-lisp.net/usocket/ticket/6">issue #6</a> +and API preparation for server side sockets (not in this release)</td> + </tr> + <tr> + <td>Feb 13, 2006</td> + <td>0.1.0</td> + <td>Initial release</td> + </tr> + </tbody> </table> - - - - <h2><a name="history">Project history</a></h2> - <p>Long ago the project was conceived and started by Erik Enge in an attempt to factor out all implementation specific sockets code from <a href="/project/cl-irc">cl-irc</a>. This 'long ago' must have been way before 2003 when I entered the cl-irc project.</p> - <p>In january 2006, Erik Huelsmann found Erik Enge willing to donate -the code he had still laying around to restart the project. The restart -took place at the 27th of january when the old code was imported into the -public repository.</p> - -<hr /> - -<div style="float:left;font-size:x-small;font-weight:bold"> -Back to <a href="http://common-lisp.net/">Common-lisp.net</a>. +the code he had still laying around to restart the project. The restart +took place at the 27th of january when the old code was imported into +the +public repository.<br> +</p> +<p>Starting from 2008, Chun Tian (binghe) joined into usocket +development team with his UDP code base.<br> +</p> +<hr> +<div style="float: left; font-size: x-small; font-weight: bold;">Back +to <a href="http://common-lisp.net/">Common-lisp.net</a>. +</div> +<div class="check" style="float: right;"> <a + href="http://validator.w3.org/check/referer">Valid XHTML 1.0 Strict</a> </div> - <div class="check" style="float:right"> - <a href="http://validator.w3.org/check/referer">Valid XHTML 1.0 Strict</a> - </div> </body> </html>

1 0

[usocket-cvs] r558 - public_html
by Chun Tian 15 Sep '10

15 Sep '10

Author: ctian Date: Tue Sep 14 23:35:27 2010 New Revision: 558 Log: API documentation for SOCKET-SERVER was added. Modified: public_html/api-docs.shtml Modified: public_html/api-docs.shtml ============================================================================== --- public_html/api-docs.shtml (original) +++ public_html/api-docs.shtml Tue Sep 14 23:35:27 2010 @@ -1,7 +1,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xml:lang="en" xmlns="http://www.w3.org/1999/xhtml" lang="en"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> - <title>usocket API documentation</title> + <title>USOCKET API documentation</title> <link rel="stylesheet" type="text/css" href="style.css"> <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> @@ -34,9 +34,8 @@ <li><a href="#docs">API documentation</a></li> <li><a href="#faqs">How do I ... (FAQ)</a></li> </ul> -<h1><a name="docs">usocket API documentation</a></h1> -<p style="font-size: 8px;">$Id: api-docs.shtml 417 2008-08-07 20:29:51Z -ehuelsmann $ <br> +<h1><a name="docs">USOCKET API documentation</a></h1> +<p style="font-size: 8px;">$Id$<br> Work in progress.</p> <p><em>Please note that we're committed to the interface described below for the entire 0.x phase of the library. When 1.0 comes @@ -44,10 +43,15 @@ and guarantees may change because of it.</em></p> <h2>Conventions</h2> <dl> - <dt>Specification of a <em>host</em> parameter</dt> - <dd>A <em>host</em> parameter may be any one of + <dt>Specification of a <em>host</em> or <em>local-host</em> +parameter</dt> + <dd>A <em>host</em> or <em>local-host</em> parameter may be any one +of <ul> <li>32-bit positive integer,</li> + <li>A four element integer list representing IPv4 address, i.e. +#(127 0 0 1)<br> + </li> <li>a string containing an IP addres in dotted notation, or</li> <li> a host name to be resolved through DNS lookup.</li> </ul> @@ -63,16 +67,13 @@ and <em>port</em> specified. The return value is a socket object of class <em><a href="#stream-usocket">stream-usocket</a></em>, or - - - <a href="#datagram-usocket"><em>datagram-usocket</em></a>.</p> <p><em>protocol</em> should be <code>:stream</code> (default) or <code>:datagram</code>, which means TCP or -UDP. <cite>(Start from USOCKET 0.5)</cite><br> +UDP <cite>(Start from USOCKET 0.5)</cite><br> <em>element-type</em> argument is used in the construction of the associated stream, i.e. <code>'character</code> or <code>'(unsigned-byte 8)</code>, only used by TCP.<br> @@ -169,7 +170,13 @@ the datagram socket -was created by <a href="#socket-connect"><em>socket-connect</em></a> +was +created +by + + + + <a href="#socket-connect"><em>socket-connect</em></a> with a <em>timeout</em> keyword argument, this function will block at most that timeout value (in seconds). (Start from USOCKET 0.5) </p> <p><em>socket</em> should be a <a href="#datagram-usocket"><em>datagram-usocket</em></a>.<br> @@ -197,14 +204,16 @@ (EINTR).  The second value is a real number indicating the time remaining within the timeout period or nil if none.<br> <br> -Without the READY-ONLY arg, WAIT-FOR-INPUT will return all sockets in +Without the <em>ready-only</em> argument, WAIT-FOR-INPUT will return +all sockets in the original list you passed it. This prevents a new list from being consed up. Some users of USOCKET were reluctant to use it if it wouldn't behave that way, expecting it to cost significant performance to do the associated garbage collection.<br> <br> -Without the READY-ONLY arg, you need to check the socket STATE slot for -the values documented in usocket.lisp in the usocket class.<br> +Without the <em>ready-only</em> arg, you need to check the socket +STATE slot for +the values documented in <a href="#usocket"><em>usocket</em></a> class.<br> </p> </dd> <dt class="sym"><span class="function-name"><a name="socket-server"></a>socket-server</span> @@ -213,8 +222,58 @@ multi-threading<br> </dt> <dd> - <p>Create a simple TCP or UDP socket server ... (Start from USOCKET -0.5) </p> + <p>Create a simple TCP or UDP socket server. (Start from USOCKET +0.5)<br> + </p> + <p><em>host</em> names a local interface,<br> + <em>port</em> names a local port,<br> + <em>function</em> names a function object, which is used to handle +TCP or UDP connections, the actual API of this function will be +explained later.<br> + <em>arguments</em> is a list used for passing extra arguments to +user-defined <em>function</em>.<br> + <em>in-new-thread</em> is a boolean, default is <code>nil</code>. +When it's <code>T</code>, the server will be created in a new thread +and socket-server returns immediately in current thread.<br> + <em>protocol</em> could be either <code>:stream</code> (default) +or <code>:datagram</code>, which decide the socket server is TCP +server or UDP server.<br> + <em>timeout</em> is UDP only, it provides the internal <a + href="#socket-receive"><em>socket-receive</em></a> call (in UDP event +loop of the socket server) a read timeout, default value is 1 (second).<br> + <em>max-buffer-size</em> is UDP only, it's the max UDP data buffer +size when handling UDP packets, default value is 65507.<br> + <em>element-type</em> is TCP only, it's element-type of the stream +provided for user-defined function,<br> + <em>reuse-address</em> is TCP only, it's a boolean option for +internal call of socket-listen in the socket server,<br> + <em>multi-threading</em> is TCP only, it's a boolean, default value +is <code>nil</code>. When it's <code>T</code>, each client connection +will cause a new thread being created to handle that client, so that +the TCP server could handle multiple clients at the same time. (Note: +since UDP server is connectionless, it can always handle multiple +clients, as long as the handler function run fast enough)<br> + </p> + <p>The handler function for TCP is stream-based. A template +function +is this one: </p> + <pre>(defun default-tcp-handler (stream) ; null<br> (declare (type stream stream))<br> (terpri stream))</pre> + <p>Note: 1. you don't need to close the stream as <a + href="#socket-server"><em>socket-server</em></a> +will do that for you. +2. More function arguments can be defined, and these extra arguments +must be feeded as the optional <em>arguments</em> of <a + href="#socket-server"><em>socket-server</em></a>.</p> + <p>The handler function for UDP is buffer-based, that is, +you receive a buffer of data as input, and you return another buffer +for output. A template function is a simple UDP echo server:</p> + <pre>(defun default-udp-handler (buffer) ; echo<br> (declare (type (simple-array (unsigned-byte 8) *) buffer))<br> buffer)</pre> + <p>Note: 1. data length is the length of the whole buffer. 2. +Sometimes you may want to know the client's IP address and sending +port, these informations are specially bounded on variables + <a href="#remote-host"><em>*remote-host*</em></a> and <a + href="#remote-port"><em>*remote-port*</em></a> when handler function +is running.</p> </dd> </dl> <h2>Classes</h2> @@ -264,7 +323,10 @@ </dl> </dd> <dt class="sym"><span class="class-name"><a name="datagram-usocket">datagram-usocket -(Start from USOCKET 0.5)<br> +(Start +from +USOCKET +0.5)<br> </a></span></dt> <dd>Parent classes: usocket<br> Slots: @@ -294,17 +356,29 @@ retrieved from the returned socket by calling <em><a href="#get-local-port">get-local-port</a></em>.</p> </dd> - <dt class="sym"><span class="var-name">*remote-host*</span></dt> + <dt class="sym"><span class="var-name"><a name="remote-host"></a>*remote-host*</span></dt> <dd> <p>Special variable used in <a href="#socket-server"><em>socket-server</em></a>'s -handler function for getting current client address. (Start from +handler +function +for +getting +current +client +address. (Start from USOCKET 0.5)<br> </p> </dd> - <dt class="sym"><span class="var-name">*remote-port*</span></dt> + <dt class="sym"><span class="var-name"><a name="remote-port"></a>*remote-port*</span></dt> <dd> <p>Special variable used in <a href="api-docs.shtml#socket-server"><em>socket-server</em></a>'s -handler function for getting current client port. (Start from USOCKET +handler +function +for +getting +current +client +port. (Start from USOCKET 0.5)</p> </dd> </dl>

1 0

[usocket-cvs] r557 - public_html
by Chun Tian 14 Sep '10

14 Sep '10

Author: ctian Date: Tue Sep 14 13:37:36 2010 New Revision: 557 Log: Updated USOCKET Web Documents Modified: public_html/api-docs.shtml Modified: public_html/api-docs.shtml ============================================================================== --- public_html/api-docs.shtml (original) +++ public_html/api-docs.shtml Tue Sep 14 13:37:36 2010 @@ -1,11 +1,10 @@ -<?xml version="1.0"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xml:lang="en" xmlns="http://www.w3.org/1999/xhtml" lang="en"> <head> <title>usocket API documentation</title> - <link rel="stylesheet" type="text/css" href="style.css"/> - <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> + <link rel="stylesheet" type="text/css" href="style.css"> + <meta http-equiv="Content-Type" + content="text/html; charset=ISO-8859-1"> <style type="text/css"> dt.sym { font-weight: normal; @@ -31,223 +30,346 @@ </style> </head> <body> - <ul> -<li><a href="#docs">API documentation</a></li> -<li><a href="#faqs">How do I ... (FAQ)</a></li> + <li><a href="#docs">API documentation</a></li> + <li><a href="#faqs">How do I ... (FAQ)</a></li> </ul> - <h1><a name="docs">usocket API documentation</a></h1> - -<p style="font-size:8px">$Id$ <br /> - Work in progress.</p> - +<p style="font-size: 8px;">$Id: api-docs.shtml 417 2008-08-07 20:29:51Z +ehuelsmann $ <br> +Work in progress.</p> <p><em>Please note that we're committed to the interface described -below for the entire 0.x phase of the library. When 1.0 comes +below for the entire 0.x phase of the library. When 1.0 comes some of the functionality may be split up in different functions and guarantees may change because of it.</em></p> - - <h2>Conventions</h2> - - <dl> -<dt>Specification of a <em>host</em> parameter</dt> -<dd>A <em>host</em> parameter may be any one of + <dt>Specification of a <em>host</em> parameter</dt> + <dd>A <em>host</em> parameter may be any one of <ul> - <li>32-bit positive integer,</li> - <li>a string containing an IP addres in dotted notation, or</li> - <li> a host name to be resolved through DNS lookup.</li> + <li>32-bit positive integer,</li> + <li>a string containing an IP addres in dotted notation, or</li> + <li> a host name to be resolved through DNS lookup.</li> </ul> -</dd> + </dd> </dl> - <h2>Functions for socket creation and manipulation</h2> - <dl> -<dt class="sym"><span class="function-name">socket-connect</span> host port &key element-type => socket</dt> + <dt class="sym"><span class="function-name"><a name="socket-connect">socket-connect</a></span> +host port &key protocol element-type timeout deadline nodelay +local-host local-port => socket</dt> + <dd> + <p>Creates a TCP (stream) or UDP (datagram) socket to the <em>host</em> +and <em>port</em> specified. The return value is +a socket object of class <em><a href="#stream-usocket">stream-usocket</a></em>, +or -<dd> -<p>Creates a tcp (stream) socket to the <em>host</em> and <em>port</em> specified. The return value is -a socket object of class <em><a href="#stream-usocket">stream-usocket</a></em>.</p> - -<p>The <em>element-type</em> argument is used in the -construction of the associated stream.</p></dd> - -<dt class="sym"> -<span class="function-name">socket-listen</span> host port &key reuse-address backlog element-type => socket</dt> -<dd><p>Creates and returns a passive ("server") socket associated with <em>host</em> and <em>port</em>. - The object returned is of subtype <a href="#stream-server-usocket">stream-server-usocket</a>.</p> - <p><em>host</em> names a local interface.<br /> - <em>port</em> names a local port, or 0 (zero) to request a random free port.<br /> - <em>reuse-address</em> is a boolean (t, nil) value signalling reuse of the address is requested (or not).<br /> - <em>backlog</em> is the length of the queue containing connections which haven't actually been accepted yet.<br /> - <em>element-type</em> is the default element type used for sockets created by socket-accept. <em>character</em> is - the default when it's not explicitly provided. - </p></dd> - - -<dt class="sym"><span class="function-name"><a name="socket-accept">socket-accept</a></span> socket &key element-type => new-socket</dt> -<dd><p>Creates and returns an active ("connected") stream socket <em>new-socket</em> from the - <em>socket</em> passed. The return value is a socket object of class - <em><a href="#stream-usocket">stream-usocket</a></em>.</p> - <p><em>element-type</em> is the element type used to construct the associated stream. If it's not specified, - the element-type of <em>socket</em> (as used when it was created by the call to socket-listen) is - used. + + + <a href="#datagram-usocket"><em>datagram-usocket</em></a>.</p> + <p><em>protocol</em> should be <code>:stream</code> (default) or <code>:datagram</code>, +which +means +TCP +or +UDP. <cite>(Start from USOCKET 0.5)</cite><br> + <em>element-type</em> argument is used in the +construction of the associated stream, i.e. <code>'character</code> or + <code>'(unsigned-byte 8)</code>, only used by TCP.<br> + <em>timeout</em> is a integer, it represents the socket option <code>SO_RCVTIMEO</code> +(read timeout), in seconds.<br> + <em>deadline</em> is only supported in Clozure CL and Digitool MCL, +look up their documents please.<br> + <em>local-host</em> and <em>local-port</em>, when specified, will +cause the socket calling bind() on local address. This is useful for +selecting interfaces to send, or listening on UDP port. Note: use only +one of them are allowed when reasonable (listen on wildcard address, or +bind to random free port). <br> + <br> + </p> + </dd> + <dt class="sym"> <span class="function-name"><a name="socket-listen"></a>socket-listen</span> +host port &key reuse-address backlog element-type => socket</dt> + <dd> + <p>Creates and returns a passive ("server") socket associated with <em>host</em> +and <em>port</em>. The object returned is of subtype <a + href="#stream-server-usocket">stream-server-usocket</a>.</p> + <p><em>host</em> names a local interface.<br> + <em>port</em> names a local port, or 0 (zero) to request a random +free port.<br> + <em>reuse-address</em> is a boolean (t, nil) value signalling reuse +of the address is requested (or not).<br> + <em>backlog</em> is the length of the queue containing connections +which haven't actually been accepted yet.<br> + <em>element-type</em> is the default element type used for sockets +created by socket-accept. <em>character</em> is the default when it's +not explicitly provided. </p> + </dd> + <dt class="sym"><span class="function-name"><a name="socket-accept">socket-accept</a></span> +socket &key element-type => new-socket</dt> + <dd> + <p>Creates and returns an active ("connected") stream socket <em>new-socket</em> +from the <em>socket</em> passed. The return value is a socket object +of class <em><a href="#stream-usocket">stream-usocket</a></em>.</p> + <p><em>element-type</em> is the element type used to construct the +associated stream. If it's not specified, the element-type of <em>socket</em> +(as used when it was created by the call to socket-listen) is used. </p> + </dd> + <dt class="sym"><span class="function-name"><a name="socket-close"></a>socket-close</span> +socket</dt> + <dd> + <p>Flushes the stream associated with the socket and closes the +socket connection.</p> + </dd> + <dt class="sym"><span class="function-name"><a name="get-local-name"></a>get-local-name</span> +socket => address, port<br> + <span class="function-name"><a name="get-local-address"></a>get-local-address</span> +socket => address<br> + <span class="function-name"><a name="get-local-port"></a>get-local-port</span> +socket => port</dt> + <dd> + <p>Returns the local address and/or port information of socket.</p> + </dd> + <dt class="sym"><span class="function-name"><a name="get-peer-name"></a>get-peer-name</span> +socket => address, port<br> + <span class="function-name"><a name="get-peer-address"></a>get-peer-address</span> +socket => address<br> + <span class="function-name"><a name="get-peer-port"></a>get-peer-port</span> +socket => port</dt> + <dd> + <p>Returns the remote address and/or port information of socket. +The socket passed to this function must be a <em>connected</em> socket.</p> + </dd> + <dt class="sym"><span class="function-name"><a name="socket-send"></a>socket-send</span> +socket buffer length &key host port<br> + </dt> + <dd> + <p>Send a (unsigned-byte 8) data buffer to a datagram socket, and +return the number of bytes sent. (Start from USOCKET 0.5)</p> + <p><em>socket</em> should be a <a href="#datagram-usocket"><em>datagram-usocket</em></a>.<br> + <em>buffer</em> is a Lisp vector, type of <code>(simple-array +(unsigned-byte 8) *)</code>.<br> + <em>length</em> is used to tell <a href="#socket-send"><em>socket-send</em></a> +the actual useful length of data buffer for sending to socket.<br> + <em>host</em> and <em>port</em> are used for unconnected datagram +sockets, for sending to specific destination.<br> </p> -</dd> + </dd> + <dt class="sym"><span class="function-name"><a name="socket-receive"></a>socket-receive</span> +socket buffer length<br> + </dt> + <dd> + <p>Receive data from a datagram socket, and return 4 values: <em>return-buffer</em>, -<dt class="sym"><span class="function-name">socket-close</span> socket</dt> -<dd><p>Flushes the stream associated with the socket and closes the socket connection.</p></dd> -<dt class="sym"><span class="function-name">get-local-name</span> socket => address, port<br/> -<span class="function-name">get-local-name</span> socket => address<br/> -<span class="function-name">get-local-port</span> socket => port</dt> -<dd><p>Returns the local address and/or port information of socket.</p></dd> - -<dt class="sym"><span class="function-name">get-peer-name</span> socket => address, port<br/> -<span class="function-name">get-peer-name</span> socket => address<br/> -<span class="function-name">get-peer-port</span> socket => port</dt> -<dd><p>Returns the remote address and/or port information of socket. - The socket passed to this function must be a <em>connected</em> socket.</p></dd> + <em>return-length</em>, <em>remote-host</em>, and <em>remove-port</em>. +If +the +datagram +socket +was created by <a href="#socket-connect"><em>socket-connect</em></a> +with a <em>timeout</em> keyword argument, this function will block at +most that timeout value (in seconds). (Start from USOCKET 0.5) </p> + <p><em>socket</em> should be a <a href="#datagram-usocket"><em>datagram-usocket</em></a>.<br> + <em>buffer</em> is a Lisp vector, type of <code>(simple-array +(unsigned-byte 8) *)</code>. Using <code>nil</code> here is also +allowed, new buffer will be created to hold data.<br> + <em>length</em> is used to specify the length of a exist buffer for +receiving at most these data. Using <em>nil</em> here is allowed, and +the actual length of <em>buffer</em> will be used; when <em>buffer</em> +is also <code>nil</code>, a default maximum length (65507) will be +used. <br> + </p> + </dd> + <dt class="sym"><span class="function-name"><a name="wait-for-input"></a>wait-for-input</span> +socket-or-sockets &key timeout ready-only<br> + </dt> + <dd> + <p>Waiting on one or multiple sockets for given time, and returns +once some of them are available of reading data. This is like UNIX's +"select" function.<br> + <br> +It returns two values: the first is the list of sockets which are +readable (or in case of server sockets acceptable). nil may be returned +for this value either when waiting timed out or when it was interrupted +(EINTR).  The second value is a real number indicating the time +remaining within the timeout period or nil if none.<br> + <br> +Without the READY-ONLY arg, WAIT-FOR-INPUT will return all sockets in +the original list you passed it. This prevents a new list from being +consed up. Some users of USOCKET were reluctant to use it if it +wouldn't behave that way, expecting it to cost significant performance +to do the associated garbage collection.<br> + <br> +Without the READY-ONLY arg, you need to check the socket STATE slot for +the values documented in usocket.lisp in the usocket class.<br> + </p> + </dd> + <dt class="sym"><span class="function-name"><a name="socket-server"></a>socket-server</span> +host port function &optional arguments &key in-new-thread +protocol timeout max-buffer-size element-type reuse-address +multi-threading<br> + </dt> + <dd> + <p>Create a simple TCP or UDP socket server ... (Start from USOCKET +0.5) </p> + </dd> </dl> - <h2>Classes</h2> - <dl> <dt class="sym"><span class="class-name"><a name="usocket">usocket</a></span></dt> <dd>Slots: <dl> - <dt><span class="slot-name">socket</span> :accessor socket</dt> - <dd><p>Used to store sockets as used by the current implementation - may be any of socket handles, socket objects and stream objects</p></dd></dl> + <dt><span class="slot-name">socket</span> :accessor socket<br> + </dt> + <dd> + <p>Used to store sockets as used by the current implementation +- may be any of socket handles, socket objects and stream objects</p> + </dd> + <dt><span class="slot-name">state</span> :accessor state<br> + </dt> + <dd> + <p>Used to store socket state: NIL (not ready), :READ (ready to +read).<br> + </p> + </dd> + </dl> </dd> - -<dt class="sym"><span class="class-name"><a name="stream-usocket">stream-usocket</a></span></dt> -<dd>Parent classes: usocket<br /> - Slots: + <dt class="sym"><span class="class-name"><a name="stream-usocket">stream-usocket</a></span></dt> + <dd>Parent classes: usocket<br> +Slots: + <dl> + <dt><span class="slot-name">stream</span> :accessor socket-stream</dt> + <dd> + <p>Used to store the stream associated with the tcp socket +connection.<br> +When you want to write to the socket stream, use this function.</p> + </dd> + </dl> + </dd> + <dt class="sym"><span class="class-name"><a + name="stream-server-usocket">stream-server-usocket</a></span></dt> + <dd>Parent classes: usocket<br> +Slots: <dl> - <dt><span class="slot-name">stream</span> :accessor socket-stream</dt> - <dd><p>Used to store the stream associated with the tcp socket connection.<br /> - When you want to write to the socket stream, use this function.</p></dd></dl> -</dd> - -<dt class="sym"><span class="class-name"><a name="stream-server-usocket">stream-server-usocket</a></span></dt> -<dd>Parent classes: usocket<br /> - Slots: + <dt><span class="slot-name">element-type</span> :reader +element-type</dt> + <dd> + <p>Indicates the default element-type to be used when +constructing streams off this socket when no element type is specified +in the call to <em><a href="#socket-accept">socket-accept</a></em>.</p> + </dd> + </dl> + </dd> + <dt class="sym"><span class="class-name"><a name="datagram-usocket">datagram-usocket +(Start from USOCKET 0.5)<br> + </a></span></dt> + <dd>Parent classes: usocket<br> +Slots: <dl> - <dt><span class="slot-name">element-type</span> :reader element-type</dt> - <dd><p>Indicates the default element-type to be used when constructing streams off this socket when - no element type is specified in the call to <em><a href="#socket-accept">socket-accept</a></em>.</p></dd></dl> -</dd> + <dt><span class="slot-name">connected-p</span> :accessor +connected-p</dt> + <dd> + <p>Used to identify if the datagram is connected. It will be +setup by <a href="#socket-connect"><em>socket-connect</em></a>, and +used by <a href="#socket-send"><em>socket-send</em></a> and <a + href="#socket-receive"><em>socket-receive</em></a>.</p> + </dd> + </dl> + </dd> </dl> - <h2>Variables / constants</h2> - <dl> -<dt class="sym"><span class="var-name">*wildcard-host*</span></dt> -<dd><p>The host to use with socket-listen to make the socket listen on all available interfaces.</p></dd> -<dt class="sym"><span class="var-name">*auto-port*</span></dt> -<dd><p>The port number to use with socket-listen to make the socket listen on a random available port. The port number assigned can be - retrieved from the returned socket by calling <em><a href="#get-local-port">get-local-port</a></em>.</p></dd> + <dt class="sym"><span class="var-name">*wildcard-host*</span></dt> + <dd> + <p>The host to use with <a href="#socket-listen"><em>socket-listen</em></a> +to make the socket listen on all available interfaces.</p> + </dd> + <dt class="sym"><span class="var-name">*auto-port*</span></dt> + <dd> + <p>The port number to use with socket-listen to make the socket +listen on a random available port. The port number assigned can be +retrieved from the returned socket by calling <em><a + href="#get-local-port">get-local-port</a></em>.</p> + </dd> + <dt class="sym"><span class="var-name">*remote-host*</span></dt> + <dd> + <p>Special variable used in <a href="#socket-server"><em>socket-server</em></a>'s +handler function for getting current client address. (Start from +USOCKET 0.5)<br> + </p> + </dd> + <dt class="sym"><span class="var-name">*remote-port*</span></dt> + <dd> + <p>Special variable used in <a href="api-docs.shtml#socket-server"><em>socket-server</em></a>'s +handler function for getting current client port. (Start from USOCKET +0.5)</p> + </dd> </dl> - - <h1><a name="faqs">How do I ...</a></h1> - <dl class="faq"> -<dt>... force the output to be written to the network? -</dt> -<dd>When you write output to the stream, it may be buffered before - sent over the network - for optimal performance of small writes. You - can force the buffer to be flushed the same way as with normal streams: - -<pre>(format (socket-stream socket) "Hello there~%") ;; output into buffers -(force-output (socket-stream socket)) ;; <== flush the buffers, if any -</pre> -</dd> -<dt>... check whether the other end has closed my socket stream? -</dt> -<dd>Reading from a stream which has been closed at the remote end - signals an END-OF-FILE condition, meaning that reading from the stream - and detecting that condition is the way to do it. -</dd> -<dt>... check whether reading from a socket stream will block? -</dt> -<dd>When you want to check <b>one</b> stream for readiness of input, - call the - <a href="http://www.lisp.org/HyperSpec/Body/fun_listen.html">listen</a> - function on the stream object associated with the socket.<br /> - Example: -<pre>(listen (usocket:socket-stream your-socket)) - ==> NIL (if no input is available) -</pre> -</dd> -<dt>... wait for input to become available on (at least) one stream (of a set) -</dt> -<dd>Currently, that's hard to do efficiently if you want to use releases. - The next minor release (0.4.0) will include this functionality and - for all platforms (except SBCL and LispWorks; both Win32) it's already - available in trunk (svn://common-lisp.net/project/usocket/svn/usocket/trunk) - <br /> - If you want to use this code you're most welcome and feedback is appreciated.<br /> - Example to be used with trunk: -<pre>(usocket:wait-for-input (list socket1 socket2 socket3) :timeout <your optional timeout value>) - ==> list-of-sockets-to-read-from</pre> -</dd> -<dt>... convert my existing trivial-sockets based application to usocket? -</dt> -<dd>There are actually 3 answers to that question. - <ol> - <li>Rewrite your code to keep a usocket object instead of the stream - object returned by trivial-sockets.</li> - <li>The quick conversion with the good performance characteristics - (use only when you don't want to use the socket object):<br /> - Replace all your invocations of -<pre> - (trivial-sockets:open-socket-stream ....) - -with - (usocket:socket-stream (usocket:socket-connect ...)) -</pre> - + <dt>... force the output to be written to the network? </dt> + <dd>When you write output to the stream, it may be buffered before +sent over the network - for optimal performance of small writes. You +can force the buffer to be flushed the same way as with normal streams: + <pre>(format (socket-stream socket) "Hello there~%") ;; output into buffers<br>(force-output (socket-stream socket)) ;; <== flush the buffers, if any<br></pre> + </dd> + <dt>... check whether the other end has closed my socket stream? </dt> + <dd>Reading from a stream which has been closed at the remote end +signals an END-OF-FILE condition, meaning that reading from the stream +and detecting that condition is the way to do it. </dd> + <dt>... check whether reading from a socket stream will block? </dt> + <dd>When you want to check <b>one</b> stream for readiness of input, +call the <a href="http://www.lisp.org/HyperSpec/Body/fun_listen.html">listen</a> +function on the stream object associated with the socket.<br> +Example: + <pre>(listen (usocket:socket-stream your-socket))<br> ==> NIL (if no input is available)<br></pre> + </dd> + <dt>... wait for input to become available on (at least) one stream +(of a set) </dt> + <dd>Currently, that's hard to do efficiently if you want to use +releases. The next minor release (0.4.0) will include this +functionality and for all platforms (except SBCL and LispWorks; both +Win32) it's already available in trunk +(svn://common-lisp.net/project/usocket/svn/usocket/trunk). <br> +If you want to use this code you're most welcome and feedback is +appreciated.<br> +Example to be used with trunk: + <pre>(usocket:wait-for-input (list socket1 socket2 socket3) :timeout <your optional timeout value>)<br> ==> list-of-sockets-to-read-from</pre> + </dd> + <dt>... convert my existing trivial-sockets based application to +usocket? </dt> + <dd>There are actually 3 answers to that question. + <ol> + <li>Rewrite your code to keep a usocket object instead of the +stream object returned by trivial-sockets.</li> + <li>The quick conversion with the good performance +characteristics (use only when you don't want to use the socket object):<br> +Replace all your invocations of + <pre> (trivial-sockets:open-socket-stream ....)<br><br>with<br> (usocket:socket-stream (usocket:socket-connect ...))<br></pre> And replace all invocations of -<pre> - (trivial-sockets:socket-accept ...) - -with - (usocket:socket-stream (usocket:socket-accept ...)) -</pre> - + <pre> (trivial-sockets:socket-accept ...)<br><br>with<br> (usocket:socket-stream (usocket:socket-accept ...))<br></pre> And replace all invocations of -<pre> - (trivial-sockets:open-server ...) - -with - (usocket:socket-listen ...) -</pre></li> - <li>And the last option which provides a compatible - (but slower, because it uses Gray streams) interface is to use - trivial-usocket.<br /> - The trivial-usocket package provides a 1-1 mapped interface to - trivial-sockets, but uses Gray streams; that way, it's later possible - to retrieve the socket object from the stream returned and to use that - socket for other usocket operations. Use this approach as a migration - path where you're not rewriting your application at once, but in - small steps. + <pre> (trivial-sockets:open-server ...)<br><br>with<br> (usocket:socket-listen ...)<br></pre> </li> + <li>And the last option which provides a compatible (but slower, +because it uses Gray streams) interface is to use trivial-usocket.<br> +The trivial-usocket package provides a 1-1 mapped interface to +trivial-sockets, but uses Gray streams; that way, it's later possible +to retrieve the socket object from the stream returned and to use that +socket for other usocket operations. Use this approach as a migration +path where you're not rewriting your application at once, but in small +steps. </li> </ol> -</dd> - + </dd> </dl> - - -<div style="float:left;font-size:x-small;font-weight:bold"> +<div style="float: left; font-size: x-small; font-weight: bold;"> Back to <a href="http://common-lisp.net/">Common-lisp.net</a>. </div> - <div class="check" style="float:right"> - <a href="http://validator.w3.org/check/referer">Valid XHTML 1.0 Strict</a> - </div> +<div class="check" style="float: right;"> <a + href="http://validator.w3.org/check/referer">Valid XHTML 1.0 Strict</a> +</div> </body> </html>

1 0

[usocket-cvs] r556 - in usocket/trunk: . backend
by Chun Tian 14 Sep '10

14 Sep '10

Author: ctian Date: Tue Sep 14 04:07:20 2010 New Revision: 556 Log: ABCL: basically working implementation of SOCKET-SEND/SOCKET-RECEIVE. Modified: usocket/trunk/README usocket/trunk/backend/abcl.lisp usocket/trunk/package.lisp usocket/trunk/usocket.lisp Modified: usocket/trunk/README ============================================================================== --- usocket/trunk/README (original) +++ usocket/trunk/README Tue Sep 14 04:07:20 2010 @@ -22,14 +22,14 @@ - SBCL - CMUCL - - ArmedBear (post feb 11th, 2006 CVS or 0.0.10 and higher) - - clisp + - ArmedBear Common Lisp + - GNU CLISP - Allegro Common Lisp - LispWorks - - OpenMCL + - Clozure CL - ECL - Scieneer Common Lisp - - <Your favorite Common Lisp here?> + - Macintosh Common Lisp If your favorite common lisp misses in the list above, please contact usocket-devel(a)common-lisp.net and submit a request. Please include Modified: usocket/trunk/backend/abcl.lisp ============================================================================== --- usocket/trunk/backend/abcl.lisp (original) +++ usocket/trunk/backend/abcl.lisp Tue Sep 14 04:07:20 2010 @@ -8,29 +8,15 @@ (in-package :usocket) -;;; Symbols in JAVA package -(eval-when (:compile-toplevel :load-toplevel :execute) - (defparameter *java-package-symbols* - '(java:jarray-length - java:jarray-ref - java:java-exception - java:java-exception-cause - java:jconstructor - java:jcall - java:jclass - java:jclass-of - java:jfield - java:jmethod - java:jnew - java:jstatic - java:make-immediate-object)) - (import *java-package-symbols*)) - ;;; Java Classes ($*...) (defvar $*boolean (jclass "boolean")) +(defvar $*byte (jclass "byte")) +(defvar $*byte[] (jclass "[B")) (defvar $*int (jclass "int")) (defvar $*long (jclass "long")) +(defvar $*|Byte| (jclass "java.lang.Byte")) (defvar $*DatagramChannel (jclass "java.nio.channels.DatagramChannel")) +(defvar $*DatagramPacket (jclass "java.net.DatagramPacket")) (defvar $*DatagramSocket (jclass "java.net.DatagramSocket")) (defvar $*Inet4Address (jclass "java.net.Inet4Address")) (defvar $*InetAddress (jclass "java.net.InetAddress")) @@ -48,6 +34,9 @@ (defvar $*String (jclass "java.lang.String")) ;;; Java Constructor ($%.../n) +(defvar $%Byte/0 (jconstructor $*|Byte| $*byte)) +(defvar $%DatagramPacket/3 (jconstructor $*DatagramPacket $*byte[] $*int $*int)) +(defvar $%DatagramPacket/5 (jconstructor $*DatagramPacket $*byte[] $*int $*int $*InetAddress $*int)) (defvar $%DatagramSocket/0 (jconstructor $*DatagramSocket)) (defvar $%DatagramSocket/1 (jconstructor $*DatagramSocket $*int)) (defvar $%DatagramSocket/2 (jconstructor $*DatagramSocket $*int $*InetAddress)) @@ -67,6 +56,7 @@ (defvar $@bind/ServerSocket/1 (jmethod $*ServerSocket "bind" $*SocketAddress)) (defvar $@bind/ServerSocket/2 (jmethod $*ServerSocket "bind" $*SocketAddress $*int)) (defvar $@bind/Socket/1 (jmethod $*Socket "bind" $*SocketAddress)) +(defvar $@byteValue/0 (jmethod $*|Byte| "byteValue")) (defvar $@channel/0 (jmethod $*SelectionKey "channel")) (defvar $@close/DatagramSocket/0 (jmethod $*DatagramSocket "close")) (defvar $@close/Selector/0 (jmethod $*Selector "close")) @@ -83,15 +73,19 @@ (defvar $@getChannel/DatagramSocket/0 (jmethod $*DatagramSocket "getChannel")) (defvar $@getChannel/ServerSocket/0 (jmethod $*ServerSocket "getChannel")) (defvar $@getChannel/Socket/0 (jmethod $*Socket "getChannel")) +(defvar $@getAddress/DatagramPacket/0 (jmethod $*DatagramPacket "getAddress")) (defvar $@getHostName/0 (jmethod $*InetAddress "getHostName")) (defvar $@getInetAddress/DatagramSocket/0 (jmethod $*DatagramSocket "getInetAddress")) (defvar $@getInetAddress/ServerSocket/0 (jmethod $*ServerSocket "getInetAddress")) (defvar $@getInetAddress/Socket/0 (jmethod $*Socket "getInetAddress")) +(defvar $@getLength/DatagramPacket/0 (jmethod $*DatagramPacket "getLength")) (defvar $@getLocalAddress/DatagramSocket/0 (jmethod $*DatagramSocket "getLocalAddress")) (defvar $@getLocalAddress/Socket/0 (jmethod $*Socket "getLocalAddress")) (defvar $@getLocalPort/DatagramSocket/0 (jmethod $*DatagramSocket "getLocalPort")) (defvar $@getLocalPort/ServerSocket/0 (jmethod $*ServerSocket "getLocalPort")) (defvar $@getLocalPort/Socket/0 (jmethod $*Socket "getLocalPort")) +(defvar $@getOffset/DatagramPacket/0 (jmethod $*DatagramPacket "getOffset")) +(defvar $@getPort/DatagramPacket/0 (jmethod $*DatagramPacket "getPort")) (defvar $@getPort/DatagramSocket/0 (jmethod $*DatagramSocket "getPort")) (defvar $@getPort/Socket/0 (jmethod $*Socket "getPort")) (defvar $@hasNext/0 (jmethod $*Iterator "hasNext")) @@ -101,10 +95,12 @@ (defvar $@open/Selector/0 (jmethod $*Selector "open")) (defvar $@open/ServerSocketChannel/0 (jmethod $*ServerSocketChannel "open")) (defvar $@open/SocketChannel/0 (jmethod $*SocketChannel "open")) +(defvar $@receive/1 (jmethod $*DatagramSocket "receive" $*DatagramPacket)) (defvar $@register/2 (jmethod $*SelectableChannel "register" $*Selector $*int)) (defvar $@select/0 (jmethod $*Selector "select")) (defvar $@select/1 (jmethod $*Selector "select" $*long)) (defvar $@selectedKeys/0 (jmethod $*Selector "selectedKeys")) +(defvar $@send/1 (jmethod $*DatagramSocket "send" $*DatagramPacket)) (defvar $@setReuseAddress/1 (jmethod $*ServerSocket "setReuseAddress" $*boolean)) (defvar $@setSoTimeout/DatagramSocket/1 (jmethod $*DatagramSocket "setSoTimeout" $*int)) (defvar $@setSoTimeout/Socket/1 (jmethod $*Socket "setSoTimeout" $*int)) @@ -137,6 +133,18 @@ ;;; HANDLE-CONTITION +(defparameter +abcl-error-map+ + `(("java.net.BindException" . operation-not-permitted-error) + ("java.net.ConnectException" . connection-refused-error) + ("java.net.NoRouteToHostException" . network-unreachable-error) ; untested + ("java.net.PortUnreachableException" . protocol-not-supported-error) ; untested + ("java.net.ProtocolException" . protocol-not-supported-error) ; untested + ("java.net.SocketException" . socket-type-not-supported-error) ; untested + ("java.net.SocketTimeoutException" . timeout-error))) + +(defparameter +abcl-nameserver-error-map+ + `(("java.net.UnknownHostException" . ns-host-not-found-error))) + (defun handle-condition (condition &optional (socket nil)) (typecase condition (java-exception @@ -153,27 +161,18 @@ (when usock-error (error usock-error :socket socket)))))))) -(defparameter +abcl-error-map+ - `(("java.net.ConnectException" . connection-refused-error) - ("java.net.SocketTimeoutException" . timeout-error) - ("java.net.BindException" . operation-not-permitted-error))) - -(defparameter +abcl-nameserver-error-map+ - `(("java.net.UnknownHostException" . ns-host-not-found-error))) - ;;; GET-HOSTS-BY-NAME (defun get-address (address) - (let* ((array (%get-address address)) - (length (jarray-length array))) - (labels ((jbyte (n) - (let ((byte (jarray-ref array n))) - (if (plusp byte) - byte - (+ 256 byte))))) - (if (= 4 length) - (vector (jbyte 0) (jbyte 1) (jbyte 2) (jbyte 3)) - nil)))) ; not a IPv4 address?! + (when address + (let* ((array (%get-address address)) + (length (jarray-length array))) + (labels ((jbyte (n) + (let ((byte (jarray-ref array n))) + (if (minusp byte) (+ 256 byte) byte)))) + (if (= 4 length) + (vector (jbyte 0) (jbyte 1) (jbyte 2) (jbyte 3)) + nil))))) ; not a IPv4 address?! (defun get-hosts-by-name (name) (with-mapped-conditions () @@ -225,7 +224,7 @@ (let ((address (jnew $%InetSocketAddress/2 (host-to-inet4 host) port))) (with-mapped-conditions () (jcall $@connect/DatagramChannel/1 channel address)))) - (setq usocket (make-datagram-socket socket)) + (setq usocket (make-datagram-socket socket :connected-p (if (and host port) t nil))) (when timeout (jcall $@setSoTimeout/DatagramSocket/1 socket (truncate (* 1000 timeout))))))) usocket)) @@ -316,14 +315,54 @@ ;;; SOCKET-SEND & SOCKET-RECEIVE -(defmethod socket-send ((socket datagram-usocket) buffer length &key host port) - (with-mapped-conditions (socket) - )) +(defun *->byte (data) + (declare (type (unsigned-byte 8) data)) ; required by SOCKET-SEND + (jnew $%Byte/0 (if (> data 127) (- data 256) data))) + +(defun byte->* (byte &optional (element-type '(unsigned-byte 8))) + (let* ((ub8 (if (minusp byte) (+ 256 byte) byte))) + (if (eq element-type 'character) + (code-char ub8) + ub8))) + +(defmethod socket-send ((usocket datagram-usocket) buffer length &key host port) + (let* ((socket (socket usocket)) + (real-length (or length (length buffer))) + (byte-array (jnew-array $*byte real-length)) + (packet (if (and host port) + (jnew $%DatagramPacket/5 byte-array 0 real-length (host-to-inet4 host) port) + (jnew $%DatagramPacket/3 byte-array 0 real-length)))) + ;; prepare sending data + (loop for i from 0 below real-length + do (setf (jarray-ref byte-array i) (*->byte (aref buffer i)))) + (with-mapped-conditions (usocket) + (jcall $@send/1 socket packet)) + real-length)) -(defmethod socket-receive ((socket datagram-usocket) buffer length +;;; TODO: return-host and return-port cannot be get ... +(defmethod socket-receive ((usocket datagram-usocket) buffer length &key (element-type '(unsigned-byte 8))) - (with-mapped-conditions (socket) - )) + (let* ((socket (socket usocket)) + (real-length (or length +max-datagram-packet-size+)) + (byte-array (jnew-array $*byte real-length)) + (packet (jnew $%DatagramPacket/3 byte-array 0 real-length))) + (with-mapped-conditions (usocket) + (jcall $@receive/1 socket packet)) + (let* ((receive-length (jcall $@getLength/DatagramPacket/0 packet)) + (return-buffer (or buffer (make-array receive-length :element-type element-type)))) + (loop for i from 0 below receive-length + do (setf (aref return-buffer i) + (byte->* (jarray-ref byte-array i) element-type))) + (let ((return-host (if (connected-p usocket) + (get-peer-address usocket) + (get-address (jcall $@getAddress/DatagramPacket/0 packet)))) + (return-port (if (connected-p usocket) + (get-peer-port usocket) + (jcall $@getPort/DatagramPacket/0 packet)))) + (values return-buffer + receive-length + return-host + return-port))))) ;;; WAIT-FOR-INPUT Modified: usocket/trunk/package.lisp ============================================================================== --- usocket/trunk/package.lisp (original) +++ usocket/trunk/package.lisp Tue Sep 14 04:07:20 2010 @@ -6,7 +6,7 @@ (in-package :usocket-system) (defpackage :usocket - (:use :common-lisp) + (:use :common-lisp #+abcl :java) (:export #:*wildcard-host* #:*auto-port* Modified: usocket/trunk/usocket.lisp ============================================================================== --- usocket/trunk/usocket.lisp (original) +++ usocket/trunk/usocket.lisp Tue Sep 14 04:07:20 2010 @@ -11,7 +11,7 @@ (defparameter *auto-port* 0 "Port number to pass when an auto-assigned port number is wanted.") -(defconstant +max-datagram-packet-size+ 65536) +(defconstant +max-datagram-packet-size+ 65507) (defclass usocket () ((socket

1 0

[usocket-cvs] r555 - in usocket/trunk: . backend vendor
by Chun Tian 13 Sep '10

13 Sep '10

Author: ctian Date: Mon Sep 13 11:33:20 2010 New Revision: 555 Log: ABCL: replace old JDI-based implementation with new implementation. Removed: usocket/trunk/backend/armedbear.lisp usocket/trunk/vendor/abcl-jdi.lisp Modified: usocket/trunk/backend/abcl.lisp usocket/trunk/package.lisp usocket/trunk/usocket.asd usocket/trunk/usocket.lisp Modified: usocket/trunk/backend/abcl.lisp ============================================================================== --- usocket/trunk/backend/abcl.lisp (original) +++ usocket/trunk/backend/abcl.lisp Mon Sep 13 11:33:20 2010 @@ -8,20 +8,49 @@ (in-package :usocket) +;;; Symbols in JAVA package +(eval-when (:compile-toplevel :load-toplevel :execute) + (defparameter *java-package-symbols* + '(java:jarray-length + java:jarray-ref + java:java-exception + java:java-exception-cause + java:jconstructor + java:jcall + java:jclass + java:jclass-of + java:jfield + java:jmethod + java:jnew + java:jstatic + java:make-immediate-object)) + (import *java-package-symbols*)) + ;;; Java Classes ($*...) (defvar $*boolean (jclass "boolean")) (defvar $*int (jclass "int")) +(defvar $*long (jclass "long")) +(defvar $*DatagramChannel (jclass "java.nio.channels.DatagramChannel")) (defvar $*DatagramSocket (jclass "java.net.DatagramSocket")) (defvar $*Inet4Address (jclass "java.net.Inet4Address")) (defvar $*InetAddress (jclass "java.net.InetAddress")) (defvar $*InetSocketAddress (jclass "java.net.InetSocketAddress")) +(defvar $*Iterator (jclass "java.util.Iterator")) +(defvar $*SelectableChannel (jclass "java.nio.channels.SelectableChannel")) +(defvar $*SelectionKey (jclass "java.nio.channels.SelectionKey")) +(defvar $*Selector (jclass "java.nio.channels.Selector")) (defvar $*ServerSocket (jclass "java.net.ServerSocket")) +(defvar $*ServerSocketChannel (jclass "java.nio.channels.ServerSocketChannel")) +(defvar $*Set (jclass "java.util.Set")) (defvar $*Socket (jclass "java.net.Socket")) (defvar $*SocketAddress (jclass "java.net.SocketAddress")) +(defvar $*SocketChannel (jclass "java.nio.channels.SocketChannel")) (defvar $*String (jclass "java.lang.String")) ;;; Java Constructor ($%.../n) (defvar $%DatagramSocket/0 (jconstructor $*DatagramSocket)) +(defvar $%DatagramSocket/1 (jconstructor $*DatagramSocket $*int)) +(defvar $%DatagramSocket/2 (jconstructor $*DatagramSocket $*int $*InetAddress)) (defvar $%InetSocketAddress/1 (jconstructor $*InetSocketAddress $*int)) (defvar $%InetSocketAddress/2 (jconstructor $*InetSocketAddress $*InetAddress $*int)) (defvar $%ServerSocket/0 (jconstructor $*ServerSocket)) @@ -34,23 +63,65 @@ ;;; Java Methods ($@...[/Class]/n) (defvar $@accept/0 (jmethod $*ServerSocket "accept")) -(defvar $@bind/1 (jmethod $*ServerSocket "bind" $*SocketAddress)) -(defvar $@bind/2 (jmethod $*ServerSocket "bind" $*SocketAddress $*int)) +(defvar $@bind/DatagramSocket/1 (jmethod $*DatagramSocket "bind" $*SocketAddress)) +(defvar $@bind/ServerSocket/1 (jmethod $*ServerSocket "bind" $*SocketAddress)) +(defvar $@bind/ServerSocket/2 (jmethod $*ServerSocket "bind" $*SocketAddress $*int)) +(defvar $@bind/Socket/1 (jmethod $*Socket "bind" $*SocketAddress)) +(defvar $@channel/0 (jmethod $*SelectionKey "channel")) +(defvar $@close/DatagramSocket/0 (jmethod $*DatagramSocket "close")) +(defvar $@close/Selector/0 (jmethod $*Selector "close")) (defvar $@close/ServerSocket/0 (jmethod $*ServerSocket "close")) (defvar $@close/Socket/0 (jmethod $*Socket "close")) -(defvar $@connect/1 (jmethod $*Socket "connect" $*SocketAddress)) -(defvar $@connect/2 (jmethod $*Socket "connect" $*SocketAddress $*int)) +(defvar $@configureBlocking/1 (jmethod $*SelectableChannel "configureBlocking" $*boolean)) +(defvar $@connect/DatagramChannel/1 (jmethod $*DatagramChannel "connect" $*SocketAddress)) +(defvar $@connect/Socket/1 (jmethod $*Socket "connect" $*SocketAddress)) +(defvar $@connect/Socket/2 (jmethod $*Socket "connect" $*SocketAddress $*int)) +(defvar $@connect/SocketChannel/1 (jmethod $*SocketChannel "connect" $*SocketAddress)) (defvar $@getAddress/0 (jmethod $*Inet4Address "getAddress")) (defvar $@getAllByName/1 (jmethod $*InetAddress "getAllByName" $*String)) (defvar $@getByName/1 (jmethod $*InetAddress "getByName" $*String)) +(defvar $@getChannel/DatagramSocket/0 (jmethod $*DatagramSocket "getChannel")) +(defvar $@getChannel/ServerSocket/0 (jmethod $*ServerSocket "getChannel")) +(defvar $@getChannel/Socket/0 (jmethod $*Socket "getChannel")) (defvar $@getHostName/0 (jmethod $*InetAddress "getHostName")) +(defvar $@getInetAddress/DatagramSocket/0 (jmethod $*DatagramSocket "getInetAddress")) (defvar $@getInetAddress/ServerSocket/0 (jmethod $*ServerSocket "getInetAddress")) (defvar $@getInetAddress/Socket/0 (jmethod $*Socket "getInetAddress")) +(defvar $@getLocalAddress/DatagramSocket/0 (jmethod $*DatagramSocket "getLocalAddress")) (defvar $@getLocalAddress/Socket/0 (jmethod $*Socket "getLocalAddress")) +(defvar $@getLocalPort/DatagramSocket/0 (jmethod $*DatagramSocket "getLocalPort")) (defvar $@getLocalPort/ServerSocket/0 (jmethod $*ServerSocket "getLocalPort")) (defvar $@getLocalPort/Socket/0 (jmethod $*Socket "getLocalPort")) +(defvar $@getPort/DatagramSocket/0 (jmethod $*DatagramSocket "getPort")) (defvar $@getPort/Socket/0 (jmethod $*Socket "getPort")) +(defvar $@hasNext/0 (jmethod $*Iterator "hasNext")) +(defvar $@iterator/0 (jmethod $*Set "iterator")) +(defvar $@next/0 (jmethod $*Iterator "next")) +(defvar $@open/DatagramChannel/0 (jmethod $*DatagramChannel "open")) +(defvar $@open/Selector/0 (jmethod $*Selector "open")) +(defvar $@open/ServerSocketChannel/0 (jmethod $*ServerSocketChannel "open")) +(defvar $@open/SocketChannel/0 (jmethod $*SocketChannel "open")) +(defvar $@register/2 (jmethod $*SelectableChannel "register" $*Selector $*int)) +(defvar $@select/0 (jmethod $*Selector "select")) +(defvar $@select/1 (jmethod $*Selector "select" $*long)) +(defvar $@selectedKeys/0 (jmethod $*Selector "selectedKeys")) (defvar $@setReuseAddress/1 (jmethod $*ServerSocket "setReuseAddress" $*boolean)) +(defvar $@setSoTimeout/DatagramSocket/1 (jmethod $*DatagramSocket "setSoTimeout" $*int)) +(defvar $@setSoTimeout/Socket/1 (jmethod $*Socket "setSoTimeout" $*int)) +(defvar $@setTcpNoDelay/1 (jmethod $*Socket "setTcpNoDelay" $*boolean)) +(defvar $@socket/DatagramChannel/0 (jmethod $*DatagramChannel "socket")) +(defvar $@socket/ServerSocketChannel/0 (jmethod $*ServerSocketChannel "socket")) +(defvar $@socket/SocketChannel/0 (jmethod $*SocketChannel "socket")) +(defvar $@validOps/0 (jmethod $*SelectableChannel "validOps")) + +;;; Java Field Variables ($+...) +(defvar $+op-accept (jfield $*SelectionKey "OP_ACCEPT")) +(defvar $+op-connect (jfield $*SelectionKey "OP_CONNECT")) +(defvar $+op-read (jfield $*SelectionKey "OP_READ")) +(defvar $+op-write (jfield $*SelectionKey "OP_WRITE")) + +(defconstant +java-true+ (make-immediate-object t :boolean)) +(defconstant +java-false+ (make-immediate-object nil :boolean)) ;;; Wrapper functions (return-type: java-object) (defun %get-address (address) @@ -60,6 +131,10 @@ (defun %get-by-name (string) (jstatic $@getByName/1 $*InetAddress string)) +(defun host-to-inet4 (host) + "USOCKET host formats to Java Inet4Address, used internally." + (%get-by-name (host-to-hostname host))) + ;;; HANDLE-CONTITION (defun handle-condition (condition &optional (socket nil)) @@ -79,8 +154,7 @@ (error usock-error :socket socket)))))))) (defparameter +abcl-error-map+ - `(;("java.io.IOException" . ) - ("java.net.ConnectException" . connection-refused-error) + `(("java.net.ConnectException" . connection-refused-error) ("java.net.SocketTimeoutException" . timeout-error) ("java.net.BindException" . operation-not-permitted-error))) @@ -105,11 +179,8 @@ (with-mapped-conditions () (map 'list #'get-address (%get-all-by-name name)))) -(defun host-to-inet4 (host) - "USOCKET host formats to Java Inet4Address, used internally." - (%get-by-name (host-to-hostname host))) - ;;; GET-HOST-BY-ADDRESS + (defun get-host-by-address (host) (let ((inet4 (host-to-inet4 host))) (with-mapped-conditions () @@ -120,83 +191,192 @@ (defun socket-connect (host port &key (protocol :stream) (element-type 'character) timeout deadline (nodelay t nodelay-supplied-p) local-host local-port) - (declare (type integer timeout)) - (if (eq protocol :stream) - (let* ((socket (with-mapped-conditions () - (if (or local-host local-port) - (jnew $%Socket/4 (host-to-inet4 host) port (host-to-inet4 local-host) local-port) - (if timeout - (let ((socket (jnew $%Socket/0)) - (address (jnew $%InetSocketAddress/2 (host-to-inet4 host) port))) - (jcall $@connect/2 socket address timeout) - socket) - (jnew $%Socket/2 (host-to-inet4 host) port))))) - (stream (ext:get-socket-stream socket :element-type element-type)) - (usocket (make-stream-socket :stream stream :socket socket))) - usocket) - (socket-connect-for-udp host port :timeout timeout :local-host local-host :local-port local-port))) + (when deadline (unsupported 'deadline 'socket-connect)) + (let (socket stream usocket) + (ecase protocol + (:stream ; TCP + (let ((channel (jstatic $@open/SocketChannel/0 $*SocketChannel)) + (address (jnew $%InetSocketAddress/2 (host-to-inet4 host) port))) + (setq socket (jcall $@socket/SocketChannel/0 channel)) + ;; bind to local address if needed + (when (or local-host local-port) + (let ((local-address (jnew $%InetSocketAddress/2 (host-to-inet4 local-host) (or local-port 0)))) + (with-mapped-conditions () + (jcall $@bind/Socket/1 socket local-address)))) + ;; connect to dest address + (with-mapped-conditions () + (jcall $@connect/SocketChannel/1 channel address)) + (setq stream (ext:get-socket-stream socket :element-type element-type) + usocket (make-stream-socket :stream stream :socket socket)) + (when nodelay-supplied-p + (jcall $@setTcpNoDelay/1 socket (if nodelay +java-true+ +java-false+))) + (when timeout + (jcall $@setSoTimeout/Socket/1 socket (truncate (* 1000 timeout)))))) + (:datagram ; UDP + (let ((channel (jstatic $@open/DatagramChannel/0 $*DatagramChannel))) + (setq socket (jcall $@socket/DatagramChannel/0 channel)) + ;; bind to local address if needed + (when (or local-host local-port) + (let ((local-address (jnew $%InetSocketAddress/2 (host-to-inet4 local-host) (or local-port 0)))) + (with-mapped-conditions () + (jcall $@bind/DatagramSocket/1 socket local-address)))) + ;; connect to dest address if needed + (when (and host port) + (let ((address (jnew $%InetSocketAddress/2 (host-to-inet4 host) port))) + (with-mapped-conditions () + (jcall $@connect/DatagramChannel/1 channel address)))) + (setq usocket (make-datagram-socket socket)) + (when timeout + (jcall $@setSoTimeout/DatagramSocket/1 socket (truncate (* 1000 timeout))))))) + usocket)) -(defun socket-connect-for-udp (host port &key timeout local-host local-port) - ) +;;; SOCKET-LISTEN -(defun socket-listen (host port &key reuseaddress (element-type 'character) +(defun socket-listen (host port &key (element-type 'character) (reuse-address nil reuse-address-supplied-p) (backlog 5 backlog-supplied-p)) - (let ((socket (jnew $%ServerSocket/0)) - (endpoint (jnew $%InetSocketAddress/2 (host-to-inet4 host) port))) - #+ignore ;; TODO: java.lang.IllegalArgumentException? + (declare (type boolean reuse-address)) + (let* ((channel (jstatic $@open/ServerSocketChannel/0 $*ServerSocketChannel)) + (socket (jcall $@socket/ServerSocketChannel/0 channel)) + (endpoint (jnew $%InetSocketAddress/2 (host-to-inet4 host) (or port 0)))) (when reuse-address-supplied-p - (jcall $@setReuseAddress/1 socket reuse-address)) + (jcall $@setReuseAddress/1 socket (if reuse-address +java-true+ +java-false+))) (with-mapped-conditions (socket) (if backlog-supplied-p - (jcall $@bind/2 socket endpoint backlog) - (jcall $@bind/1 socket endpoint))) + (jcall $@bind/ServerSocket/2 socket endpoint backlog) + (jcall $@bind/ServerSocket/1 socket endpoint))) (make-stream-server-socket socket :element-type element-type))) +;;; SOCKET-ACCEPT + (defmethod socket-accept ((socket stream-server-usocket) &key (element-type 'character)) (with-mapped-conditions (socket) (let* ((client-socket (jcall $@accept/0 socket)) (stream (ext:get-socket-stream client-socket :element-type element-type))) (make-stream-socket :stream stream :socket client-socket)))) +;;; SOCKET-CLOSE + (defmethod socket-close :before ((usocket usocket)) (when (wait-list usocket) (remove-waiter (wait-list usocket) usocket))) -(defmethod socket-close ((usocket usocket)) - (with-mapped-conditions (usocket) - (jcall $@close/Socket/0 (socket usocket)))) - (defmethod socket-close ((usocket stream-server-usocket)) (with-mapped-conditions (usocket) (jcall $@close/ServerSocket/0 (socket usocket)))) (defmethod socket-close ((usocket stream-usocket)) (with-mapped-conditions (usocket) - (close (socket-stream usocket)))) + (close (socket-stream usocket)) + (jcall $@close/Socket/0 (socket usocket)))) + +(defmethod socket-close ((usocket datagram-usocket)) + (with-mapped-conditions (usocket) + (jcall $@close/DatagramSocket/0 (socket usocket)))) + +;;; GET-LOCAL/PEER-NAME/ADDRESS/PORT (defmethod get-local-name ((usocket usocket)) (values (get-local-address usocket) (get-local-port usocket))) -(defmethod get-peer-name ((usocket stream-usocket)) +(defmethod get-peer-name ((usocket usocket)) (values (get-peer-address usocket) (get-peer-port usocket))) -(defmethod get-local-address ((usocket usocket)) +(defmethod get-local-address ((usocket stream-usocket)) (get-address (jcall $@getLocalAddress/Socket/0 (socket usocket)))) (defmethod get-local-address ((usocket stream-server-usocket)) (get-address (jcall $@getInetAddress/ServerSocket/0 (socket usocket)))) -(defmethod get-peer-address ((usocket usocket)) +(defmethod get-local-address ((usocket datagram-usocket)) + (get-address (jcall $@getLocalAddress/DatagramSocket/0 (socket usocket)))) + +(defmethod get-peer-address ((usocket stream-usocket)) (get-address (jcall $@getInetAddress/Socket/0 (socket usocket)))) -(defmethod get-local-port ((usocket usocket)) +(defmethod get-peer-address ((usocket datagram-usocket)) + (get-address (jcall $@getInetAddress/DatagramSocket/0 (socket usocket)))) + +(defmethod get-local-port ((usocket stream-usocket)) (jcall $@getLocalPort/Socket/0 (socket usocket))) (defmethod get-local-port ((usocket stream-server-usocket)) (jcall $@getLocalPort/ServerSocket/0 (socket usocket))) -(defmethod get-peer-port ((usocket usocket)) +(defmethod get-local-port ((usocket datagram-usocket)) + (jcall $@getLocalPort/DatagramSocket/0 (socket usocket))) + +(defmethod get-peer-port ((usocket stream-usocket)) (jcall $@getPort/Socket/0 (socket usocket))) + +(defmethod get-peer-port ((usocket datagram-usocket)) + (jcall $@getPort/DatagramSocket/0 (socket usocket))) + +;;; SOCKET-SEND & SOCKET-RECEIVE + +(defmethod socket-send ((socket datagram-usocket) buffer length &key host port) + (with-mapped-conditions (socket) + )) + +(defmethod socket-receive ((socket datagram-usocket) buffer length + &key (element-type '(unsigned-byte 8))) + (with-mapped-conditions (socket) + )) + +;;; WAIT-FOR-INPUT + +(defun socket-channel-class (usocket) + (cond ((stream-usocket-p usocket) $*SocketChannel) + ((stream-server-usocket-p usocket) $*ServerSocketChannel) + ((datagram-usocket-p usocket) $*DatagramChannel))) + +(defun get-socket-channel (usocket) + (let ((method (cond ((stream-usocket-p usocket) $@getChannel/Socket/0) + ((stream-server-usocket-p usocket) $@getChannel/ServerSocket/0) + ((datagram-usocket-p usocket) $@getChannel/DatagramSocket/0)))) + (jcall method (socket usocket)))) + +(defun wait-for-input-internal (wait-list &key timeout) + (let* ((sockets (wait-list-waiters wait-list)) + (ops (logior $+op-read $+op-accept)) + (selector (jstatic $@open/Selector/0 $*Selector)) + (channels (mapcar #'get-socket-channel sockets))) + (unwind-protect + (with-mapped-conditions () + (dolist (channel channels) + (jcall $@configureBlocking/1 channel +java-false+) + (jcall $@register/2 channel selector (logand ops (jcall $@validOps/0 channel)))) + (let ((ready-count (if timeout + (jcall $@select/1 selector (truncate (* timeout 1000))) + (jcall $@select/0 selector)))) + (when (plusp ready-count) + (let* ((keys (jcall $@selectedKeys/0 selector)) + (iterator (jcall $@iterator/0 keys)) + (%wait (wait-list-%wait wait-list))) + (loop while (jcall $@hasNext/0 iterator) + do (let* ((key (jcall $@next/0 iterator)) + (channel (jcall $@channel/0 key))) + (setf (state (gethash channel %wait)) :read))))))) + (jcall $@close/Selector/0 selector) + (dolist (channel channels) + (jcall $@configureBlocking/1 channel +java-true+))))) + +;;; WAIT-LIST + +;;; NOTE from original worker (Erik): +;;; Note that even though Java has the concept of the Selector class, which +;;; remotely looks like a wait-list, it requires the sockets to be non-blocking. +;;; usocket however doesn't make any such guarantees and is therefore unable to +;;; use the concept outside of the waiting routine itself (blergh!). + +(defun %setup-wait-list (wl) + (setf (wait-list-%wait wl) + (make-hash-table :test #'equal :rehash-size 1.3d0))) + +(defun %add-waiter (wl w) + (setf (gethash (get-socket-channel w) (wait-list-%wait wl)) w)) + +(defun %remove-waiter (wl w) + (remhash (get-socket-channel w) (wait-list-%wait wl))) Modified: usocket/trunk/package.lisp ============================================================================== --- usocket/trunk/package.lisp (original) +++ usocket/trunk/package.lisp Mon Sep 13 11:33:20 2010 @@ -5,10 +5,6 @@ (in-package :usocket-system) -#+lispworks -(eval-when (:compile-toplevel :load-toplevel :execute) - (require "comm")) - (defpackage :usocket (:use :common-lisp) (:export #:*wildcard-host* Modified: usocket/trunk/usocket.asd ============================================================================== --- usocket/trunk/usocket.asd (original) +++ usocket/trunk/usocket.asd Mon Sep 13 11:33:20 2010 @@ -23,20 +23,19 @@ :components ((:file "split-sequence") #+mcl (:file "kqueue") #+openmcl (:file "ccl-send") - #+armedbear (:file "abcl-jdi") (:file "spawn-thread"))) (:file "usocket" :depends-on ("vendor")) (:file "condition" :depends-on ("usocket")) (:module "backend" :depends-on ("condition") - :components (#+clisp (:file "clisp") + :components (#+abcl (:file "abcl") + #+clisp (:file "clisp") #+cmu (:file "cmucl") #+scl (:file "scl") #+(or sbcl ecl) (:file "sbcl") #+lispworks (:file "lispworks") #+mcl (:file "mcl") #+openmcl (:file "openmcl") - #+allegro (:file "allegro") - #+armedbear (:file "armedbear"))) + #+allegro (:file "allegro"))) (:file "server" :depends-on ("backend")))) (defmethod perform ((op test-op) (c (eql (find-system :usocket)))) Modified: usocket/trunk/usocket.lisp ============================================================================== --- usocket/trunk/usocket.lisp (original) +++ usocket/trunk/usocket.lisp Mon Sep 13 11:33:20 2010 @@ -431,7 +431,8 @@ ((or (vector t 4) (array (unsigned-byte 8) (4))) (vector-quad-to-dotted-quad host)) - (integer (hbo-to-dotted-quad host)))) + (integer (hbo-to-dotted-quad host)) + (null "0.0.0.0"))) (defun ip= (ip1 ip2) (etypecase ip1 @@ -452,7 +453,7 @@ ;; DNS helper functions ;; -#-(or clisp armedbear) +#-clisp (progn (defun get-host-by-name (name) (let ((hosts (get-hosts-by-name name)))

1 0

[usocket-cvs] r554 - in usocket/trunk: backend test
by Chun Tian 11 Sep '10

11 Sep '10

Author: ctian Date: Sat Sep 11 09:34:27 2010 New Revision: 554 Log: New ABCL backend using latest JAVA interface. Added: usocket/trunk/backend/abcl.lisp (contents, props changed) usocket/trunk/test/test-condition.lisp (contents, props changed) Added: usocket/trunk/backend/abcl.lisp ============================================================================== --- (empty file) +++ usocket/trunk/backend/abcl.lisp Sat Sep 11 09:34:27 2010 @@ -0,0 +1,202 @@ +;;;; $Id$ +;;;; $URL$ + +;;;; New ABCL networking support (replacement to old armedbear.lisp) +;;;; Author: Chun Tian (binghe) + +;;;; See LICENSE for licensing information. + +(in-package :usocket) + +;;; Java Classes ($*...) +(defvar $*boolean (jclass "boolean")) +(defvar $*int (jclass "int")) +(defvar $*DatagramSocket (jclass "java.net.DatagramSocket")) +(defvar $*Inet4Address (jclass "java.net.Inet4Address")) +(defvar $*InetAddress (jclass "java.net.InetAddress")) +(defvar $*InetSocketAddress (jclass "java.net.InetSocketAddress")) +(defvar $*ServerSocket (jclass "java.net.ServerSocket")) +(defvar $*Socket (jclass "java.net.Socket")) +(defvar $*SocketAddress (jclass "java.net.SocketAddress")) +(defvar $*String (jclass "java.lang.String")) + +;;; Java Constructor ($%.../n) +(defvar $%DatagramSocket/0 (jconstructor $*DatagramSocket)) +(defvar $%InetSocketAddress/1 (jconstructor $*InetSocketAddress $*int)) +(defvar $%InetSocketAddress/2 (jconstructor $*InetSocketAddress $*InetAddress $*int)) +(defvar $%ServerSocket/0 (jconstructor $*ServerSocket)) +(defvar $%ServerSocket/1 (jconstructor $*ServerSocket $*int)) +(defvar $%ServerSocket/2 (jconstructor $*ServerSocket $*int $*int)) +(defvar $%ServerSocket/3 (jconstructor $*ServerSocket $*int $*int $*InetAddress)) +(defvar $%Socket/0 (jconstructor $*Socket)) +(defvar $%Socket/2 (jconstructor $*Socket $*InetAddress $*int)) +(defvar $%Socket/4 (jconstructor $*Socket $*InetAddress $*int $*InetAddress $*int)) + +;;; Java Methods ($@...[/Class]/n) +(defvar $@accept/0 (jmethod $*ServerSocket "accept")) +(defvar $@bind/1 (jmethod $*ServerSocket "bind" $*SocketAddress)) +(defvar $@bind/2 (jmethod $*ServerSocket "bind" $*SocketAddress $*int)) +(defvar $@close/ServerSocket/0 (jmethod $*ServerSocket "close")) +(defvar $@close/Socket/0 (jmethod $*Socket "close")) +(defvar $@connect/1 (jmethod $*Socket "connect" $*SocketAddress)) +(defvar $@connect/2 (jmethod $*Socket "connect" $*SocketAddress $*int)) +(defvar $@getAddress/0 (jmethod $*Inet4Address "getAddress")) +(defvar $@getAllByName/1 (jmethod $*InetAddress "getAllByName" $*String)) +(defvar $@getByName/1 (jmethod $*InetAddress "getByName" $*String)) +(defvar $@getHostName/0 (jmethod $*InetAddress "getHostName")) +(defvar $@getInetAddress/ServerSocket/0 (jmethod $*ServerSocket "getInetAddress")) +(defvar $@getInetAddress/Socket/0 (jmethod $*Socket "getInetAddress")) +(defvar $@getLocalAddress/Socket/0 (jmethod $*Socket "getLocalAddress")) +(defvar $@getLocalPort/ServerSocket/0 (jmethod $*ServerSocket "getLocalPort")) +(defvar $@getLocalPort/Socket/0 (jmethod $*Socket "getLocalPort")) +(defvar $@getPort/Socket/0 (jmethod $*Socket "getPort")) +(defvar $@setReuseAddress/1 (jmethod $*ServerSocket "setReuseAddress" $*boolean)) + +;;; Wrapper functions (return-type: java-object) +(defun %get-address (address) + (jcall $@getAddress/0 address)) +(defun %get-all-by-name (string) ; return a simple vector + (jstatic $@getAllByName/1 $*InetAddress string)) +(defun %get-by-name (string) + (jstatic $@getByName/1 $*InetAddress string)) + +;;; HANDLE-CONTITION + +(defun handle-condition (condition &optional (socket nil)) + (typecase condition + (java-exception + (let ((java-cause (java-exception-cause condition))) + (let* ((usock-error (cdr (assoc (jclass-of java-cause) +abcl-error-map+ + :test #'string=))) + (usock-error (if (functionp usock-error) + (funcall usock-error condition) + usock-error)) + (nameserver-error (cdr (assoc (jclass-of java-cause) +abcl-nameserver-error-map+ + :test #'string=)))) + (if nameserver-error + (error nameserver-error :host-or-ip nil) + (when usock-error + (error usock-error :socket socket)))))))) + +(defparameter +abcl-error-map+ + `(;("java.io.IOException" . ) + ("java.net.ConnectException" . connection-refused-error) + ("java.net.SocketTimeoutException" . timeout-error) + ("java.net.BindException" . operation-not-permitted-error))) + +(defparameter +abcl-nameserver-error-map+ + `(("java.net.UnknownHostException" . ns-host-not-found-error))) + +;;; GET-HOSTS-BY-NAME + +(defun get-address (address) + (let* ((array (%get-address address)) + (length (jarray-length array))) + (labels ((jbyte (n) + (let ((byte (jarray-ref array n))) + (if (plusp byte) + byte + (+ 256 byte))))) + (if (= 4 length) + (vector (jbyte 0) (jbyte 1) (jbyte 2) (jbyte 3)) + nil)))) ; not a IPv4 address?! + +(defun get-hosts-by-name (name) + (with-mapped-conditions () + (map 'list #'get-address (%get-all-by-name name)))) + +(defun host-to-inet4 (host) + "USOCKET host formats to Java Inet4Address, used internally." + (%get-by-name (host-to-hostname host))) + +;;; GET-HOST-BY-ADDRESS +(defun get-host-by-address (host) + (let ((inet4 (host-to-inet4 host))) + (with-mapped-conditions () + (jcall $@getHostName/0 inet4)))) + +;;; SOCKET-CONNECT + +(defun socket-connect (host port &key (protocol :stream) (element-type 'character) + timeout deadline (nodelay t nodelay-supplied-p) + local-host local-port) + (declare (type integer timeout)) + (if (eq protocol :stream) + (let* ((socket (with-mapped-conditions () + (if (or local-host local-port) + (jnew $%Socket/4 (host-to-inet4 host) port (host-to-inet4 local-host) local-port) + (if timeout + (let ((socket (jnew $%Socket/0)) + (address (jnew $%InetSocketAddress/2 (host-to-inet4 host) port))) + (jcall $@connect/2 socket address timeout) + socket) + (jnew $%Socket/2 (host-to-inet4 host) port))))) + (stream (ext:get-socket-stream socket :element-type element-type)) + (usocket (make-stream-socket :stream stream :socket socket))) + usocket) + (socket-connect-for-udp host port :timeout timeout :local-host local-host :local-port local-port))) + +(defun socket-connect-for-udp (host port &key timeout local-host local-port) + ) + +(defun socket-listen (host port &key reuseaddress (element-type 'character) + (reuse-address nil reuse-address-supplied-p) + (backlog 5 backlog-supplied-p)) + (let ((socket (jnew $%ServerSocket/0)) + (endpoint (jnew $%InetSocketAddress/2 (host-to-inet4 host) port))) + #+ignore ;; TODO: java.lang.IllegalArgumentException? + (when reuse-address-supplied-p + (jcall $@setReuseAddress/1 socket reuse-address)) + (with-mapped-conditions (socket) + (if backlog-supplied-p + (jcall $@bind/2 socket endpoint backlog) + (jcall $@bind/1 socket endpoint))) + (make-stream-server-socket socket :element-type element-type))) + +(defmethod socket-accept ((socket stream-server-usocket) &key (element-type 'character)) + (with-mapped-conditions (socket) + (let* ((client-socket (jcall $@accept/0 socket)) + (stream (ext:get-socket-stream client-socket :element-type element-type))) + (make-stream-socket :stream stream :socket client-socket)))) + +(defmethod socket-close :before ((usocket usocket)) + (when (wait-list usocket) + (remove-waiter (wait-list usocket) usocket))) + +(defmethod socket-close ((usocket usocket)) + (with-mapped-conditions (usocket) + (jcall $@close/Socket/0 (socket usocket)))) + +(defmethod socket-close ((usocket stream-server-usocket)) + (with-mapped-conditions (usocket) + (jcall $@close/ServerSocket/0 (socket usocket)))) + +(defmethod socket-close ((usocket stream-usocket)) + (with-mapped-conditions (usocket) + (close (socket-stream usocket)))) + +(defmethod get-local-name ((usocket usocket)) + (values (get-local-address usocket) + (get-local-port usocket))) + +(defmethod get-peer-name ((usocket stream-usocket)) + (values (get-peer-address usocket) + (get-peer-port usocket))) + +(defmethod get-local-address ((usocket usocket)) + (get-address (jcall $@getLocalAddress/Socket/0 (socket usocket)))) + +(defmethod get-local-address ((usocket stream-server-usocket)) + (get-address (jcall $@getInetAddress/ServerSocket/0 (socket usocket)))) + +(defmethod get-peer-address ((usocket usocket)) + (get-address (jcall $@getInetAddress/Socket/0 (socket usocket)))) + +(defmethod get-local-port ((usocket usocket)) + (jcall $@getLocalPort/Socket/0 (socket usocket))) + +(defmethod get-local-port ((usocket stream-server-usocket)) + (jcall $@getLocalPort/ServerSocket/0 (socket usocket))) + +(defmethod get-peer-port ((usocket usocket)) + (jcall $@getPort/Socket/0 (socket usocket))) Added: usocket/trunk/test/test-condition.lisp ============================================================================== --- (empty file) +++ usocket/trunk/test/test-condition.lisp Sat Sep 11 09:34:27 2010 @@ -0,0 +1,28 @@ +;;;; $Id$ +;;;; $URL$ + +(in-package :usocket-test) + +(deftest ns-host-not-found-error.1 + (with-caught-conditions (usocket:ns-host-not-found-error nil) + (usocket:socket-connect "xxx" 123) + t) + nil) + +(deftest timeout-error.1 + (with-caught-conditions (usocket:timeout-error nil) + (usocket:socket-connect "common-lisp.net" 81 :timeout 1) + t) + nil) + +(deftest connection-refused-error.1 + (with-caught-conditions (usocket:connection-refused-error nil) + (usocket:socket-connect "common-lisp.net" 81) + t) + nil) + +(deftest operation-not-permitted-error.1 + (with-caught-conditions (usocket:operation-not-permitted-error nil) + (usocket:socket-listen "0.0.0.0" 81) + t) + nil)

1 0