Changeset 94 for branches/home/psmith/restructure/src/protocol/yarpc

Timestamp:

02/22/07 22:50:56 (18 years ago)

Author:

psmith

Message:

moved threadsafe queue and added more tests.

Location:

branches/home/psmith/restructure/src/protocol/yarpc

Files:

• nio-yarpc.asd (modified) (1 diff)
• yarpc-client-state-machine.lisp (modified) (3 diffs)
• yarpc-state-machine.lisp (modified) (3 diffs)

branches/home/psmith/restructure/src/protocol/yarpc/nio-yarpc.asd ¶

@@ -11 +11 @@
                  )
 
-    :depends-on (:nio :nio-sm :nio-compat))
+    :depends-on (:nio :nio-sm :nio-utils))

branches/home/psmith/restructure/src/protocol/yarpc/yarpc-client-state-machine.lisp ¶

@@ -34 +34 @@
 ;;
 (defclass yarpc-client-state-machine (state-machine)
-  ((job-queue :initform (nio-compat:concurrent-queue)
+  ((job-queue :initform (nio-utils:concurrent-queue)
               :accessor job-queue
               :documentation "The queue used to hand off work from an external thread to the io thread")
@@ -75 +75 @@
 (defmethod process-outgoing-packet((sm yarpc-client-state-machine))
 #+nio-debug  (format-log t "yarpc-client-state-machine:process-outgoing-packet called, polling the job-queue ~%")
-  (let ((ttd (nio-compat:take (job-queue sm) :blocking-call nil)))
+  (let ((ttd (nio-utils:take (job-queue sm) :blocking-call nil)))
     (when ttd
 #+nio-debug      (format-log t "yarpc-client-state-machine:process-outgoing-packet got job ~A ~%" ttd)
@@ -95 +95 @@
 (defmethod remote-execute ((sm yarpc-client-state-machine) call-string callback)
 #+nio-debug  (format-log t "yarpc-client-state-machine:remote-execute called :sm ~A :call-string ~A :callback ~A~%" sm call-string callback)
-  (nio-compat:add (job-queue sm) (list (remote-job callback) call-string)))
+  (nio-utils:add (job-queue sm) (list (remote-job callback) call-string)))

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

@@ -35 +35 @@
 (defclass yarpc-state-machine (state-machine)
   (
-   (result-queue :initform (nio-compat:concurrent-queue)
+   (result-queue :initform (nio-utils:concurrent-queue)
                  :accessor result-queue
                  :documentation "The queue used to return results from an external thread to the nio thread")))
 
-(defparameter job-queue (nio-compat:concurrent-queue)
+(defparameter job-queue (nio-utils:concurrent-queue)
   "The queue used to hand off work from the NIO thread to an external thread for execution")
 
@@ -61 +61 @@
 (defun run-job(&key (blocking t))
 #+nio-debug  (format-log t "yarpc-state-machine:run-job - Server toplevel waiting for job~%")
-  (let ((server-job (nio-compat:take nio-yarpc:job-queue :blocking-call blocking)))
+  (let ((server-job (nio-utils:take nio-yarpc:job-queue :blocking-call blocking)))
     (when server-job 
       (destructuring-bind (job request-id result-queue) server-job
 #+nio-debug     (format-log t "yarpc-state-machine:run-job - Server received job ~A~%" job)
-        (nio-compat:add result-queue (list request-id (nio-yarpc:execute-call job)))))))
+        (nio-utils:add result-queue (list request-id (nio-yarpc:execute-call job)))))))
 
 
 (defmethod process-outgoing-packet((sm yarpc-state-machine))
 #+nio-debug2  (format-log t "yarpc-state-machine:process-outgoing-packet - called, polling the results-queue ~%" )
-  (let ((server-job (nio-compat:take (result-queue sm) :blocking-call nil)))
+  (let ((server-job (nio-utils:take (result-queue sm) :blocking-call nil)))
     (when server-job
       (destructuring-bind (request-id result) server-job
@@ -79 +79 @@
 (defmethod process-incoming-packet ((sm yarpc-state-machine) (call call-method-packet))
 #+nio-debug  (format-log t "yarpc-state-machine:process-incoming-packet - called :sm ~A :packet ~A~%" sm call)
-  (nio-compat:add job-queue (list (call-string call) (request-id call) (result-queue sm)))
+  (nio-utils:add job-queue (list (call-string call) (request-id call) (result-queue sm)))
   (when +process-jobs-inline+ (run-job :blocking nil)))