Merge pull request #2151 from bluca/newopts

Problem: no support for new socket and context options

Author: somdoron

api/python_cffi.slurp

@@ -2759,6 +2759,26 @@ void *
 bool
     zsock_has_in (void *self);
 
+// Get socket option `priority`.
+// Available from libzmq 4.3.0.
+int
+    zsock_priority (void *self);
+
+// Set socket option `priority`.
+// Available from libzmq 4.3.0.
+void
+    zsock_set_priority (void *self, int priority);
+
+// Get socket option `reconnect_stop`.
+// Available from libzmq 4.3.0.
+int
+    zsock_reconnect_stop (void *self);
+
+// Set socket option `reconnect_stop`.
+// Available from libzmq 4.3.0.
+void
+    zsock_set_reconnect_stop (void *self, int reconnect_stop);
+
 // Set socket option `only_first_subscribe`.
 // Available from libzmq 4.3.0.
 void
@@ -3934,6 +3954,18 @@ void
 int
     zsys_thread_name_prefix (void);
 
+// Configure the numeric prefix to each thread created for the internal
+// context's thread pool. This option is only supported on Linux.
+// If the environment variable ZSYS_THREAD_NAME_PREFIX_STR is defined, that
+// provides the default.
+// Note that this method is valid only before any socket is created.
+void
+    zsys_set_thread_name_prefix_str (const char *prefix);
+
+// Return thread name prefix.
+const char *
+    zsys_thread_name_prefix_str (void);
+
 // Adds a specific CPU to the affinity list of the ZMQ context thread pool.
 // This option is only supported on Linux.
 // Note that this method is valid only before any socket is created.

api/zsock_option.api

@@ -10,6 +10,30 @@
 
 <!-- The following socket options are available in libzmq from version 4.3.0 -->
 
+<method name = "priority" polymorphic = "1">
+    Get socket option `priority`.
+    Available from libzmq 4.3.0.
+    <return type = "integer" fresh = "1" />
+</method>
+
+<method name = "set priority" polymorphic = "1">
+    Set socket option `priority`.
+    Available from libzmq 4.3.0.
+    <argument name = "priority" type = "integer" />
+</method>
+
+<method name = "reconnect stop" polymorphic = "1">
+    Get socket option `reconnect_stop`.
+    Available from libzmq 4.3.0.
+    <return type = "integer" fresh = "1" />
+</method>
+
+<method name = "set reconnect stop" polymorphic = "1">
+    Set socket option `reconnect_stop`.
+    Available from libzmq 4.3.0.
+    <argument name = "reconnect stop" type = "integer" />
+</method>
+
 <method name = "set only first subscribe" polymorphic = "1">
     Set socket option `only_first_subscribe`.
     Available from libzmq 4.3.0.

api/zsys.api

@@ -318,6 +318,20 @@
         <return type = "integer" />
     </method>
 
+    <method name = "set thread name prefix str" singleton = "1" state = "draft">
+        Configure the numeric prefix to each thread created for the internal
+        context's thread pool. This option is only supported on Linux.
+        If the environment variable ZSYS_THREAD_NAME_PREFIX_STR is defined, that
+        provides the default.
+        Note that this method is valid only before any socket is created.
+        <argument name = "prefix" type = "string" />
+    </method>
+
+    <method name = "thread name prefix str" singleton = "1" state = "draft">
+        Return thread name prefix.
+        <return type = "string" />
+    </method>
+
     <method name = "thread affinity cpu add" singleton = "1">
         Adds a specific CPU to the affinity list of the ZMQ context thread pool.
         This option is only supported on Linux.

bindings/delphi/CZMQ.pas

@@ -1583,6 +1583,22 @@ interface
     // Check whether the socket has available message to read.
     function HasIn: Boolean;
 
