Merge pull request #1543 from bluca/zloop_interr

Problem: interrupt handling was retired, but replacement is draft

Author: sappo

README.md

@@ -158,7 +158,7 @@
         <argument name = "verbose" type = "boolean" />
     </method>
 
-    <method name = "set nonstop" state = "draft" >
+    <method name = "set nonstop" >
         By default the reactor stops if the process receives a SIGINT or SIGTERM
         signal. This makes it impossible to shut-down message based architectures
         like zactors. This method lets you switch off break handling. The default

api/zloop.api

@@ -35,7 +35,7 @@
         <return type = "integer" />
     </method>
 
-    <method name = "set nonstop" state = "draft" >
+    <method name = "set nonstop" >
         By default the poller stops if the process receives a SIGINT or SIGTERM
         signal. This makes it impossible to shut-down message based architectures
         like zactors. This method lets you switch off break handling. The default

api/zpoller.api

@@ -480,14 +480,7 @@ def self.available?
       attach_function :zloop_set_ticket_delay, [:pointer, :size_t], :void, **opts
       attach_function :zloop_set_max_timers, [:pointer, :size_t], :void, **opts
       attach_function :zloop_set_verbose, [:pointer, :bool], :void, **opts
-      begin # DRAFT method
-        attach_function :zloop_set_nonstop, [:pointer, :bool], :void, **opts
-      rescue ::FFI::NotFoundError
-        if $VERBOSE || $DEBUG
-          warn "The function zloop_set_nonstop() can't be used through " +
-               "this Ruby binding because it's not available."
-        end
-      end
+      attach_function :zloop_set_nonstop, [:pointer, :bool], :void, **opts
       attach_function :zloop_start, [:pointer], :int, **opts
       attach_function :zloop_test, [:bool], :void, **opts
 
@@ -550,14 +543,7 @@ def self.available?
       attach_function :zpoller_destroy, [:pointer], :void, **opts
       attach_function :zpoller_add, [:pointer, :pointer], :int, **opts
       attach_function :zpoller_remove, [:pointer, :pointer], :int, **opts
-      begin # DRAFT method
-        attach_function :zpoller_set_nonstop, [:pointer, :bool], :void, **opts
-      rescue ::FFI::NotFoundError
-        if $VERBOSE || $DEBUG
-          warn "The function zpoller_set_nonstop() can't be used through " +
-               "this Ruby binding because it's not available."
-        end
-      end
+      attach_function :zpoller_set_nonstop, [:pointer, :bool], :void, **opts
       attach_function :zpoller_wait, [:pointer, :int], :pointer, **opts
       attach_function :zpoller_expired, [:pointer], :bool, **opts
       attach_function :zpoller_terminated, [:pointer], :bool, **opts

bindings/ruby/lib/czmq/ffi.rb

