Merge pull request #2779 from bluca/thread_fixes

Problems: no documentation for new thread affinity and priority options, test_ctx_options only checks global DRAFT flag

doc/zmq_ctx_set.txt

@@ -64,6 +64,8 @@ ZMQ_THREAD_PRIORITY: Set scheduling priority for I/O threads
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 The 'ZMQ_THREAD_PRIORITY' argument sets scheduling priority for
 internal context's thread pool. This option is not available on windows.
+When the scheduler policy is SCHED_OTHER on Linux, the system call "nice"
+will be used to set a priority of -20 (max priority).
 Supported values for this option depend on chosen scheduling policy.
 Details can be found in sched.h file, or at http://man7.org/linux/man-pages/man2/sched_setscheduler.2.html.
 This option only applies before creating any sockets on the context.
@@ -72,6 +74,16 @@ This option only applies before creating any sockets on the context.
 Default value:: -1
 
 
+ZMQ_THREAD_AFFINITY: Set CPU affinity for I/O threads
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The 'ZMQ_THREAD_AFFINITY' argument sets CPU affinity for the internal
+context's thread pool. This option is only supported on Linux.
+This option only applies before creating any sockets on the context.
+
+[horizontal]
+Default value:: -1
+
+
 ZMQ_MAX_MSGSZ: Set maximum message size
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 The 'ZMQ_MAX_MSGSZ' argument sets the maximum allowed size

tests/test_ctx_options.cpp

@@ -81,7 +81,7 @@ void test_ctx_thread_opts(void* ctx)
     assert (rc == -1 && errno == EINVAL);
     rc = zmq_ctx_set(ctx, ZMQ_THREAD_PRIORITY, ZMQ_THREAD_PRIORITY_DFLT);
     assert (rc == -1 && errno == EINVAL);
-#if ZMQ_BUILD_DRAFT_API
+#ifdef ZMQ_THREAD_AFFINITY
     rc = zmq_ctx_set(ctx, ZMQ_THREAD_AFFINITY, ZMQ_THREAD_AFFINITY_DFLT);
     assert (rc == -1 && errno == EINVAL);
 #endif
@@ -113,7 +113,7 @@ void test_ctx_thread_opts(void* ctx)
     }
 
 
-#if ZMQ_BUILD_DRAFT_API
+#ifdef ZMQ_THREAD_AFFINITY
     // test affinity:
 
     int cpu_affinity_test = (1 << 0);
@@ -145,7 +145,7 @@ int main (void)
 #endif
     assert (zmq_ctx_get (ctx, ZMQ_IO_THREADS) == ZMQ_IO_THREADS_DFLT);
     assert (zmq_ctx_get (ctx, ZMQ_IPV6) == 0);
-#if defined (ZMQ_BUILD_DRAFT_AP)
+#if defined (ZMQ_MSG_T_SIZE)
     assert (zmq_ctx_get (ctx, ZMQ_MSG_T_SIZE) == sizeof (zmq_msg_t));
 #endif