Changeset 33 for branches/home/psmith/restructure/src/protocol/yarpc/yarpc-state-machine.lisp

Timestamp:

01/12/07 06:44:39 (18 years ago)

Author:

psmith

Message:

yarpc progress...

File:

• branches/home/psmith/restructure/src/protocol/yarpc/yarpc-state-machine.lisp (modified) (3 diffs)

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

@@ -41 +41 @@
 ;; response - who 2 'S
 ;;
-(defclass yarpc-state-machine (async-fd)())
+(defclass yarpc-state-machine (state-machine)())
 
+(defun yarpc-state-machine ()
+    (make-instance 'yarpc-state-machine))
+
+(defparameter yarpc-pf (yarpc-packet-factory))
+
+(defmethod get-packet-factory((sm yarpc-state-machine))
+  yarpc-pf)
 
 ;;TODO move somewhere suitable
@@ -75 +82 @@
   (format stream "#<YARPC-STATE-MACHINE ~A >" (call-next-method sm nil)))
 
-(defmethod process-read((sm yarpc-state-machine))
-  (with-slots (foreign-read-buffer foreign-write-buffer) sm
-    (let ((fn-result (execute-call (sb-ext:octets-to-string (get-string foreign-read-buffer) :external-format :ascii))))
-      (format t "process-read - function result: ~A~%" fn-result)
-      (nio-buffer:bytebuffer-write-string foreign-write-buffer (write-to-string fn-result) 0 :utf-8)
-      (close-sm sm))))
+(defconstant STATE-INITIALISED 0)
+(defconstant STATE-SEND-RESPONSE 1)
 
+(defparameter state STATE-INITIALISED)
 
 (define-condition authorization-error (error) ())
 
+;Process a call method packet, returns 
+(defmethod process-packet ((sm yarpc-state-machine) (call call-method-packet))
+  ;todo change state, create method-response packet and return it
+  ;(assert (eql state 0))
+  (handler-case
+    (let ((result (execute-call (get-call-string call))))
+      (when result 
+        (let ((response-packet (progn 
+                                  (setf state STATE-SEND-RESPONSE)
+                                  (method-response-packet result))))
+          (values response-packet t))))
+    (reader-error (re) (format t "No such function ~A~%" (get-call-string call)))
+    (authorization-error (ae) (format t "Function not declared with defremote ~A~%" (get-call-string call)))))
+
+
 (defun execute-call (call-string)
-  (handler-case
       (let* ((rpc-call-list (read-from-string call-string ))
              (fn (member (symbol-function (first rpc-call-list)) *remote-fns* )))
@@ -92 +110 @@
         (if fn
             (apply (first rpc-call-list) (rest rpc-call-list))
-            (error 'authorization-error)))
-    (reader-error (re) (format t "No such function ~A~%" call-string))))
+            (error 'authorization-error))))