[usocket-cvs] r502 - usocket/branches/experimental-udp

[Chun Tian (binghe)]

Author: ctian
Date: Fri Dec 11 08:37:33 2009
New Revision: 502

Log:
Clean UDP code (remove less used RTT stuff: SOCKET-SYNC)

Removed:
   usocket/branches/experimental-udp/rtt-client.lisp
   usocket/branches/experimental-udp/rtt.lisp
Modified:
   usocket/branches/experimental-udp/condition.lisp
   usocket/branches/experimental-udp/package.lisp
   usocket/branches/experimental-udp/usocket.asd
   usocket/branches/experimental-udp/usocket.lisp

Modified: usocket/branches/experimental-udp/condition.lisp
==============================================================================
--- usocket/branches/experimental-udp/condition.lisp	(original)
+++ usocket/branches/experimental-udp/condition.lisp	Fri Dec 11 08:37:33 2009
@@ -225,42 +225,6 @@
 (defmacro unimplemented (feature context)
   `(signal 'unimplemented :feature ,feature :context ,context))
 
-;;; binghe: socket-warning for UDP retransmit support
-
 (define-condition socket-warning (socket-condition warning)
   () ;; no slots (yet)
   (:documentation "Parent warning for all socket related warnings"))
-
-(define-condition rtt-timeout-warning (socket-warning)
-  ((old-rto :type short-float
-            :reader old-rto-of
-            :initarg :old-rto)
-   (new-rto :type short-float
-            :reader new-rto-of
-            :initarg :new-rto))
-  (:report (lambda (condition stream)
-             (format stream "Receive timeout (~As), next: ~As.~%"
-                     (old-rto-of condition)
-                     (new-rto-of condition))))
-  (:documentation "RTT timeout warning"))
-
-(define-condition rtt-seq-mismatch-warning (socket-warning)
-  ((send-seq :type integer
-             :reader send-seq-of
-             :initarg :send-seq)
-   (recv-seq :type integer
-             :reader recv-seq-of
-             :initarg :recv-seq))
-  (:report (lambda (condition stream)
-             (format stream "Sequence number mismatch (~A -> ~A), try read again.~%"
-                     (send-seq-of condition)
-                     (recv-seq-of condition))))
-  (:documentation "RTT sequence mismatch warning"))
-
-(define-condition rtt-timeout-error (socket-error)
-  ()
-  (:report (lambda (condition stream)
-             (declare (ignore condition))
-             (format stream "Max retransmit times (~A) reached, give up.~%"
-                     *rtt-maxnrexmt*)))
-  (:documentation "RTT timeout error"))

Modified: usocket/branches/experimental-udp/package.lisp
==============================================================================
--- usocket/branches/experimental-udp/package.lisp	(original)
+++ usocket/branches/experimental-udp/package.lisp	Fri Dec 11 08:37:33 2009
@@ -30,7 +30,6 @@
 
              #:socket-send    ; udp function (send)
              #:socket-receive ; udp function (receive)
-             #:socket-sync    ; udp client (high-level)
              #:socket-server  ; udp server
 
              #:wait-for-input ; waiting for input-ready state (select() like)

Modified: usocket/branches/experimental-udp/usocket.asd
==============================================================================
--- usocket/branches/experimental-udp/usocket.asd	(original)
+++ usocket/branches/experimental-udp/usocket.asd	Fri Dec 11 08:37:33 2009
@@ -20,12 +20,8 @@
     :depends-on (:split-sequence
                  #+sbcl :sb-bsd-sockets)
     :components ((:file "package")
-                 (:file "rtt"
-                  :depends-on ("package"))
-                 (:file "usocket"
-                  :depends-on ("package" "rtt"))
-                 (:file "condition"
-                  :depends-on ("usocket" "rtt"))
+                 (:file "usocket" :depends-on ("package"))
+                 (:file "condition" :depends-on ("usocket"))
                  (:module "backend"
                   :components (#+clisp         (:file "clisp")
                                #+cmu           (:file "cmucl")
@@ -36,7 +32,5 @@
                                #+allegro       (:file "allegro")
                                #+armedbear     (:file "armedbear"))
                   :depends-on ("condition"))
-                 (:file "rtt-client"
-                  :depends-on ("rtt" "backend" "condition"))
                  (:file "server"
                   :depends-on ("backend"))))

Modified: usocket/branches/experimental-udp/usocket.lisp
==============================================================================
--- usocket/branches/experimental-udp/usocket.lisp	(original)
+++ usocket/branches/experimental-udp/usocket.lisp	Fri Dec 11 08:37:33 2009
@@ -84,7 +84,7 @@
   (:documentation "Socket which listens for stream connections to
 be initiated from remote sockets."))
 
-(defclass datagram-usocket (usocket rtt-info-mixin)
+(defclass datagram-usocket (usocket)
   ((connected-p :type boolean
                 :accessor connected-p
                 :initarg :connected-p)