From 27e2d08449ea52649e2e42b263f76fbd5d8382c5 Mon Sep 17 00:00:00 2001 From: Martin Lucina Date: Thu, 11 Mar 2010 20:33:27 +0100 Subject: Restructure language bindings C and C++ headers moved from bindings/ to include/, bindings/ removed --with-c and --with-cpp options to configure removed, C and C++ now built and installed by default --- bindings/c/zmq.h | 249 ---------------------------------------------- bindings/cpp/zmq.hpp | 266 -------------------------------------------------- configure.in | 32 +----- include/zmq.h | 249 ++++++++++++++++++++++++++++++++++++++++++++++ include/zmq.hpp | 266 ++++++++++++++++++++++++++++++++++++++++++++++++++ perf/Makefile.am | 10 +- perf/c/Makefile.am | 2 +- perf/cpp/Makefile.am | 2 +- src/Makefile.am | 12 +-- src/app_thread.cpp | 2 +- src/dispatcher.cpp | 2 +- src/downstream.cpp | 2 +- src/err.cpp | 2 +- src/fq.cpp | 2 +- src/i_inout.hpp | 2 +- src/io_thread.cpp | 2 +- src/lb.cpp | 2 +- src/msg_content.hpp | 2 +- src/options.cpp | 2 +- src/p2p.cpp | 2 +- src/pipe.cpp | 2 +- src/pipe.hpp | 2 +- src/pub.cpp | 2 +- src/rep.cpp | 2 +- src/req.cpp | 2 +- src/socket_base.cpp | 2 +- src/socket_base.hpp | 2 +- src/sub.cpp | 2 +- src/sub.hpp | 2 +- src/tcp_connecter.cpp | 2 +- src/tcp_listener.cpp | 2 +- src/upstream.cpp | 2 +- src/xrep.cpp | 2 +- src/xreq.cpp | 2 +- src/zmq.cpp | 2 +- src/zmq_decoder.hpp | 2 +- src/zmq_encoder.hpp | 2 +- 37 files changed, 549 insertions(+), 595 deletions(-) delete mode 100644 bindings/c/zmq.h delete mode 100644 bindings/cpp/zmq.hpp create mode 100644 include/zmq.h create mode 100644 include/zmq.hpp diff --git a/bindings/c/zmq.h b/bindings/c/zmq.h deleted file mode 100644 index 7d8d8ad..0000000 --- a/bindings/c/zmq.h +++ /dev/null @@ -1,249 +0,0 @@ -/* - Copyright (c) 2007-2010 iMatix Corporation - - This file is part of 0MQ. - - 0MQ is free software; you can redistribute it and/or modify it under - the terms of the Lesser GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - 0MQ is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - Lesser GNU General Public License for more details. - - You should have received a copy of the Lesser GNU General Public License - along with this program. If not, see . -*/ - -#ifndef __ZMQ_H_INCLUDED__ -#define __ZMQ_H_INCLUDED__ - -#ifdef __cplusplus -extern "C" { -#endif - -#include -#include -#if defined _WIN32 -#include "winsock2.h" -#endif - -// Microsoft Visual Studio uses non-standard way to export/import symbols. -#if defined ZMQ_BUILDING_LIBZMQ_WITH_MSVC -#define ZMQ_EXPORT __declspec(dllexport) -#elif defined _MSC_VER -#define ZMQ_EXPORT __declspec(dllimport) -#else -#define ZMQ_EXPORT -#endif - -//////////////////////////////////////////////////////////////////////////////// -// 0MQ versioning supprt. -//////////////////////////////////////////////////////////////////////////////// - -ZMQ_EXPORT void zmq_version (int *major, int *minor, int *patch); - -//////////////////////////////////////////////////////////////////////////////// -// 0MQ errors. -//////////////////////////////////////////////////////////////////////////////// - -// A number random anough not to collide with different errno ranges on -// different OSes. The assumption is that error_t is at least 32-bit type. -#define ZMQ_HAUSNUMERO 156384712 - -// On Windows platform some of the standard POSIX errnos are not defined. -#ifndef ENOTSUP -#define ENOTSUP (ZMQ_HAUSNUMERO + 1) -#endif -#ifndef EPROTONOSUPPORT -#define EPROTONOSUPPORT (ZMQ_HAUSNUMERO + 2) -#endif -#ifndef ENOBUFS -#define ENOBUFS (ZMQ_HAUSNUMERO + 3) -#endif -#ifndef ENETDOWN -#define ENETDOWN (ZMQ_HAUSNUMERO + 4) -#endif -#ifndef EADDRINUSE -#define EADDRINUSE (ZMQ_HAUSNUMERO + 5) -#endif -#ifndef EADDRNOTAVAIL -#define EADDRNOTAVAIL (ZMQ_HAUSNUMERO + 6) -#endif -#ifndef ECONNREFUSED -#define ECONNREFUSED (ZMQ_HAUSNUMERO + 7) -#endif -#ifndef EINPROGRESS -#define EINPROGRESS (ZMQ_HAUSNUMERO + 8) -#endif - -// Native 0MQ error codes. -#define EMTHREAD (ZMQ_HAUSNUMERO + 50) -#define EFSM (ZMQ_HAUSNUMERO + 51) -#define ENOCOMPATPROTO (ZMQ_HAUSNUMERO + 52) - -// Resolves system errors and 0MQ errors to human-readable string. -ZMQ_EXPORT const char *zmq_strerror (int errnum); - -//////////////////////////////////////////////////////////////////////////////// -// 0MQ message definition. -//////////////////////////////////////////////////////////////////////////////// - -// Maximal size of "Very Small Message". VSMs are passed by value -// to avoid excessive memory allocation/deallocation. -// If VMSs larger than 255 bytes are required, type of 'vsm_size' -// field in zmq_msg_t structure should be modified accordingly. -#define ZMQ_MAX_VSM_SIZE 30 - -// Message types. These integers may be stored in 'content' member of the -// message instead of regular pointer to the data. -#define ZMQ_DELIMITER 31 -#define ZMQ_VSM 32 - -// Message flags. ZMQ_MSG_SHARED is strictly speaking not a message flag -// (it has no equivalent in the wire format), however, making it a flag -// allows us to pack the stucture tigher and thus improve performance. -#define ZMQ_MSG_TBC 1 -#define ZMQ_MSG_SHARED 128 - -// A message. Note that 'content' is not a pointer to the raw data. -// Rather it is pointer to zmq::msg_content_t structure -// (see src/msg_content.hpp for its definition). -typedef struct -{ - void *content; - unsigned char flags; - unsigned char vsm_size; - unsigned char vsm_data [ZMQ_MAX_VSM_SIZE]; -} zmq_msg_t; - -typedef void (zmq_free_fn) (void *data, void *hint); - -ZMQ_EXPORT int zmq_msg_init (zmq_msg_t *msg); -ZMQ_EXPORT int zmq_msg_init_size (zmq_msg_t *msg, size_t size); -ZMQ_EXPORT int zmq_msg_init_data (zmq_msg_t *msg, void *data, - size_t size, zmq_free_fn *ffn, void *hint); -ZMQ_EXPORT int zmq_msg_close (zmq_msg_t *msg); -ZMQ_EXPORT int zmq_msg_move (zmq_msg_t *dest, zmq_msg_t *src); -ZMQ_EXPORT int zmq_msg_copy (zmq_msg_t *dest, zmq_msg_t *src); -ZMQ_EXPORT void *zmq_msg_data (zmq_msg_t *msg); -ZMQ_EXPORT size_t zmq_msg_size (zmq_msg_t *msg); - -//////////////////////////////////////////////////////////////////////////////// -// 0MQ infrastructure (a.k.a. context) initialisation & termination. -//////////////////////////////////////////////////////////////////////////////// - -#define ZMQ_POLL 1 - -ZMQ_EXPORT void *zmq_init (int app_threads, int io_threads, int flags); -ZMQ_EXPORT int zmq_term (void *context); - -//////////////////////////////////////////////////////////////////////////////// -// 0MQ socket definition. -//////////////////////////////////////////////////////////////////////////////// - -// Addresses are composed of the name of the protocol to use followed by :// -// and a protocol-specific address. Available protocols: -// -// tcp - the address is composed of IP address and port delimited by colon -// sign (:). The IP address can be a hostname (with 'connect') or -// a network interface name (with 'bind'). Examples "tcp://eth0:5555", -// "tcp://192.168.0.1:20000", "tcp://hq.mycompany.com:80". -// -// pgm & udp - both protocols have same address format. It's network interface -// to use, semicolon (;), multicast group IP address, colon (:) and -// port. Examples: "pgm://eth2;224.0.0.1:8000", -// "udp://192.168.0.111;224.1.1.1:5555". - -#define ZMQ_P2P 0 -#define ZMQ_PUB 1 -#define ZMQ_SUB 2 -#define ZMQ_REQ 3 -#define ZMQ_REP 4 -#define ZMQ_XREQ 5 -#define ZMQ_XREP 6 -#define ZMQ_UPSTREAM 7 -#define ZMQ_DOWNSTREAM 8 - -#define ZMQ_HWM 1 -#define ZMQ_LWM 2 -#define ZMQ_SWAP 3 -#define ZMQ_AFFINITY 4 -#define ZMQ_IDENTITY 5 -#define ZMQ_SUBSCRIBE 6 -#define ZMQ_UNSUBSCRIBE 7 -#define ZMQ_RATE 8 -#define ZMQ_RECOVERY_IVL 9 -#define ZMQ_MCAST_LOOP 10 -#define ZMQ_SNDBUF 11 -#define ZMQ_RCVBUF 12 - -#define ZMQ_NOBLOCK 1 -#define ZMQ_NOFLUSH 2 - -ZMQ_EXPORT void *zmq_socket (void *context, int type); -ZMQ_EXPORT int zmq_close (void *s); -ZMQ_EXPORT int zmq_setsockopt (void *s, int option, const void *optval, - size_t optvallen); -ZMQ_EXPORT int zmq_bind (void *s, const char *addr); -ZMQ_EXPORT int zmq_connect (void *s, const char *addr); -ZMQ_EXPORT int zmq_send (void *s, zmq_msg_t *msg, int flags); -ZMQ_EXPORT int zmq_flush (void *s); -ZMQ_EXPORT int zmq_recv (void *s, zmq_msg_t *msg, int flags); - -//////////////////////////////////////////////////////////////////////////////// -// I/O multiplexing. -//////////////////////////////////////////////////////////////////////////////// - -#define ZMQ_POLLIN 1 -#define ZMQ_POLLOUT 2 -#define ZMQ_POLLERR 4 - -typedef struct -{ - void *socket; -#if defined _WIN32 - SOCKET fd; -#else - int fd; -#endif - short events; - short revents; -} zmq_pollitem_t; - -ZMQ_EXPORT int zmq_poll (zmq_pollitem_t *items, int nitems, long timeout); - -//////////////////////////////////////////////////////////////////////////////// -// Experimental. -//////////////////////////////////////////////////////////////////////////////// - -// This function retrieves the errno as it is known to 0MQ library. The goal -// of this function is to make the code 100% portable, including where 0MQ -// compiled with certain CRT library (on Windows) is linked to an application -// compiled with different CRT library. -ZMQ_EXPORT int zmq_errno (); - -//////////////////////////////////////////////////////////////////////////////// -// Helper functions. -//////////////////////////////////////////////////////////////////////////////// - -// Helper functions are used by perf tests so that they don't have to care -// about minutiae of time-related functions on different OS platforms. - -// Starts the stopwatch. Returns the handle to the watch. -ZMQ_EXPORT void *zmq_stopwatch_start (); - -// Stops the stopwatch. Returns the number of microseconds elapsed since -// the stopwatch was started. -ZMQ_EXPORT unsigned long zmq_stopwatch_stop (void *watch_); - -// Sleeps for specified number of seconds. -ZMQ_EXPORT void zmq_sleep (int seconds_); - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/bindings/cpp/zmq.hpp b/bindings/cpp/zmq.hpp deleted file mode 100644 index 3ddc043..0000000 --- a/bindings/cpp/zmq.hpp +++ /dev/null @@ -1,266 +0,0 @@ -/* - Copyright (c) 2007-2010 iMatix Corporation - - This file is part of 0MQ. - - 0MQ is free software; you can redistribute it and/or modify it under - the terms of the Lesser GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - 0MQ is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - Lesser GNU General Public License for more details. - - You should have received a copy of the Lesser GNU General Public License - along with this program. If not, see . -*/ - -#ifndef __ZMQ_HPP_INCLUDED__ -#define __ZMQ_HPP_INCLUDED__ - -#include "zmq.h" - -#include -#include -#include - -namespace zmq -{ - - typedef zmq_free_fn free_fn; - typedef zmq_pollitem_t pollitem_t; - - class error_t : public std::exception - { - public: - - error_t () : errnum (zmq_errno ()) {} - - virtual const char *what () const throw () - { - return zmq_strerror (errnum); - } - - private: - - int errnum; - }; - - inline int poll (zmq_pollitem_t *items_, int nitems_, long timeout_ = -1) - { - int rc = zmq_poll (items_, nitems_, timeout_); - if (rc < 0) - throw error_t (); - return rc; - } - - class message_t : private zmq_msg_t - { - friend class socket_t; - - public: - - inline message_t () - { - int rc = zmq_msg_init (this); - if (rc != 0) - throw error_t (); - } - - inline message_t (size_t size_) - { - int rc = zmq_msg_init_size (this, size_); - if (rc != 0) - throw error_t (); - } - - inline message_t (void *data_, size_t size_, free_fn *ffn_, - void *hint_ = NULL) - { - int rc = zmq_msg_init_data (this, data_, size_, ffn_, hint_); - if (rc != 0) - throw error_t (); - } - - inline ~message_t () - { - int rc = zmq_msg_close (this); - if (rc != 0) - throw error_t (); - } - - inline void rebuild () - { - int rc = zmq_msg_close (this); - if (rc != 0) - throw error_t (); - rc = zmq_msg_init (this); - if (rc != 0) - throw error_t (); - } - - inline void rebuild (size_t size_) - { - int rc = zmq_msg_close (this); - if (rc != 0) - throw error_t (); - rc = zmq_msg_init_size (this, size_); - if (rc != 0) - throw error_t (); - } - - inline void rebuild (void *data_, size_t size_, free_fn *ffn_, - void *hint_ = NULL) - { - int rc = zmq_msg_close (this); - if (rc != 0) - throw error_t (); - rc = zmq_msg_init_data (this, data_, size_, ffn_, hint_); - if (rc != 0) - throw error_t (); - } - - inline void move (message_t *msg_) - { - int rc = zmq_msg_move (this, (zmq_msg_t*) msg_); - if (rc != 0) - throw error_t (); - } - - inline void copy (message_t *msg_) - { - int rc = zmq_msg_copy (this, (zmq_msg_t*) msg_); - if (rc != 0) - throw error_t (); - } - - inline void *data () - { - return zmq_msg_data (this); - } - - inline size_t size () - { - return zmq_msg_size (this); - } - - private: - - // Disable implicit message copying, so that users won't use shared - // messages (less efficient) without being aware of the fact. - message_t (const message_t&); - void operator = (const message_t&); - }; - - class context_t - { - friend class socket_t; - - public: - - inline context_t (int app_threads_, int io_threads_, int flags_ = 0) - { - ptr = zmq_init (app_threads_, io_threads_, flags_); - if (ptr == NULL) - throw error_t (); - } - - inline ~context_t () - { - int rc = zmq_term (ptr); - assert (rc == 0); - } - - private: - - void *ptr; - - context_t (const context_t&); - void operator = (const context_t&); - }; - - class socket_t - { - public: - - inline socket_t (context_t &context_, int type_) - { - ptr = zmq_socket (context_.ptr, type_); - if (ptr == NULL) - throw error_t (); - } - - inline ~socket_t () - { - int rc = zmq_close (ptr); - if (rc != 0) - throw error_t (); - } - - inline operator void* () - { - return ptr; - } - - inline void setsockopt (int option_, const void *optval_, - size_t optvallen_) - { - int rc = zmq_setsockopt (ptr, option_, optval_, optvallen_); - if (rc != 0) - throw error_t (); - } - - inline void bind (const char *addr_) - { - int rc = zmq_bind (ptr, addr_); - if (rc != 0) - throw error_t (); - } - - inline void connect (const char *addr_) - { - int rc = zmq_connect (ptr, addr_); - if (rc != 0) - throw error_t (); - } - - inline bool send (message_t &msg_, int flags_ = 0) - { - int rc = zmq_send (ptr, &msg_, flags_); - if (rc == 0) - return true; - if (rc == -1 && zmq_errno () == EAGAIN) - return false; - throw error_t (); - } - - inline void flush () - { - int rc = zmq_flush (ptr); - if (rc != 0) - throw error_t (); - } - - inline bool recv (message_t *msg_, int flags_ = 0) - { - int rc = zmq_recv (ptr, msg_, flags_); - if (rc == 0) - return true; - if (rc == -1 && zmq_errno () == EAGAIN) - return false; - throw error_t (); - } - - private: - - void *ptr; - - socket_t (const socket_t&); - void operator = (const socket_t&); - }; - -} - -#endif diff --git a/configure.in b/configure.in index afee13d..f630398 100644 --- a/configure.in +++ b/configure.in @@ -286,24 +286,6 @@ if test "x$HAVE_INTTYPES_H" = "xyes"; then inttypes="1" fi -# c -czmq="no" -AC_ARG_WITH([c], [AS_HELP_STRING([--with-c], - [build c language binding [default=no]])], [c=yes], [c=no]) - -if test "x$c" != "xno"; then - czmq="yes" -fi - -# c++ -cppzmq="no" -AC_ARG_WITH([cpp], [AS_HELP_STRING([--with-cpp], - [build c++ language binding [default=no]])], [cpp=yes], [cpp=no]) - -if test "x$cpp" != "xno"; then - cppzmq="yes" -fi - # PGM extension pgm_ext="no" @@ -323,10 +305,6 @@ if test "x$with_pgm_ext" = "xno" -a "x$with_pgm_examples" = "xyes"; then AC_MSG_ERROR([cannot configure --with-pgm-examples without --with-pgm.]); fi -if test "x$c" = "xno" -a "x$with_pgm_examples" = "xyes"; then - AC_MSG_ERROR([cannot configure --with-pgm-examples without --with-c.]); -fi - if test "x$with_pgm_ext" != "xno"; then AC_MSG_CHECKING([if the PGM extension is supported on this platform]) @@ -430,18 +408,12 @@ AC_ARG_WITH([perf], [AS_HELP_STRING([--with-perf], if test "x$with_perf" != "xno"; then perf="yes" - - if test "x$czmq" = "xno" -a "x$cppzmq" = "xno"; then - AC_MSG_ERROR([the --with-perf option requires at least one language binding.]); - fi fi if test "x$with_perf" = "xno" -a "x$with_pgm_examples" = "xyes"; then AC_MSG_ERROR([cannot configure --with-pgm-examples without --with-perf.]); fi -AM_CONDITIONAL(BUILD_C, test "x$czmq" = "xyes") -AM_CONDITIONAL(BUILD_CPP, test "x$cppzmq" = "xyes") AM_CONDITIONAL(BUILD_PGM, test "x$pgm_ext" = "xyes") AM_CONDITIONAL(BUILD_NO_PGM, test "x$pgm_ext" = "xno") AM_CONDITIONAL(BUILD_FORWARDER, test "x$forwarder" = "xyes") @@ -493,8 +465,8 @@ AC_MSG_RESULT([ ******************************************************** ]) AC_MSG_RESULT([]) AC_MSG_RESULT([ 0MQ install dir: $prefix]) AC_MSG_RESULT([ Language bindings:]) -AC_MSG_RESULT([ C: $czmq]) -AC_MSG_RESULT([ C++: $cppzmq]) +AC_MSG_RESULT([ C: yes]) +AC_MSG_RESULT([ C++: yes]) AC_MSG_RESULT([ Transports:]) AC_MSG_RESULT([ tcp: yes]) AC_MSG_RESULT([ pgm (epgm): $pgm_ext]) diff --git a/include/zmq.h b/include/zmq.h new file mode 100644 index 0000000..7d8d8ad --- /dev/null +++ b/include/zmq.h @@ -0,0 +1,249 @@ +/* + Copyright (c) 2007-2010 iMatix Corporation + + This file is part of 0MQ. + + 0MQ is free software; you can redistribute it and/or modify it under + the terms of the Lesser GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + 0MQ is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + Lesser GNU General Public License for more details. + + You should have received a copy of the Lesser GNU General Public License + along with this program. If not, see . +*/ + +#ifndef __ZMQ_H_INCLUDED__ +#define __ZMQ_H_INCLUDED__ + +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include +#if defined _WIN32 +#include "winsock2.h" +#endif + +// Microsoft Visual Studio uses non-standard way to export/import symbols. +#if defined ZMQ_BUILDING_LIBZMQ_WITH_MSVC +#define ZMQ_EXPORT __declspec(dllexport) +#elif defined _MSC_VER +#define ZMQ_EXPORT __declspec(dllimport) +#else +#define ZMQ_EXPORT +#endif + +//////////////////////////////////////////////////////////////////////////////// +// 0MQ versioning supprt. +//////////////////////////////////////////////////////////////////////////////// + +ZMQ_EXPORT void zmq_version (int *major, int *minor, int *patch); + +//////////////////////////////////////////////////////////////////////////////// +// 0MQ errors. +//////////////////////////////////////////////////////////////////////////////// + +// A number random anough not to collide with different errno ranges on +// different OSes. The assumption is that error_t is at least 32-bit type. +#define ZMQ_HAUSNUMERO 156384712 + +// On Windows platform some of the standard POSIX errnos are not defined. +#ifndef ENOTSUP +#define ENOTSUP (ZMQ_HAUSNUMERO + 1) +#endif +#ifndef EPROTONOSUPPORT +#define EPROTONOSUPPORT (ZMQ_HAUSNUMERO + 2) +#endif +#ifndef ENOBUFS +#define ENOBUFS (ZMQ_HAUSNUMERO + 3) +#endif +#ifndef ENETDOWN +#define ENETDOWN (ZMQ_HAUSNUMERO + 4) +#endif +#ifndef EADDRINUSE +#define EADDRINUSE (ZMQ_HAUSNUMERO + 5) +#endif +#ifndef EADDRNOTAVAIL +#define EADDRNOTAVAIL (ZMQ_HAUSNUMERO + 6) +#endif +#ifndef ECONNREFUSED +#define ECONNREFUSED (ZMQ_HAUSNUMERO + 7) +#endif +#ifndef EINPROGRESS +#define EINPROGRESS (ZMQ_HAUSNUMERO + 8) +#endif + +// Native 0MQ error codes. +#define EMTHREAD (ZMQ_HAUSNUMERO + 50) +#define EFSM (ZMQ_HAUSNUMERO + 51) +#define ENOCOMPATPROTO (ZMQ_HAUSNUMERO + 52) + +// Resolves system errors and 0MQ errors to human-readable string. +ZMQ_EXPORT const char *zmq_strerror (int errnum); + +//////////////////////////////////////////////////////////////////////////////// +// 0MQ message definition. +//////////////////////////////////////////////////////////////////////////////// + +// Maximal size of "Very Small Message". VSMs are passed by value +// to avoid excessive memory allocation/deallocation. +// If VMSs larger than 255 bytes are required, type of 'vsm_size' +// field in zmq_msg_t structure should be modified accordingly. +#define ZMQ_MAX_VSM_SIZE 30 + +// Message types. These integers may be stored in 'content' member of the +// message instead of regular pointer to the data. +#define ZMQ_DELIMITER 31 +#define ZMQ_VSM 32 + +// Message flags. ZMQ_MSG_SHARED is strictly speaking not a message flag +// (it has no equivalent in the wire format), however, making it a flag +// allows us to pack the stucture tigher and thus improve performance. +#define ZMQ_MSG_TBC 1 +#define ZMQ_MSG_SHARED 128 + +// A message. Note that 'content' is not a pointer to the raw data. +// Rather it is pointer to zmq::msg_content_t structure +// (see src/msg_content.hpp for its definition). +typedef struct +{ + void *content; + unsigned char flags; + unsigned char vsm_size; + unsigned char vsm_data [ZMQ_MAX_VSM_SIZE]; +} zmq_msg_t; + +typedef void (zmq_free_fn) (void *data, void *hint); + +ZMQ_EXPORT int zmq_msg_init (zmq_msg_t *msg); +ZMQ_EXPORT int zmq_msg_init_size (zmq_msg_t *msg, size_t size); +ZMQ_EXPORT int zmq_msg_init_data (zmq_msg_t *msg, void *data, + size_t size, zmq_free_fn *ffn, void *hint); +ZMQ_EXPORT int zmq_msg_close (zmq_msg_t *msg); +ZMQ_EXPORT int zmq_msg_move (zmq_msg_t *dest, zmq_msg_t *src); +ZMQ_EXPORT int zmq_msg_copy (zmq_msg_t *dest, zmq_msg_t *src); +ZMQ_EXPORT void *zmq_msg_data (zmq_msg_t *msg); +ZMQ_EXPORT size_t zmq_msg_size (zmq_msg_t *msg); + +//////////////////////////////////////////////////////////////////////////////// +// 0MQ infrastructure (a.k.a. context) initialisation & termination. +//////////////////////////////////////////////////////////////////////////////// + +#define ZMQ_POLL 1 + +ZMQ_EXPORT void *zmq_init (int app_threads, int io_threads, int flags); +ZMQ_EXPORT int zmq_term (void *context); + +//////////////////////////////////////////////////////////////////////////////// +// 0MQ socket definition. +//////////////////////////////////////////////////////////////////////////////// + +// Addresses are composed of the name of the protocol to use followed by :// +// and a protocol-specific address. Available protocols: +// +// tcp - the address is composed of IP address and port delimited by colon +// sign (:). The IP address can be a hostname (with 'connect') or +// a network interface name (with 'bind'). Examples "tcp://eth0:5555", +// "tcp://192.168.0.1:20000", "tcp://hq.mycompany.com:80". +// +// pgm & udp - both protocols have same address format. It's network interface +// to use, semicolon (;), multicast group IP address, colon (:) and +// port. Examples: "pgm://eth2;224.0.0.1:8000", +// "udp://192.168.0.111;224.1.1.1:5555". + +#define ZMQ_P2P 0 +#define ZMQ_PUB 1 +#define ZMQ_SUB 2 +#define ZMQ_REQ 3 +#define ZMQ_REP 4 +#define ZMQ_XREQ 5 +#define ZMQ_XREP 6 +#define ZMQ_UPSTREAM 7 +#define ZMQ_DOWNSTREAM 8 + +#define ZMQ_HWM 1 +#define ZMQ_LWM 2 +#define ZMQ_SWAP 3 +#define ZMQ_AFFINITY 4 +#define ZMQ_IDENTITY 5 +#define ZMQ_SUBSCRIBE 6 +#define ZMQ_UNSUBSCRIBE 7 +#define ZMQ_RATE 8 +#define ZMQ_RECOVERY_IVL 9 +#define ZMQ_MCAST_LOOP 10 +#define ZMQ_SNDBUF 11 +#define ZMQ_RCVBUF 12 + +#define ZMQ_NOBLOCK 1 +#define ZMQ_NOFLUSH 2 + +ZMQ_EXPORT void *zmq_socket (void *context, int type); +ZMQ_EXPORT int zmq_close (void *s); +ZMQ_EXPORT int zmq_setsockopt (void *s, int option, const void *optval, + size_t optvallen); +ZMQ_EXPORT int zmq_bind (void *s, const char *addr); +ZMQ_EXPORT int zmq_connect (void *s, const char *addr); +ZMQ_EXPORT int zmq_send (void *s, zmq_msg_t *msg, int flags); +ZMQ_EXPORT int zmq_flush (void *s); +ZMQ_EXPORT int zmq_recv (void *s, zmq_msg_t *msg, int flags); + +//////////////////////////////////////////////////////////////////////////////// +// I/O multiplexing. +//////////////////////////////////////////////////////////////////////////////// + +#define ZMQ_POLLIN 1 +#define ZMQ_POLLOUT 2 +#define ZMQ_POLLERR 4 + +typedef struct +{ + void *socket; +#if defined _WIN32 + SOCKET fd; +#else + int fd; +#endif + short events; + short revents; +} zmq_pollitem_t; + +ZMQ_EXPORT int zmq_poll (zmq_pollitem_t *items, int nitems, long timeout); + +//////////////////////////////////////////////////////////////////////////////// +// Experimental. +//////////////////////////////////////////////////////////////////////////////// + +// This function retrieves the errno as it is known to 0MQ library. The goal +// of this function is to make the code 100% portable, including where 0MQ +// compiled with certain CRT library (on Windows) is linked to an application +// compiled with different CRT library. +ZMQ_EXPORT int zmq_errno (); + +//////////////////////////////////////////////////////////////////////////////// +// Helper functions. +//////////////////////////////////////////////////////////////////////////////// + +// Helper functions are used by perf tests so that they don't have to care +// about minutiae of time-related functions on different OS platforms. + +// Starts the stopwatch. Returns the handle to the watch. +ZMQ_EXPORT void *zmq_stopwatch_start (); + +// Stops the stopwatch. Returns the number of microseconds elapsed since +// the stopwatch was started. +ZMQ_EXPORT unsigned long zmq_stopwatch_stop (void *watch_); + +// Sleeps for specified number of seconds. +ZMQ_EXPORT void zmq_sleep (int seconds_); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/zmq.hpp b/include/zmq.hpp new file mode 100644 index 0000000..3ddc043 --- /dev/null +++ b/include/zmq.hpp @@ -0,0 +1,266 @@ +/* + Copyright (c) 2007-2010 iMatix Corporation + + This file is part of 0MQ. + + 0MQ is free software; you can redistribute it and/or modify it under + the terms of the Lesser GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + 0MQ is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + Lesser GNU General Public License for more details. + + You should have received a copy of the Lesser GNU General Public License + along with this program. If not, see . +*/ + +#ifndef __ZMQ_HPP_INCLUDED__ +#define __ZMQ_HPP_INCLUDED__ + +#include "zmq.h" + +#include +#include +#include + +namespace zmq +{ + + typedef zmq_free_fn free_fn; + typedef zmq_pollitem_t pollitem_t; + + class error_t : public std::exception + { + public: + + error_t () : errnum (zmq_errno ()) {} + + virtual const char *what () const throw () + { + return zmq_strerror (errnum); + } + + private: + + int errnum; + }; + + inline int poll (zmq_pollitem_t *items_, int nitems_, long timeout_ = -1) + { + int rc = zmq_poll (items_, nitems_, timeout_); + if (rc < 0) + throw error_t (); + return rc; + } + + class message_t : private zmq_msg_t + { + friend class socket_t; + + public: + + inline message_t () + { + int rc = zmq_msg_init (this); + if (rc != 0) + throw error_t (); + } + + inline message_t (size_t size_) + { + int rc = zmq_msg_init_size (this, size_); + if (rc != 0) + throw error_t (); + } + + inline message_t (void *data_, size_t size_, free_fn *ffn_, + void *hint_ = NULL) + { + int rc = zmq_msg_init_data (this, data_, size_, ffn_, hint_); + if (rc != 0) + throw error_t (); + } + + inline ~message_t () + { + int rc = zmq_msg_close (this); + if (rc != 0) + throw error_t (); + } + + inline void rebuild () + { + int rc = zmq_msg_close (this); + if (rc != 0) + throw error_t (); + rc = zmq_msg_init (this); + if (rc != 0) + throw error_t (); + } + + inline void rebuild (size_t size_) + { + int rc = zmq_msg_close (this); + if (rc != 0) + throw error_t (); + rc = zmq_msg_init_size (this, size_); + if (rc != 0) + throw error_t (); + } + + inline void rebuild (void *data_, size_t size_, free_fn *ffn_, + void *hint_ = NULL) + { + int rc = zmq_msg_close (this); + if (rc != 0) + throw error_t (); + rc = zmq_msg_init_data (this, data_, size_, ffn_, hint_); + if (rc != 0) + throw error_t (); + } + + inline void move (message_t *msg_) + { + int rc = zmq_msg_move (this, (zmq_msg_t*) msg_); + if (rc != 0) + throw error_t (); + } + + inline void copy (message_t *msg_) + { + int rc = zmq_msg_copy (this, (zmq_msg_t*) msg_); + if (rc != 0) + throw error_t (); + } + + inline void *data () + { + return zmq_msg_data (this); + } + + inline size_t size () + { + return zmq_msg_size (this); + } + + private: + + // Disable implicit message copying, so that users won't use shared + // messages (less efficient) without being aware of the fact. + message_t (const message_t&); + void operator = (const message_t&); + }; + + class context_t + { + friend class socket_t; + + public: + + inline context_t (int app_threads_, int io_threads_, int flags_ = 0) + { + ptr = zmq_init (app_threads_, io_threads_, flags_); + if (ptr == NULL) + throw error_t (); + } + + inline ~context_t () + { + int rc = zmq_term (ptr); + assert (rc == 0); + } + + private: + + void *ptr; + + context_t (const context_t&); + void operator = (const context_t&); + }; + + class socket_t + { + public: + + inline socket_t (context_t &context_, int type_) + { + ptr = zmq_socket (context_.ptr, type_); + if (ptr == NULL) + throw error_t (); + } + + inline ~socket_t () + { + int rc = zmq_close (ptr); + if (rc != 0) + throw error_t (); + } + + inline operator void* () + { + return ptr; + } + + inline void setsockopt (int option_, const void *optval_, + size_t optvallen_) + { + int rc = zmq_setsockopt (ptr, option_, optval_, optvallen_); + if (rc != 0) + throw error_t (); + } + + inline void bind (const char *addr_) + { + int rc = zmq_bind (ptr, addr_); + if (rc != 0) + throw error_t (); + } + + inline void connect (const char *addr_) + { + int rc = zmq_connect (ptr, addr_); + if (rc != 0) + throw error_t (); + } + + inline bool send (message_t &msg_, int flags_ = 0) + { + int rc = zmq_send (ptr, &msg_, flags_); + if (rc == 0) + return true; + if (rc == -1 && zmq_errno () == EAGAIN) + return false; + throw error_t (); + } + + inline void flush () + { + int rc = zmq_flush (ptr); + if (rc != 0) + throw error_t (); + } + + inline bool recv (message_t *msg_, int flags_ = 0) + { + int rc = zmq_recv (ptr, msg_, flags_); + if (rc == 0) + return true; + if (rc == -1 && zmq_errno () == EAGAIN) + return false; + throw error_t (); + } + + private: + + void *ptr; + + socket_t (const socket_t&); + void operator = (const socket_t&); + }; + +} + +#endif diff --git a/perf/Makefile.am b/perf/Makefile.am index 87c4833..7e87d68 100644 --- a/perf/Makefile.am +++ b/perf/Makefile.am @@ -1,10 +1,2 @@ -if BUILD_C -PERF_DIR_C = c -endif - -if BUILD_CPP -PERF_DIR_CPP = cpp -endif - -SUBDIRS = $(PERF_DIR_C) $(PERF_DIR_CPP) +SUBDIRS = c cpp DIST_SUBDIRS = c cpp diff --git a/perf/c/Makefile.am b/perf/c/Makefile.am index c6d8d8a..d48dcee 100644 --- a/perf/c/Makefile.am +++ b/perf/c/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_builddir)/bindings/c +INCLUDES = -I$(top_builddir)/include if BUILD_PGM_EXAMPLES PGM_EXAMPLES_BINS = pgmsend pgmrecv diff --git a/perf/cpp/Makefile.am b/perf/cpp/Makefile.am index 65ffe68..37b970c 100644 --- a/perf/cpp/Makefile.am +++ b/perf/cpp/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_srcdir)/bindings/cpp -I$(top_srcdir)/bindings/c +INCLUDES = -I$(top_srcdir)/include noinst_PROGRAMS = local_lat remote_lat local_thr remote_thr diff --git a/src/Makefile.am b/src/Makefile.am index eeb33d6..26106d8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,17 +3,7 @@ lib_LTLIBRARIES = libzmq.la pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libzmq.pc -if BUILD_CPP -include_HEADERS = ../bindings/cpp/zmq.hpp ../bindings/c/zmq.h -endif - -if BUILD_C -if BUILD_CPP - -else -include_HEADERS = ../bindings/c/zmq.h -endif -endif +include_HEADERS = ../include/zmq.h ../include/zmq.hpp if BUILD_PGM pgm_sources = ../foreign/openpgm/@pgm_basename@/openpgm/pgm/packet.c \ diff --git a/src/app_thread.cpp b/src/app_thread.cpp index eff0cf7..61e49e5 100644 --- a/src/app_thread.cpp +++ b/src/app_thread.cpp @@ -20,7 +20,7 @@ #include #include -#include "../bindings/c/zmq.h" +#include "../include/zmq.h" #include "platform.hpp" diff --git a/src/dispatcher.cpp b/src/dispatcher.cpp index 4233278..a49b598 100644 --- a/src/dispatcher.cpp +++ b/src/dispatcher.cpp @@ -19,7 +19,7 @@ #include -#include "../bindings/c/zmq.h" +#include "../include/zmq.h" #include "dispatcher.hpp" #include "socket_base.hpp" diff --git a/src/downstream.cpp b/src/downstream.cpp index 3431264..7ff88f1 100644 --- a/src/downstream.cpp +++ b/src/downstream.cpp @@ -17,7 +17,7 @@ along with this program. If not, see . */ -#include "../bindings/c/zmq.h" +#include "../include/zmq.h" #include "downstream.hpp" #include "err.hpp" diff --git a/src/err.cpp b/src/err.cpp index 0ff6335..17a9689 100644 --- a/src/err.cpp +++ b/src/err.cpp @@ -17,7 +17,7 @@ along with this program. If not, see . */ -#include "../bindings/c/zmq.h" +#include "../include/zmq.h" #include "err.hpp" #include "platform.hpp" diff --git a/src/fq.cpp b/src/fq.cpp index 1836058..a7e93ce 100644 --- a/src/fq.cpp +++ b/src/fq.cpp @@ -17,7 +17,7 @@ along with this program. If not, see . */ -#include "../bindings/c/zmq.h" +#include "../include/zmq.h" #include "fq.hpp" #include "pipe.hpp" diff --git a/src/i_inout.hpp b/src/i_inout.hpp index c11137d..21d1838 100644 --- a/src/i_inout.hpp +++ b/src/i_inout.hpp @@ -20,7 +20,7 @@ #ifndef __ZMQ_I_INOUT_HPP_INCLUDED__ #define __ZMQ_I_INOUT_HPP_INCLUDED__ -#include "../bindings/c/zmq.h" +#include "../include/zmq.h" #include "stdint.hpp" diff --git a/src/io_thread.cpp b/src/io_thread.cpp index 2e1237b..ff45478 100644 --- a/src/io_thread.cpp +++ b/src/io_thread.cpp @@ -19,7 +19,7 @@ #include -#include "../bindings/c/zmq.h" +#include "../include/zmq.h" #include "io_thread.hpp" #include "command.hpp" diff --git a/src/lb.cpp b/src/lb.cpp index e1628db..4743ac6 100644 --- a/src/lb.cpp +++ b/src/lb.cpp @@ -17,7 +17,7 @@ along with this program. If not, see . */ -#include "../bindings/c/zmq.h" +#include "../include/zmq.h" #include "lb.hpp" #include "pipe.hpp" diff --git a/src/msg_content.hpp b/src/msg_content.hpp index 3daf0e6..d409d45 100644 --- a/src/msg_content.hpp +++ b/src/msg_content.hpp @@ -22,7 +22,7 @@ #include -#include "../bindings/c/zmq.h" +#include "../include/zmq.h" #include "atomic_counter.hpp" diff --git a/src/options.cpp b/src/options.cpp index f78d8de..c0d5339 100644 --- a/src/options.cpp +++ b/src/options.cpp @@ -17,7 +17,7 @@ along with this program. If not, see . */ -#include "../bindings/c/zmq.h" +#include "../include/zmq.h" #include "options.hpp" #include "err.hpp" diff --git a/src/p2p.cpp b/src/p2p.cpp index ca7a8f5..334cfcc 100644 --- a/src/p2p.cpp +++ b/src/p2p.cpp @@ -17,7 +17,7 @@ along with this program. If not, see . */ -#include "../bindings/c/zmq.h" +#include "../include/zmq.h" #include "p2p.hpp" #include "err.hpp" diff --git a/src/pipe.cpp b/src/pipe.cpp index f4582f2..da019c1 100644 --- a/src/pipe.cpp +++ b/src/pipe.cpp @@ -17,7 +17,7 @@ along with this program. If not, see . */ -#include "../bindings/c/zmq.h" +#include "../include/zmq.h" #include "pipe.hpp" diff --git a/src/pipe.hpp b/src/pipe.hpp index 771081c..df3d0b1 100644 --- a/src/pipe.hpp +++ b/src/pipe.hpp @@ -20,7 +20,7 @@ #ifndef __ZMQ_PIPE_HPP_INCLUDED__ #define __ZMQ_PIPE_HPP_INCLUDED__ -#include "../bindings/c/zmq.h" +#include "../include/zmq.h" #include "stdint.hpp" #include "i_endpoint.hpp" diff --git a/src/pub.cpp b/src/pub.cpp index 342b1d2..643e29e 100644 --- a/src/pub.cpp +++ b/src/pub.cpp @@ -17,7 +17,7 @@ along with this program. If not, see . */ -#include "../bindings/c/zmq.h" +#include "../include/zmq.h" #include "pub.hpp" #include "err.hpp" diff --git a/src/rep.cpp b/src/rep.cpp index 5e813df..4e69fa3 100644 --- a/src/rep.cpp +++ b/src/rep.cpp @@ -17,7 +17,7 @@ along with this program. If not, see . */ -#include "../bindings/c/zmq.h" +#include "../include/zmq.h" #include "rep.hpp" #include "err.hpp" diff --git a/src/req.cpp b/src/req.cpp index 833db9a..5c067b3 100644 --- a/src/req.cpp +++ b/src/req.cpp @@ -17,7 +17,7 @@ along with this program. If not, see . */ -#include "../bindings/c/zmq.h" +#include "../include/zmq.h" #include "req.hpp" #include "err.hpp" diff --git a/src/socket_base.cpp b/src/socket_base.cpp index f17a578..50b4152 100644 --- a/src/socket_base.cpp +++ b/src/socket_base.cpp @@ -21,7 +21,7 @@ #include #include -#include "../bindings/c/zmq.h" +#include "../include/zmq.h" #include "socket_base.hpp" #include "app_thread.hpp" diff --git a/src/socket_base.hpp b/src/socket_base.hpp index 5327acc..31c241b 100644 --- a/src/socket_base.hpp +++ b/src/socket_base.hpp @@ -24,7 +24,7 @@ #include #include -#include "../bindings/c/zmq.h" +#include "../include/zmq.h" #include "i_endpoint.hpp" #include "object.hpp" diff --git a/src/sub.cpp b/src/sub.cpp index 29ac951..fb00bfb 100644 --- a/src/sub.cpp +++ b/src/sub.cpp @@ -19,7 +19,7 @@ #include -#include "../bindings/c/zmq.h" +#include "../include/zmq.h" #include "sub.hpp" #include "err.hpp" diff --git a/src/sub.hpp b/src/sub.hpp index 8234b77..670aa79 100644 --- a/src/sub.hpp +++ b/src/sub.hpp @@ -20,7 +20,7 @@ #ifndef __ZMQ_SUB_HPP_INCLUDED__ #define __ZMQ_SUB_HPP_INCLUDED__ -#include "../bindings/c/zmq.h" +#include "../include/zmq.h" #include "prefix_tree.hpp" #include "socket_base.hpp" diff --git a/src/tcp_connecter.cpp b/src/tcp_connecter.cpp index 06214e2..1286187 100644 --- a/src/tcp_connecter.cpp +++ b/src/tcp_connecter.cpp @@ -21,7 +21,7 @@ #include -#include "../bindings/c/zmq.h" +#include "../include/zmq.h" #include "tcp_connecter.hpp" #include "platform.hpp" diff --git a/src/tcp_listener.cpp b/src/tcp_listener.cpp index db12c7a..fdcdf17 100644 --- a/src/tcp_listener.cpp +++ b/src/tcp_listener.cpp @@ -19,7 +19,7 @@ #include -#include "../bindings/c/zmq.h" +#include "../include/zmq.h" #include "tcp_listener.hpp" #include "platform.hpp" diff --git a/src/upstream.cpp b/src/upstream.cpp index d7238b9..7ff1157 100644 --- a/src/upstream.cpp +++ b/src/upstream.cpp @@ -17,7 +17,7 @@ along with this program. If not, see . */ -#include "../bindings/c/zmq.h" +#include "../include/zmq.h" #include "upstream.hpp" #include "err.hpp" diff --git a/src/xrep.cpp b/src/xrep.cpp index 6fa6bfa..df74302 100644 --- a/src/xrep.cpp +++ b/src/xrep.cpp @@ -17,7 +17,7 @@ along with this program. If not, see . */ -#include "../bindings/c/zmq.h" +#include "../include/zmq.h" #include "xrep.hpp" #include "err.hpp" diff --git a/src/xreq.cpp b/src/xreq.cpp index dda924c..12c3dd6 100644 --- a/src/xreq.cpp +++ b/src/xreq.cpp @@ -17,7 +17,7 @@ along with this program. If not, see . */ -#include "../bindings/c/zmq.h" +#include "../include/zmq.h" #include "xreq.hpp" #include "err.hpp" diff --git a/src/zmq.cpp b/src/zmq.cpp index 8540e06..a9430d4 100644 --- a/src/zmq.cpp +++ b/src/zmq.cpp @@ -17,7 +17,7 @@ along with this program. If not, see . */ -#include "../bindings/c/zmq.h" +#include "../include/zmq.h" #include #include diff --git a/src/zmq_decoder.hpp b/src/zmq_decoder.hpp index 5a9580a..2efed2a 100644 --- a/src/zmq_decoder.hpp +++ b/src/zmq_decoder.hpp @@ -20,7 +20,7 @@ #ifndef __ZMQ_ZMQ_DECODER_HPP_INCLUDED__ #define __ZMQ_ZMQ_DECODER_HPP_INCLUDED__ -#include "../bindings/c/zmq.h" +#include "../include/zmq.h" #include "decoder.hpp" #include "blob.hpp" diff --git a/src/zmq_encoder.hpp b/src/zmq_encoder.hpp index 953012b..a3bc4ac 100644 --- a/src/zmq_encoder.hpp +++ b/src/zmq_encoder.hpp @@ -20,7 +20,7 @@ #ifndef __ZMQ_ZMQ_ENCODER_HPP_INCLUDED__ #define __ZMQ_ZMQ_ENCODER_HPP_INCLUDED__ -#include "../bindings/c/zmq.h" +#include "../include/zmq.h" #include "encoder.hpp" -- cgit v1.2.3