[nio-cvs] r78 - in branches/home/psmith/restructure/src: io protocol/yarpc statemachine

[psmith at common-lisp.net]

Author: psmith
Date: Wed Feb  7 01:03:21 2007
New Revision: 78

Modified:
   branches/home/psmith/restructure/src/io/nio-server.lisp
   branches/home/psmith/restructure/src/protocol/yarpc/yarpc-client-state-machine.lisp
   branches/home/psmith/restructure/src/statemachine/state-machine.lisp
Log:
verbosity changes

Modified: branches/home/psmith/restructure/src/io/nio-server.lisp
==============================================================================
--- branches/home/psmith/restructure/src/io/nio-server.lisp	(original)
+++ branches/home/psmith/restructure/src/io/nio-server.lisp	Wed Feb  7 01:03:21 2007
@@ -41,7 +41,7 @@
 (defun process-async-fds (client-hash)
   (let ((removals nil))
     (maphash #'(lambda (k async-fd) 
-	       (format-log t "Dealing with ~a => ~a~%" k async-fd)
+#+nio-debug2	(format-log t "Dealing with ~a => ~a~%" k async-fd)
 	       
 	       ;process reads
 	       (when (read-ready async-fd) (read-more async-fd))
@@ -153,7 +153,7 @@
 #+nio-debug2     (format-log t "nio-server:start-server - Processing client add ~A~%" +connected-sockets-queue+)
 
              (loop for new-fd = (nio-compat:take +connected-sockets-queue+ :blocking-call nil) until (null new-fd) do
-		  (format-log t "nio-server:start-server - Dealing with ~A~%" new-fd)
+#+nio-debug	  (format-log t "nio-server:start-server - adding connection to nio thread ~A~%" new-fd)
 		  (setf (gethash (async-fd-read-fd new-fd) client-hash) new-fd)
 		  (add-async-fd event-queue new-fd :read-write))
 	     

Modified: branches/home/psmith/restructure/src/protocol/yarpc/yarpc-client-state-machine.lisp
==============================================================================
--- branches/home/psmith/restructure/src/protocol/yarpc/yarpc-client-state-machine.lisp	(original)
+++ branches/home/psmith/restructure/src/protocol/yarpc/yarpc-client-state-machine.lisp	Wed Feb  7 01:03:21 2007
@@ -56,12 +56,12 @@
 (defconstant STATE-SENT-REQUEST 1)
 
 (defmethod process-outgoing-packet((sm yarpc-client-state-machine))
-  (format-log t "yarpc-client-state-machine:process-outgoing-packet called, polling the job-queue ~%")
+#+nio-debug2  (format-log t "yarpc-client-state-machine:process-outgoing-packet called, polling the job-queue ~%")
   (let ((packet (nio-compat:take (job-queue sm) :blocking-call nil)))
     (when packet
       (format-log t "yarpc-client-state-machine:process-outgoing-packet got job ~A ~%" packet)
       (setf (state sm) STATE-SENT-REQUEST))
-      packet))
+    packet)) 
 
 (defmethod process-incoming-packet ((sm yarpc-client-state-machine) (response method-response-packet))
   (assert (eql (state sm) STATE-SENT-REQUEST))

Modified: branches/home/psmith/restructure/src/statemachine/state-machine.lisp
==============================================================================
--- branches/home/psmith/restructure/src/statemachine/state-machine.lisp	(original)
+++ branches/home/psmith/restructure/src/statemachine/state-machine.lisp	Wed Feb  7 01:03:21 2007
@@ -72,8 +72,8 @@
 (defmethod process-write((sm state-machine))
   (with-slots (foreign-write-buffer) sm
   (let ((outgoing-packet (process-outgoing-packet sm)))
-    (format-log t "state-machine::process-write - outgoing packet: ~A~%" outgoing-packet)
     (when outgoing-packet 
+#+nio-debug    (format-log t "state-machine::process-write - outgoing packet: ~A~%" outgoing-packet)
       (handler-case
 	  (write-bytes outgoing-packet foreign-write-buffer)
 	(buffer-too-small-error (write-error1)