+    // Get socket option `priority`.
+    // Available from libzmq 4.3.0.
+    function Priority: Integer;
+
+    // Set socket option `priority`.
+    // Available from libzmq 4.3.0.
+    procedure SetPriority(Priority: Integer);
+
+    // Get socket option `reconnect_stop`.
+    // Available from libzmq 4.3.0.
+    function ReconnectStop: Integer;
+
+    // Set socket option `reconnect_stop`.
+    // Available from libzmq 4.3.0.
+    procedure SetReconnectStop(ReconnectStop: Integer);
+
     // Set socket option `only_first_subscribe`.
     // Available from libzmq 4.3.0.
     procedure SetOnlyFirstSubscribe(OnlyFirstSubscribe: Integer);
@@ -4531,6 +4547,22 @@   TZsock = class(TInterfacedObject, IZsock)
     // Check whether the socket has available message to read.
     function HasIn: Boolean;
 
+    // Get socket option `priority`.
+    // Available from libzmq 4.3.0.
+    function Priority: Integer;
+
+    // Set socket option `priority`.
+    // Available from libzmq 4.3.0.
+    procedure SetPriority(Priority: Integer);
+
+    // Get socket option `reconnect_stop`.
+    // Available from libzmq 4.3.0.
+    function ReconnectStop: Integer;
+
+    // Set socket option `reconnect_stop`.
+    // Available from libzmq 4.3.0.
+    procedure SetReconnectStop(ReconnectStop: Integer);
+
     // Set socket option `only_first_subscribe`.
     // Available from libzmq 4.3.0.
     procedure SetOnlyFirstSubscribe(OnlyFirstSubscribe: Integer);
@@ -5474,6 +5506,16 @@   TZsys = class
     // Return thread name prefix.
     class function ThreadNamePrefix: Integer;
 
+    // Configure the numeric prefix to each thread created for the internal
+    // context's thread pool. This option is only supported on Linux.
+    // If the environment variable ZSYS_THREAD_NAME_PREFIX_STR is defined, that
+    // provides the default.
+    // Note that this method is valid only before any socket is created.
+    class procedure SetThreadNamePrefixStr(const Prefix: string);
+
+    // Return thread name prefix.
+    class function ThreadNamePrefixStr: string;
+
     // Adds a specific CPU to the affinity list of the ZMQ context thread pool.
     // This option is only supported on Linux.
     // Note that this method is valid only before any socket is created.
@@ -8690,6 +8732,26 @@ function ZFreeString(const str: PAnsiChar): string;
     Result := zsock_has_in(FHandle);
   end;
 
+  function TZsock.Priority: Integer;
+  begin
+    Result := zsock_priority(FHandle);
+  end;
+
+  procedure TZsock.SetPriority(Priority: Integer);
+  begin
+    zsock_set_priority(FHandle, Priority);
+  end;
+
+  function TZsock.ReconnectStop: Integer;
+  begin
+    Result := zsock_reconnect_stop(FHandle);
+  end;
+
+  procedure TZsock.SetReconnectStop(ReconnectStop: Integer);
+  begin
+    zsock_set_reconnect_stop(FHandle, ReconnectStop);
+  end;
+
   procedure TZsock.SetOnlyFirstSubscribe(OnlyFirstSubscribe: Integer);
   begin
     zsock_set_only_first_subscribe(FHandle, OnlyFirstSubscribe);
@@ -9946,6 +10008,19 @@ function ZFreeString(const str: PAnsiChar): string;
     Result := zsys_thread_name_prefix;
   end;
 
+  class procedure TZsys.SetThreadNamePrefixStr(const Prefix: string);
+  var
+    __Prefix__: UTF8String;
+  begin
+    __Prefix__ := UTF8String(Prefix);
+    zsys_set_thread_name_prefix_str(PAnsiChar(__Prefix__));
+  end;
+
+  class function TZsys.ThreadNamePrefixStr: string;
+  begin
+    Result := string(UTF8String(zsys_thread_name_prefix_str));
+  end;
+
   class procedure TZsys.ThreadAffinityCpuAdd(Cpu: Integer);
   begin
     zsys_thread_affinity_cpu_add(Cpu);

bindings/delphi/libczmq.pas

