Changeset 44 for branches/home/psmith/restructure/src

Timestamp:

01/19/07 00:11:08 (18 years ago)

Author:

psmith

Message:

Moved verbose messages to nio-debug

Location:

branches/home/psmith/restructure/src

Files:

• buffer/buffer.lisp (modified) (2 diffs)
• compat/nio-compat-package.lisp (modified) (1 diff)
• compat/nio-compat.asd (modified) (1 diff)
• compat/utils.lisp (added)
• io/async-fd.lisp (modified) (1 diff)
• io/nio-server.lisp (modified) (1 diff)
• protocol/yarpc/yarpc-packet-factory.lisp (modified) (2 diffs)
• statemachine/state-machine.lisp (modified) (2 diffs)

branches/home/psmith/restructure/src/buffer/buffer.lisp ¶

@@ -160 +160 @@
 (defmethod bytebuffer-write-vector((bb byte-buffer) vec)
   :documentation "Returns number of bytes written to bytebuffer"
-  (format t "bytebuffer-write-vector - called with ~A ~A"bb vec)
+#+nio-debug    (format t "bytebuffer-write-vector - called with ~A ~A"bb vec)
 ;  (if (> (remaining bb) 0)
 ;      0
@@ -166 +166 @@
 ;       (clear bb)
         (let ((bytes-written (cffi:mem-write-vector vec (buffer-buf bb) :unsigned-char (length vec) (buffer-position bb))))
-          (format t "bytebuffer-write-vector -  byteswritten: ~A~%" bytes-written)
+#+nio-debug       (format t "bytebuffer-write-vector -  byteswritten: ~A~%" bytes-written)
           (inc-position bb bytes-written)
           bytes-written)))

branches/home/psmith/restructure/src/compat/nio-compat-package.lisp ¶

@@ -34 +34 @@
              ;;concurrent-queue
              concurrent-queue add take
+             
+             ;;utils
+             get-readable-time
              ))

branches/home/psmith/restructure/src/compat/nio-compat.asd ¶

@@ -8 +8 @@
                  (:file "errno" :depends-on ("nio-compat-package"))
                  (:file "concurrent-queue" :depends-on ("nio-compat-package"))
+                 (:file "utils" :depends-on ("nio-compat-package"))
                  )
 

branches/home/psmith/restructure/src/io/async-fd.lisp ¶

@@ -111 +111 @@
 (defun read-more (state-machine)
   (with-slots (foreign-read-buffer read-fd) state-machine
-  (format t "read-more called with ~A~%" state-machine)
+#+nio-debug  (format t "read-more called with ~A~%" state-machine)
 
 #+nio-debug      (format t "read-more - calling read() into ~A~%" foreign-read-buffer) 

branches/home/psmith/restructure/src/io/nio-server.lisp ¶

@@ -91 +91 @@
       (handler-bind ((poll-error #'(lambda (cond) 
                                      (declare (ignore cond))
-                                     (format t "Poll-error, exiting..~%")
+                                     (format t "Poll-error (errno ~A), exiting..~%" (get-errno))
                                      (throw 'poll-error-exit nil))))
        

branches/home/psmith/restructure/src/protocol/yarpc/yarpc-packet-factory.lisp ¶

@@ -60 +60 @@
 
 (defmethod write-bytes((packet call-method-packet) buf)
-  (format t "yarpc-packet-factory:write-bytes - writing ~A to ~A~%" packet buf)
-;  (nio-buffer:flip buf)
+#+nio-debug  (format t "yarpc-packet-factory:write-bytes - writing ~A to ~A~%" packet buf)
   (nio-buffer:bytebuffer-write-vector buf #(#x0))
   (nio-buffer:bytebuffer-write-string buf (call-string packet))
-  (format t "yarpc-packet-factory:write-bytes - written ~A~%" buf)  )
+#+nio-debug    (format t "yarpc-packet-factory:write-bytes - written ~A~%" buf)  
+)
   
 
@@ -78 +78 @@
 
 (defmethod write-bytes((packet method-response-packet) buf)
-  (format t "yarpc-packet-factory:write-bytes - writing ~A to ~A~%" packet buf)
+#+nio-debug    (format t "yarpc-packet-factory:write-bytes - writing ~A to ~A~%" packet buf)
   (nio-buffer:bytebuffer-write-vector buf #(#x1))
   (nio-buffer:bytebuffer-write-string buf (write-to-string (response packet)))
-  (format t "yarpc-packet-factory:write-bytes - written ~A~%" buf)  )
+#+nio-debug    (format t "yarpc-packet-factory:write-bytes - written ~A~%" buf)  
+)

branches/home/psmith/restructure/src/statemachine/state-machine.lisp ¶

@@ -58 +58 @@
   (with-slots (foreign-read-buffer) sm
     (let ((incoming-packet (get-packet (get-packet-factory sm) foreign-read-buffer)))
-      (format t "state-machine::process-read - incoming packet: ~A~%" incoming-packet)
+      (format t "~A state-machine::process-read - incoming packet: ~A~%" (nio-compat:get-readable-time) incoming-packet)
       (when incoming-packet 
           (when (not (process-incoming-packet sm incoming-packet))
@@ -68 +68 @@
   (with-slots (foreign-write-buffer) sm
   (let ((outgoing-packet (process-outgoing-packet sm)))
-    (format t "state-machine::process-write - outgoing packet: ~A~%" outgoing-packet)
+    (format t "~A state-machine::process-write - outgoing packet: ~A~%" (nio-compat:get-readable-time) outgoing-packet)
     (when outgoing-packet (write-bytes outgoing-packet foreign-write-buffer)))))