usocket-cvs

usocket-cvs@common-lisp.net

702 discussions

[usocket-cvs] r355 - usocket/branches/0.3.x/backend
by ehuelsmann＠common-lisp.net 28 Jun '08

28 Jun '08

Author: ehuelsmann Date: Sat Jun 28 03:57:38 2008 New Revision: 355 Modified: usocket/branches/0.3.x/backend/openmcl.lisp Log: Followup to fix of OpenMCL backend. Patch by: Chun Tian (binghe.lisp(a)gmail.com) Modified: usocket/branches/0.3.x/backend/openmcl.lisp ============================================================================== --- usocket/branches/0.3.x/backend/openmcl.lisp (original) +++ usocket/branches/0.3.x/backend/openmcl.lisp Sat Jun 28 03:57:38 2008 @@ -37,8 +37,8 @@ (ccl::fd-zero infds) (ccl::fd-zero errfds) (dolist (sock sockets) - (ccl::fd-set (openmcl-socket:socket-os-fd sock infds)) - (ccl::fd-set (openmcl-socket:socket-os-fd sock errfds))) + (ccl::fd-set (openmcl-socket:socket-os-fd sock) infds) + (ccl::fd-set (openmcl-socket:socket-os-fd sock) errfds)) (let* ((res (#_select (1+ (apply #'max infds)) infds (ccl::%null-ptr) errfds

1 0

[usocket-cvs] r354 - usocket/branches/0.3.x/backend
by ehuelsmann＠common-lisp.net 26 Jun '08

26 Jun '08

Author: ehuelsmann Date: Thu Jun 26 17:30:49 2008 New Revision: 354 Modified: usocket/branches/0.3.x/backend/openmcl.lisp Log: Fix OpenMCL (CCL) backend, directly on the branch, because this code doesn't exist on trunk any longer. Patch by: Chun Tian (binghe) (binghe.lisp(a)gmail.com) Modified: usocket/branches/0.3.x/backend/openmcl.lisp ============================================================================== --- usocket/branches/0.3.x/backend/openmcl.lisp (original) +++ usocket/branches/0.3.x/backend/openmcl.lisp Thu Jun 26 17:30:49 2008 @@ -37,15 +37,15 @@ (ccl::fd-zero infds) (ccl::fd-zero errfds) (dolist (sock sockets) - (ccl::fd-set (socket-os-fd sock infds)) - (ccl::fd-set (socket-os-fd sock errfds))) + (ccl::fd-set (openmcl-socket:socket-os-fd sock infds)) + (ccl::fd-set (openmcl-socket:socket-os-fd sock errfds))) (let* ((res (#_select - (1+ (apply #'max fds)) + (1+ (apply #'max infds)) infds (ccl::%null-ptr) errfds (if ticks-to-wait tv (ccl::%null-ptr))))) (when (> res 0) (remove-if #'(lambda (x) - (not (ccl::fd-is-set (socket-os-fd x) infds))) + (not (ccl::fd-is-set (openmcl-socket:socket-os-fd x) infds))) sockets)))))) (defun wait-for-input (sockets &optional ticks-to-wait) @@ -67,7 +67,7 @@ (raise-error-from-id (openmcl-socket:socket-error-identifier condition) socket condition)) (ccl::socket-creation-error #| ugh! |# - (raise-error-from-id (ccl::socket-creationg-error-identifier condition) + (raise-error-from-id (ccl::socket-creation-error-identifier condition) socket condition)) (error (error 'unknown-error :socket socket :real-error condition)) (condition (signal 'unknown-condition :real-condition condition))))

1 0

[usocket-cvs] r353 - usocket/trunk/backend
by ehuelsmann＠common-lisp.net 21 Jun '08

21 Jun '08

Author: ehuelsmann Date: Fri Jun 20 20:06:02 2008 New Revision: 353 Modified: usocket/trunk/backend/allegro.lisp usocket/trunk/backend/armedbear.lisp usocket/trunk/backend/clisp.lisp usocket/trunk/backend/cmucl.lisp usocket/trunk/backend/lispworks.lisp usocket/trunk/backend/openmcl.lisp usocket/trunk/backend/sbcl.lisp usocket/trunk/backend/scl.lisp Log: Start supporting the timeout parameter for SOCKET-CONNECT. >From a patch by Hans Huebner, with additional supported platforms from me. Modified: usocket/trunk/backend/allegro.lisp ============================================================================== --- usocket/trunk/backend/allegro.lisp (original) +++ usocket/trunk/backend/allegro.lisp Fri Jun 20 20:06:02 2008 @@ -49,13 +49,18 @@ :text :binary)) -(defun socket-connect (host port &key (element-type 'character)) +(defun socket-connect (host port &key (element-type 'character) timeout) (let ((socket)) (setf socket (with-mapped-conditions (socket) - (socket:make-socket :remote-host (host-to-hostname host) - :remote-port port - :format (to-format element-type)))) + (if timeout + (mp:with-timeout (timeout nil) + (socket:make-socket :remote-host (host-to-hostname host) + :remote-port port + :format (to-format element-type))) + (socket:make-socket :remote-host (host-to-hostname host) + :remote-port port + :format (to-format element-type))))) (make-stream-socket :socket socket :stream socket))) Modified: usocket/trunk/backend/armedbear.lisp ============================================================================== --- usocket/trunk/backend/armedbear.lisp (original) +++ usocket/trunk/backend/armedbear.lisp Fri Jun 20 20:06:02 2008 @@ -185,7 +185,9 @@ (typecase condition (error (error 'unknown-error :socket socket :real-error condition)))) -(defun socket-connect (host port &key (element-type 'character)) +(defun socket-connect (host port &key (element-type 'character) timeout) + (when timeout + (warn "SOCKET-CONNECT timeout not supported in ABCL")) (let ((usock)) (with-mapped-conditions (usock) (let* ((sock-addr (jdi:jcoerce Modified: usocket/trunk/backend/clisp.lisp ============================================================================== --- usocket/trunk/backend/clisp.lisp (original) +++ usocket/trunk/backend/clisp.lisp Fri Jun 20 20:06:02 2008 @@ -55,14 +55,19 @@ (error usock-err :socket socket) (signal usock-err :socket socket))))))) -(defun socket-connect (host port &key (element-type 'character)) +(defun socket-connect (host port &key (element-type 'character) timeout) (let ((socket) (hostname (host-to-hostname host))) (with-mapped-conditions (socket) - (setf socket - (socket:socket-connect port hostname - :element-type element-type - :buffered t))) + (setf socket + (if timeout + (socket:socket-connect port hostname + :element-type element-type + :buffered t + :timeout timeout) + (socket:socket-connect port hostname + :element-type element-type + :buffered t)))) (make-stream-socket :socket socket :stream socket))) ;; the socket is a stream too Modified: usocket/trunk/backend/cmucl.lisp ============================================================================== --- usocket/trunk/backend/cmucl.lisp (original) +++ usocket/trunk/backend/cmucl.lisp Fri Jun 20 20:06:02 2008 @@ -50,7 +50,9 @@ :socket socket :condition condition)))) -(defun socket-connect (host port &key (element-type 'character)) +(defun socket-connect (host port &key (element-type 'character) timeout) + (when timeout + (warn "SOCKET-CONNECT timeout not supported in CMUCL")) (let* ((socket)) (setf socket (with-mapped-conditions (socket) Modified: usocket/trunk/backend/lispworks.lisp ============================================================================== --- usocket/trunk/backend/lispworks.lisp (original) +++ usocket/trunk/backend/lispworks.lisp Fri Jun 20 20:06:02 2008 @@ -73,7 +73,9 @@ (declare (ignore host port err-msg)) (raise-usock-err errno socket condition))))) -(defun socket-connect (host port &key (element-type 'base-char)) +(defun socket-connect (host port &key (element-type 'base-char) timeout) + (when timeout + (warn "SOCKET-CONNECT timeout not supported in Lispworks")) (let ((hostname (host-to-hostname host)) (stream)) (setf stream Modified: usocket/trunk/backend/openmcl.lisp ============================================================================== --- usocket/trunk/backend/openmcl.lisp (original) +++ usocket/trunk/backend/openmcl.lisp Fri Jun 20 20:06:02 2008 @@ -57,25 +57,30 @@ (defun handle-condition (condition &optional socket) (typecase condition (openmcl-socket:socket-error - (raise-error-from-id (openmcl-socket:socket-error-identifier condition) - socket condition)) + (raise-error-from-id (openmcl-socket:socket-error-identifier condition) + socket condition)) + (ccl:communication-deadline-expired + (error 'timeout-error :socket socket :real-error condition)) (ccl::socket-creation-error #| ugh! |# - (raise-error-from-id (ccl::socket-creation-error-identifier condition) - socket condition)))) + (raise-error-from-id (ccl::socket-creation-error-identifier condition) + socket condition)))) (defun to-format (element-type) (if (subtypep element-type 'character) :text :binary)) -(defun socket-connect (host port &key (element-type 'character)) +(defun socket-connect (host port &key (element-type 'character) timeout deadline) (with-mapped-conditions () - (let ((mcl-sock - (openmcl-socket:make-socket :remote-host (host-to-hostname host) - :remote-port port - :format (to-format element-type)))) - (openmcl-socket:socket-connect mcl-sock) - (make-stream-socket :stream mcl-sock :socket mcl-sock)))) + (let ((mcl-sock + (openmcl-socket:make-socket :remote-host (host-to-hostname host) + :remote-port port + :format (to-format element-type) + :deadline deadline + :connect-timeout (and timeout + (* timeout internal-time-units-per-second))))) + (openmcl-socket:socket-connect mcl-sock) + (make-stream-socket :stream mcl-sock :socket mcl-sock)))) (defun socket-listen (host port &key reuseaddress Modified: usocket/trunk/backend/sbcl.lisp ============================================================================== --- usocket/trunk/backend/sbcl.lisp (original) +++ usocket/trunk/backend/sbcl.lisp Fri Jun 20 20:06:02 2008 @@ -184,7 +184,10 @@ (signal usock-cond :socket socket)))))) -(defun socket-connect (host port &key (element-type 'character)) +(defun socket-connect (host port &key (element-type 'character) timeout deadline) + (declare (ignore deadline)) + (when timeout + (warn "SOCKET-CONNECT timeout not supported in SBCL")) (let* ((socket (make-instance 'sb-bsd-sockets:inet-socket :type :stream :protocol :tcp)) (stream (sb-bsd-sockets:socket-make-stream socket Modified: usocket/trunk/backend/scl.lisp ============================================================================== --- usocket/trunk/backend/scl.lisp (original) +++ usocket/trunk/backend/scl.lisp Fri Jun 20 20:06:02 2008 @@ -28,7 +28,9 @@ :socket socket :condition condition)))) -(defun socket-connect (host port &key (element-type 'character)) +(defun socket-connect (host port &key (element-type 'character) timeout) + (when timeout + (warn "SOCKET-CONNECT timeout not supported in SCL")) (let* ((socket (with-mapped-conditions () (ext:connect-to-inet-socket (host-to-hbo host) port :kind :stream)))

1 0

[usocket-cvs] r352 - public_html
by ehuelsmann＠common-lisp.net 21 Jun '08

21 Jun '08

Author: ehuelsmann Date: Fri Jun 20 19:33:15 2008 New Revision: 352 Modified: public_html/index.shtml Log: Document the release. Modified: public_html/index.shtml ============================================================================== --- public_html/index.shtml (original) +++ public_html/index.shtml Fri Jun 20 19:33:15 2008 @@ -391,12 +391,11 @@ <table> <caption>Release history</caption> <tr><th>Date</th><th>Release</th><th>Summary</th></tr> -<tr><td>Sep 18, 2007</td> - <td>0.3.5</td> - <td>Implementation-dependent errors bleeding through, ECL get-host-name - memory allocation fix/win32 compat fix, CLISP compile warnings fixes, - SBCL compile warning/error fix, CLISP get-peer-name/get-local-name - fixes</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>

1 0

[usocket-cvs] r351 - public_html/releases
by ehuelsmann＠common-lisp.net 21 Jun '08

21 Jun '08

Author: ehuelsmann Date: Fri Jun 20 19:31:29 2008 New Revision: 351 Added: public_html/releases/usocket-0.3.6.tar.gz (contents, props changed) Log: Publish usocket 0.3.6 (signing will do later). Added: public_html/releases/usocket-0.3.6.tar.gz ============================================================================== Binary file. No diff available.

1 0

[usocket-cvs] r350 - usocket/tags/0.3.6
by ehuelsmann＠common-lisp.net 21 Jun '08

21 Jun '08

Author: ehuelsmann Date: Fri Jun 20 19:30:09 2008 New Revision: 350 Added: usocket/tags/0.3.6/ - copied from r349, usocket/branches/0.3.x/ Modified: usocket/tags/0.3.6/usocket.asd Log: Create 0.3.6 tag. Modified: usocket/tags/0.3.6/usocket.asd ============================================================================== --- usocket/branches/0.3.x/usocket.asd (original) +++ usocket/tags/0.3.6/usocket.asd Fri Jun 20 19:30:09 2008 @@ -14,7 +14,7 @@ (defsystem usocket :name "usocket" :author "Erik Enge & Erik Huelsmann" - :version "0.3.5-dev" + :version "0.3.6" :licence "MIT" :description "Universal socket library for Common Lisp" :depends-on (:split-sequence

1 0

[usocket-cvs] r349 - usocket/branches/0.3.x/backend
by ehuelsmann＠common-lisp.net 21 Jun '08

21 Jun '08

Author: ehuelsmann Date: Fri Jun 20 19:26:28 2008 New Revision: 349 Modified: usocket/branches/0.3.x/backend/sbcl.lisp Log: Fix the fix (ecl coding hints). Modified: usocket/branches/0.3.x/backend/sbcl.lisp ============================================================================== --- usocket/branches/0.3.x/backend/sbcl.lisp (original) +++ usocket/branches/0.3.x/backend/sbcl.lisp Fri Jun 20 19:26:28 2008 @@ -52,7 +52,7 @@ "{ char *buf = cl_alloc_atomic(257); if (gethostname(buf,256) == 0) - @(return) = make_simple_base_string(strndup(&buf,255)); + @(return) = make_simple_base_string(buf); else @(return) = Cnil; }" :one-liner nil :side-effects nil)))

1 0

[usocket-cvs] r348 - usocket/branches/0.4.x/backend
by ehuelsmann＠common-lisp.net 21 Jun '08

21 Jun '08

Author: ehuelsmann Date: Fri Jun 20 18:45:52 2008 New Revision: 348 Modified: usocket/branches/0.4.x/backend/sbcl.lisp Log: Implement Juan's latest advice and backport c337 from Hans's branch. Modified: usocket/branches/0.4.x/backend/sbcl.lisp ============================================================================== --- usocket/branches/0.4.x/backend/sbcl.lisp (original) +++ usocket/branches/0.4.x/backend/sbcl.lisp Fri Jun 20 18:45:52 2008 @@ -67,7 +67,7 @@ (defun get-host-name () (ffi:c-inline () () :object - "{ char *buf = GC_malloc(256); + "{ char *buf = cl_alloc_atomic(256); if (gethostname(buf,256) == 0) @(return) = make_simple_base_string(buf); @@ -86,10 +86,10 @@ FD_ZERO(&rfds); while (CONSP(cur_fd)) { - int fd = fixint(cur_fd->cons.car); + int fd = fixint(CAR(cur_fd)); max_fd = (max_fd > fd) ? max_fd : fd; FD_SET(fd, &rfds); - cur_fd = cur_fd->cons.cdr; + cur_fd = CDR(cur_fd); } if (#1 != Cnil) { @@ -102,14 +102,14 @@ if (count == 0) @(return 0) = Cnil; @(return 1) = Cnil; - else if (count < 0) + } else if (count < 0) { /*###FIXME: We should be raising an error here... except, ofcourse in case of EINTR or EAGAIN */ @(return 0) = Cnil; @(return 1) = MAKE_INTEGER(errno); - else + } else { cl_object rv = Cnil; cur_fd = #0; @@ -152,6 +152,7 @@ . operation-not-permitted-error) (sb-bsd-sockets:protocol-not-supported-error . protocol-not-supported-error) + #-ecl (sb-bsd-sockets:unknown-protocol . protocol-not-supported-error) (sb-bsd-sockets:socket-type-not-supported-error @@ -161,6 +162,7 @@ (sb-bsd-sockets:socket-error . ,#'map-socket-error) ;; Nameservice errors: mapped to unknown-error + #-ecl #-ecl #-ecl (sb-bsd-sockets:no-recovery-error . ns-no-recovery-error) (sb-bsd-sockets:try-again-error . ns-try-again-condition) (sb-bsd-sockets:host-not-found-error . ns-host-not-found-error)))

1 0

[usocket-cvs] r347 - usocket/branches/0.3.x/backend
by ehuelsmann＠common-lisp.net 21 Jun '08

21 Jun '08

Author: ehuelsmann Date: Fri Jun 20 18:41:17 2008 New Revision: 347 Modified: usocket/branches/0.3.x/backend/sbcl.lisp Log: Implement Juan's latest advice. Modified: usocket/branches/0.3.x/backend/sbcl.lisp ============================================================================== --- usocket/branches/0.3.x/backend/sbcl.lisp (original) +++ usocket/branches/0.3.x/backend/sbcl.lisp Fri Jun 20 18:41:17 2008 @@ -49,7 +49,7 @@ (defun get-host-name () (ffi:c-inline () () :object - "{ char *buf = GC_malloc(257); + "{ char *buf = cl_alloc_atomic(257); if (gethostname(buf,256) == 0) @(return) = make_simple_base_string(strndup(&buf,255));

1 0

[usocket-cvs] r346 - usocket/branches/0.4.x/backend
by ehuelsmann＠common-lisp.net 21 Jun '08

21 Jun '08

Author: ehuelsmann Date: Fri Jun 20 18:21:33 2008 New Revision: 346 Modified: usocket/branches/0.4.x/backend/lispworks.lisp Log: Backport c342 (mapcar and listen arguments). Modified: usocket/branches/0.4.x/backend/lispworks.lisp ============================================================================== --- usocket/branches/0.4.x/backend/lispworks.lisp (original) +++ usocket/branches/0.4.x/backend/lispworks.lisp Fri Jun 20 18:21:33 2008 @@ -157,7 +157,7 @@ (defun usocket-listen (usocket) (if (stream-usocket-p usocket) - (when (listen (socket usocket)) + (when (listen (socket-stream usocket)) usocket) (when (comm::socket-listen (socket usocket)) usocket))) @@ -174,15 +174,15 @@ ;; unfortunately, it's impossible to share code between ;; non-win32 and win32 platforms... ;; Can we have a sane -pref. complete [UDP!?]- API next time, please? - (mapcar #'mp:notice-fd sockets - :key #'os-socket-handle) + (dolist (x sockets) + (mp:notice-fd (os-socket-handle x))) (mp:process-wait-with-timeout "Waiting for a socket to become active" (truncate timeout) #'(lambda (socks) (some #'usocket-listen socks)) sockets) - (mapcar #'mp:unnotice-fd sockets - :key #'os-socket-handle) + (dolist (x sockets) + (mp:unnotice-fd (os-socket-handle x))) (remove nil (mapcar #'usocket-listen sockets))))

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

usocket-cvs