From 298afd774a0ec85fd9ae74290d1e70f375bc1562 Mon Sep 17 00:00:00 2001 From: Vitaly Mayatskikh Date: Sun, 13 Jun 2010 12:15:40 +0200 Subject: [PATCH] Fixes for 0MQ 2.0.7. --- tests/client.lisp | 11 ++++++----- tests/server.lisp | 6 +++--- transport-zmq.lisp | 14 ++++++-------- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/tests/client.lisp b/tests/client.lisp index a4ff0b8..494d288 100644 --- a/tests/client.lisp +++ b/tests/client.lisp @@ -2,11 +2,12 @@ (in-package :cl-cluster) -(setq my-remote (make-instance 'node-zmq :endpoint "tcp://127.0.0.1:5555" - :connect t)) -(setq feed (make-instance 'node-zmq - :endpoint "pgm://lo;226.0.0.1:5555" - :connect t :type zmq:pub)) +(defvar my-remote (make-instance 'node-zmq :endpoint "tcp://127.0.0.1:5555" + :connect t)) + +(defvar feed (make-instance 'node-zmq + :endpoint "epgm://lo;226.0.0.1:5555" + :connect t :type zmq:pub)) (node-send feed "(defvar remote-list '(1 2 3 4 5 6 7 8))") diff --git a/tests/server.lisp b/tests/server.lisp index e182372..04293b7 100644 --- a/tests/server.lisp +++ b/tests/server.lisp @@ -6,12 +6,12 @@ (in-package :cl-cluster-server) -(defvar *feed-address* "pgm://lo;226.0.0.1:5555") +(defvar *feed-address* "epgm://lo;226.0.0.1:5555") (defvar *repl-address* "tcp://127.0.0.1:5555") (defvar *generation* 0) (defvar *reqs* nil) -(zmq:with-context (ctx 2 2 zmq:noblock) +(zmq:with-context (ctx 2) (zmq:with-socket (feed ctx zmq:sub) (zmq:connect feed *feed-address*) (zmq:setsockopt feed zmq:subscribe "") @@ -50,7 +50,7 @@ (list 'error (format nil "~a" c)))))) (format t "<- ~s~%" rep) (zmq:send repl (make-instance 'zmq:msg :data rep)))))))))) - (zmq:sleep 1))) + (sleep 1))) (tg:gc) #+sbcl (sb-ext:quit) diff --git a/transport-zmq.lisp b/transport-zmq.lisp index a88f95d..c5b0bbc 100644 --- a/transport-zmq.lisp +++ b/transport-zmq.lisp @@ -17,9 +17,10 @@ (in-package :cl-cluster) +(defvar *context* (zmq:init 2)) ; FIXME: ask for actual CPUs nr + (defclass node-zmq (node) ((endpoint :initarg :endpoint :accessor node-zmq-endpoint) - (context :initform nil :accessor node-zmq-context) (socket :initform nil :accessor node-zmq-socket) (type :initform zmq:req :initarg :type :accessor node-zmq-type) (message :initform nil :accessor node-zmq-message))) @@ -32,17 +33,14 @@ (not (null (node-zmq-socket object)))) (defmethod node-connect ((object node-zmq)) - (with-slots (context socket endpoint type) object - (setf context (zmq:init 1 1 0) - socket (zmq:socket context type)) + (with-slots (socket endpoint type) object + (setf socket (zmq:socket *context* type)) (zmq:connect socket endpoint))) (defmethod node-disconnect ((object node-zmq)) - (with-slots (context socket) object + (with-slots (socket) object (zmq:close socket) - (zmq:term context) - (setf context nil - socket nil))) + (setf socket nil))) (defmethod node-send/unsafe ((object node-zmq) msg) (zmq:send (node-zmq-socket object) (make-instance 'zmq:msg :data msg))) -- 2.11.4.GIT