@@ -2223,6 +2223,22 @@ interface
   // Check whether the socket has available message to read.
   function zsock_has_in(self: PZsock): Boolean; cdecl; external lib_czmq {$IFDEF MSWINDOWS}delayed{$ENDIF};
 
+  // Get socket option `priority`.
+  // Available from libzmq 4.3.0.
+  function zsock_priority(self: PZsock): Integer; cdecl; external lib_czmq {$IFDEF MSWINDOWS}delayed{$ENDIF};
+
+  // Set socket option `priority`.
+  // Available from libzmq 4.3.0.
+  procedure zsock_set_priority(self: PZsock; Priority: Integer); cdecl; external lib_czmq {$IFDEF MSWINDOWS}delayed{$ENDIF};
+
+  // Get socket option `reconnect_stop`.
+  // Available from libzmq 4.3.0.
+  function zsock_reconnect_stop(self: PZsock): Integer; cdecl; external lib_czmq {$IFDEF MSWINDOWS}delayed{$ENDIF};
+
+  // Set socket option `reconnect_stop`.
+  // Available from libzmq 4.3.0.
+  procedure zsock_set_reconnect_stop(self: PZsock; ReconnectStop: Integer); cdecl; external lib_czmq {$IFDEF MSWINDOWS}delayed{$ENDIF};
+
   // Set socket option `only_first_subscribe`.
   // Available from libzmq 4.3.0.
   procedure zsock_set_only_first_subscribe(self: PZsock; OnlyFirstSubscribe: Integer); cdecl; external lib_czmq {$IFDEF MSWINDOWS}delayed{$ENDIF};
@@ -3184,6 +3200,16 @@ interface
   // Return thread name prefix.
   function zsys_thread_name_prefix: Integer; cdecl; external lib_czmq {$IFDEF MSWINDOWS}delayed{$ENDIF};
 
+  // Configure the numeric prefix to each thread created for the internal
+  // context's thread pool. This option is only supported on Linux.
+  // If the environment variable ZSYS_THREAD_NAME_PREFIX_STR is defined, that
+  // provides the default.
+  // Note that this method is valid only before any socket is created.
+  procedure zsys_set_thread_name_prefix_str(Prefix: PAnsiChar); cdecl; external lib_czmq {$IFDEF MSWINDOWS}delayed{$ENDIF};
+
+  // Return thread name prefix.
+  function zsys_thread_name_prefix_str: PAnsiChar; cdecl; external lib_czmq {$IFDEF MSWINDOWS}delayed{$ENDIF};
+
   // Adds a specific CPU to the affinity list of the ZMQ context thread pool.
   // This option is only supported on Linux.
   // Note that this method is valid only before any socket is created.

bindings/jni/czmq-jni/src/main/c/org_zeromq_czmq_Zsock.c

@@ -373,6 +373,32 @@ Java_org_zeromq_czmq_Zsock__1_1hasIn (JNIEnv *env, jclass c, jlong self)
     return has_in_;
 }
 
+JNIEXPORT jint JNICALL
+Java_org_zeromq_czmq_Zsock__1_1priority (JNIEnv *env, jclass c, jlong self)
+{
+    jint priority_ = (jint) zsock_priority ((zsock_t *) (intptr_t) self);
+    return priority_;
+}
+
+JNIEXPORT void JNICALL
+Java_org_zeromq_czmq_Zsock__1_1setPriority (JNIEnv *env, jclass c, jlong self, jint priority)
+{
+    zsock_set_priority ((zsock_t *) (intptr_t) self, (int) priority);
+}
+
+JNIEXPORT jint JNICALL
+Java_org_zeromq_czmq_Zsock__1_1reconnectStop (JNIEnv *env, jclass c, jlong self)
+{
+    jint reconnect_stop_ = (jint) zsock_reconnect_stop ((zsock_t *) (intptr_t) self);
+    return reconnect_stop_;
+}
+
+JNIEXPORT void JNICALL
+Java_org_zeromq_czmq_Zsock__1_1setReconnectStop (JNIEnv *env, jclass c, jlong self, jint reconnect_stop)
+{
+    zsock_set_reconnect_stop ((zsock_t *) (intptr_t) self, (int) reconnect_stop);
+}
+
 JNIEXPORT void JNICALL
 Java_org_zeromq_czmq_Zsock__1_1setOnlyFirstSubscribe (JNIEnv *env, jclass c, jlong self, jint only_first_subscribe)
 {

bindings/jni/czmq-jni/src/main/c/org_zeromq_czmq_Zsys.c

@@ -267,6 +267,22 @@ Java_org_zeromq_czmq_Zsys__1_1threadNamePrefix (JNIEnv *env, jclass c)
     return thread_name_prefix_;
 }
 
