Remove context monitoring

src/bindings.lisp

@@ -46,7 +46,7 @@
 (defun raise-error (errno)
   (declare (inline raise-error)
            (type fixnum errno))
-  (cond 
+  (cond
     ((eq +eagain+ errno) (error 'eagain :error-number errno))
     (t (error 'zmq-error :error-number errno))))
 
@@ -58,7 +58,7 @@
            (type (function (error) boolean) predicate))
   (tagbody retry
      (return-from call-with-retry
-       (handler-bind ((t (lambda (condition)                       
+       (handler-bind ((t (lambda (condition)
                            (when (funcall predicate condition)
                              (go retry)))))
          (funcall thunk)))))
@@ -135,7 +135,7 @@
          (binding-lisp-name (concatenate 'string "%" (symbol-name lisp-name))))
     `(progn
        (cffi:defcfun (,foreign-name ,(intern binding-lisp-name)) ,return-type
-         ,@args)       
+         ,@args)
        (defun ,lisp-name ,(append (loop :for arg :in args
                                         :collect (car arg))
                            '(&optional eintr-retry))
@@ -145,7 +145,7 @@
             retry
               (setf ret (,(intern binding-lisp-name)
                          ,@(loop :for arg :in args
-                                 :collect (car arg))))        
+                                 :collect (car arg))))
               (when ,(if (eq return-type :pointer)
                          '(cffi:null-pointer-p ret)
                          '(< ret 0))
@@ -234,10 +234,6 @@
   (option :int)
   (value :int))
 
-(defcfun* ("zmq_ctx_set_monitor" ctx-set-monitor) :int
-  (context :pointer)
-  (monitor :pointer))
-
 ;;; ZMQ Socket Definition
 
 (defcfun* ("zmq_socket" socket) :pointer
@@ -317,4 +313,3 @@
   (dst :pointer)
   (src :pointer)
   (len size-t))
-

src/context.lisp

@@ -5,8 +5,7 @@
    #:ptr
    #:destroy
    #:context
-   #:with-context
-   #:activate-monitoring))
+   #:with-context))
 
 (in-package #:context)
 
@@ -16,24 +15,6 @@
 (defparameter +io-threads-default+ 1)
 (defparameter +max-sockets-default+ 1024)
 
-(defmacro define-context-events (events)
-  (let ((event-id 1))
-    `(progn ,@(loop :for symbol :in events
-	       :collect (list 'defparameter symbol event-id)
-	       :do (setf event-id (* event-id 2))))))
-
-(define-context-events
-    (+event-connected+
-     +event-connect-delayed+
-     +event-connect-retried+
-     +event-listening+
-     +event-bind-failed+
-     +event-accepted+
-     +event-accept-failed+
-     +event-closed+
-     +event-close-failed+
-     +event-disconnected+))
-
 (defclass context ()
   ((io-threads :accessor io-threads)
    (max-sockets :accessor max-sockets)
@@ -75,39 +56,4 @@
      (unwind-protect
           (progn
             ,@body)
-       (%zmq::ctx-set-monitor (ptr ,ctx) (cffi:null-pointer))
-       (destroy ,ctx))))
-
-(cffi:defcstruct event-data-t
-  (address :string)
-  (data :int))
-
-(defun activate-monitoring (context)
-  (%zmq::ctx-set-monitor (ptr context) (cffi:callback ctx-monitor-callback)))
-
-(cffi:defcallback ctx-monitor-callback :void
-    ((socket :pointer)
-     (event :int)
-     (data :pointer event-data-t))
-  (declare (ignore socket data))
-  (unless (zerop (boole boole-and event +event-connected+))
-    (format t "Connected~%"))
-  (unless (zerop (boole boole-and event +event-connect-delayed+))
-    (format t "Connect delayed~%"))
-  (unless (zerop (boole boole-and event +event-connect-retried+))
-    (format t "Connect retried~%"))
-  (unless (zerop (boole boole-and event +event-listening+))
-    (format t "Listening~%"))
-  (unless (zerop (boole boole-and event +event-bind-failed+))
-    (format t "Bind failed~%"))
-  (unless (zerop (boole boole-and event +event-accepted+))
-    (format t "Accepted~%"))
-  (unless (zerop (boole boole-and event +event-accept-failed+))
-    (format t "Accept failed~%"))
-  (unless (zerop (boole boole-and event +event-closed+))
-    (format t "Close~%"))
-  (unless (zerop (boole boole-and event +event-close-failed+))
-    (format t "Close failed~%"))
-  (unless (zerop (boole boole-and event +event-disconnected+))
-    (format t "Disconnected~%")))
-
+       (destroy ,ctx))))