@@ -23,8 +23,6 @@ extern "C" {
 //  @interface
 //  This is a stable class, and may not change except for emergencies. It
 //  is provided in stable builds.
-//  This class has draft methods, which may change over time. They are not
-//  in stable releases, by default. Use --enable-drafts to enable.
 // Callback function for reactor socket activity
 typedef int (zloop_reader_fn) (
     zloop_t *loop, zsock_t *reader, void *arg);
@@ -134,6 +132,13 @@ CZMQ_EXPORT void
 CZMQ_EXPORT void
     zloop_set_verbose (zloop_t *self, bool verbose);
 
+//  By default the reactor stops if the process receives a SIGINT or SIGTERM 
+//  signal. This makes it impossible to shut-down message based architectures
+//  like zactors. This method lets you switch off break handling. The default
+//  nonstop setting is off (false).                                          
+CZMQ_EXPORT void
+    zloop_set_nonstop (zloop_t *self, bool nonstop);
+
 //  Start the reactor. Takes control of the thread and returns when the 0MQ  
 //  context is terminated or the process is interrupted, or any event handler
 //  returns -1. Event handlers may register new sockets and timers, and      
@@ -145,16 +150,6 @@ CZMQ_EXPORT int
 CZMQ_EXPORT void
     zloop_test (bool verbose);
 
-#ifdef CZMQ_BUILD_DRAFT_API
-//  *** Draft method, for development use, may change without warning ***
-//  By default the reactor stops if the process receives a SIGINT or SIGTERM 
-//  signal. This makes it impossible to shut-down message based architectures
-//  like zactors. This method lets you switch off break handling. The default
-//  nonstop setting is off (false).                                          
-CZMQ_EXPORT void
-    zloop_set_nonstop (zloop_t *self, bool nonstop);
-
-#endif // CZMQ_BUILD_DRAFT_API
 //  @end
 
 

images/README_1.png

@@ -23,8 +23,6 @@ extern "C" {
 //  @interface
 //  This is a stable class, and may not change except for emergencies. It
 //  is provided in stable builds.
-//  This class has draft methods, which may change over time. They are not
-//  in stable releases, by default. Use --enable-drafts to enable.
 //  Create new poller, specifying zero or more readers. The list of 
 //  readers ends in a NULL. Each reader can be a zsock_t instance, a
 //  zactor_t instance, a libzmq socket (void *), or a file handle.  
@@ -45,6 +43,13 @@ CZMQ_EXPORT int
 CZMQ_EXPORT int
     zpoller_remove (zpoller_t *self, void *reader);
 
+//  By default the poller stops if the process receives a SIGINT or SIGTERM  
+//  signal. This makes it impossible to shut-down message based architectures
+//  like zactors. This method lets you switch off break handling. The default
+//  nonstop setting is off (false).                                          
+CZMQ_EXPORT void
+    zpoller_set_nonstop (zpoller_t *self, bool nonstop);
+
 //  Poll the registered readers for I/O, return first reader that has input.  
 //  The reader will be a libzmq void * socket, or a zsock_t or zactor_t       
 //  instance as specified in zpoller_new/zpoller_add. The timeout should be   
@@ -71,16 +76,6 @@ CZMQ_EXPORT bool
 CZMQ_EXPORT void
     zpoller_test (bool verbose);
 
-#ifdef CZMQ_BUILD_DRAFT_API
-//  *** Draft method, for development use, may change without warning ***
-//  By default the poller stops if the process receives a SIGINT or SIGTERM  
-//  signal. This makes it impossible to shut-down message based architectures
-//  like zactors. This method lets you switch off break handling. The default
-//  nonstop setting is off (false).                                          
-CZMQ_EXPORT void
-    zpoller_set_nonstop (zpoller_t *self, bool nonstop);
-
-#endif // CZMQ_BUILD_DRAFT_API
 //  @end
 
 

include/zloop.h

@@ -92,14 +92,6 @@ CZMQ_EXPORT zframe_t *
 CZMQ_EXPORT zhashx_t *
     zhashx_unpack_own (zframe_t *frame, zhashx_deserializer_fn deserializer);
 
-//  *** Draft method, defined for internal use only ***
-//  By default the reactor stops if the process receives a SIGINT or SIGTERM 
-//  signal. This makes it impossible to shut-down message based architectures
-//  like zactors. This method lets you switch off break handling. The default
-//  nonstop setting is off (false).                                          
-CZMQ_EXPORT void
-    zloop_set_nonstop (zloop_t *self, bool nonstop);
-
 //  *** Draft method, defined for internal use only ***
 //  Return message routing ID, if the message came from a ZMQ_SERVER socket.
 //  Else returns zero.                                                      
@@ -112,14 +104,6 @@ CZMQ_EXPORT uint32_t
 CZMQ_EXPORT void
     zmsg_set_routing_id (zmsg_t *self, uint32_t routing_id);
 
-//  *** Draft method, defined for internal use only ***
-//  By default the poller stops if the process receives a SIGINT or SIGTERM  
-//  signal. This makes it impossible to shut-down message based architectures
-//  like zactors. This method lets you switch off break handling. The default
-//  nonstop setting is off (false).                                          
-CZMQ_EXPORT void
-    zpoller_set_nonstop (zpoller_t *self, bool nonstop);
-
 //  *** Draft method, defined for internal use only ***
 //  Create a SERVER socket. Default action is bind.
 //  Caller owns return value and must destroy it when done.