+JNIEXPORT void JNICALL
+Java_org_zeromq_czmq_Zsys__1_1setThreadNamePrefixStr (JNIEnv *env, jclass c, jstring prefix)
+{
+    char *prefix_ = (char *) (*env)->GetStringUTFChars (env, prefix, NULL);
+    zsys_set_thread_name_prefix_str (prefix_);
+    (*env)->ReleaseStringUTFChars (env, prefix, prefix_);
+}
+
+JNIEXPORT jstring JNICALL
+Java_org_zeromq_czmq_Zsys__1_1threadNamePrefixStr (JNIEnv *env, jclass c)
+{
+    char *thread_name_prefix_str_ = (char *) zsys_thread_name_prefix_str ();
+    jstring return_string_ = (*env)->NewStringUTF (env, thread_name_prefix_str_);
+    return return_string_;
+}
+
 JNIEXPORT void JNICALL
 Java_org_zeromq_czmq_Zsys__1_1threadAffinityCpuAdd (JNIEnv *env, jclass c, jint cpu)
 {

bindings/jni/czmq-jni/src/main/java/org/zeromq/czmq/Zsock.java

@@ -485,6 +485,38 @@ public boolean hasIn () {
         return __hasIn (self);
     }
     /*
+    Get socket option `priority`.
+    Available from libzmq 4.3.0.
+    */
+    native static int __priority (long self);
+    public int priority () {
+        return __priority (self);
+    }
+    /*
+    Set socket option `priority`.
+    Available from libzmq 4.3.0.
+    */
+    native static void __setPriority (long self, int priority);
+    public void setPriority (int priority) {
+        __setPriority (self, priority);
+    }
+    /*
+    Get socket option `reconnect_stop`.
+    Available from libzmq 4.3.0.
+    */
+    native static int __reconnectStop (long self);
+    public int reconnectStop () {
+        return __reconnectStop (self);
+    }
+    /*
+    Set socket option `reconnect_stop`.
+    Available from libzmq 4.3.0.
+    */
+    native static void __setReconnectStop (long self, int reconnectStop);
+    public void setReconnectStop (int reconnectStop) {
+        __setReconnectStop (self, reconnectStop);
+    }
+    /*
     Set socket option `only_first_subscribe`.
     Available from libzmq 4.3.0.
     */

bindings/jni/czmq-jni/src/main/java/org/zeromq/czmq/Zsys.java

@@ -322,6 +322,24 @@ public static int threadNamePrefix () {
         return __threadNamePrefix ();
     }
     /*
+    Configure the numeric prefix to each thread created for the internal
+    context's thread pool. This option is only supported on Linux.
+    If the environment variable ZSYS_THREAD_NAME_PREFIX_STR is defined, that
+    provides the default.
+    Note that this method is valid only before any socket is created.
+    */
+    native static void __setThreadNamePrefixStr (String prefix);
+    public static void setThreadNamePrefixStr (String prefix) {
+        __setThreadNamePrefixStr (prefix);
+    }
+    /*
+    Return thread name prefix.
+    */
+    native static String __threadNamePrefixStr ();
+    public static String threadNamePrefixStr () {
+        return __threadNamePrefixStr ();
+    }
+    /*
     Adds a specific CPU to the affinity list of the ZMQ context thread pool.
     This option is only supported on Linux.
     Note that this method is valid only before any socket is created.