diff options
| -rw-r--r-- | devices/zmq_forwarder/zmq_forwarder.cpp | 2 | ||||
| -rw-r--r-- | devices/zmq_queue/zmq_queue.cpp | 2 | ||||
| -rw-r--r-- | devices/zmq_streamer/zmq_streamer.cpp | 2 | ||||
| -rw-r--r-- | include/zmq.h | 11 | ||||
| -rw-r--r-- | include/zmq.hpp | 4 | ||||
| -rw-r--r-- | perf/local_lat.cpp | 2 | ||||
| -rw-r--r-- | perf/local_thr.cpp | 2 | ||||
| -rw-r--r-- | perf/remote_lat.cpp | 2 | ||||
| -rw-r--r-- | perf/remote_thr.cpp | 2 | ||||
| -rw-r--r-- | src/zmq.cpp | 4 |
10 files changed, 11 insertions, 22 deletions
diff --git a/devices/zmq_forwarder/zmq_forwarder.cpp b/devices/zmq_forwarder/zmq_forwarder.cpp index 496c3f6..96c9ae5 100644 --- a/devices/zmq_forwarder/zmq_forwarder.cpp +++ b/devices/zmq_forwarder/zmq_forwarder.cpp @@ -52,7 +52,7 @@ int main (int argc, char *argv []) } // TODO: make the number of I/O threads configurable. - zmq::context_t ctx (1, 1); + zmq::context_t ctx (1); zmq::socket_t in_socket (ctx, ZMQ_SUB); in_socket.setsockopt (ZMQ_SUBSCRIBE, "", 0); zmq::socket_t out_socket (ctx, ZMQ_PUB); diff --git a/devices/zmq_queue/zmq_queue.cpp b/devices/zmq_queue/zmq_queue.cpp index 1507ecc..3a20620 100644 --- a/devices/zmq_queue/zmq_queue.cpp +++ b/devices/zmq_queue/zmq_queue.cpp @@ -52,7 +52,7 @@ int main (int argc, char *argv []) } // TODO: make the number of I/O threads configurable. - zmq::context_t ctx (1, 1, ZMQ_POLL); + zmq::context_t ctx (1); zmq::socket_t in_socket (ctx, ZMQ_XREP); zmq::socket_t out_socket (ctx, ZMQ_XREQ); diff --git a/devices/zmq_streamer/zmq_streamer.cpp b/devices/zmq_streamer/zmq_streamer.cpp index 7f4e8a5..f9dcd00 100644 --- a/devices/zmq_streamer/zmq_streamer.cpp +++ b/devices/zmq_streamer/zmq_streamer.cpp @@ -52,7 +52,7 @@ int main (int argc, char *argv []) } // TODO: make the number of I/O threads configurable. - zmq::context_t ctx (1, 1); + zmq::context_t ctx (1); zmq::socket_t in_socket (ctx, ZMQ_UPSTREAM); zmq::socket_t out_socket (ctx, ZMQ_DOWNSTREAM); diff --git a/include/zmq.h b/include/zmq.h index a3dc781..3bf55b6 100644 --- a/include/zmq.h +++ b/include/zmq.h @@ -144,10 +144,7 @@ ZMQ_EXPORT size_t zmq_msg_size (zmq_msg_t *msg); /* 0MQ infrastructure (a.k.a. context) initialisation & termination. */ /******************************************************************************/ -/* This flag is obsolete and has no effect. To be removed in next version. */ -#define ZMQ_POLL 1 - -ZMQ_EXPORT void *zmq_init (int app_threads, int io_threads, int flags); +ZMQ_EXPORT void *zmq_init (int io_threads); ZMQ_EXPORT int zmq_term (void *context); /******************************************************************************/ @@ -155,9 +152,7 @@ ZMQ_EXPORT int zmq_term (void *context); /******************************************************************************/ /* Socket types. */ -/* ZMQ_P2P is obsolete and scheduled to be removed in version 2.0.8 */ #define ZMQ_PAIR 0 -#define ZMQ_P2P 0 #define ZMQ_PUB 1 #define ZMQ_SUB 2 #define ZMQ_REQ 3 @@ -169,8 +164,6 @@ ZMQ_EXPORT int zmq_term (void *context); /* Socket options. */ #define ZMQ_HWM 1 -/* TODO: LWM is obsolete and should be removed in next version. */ -#define ZMQ_LWM 2 #define ZMQ_SWAP 3 #define ZMQ_AFFINITY 4 #define ZMQ_IDENTITY 5 @@ -186,8 +179,6 @@ ZMQ_EXPORT int zmq_term (void *context); /* Send/recv options. */ #define ZMQ_NOBLOCK 1 #define ZMQ_SNDMORE 2 -/* Obsolete. To be removed in 2.0.7 release. */ -#define ZMQ_MORE 2 ZMQ_EXPORT void *zmq_socket (void *context, int type); ZMQ_EXPORT int zmq_close (void *s); diff --git a/include/zmq.hpp b/include/zmq.hpp index d19f642..86ffff6 100644 --- a/include/zmq.hpp +++ b/include/zmq.hpp @@ -167,9 +167,9 @@ namespace zmq public: - inline context_t (int app_threads_, int io_threads_, int flags_ = 0) + inline context_t (int io_threads_) { - ptr = zmq_init (app_threads_, io_threads_, flags_); + ptr = zmq_init (io_threads_); if (ptr == NULL) throw error_t (); } diff --git a/perf/local_lat.cpp b/perf/local_lat.cpp index 4cfb155..0628a97 100644 --- a/perf/local_lat.cpp +++ b/perf/local_lat.cpp @@ -42,7 +42,7 @@ int main (int argc, char *argv []) message_size = atoi (argv [2]); roundtrip_count = atoi (argv [3]); - ctx = zmq_init (1, 1, 0); + ctx = zmq_init (1); if (!ctx) { printf ("error in zmq_init: %s\n", zmq_strerror (errno)); return -1; diff --git a/perf/local_thr.cpp b/perf/local_thr.cpp index 42b3ec7..8480ebd 100644 --- a/perf/local_thr.cpp +++ b/perf/local_thr.cpp @@ -45,7 +45,7 @@ int main (int argc, char *argv []) message_size = atoi (argv [2]); message_count = atoi (argv [3]); - ctx = zmq_init (1, 1, 0); + ctx = zmq_init (1); if (!ctx) { printf ("error in zmq_send: %s\n", zmq_strerror (errno)); return -1; diff --git a/perf/remote_lat.cpp b/perf/remote_lat.cpp index 1a408f1..cd465f7 100644 --- a/perf/remote_lat.cpp +++ b/perf/remote_lat.cpp @@ -46,7 +46,7 @@ int main (int argc, char *argv []) message_size = atoi (argv [2]); roundtrip_count = atoi (argv [3]); - ctx = zmq_init (1, 1, 0); + ctx = zmq_init (1); if (!ctx) { printf ("error in zmq_init: %s\n", zmq_strerror (errno)); return -1; diff --git a/perf/remote_thr.cpp b/perf/remote_thr.cpp index 99fa482..002aaf2 100644 --- a/perf/remote_thr.cpp +++ b/perf/remote_thr.cpp @@ -42,7 +42,7 @@ int main (int argc, char *argv []) message_size = atoi (argv [2]); message_count = atoi (argv [3]); - ctx = zmq_init (1, 1, 0); + ctx = zmq_init (1); if (!ctx) { printf ("error in zmq_recv: %s\n", zmq_strerror (errno)); return -1; diff --git a/src/zmq.cpp b/src/zmq.cpp index c32fd65..c8f419a 100644 --- a/src/zmq.cpp +++ b/src/zmq.cpp @@ -226,9 +226,7 @@ size_t zmq_msg_size (zmq_msg_t *msg_) return ((zmq::msg_content_t*) msg_->content)->size; } -// TODO: app_threads and flags parameters are not used anymore... -// Reflect this in the API/ABI. -void *zmq_init (int /*app_threads_*/, int io_threads_, int /*flags_*/) +void *zmq_init (int io_threads_) { if (io_threads_ < 0) { errno = EINVAL; |