From b71c3005e68d02f800ff09bcacece79d167bff75 Mon Sep 17 00:00:00 2001 From: malosek Date: Mon, 7 Sep 2009 17:06:47 +0200 Subject: include directory split into c and cpp dirs, added --with-c and --with-cpp configure options --- Makefile.am | 2 - autogen.sh | 8 +- c/zmq.h | 206 ++++++++++++++++++++++++++++++++++++++ configure.in | 45 ++++++--- cpp/zmq.hpp | 276 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/zmq.h | 206 -------------------------------------- include/zmq.hpp | 276 --------------------------------------------------- perf/c/Makefile.am | 4 +- perf/cpp/Makefile.am | 4 +- src/Makefile.am | 15 ++- src/app_thread.cpp | 2 +- src/dispatcher.cpp | 2 +- src/i_inout.hpp | 2 +- src/io_thread.cpp | 2 +- src/msg_content.hpp | 2 +- src/pipe.cpp | 2 +- src/pipe.hpp | 2 +- src/socket_base.cpp | 2 +- src/zmq.cpp | 2 +- src/zmq_decoder.hpp | 2 +- src/zmq_encoder.hpp | 2 +- 21 files changed, 547 insertions(+), 517 deletions(-) create mode 100644 c/zmq.h create mode 100644 cpp/zmq.hpp delete mode 100644 include/zmq.h delete mode 100644 include/zmq.hpp diff --git a/Makefile.am b/Makefile.am index 3055e64..4dda619 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,3 @@ -include_HEADERS = include/zmq.h include/zmq.hpp - if BUILD_PYTHON DIR_P = python endif diff --git a/autogen.sh b/autogen.sh index 19f2174..dfa69c0 100755 --- a/autogen.sh +++ b/autogen.sh @@ -18,7 +18,13 @@ # Script to generate all required files from fresh svn checkout. - +pkg-config --version > /dev/null 2>&1 +if [ $? -ne 0 ]; then + echo + echo "Could not find pkg-config, pkg.m4 macro is probably not installed." + echo + exit 1 +fi autoreconf --install --force --verbose -I config diff --git a/c/zmq.h b/c/zmq.h new file mode 100644 index 0000000..a8394ed --- /dev/null +++ b/c/zmq.h @@ -0,0 +1,206 @@ +/* + Copyright (c) 2007-2009 FastMQ Inc. + + 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 + +#if defined MSC_VER && defined ZMQ_BUILDING_LIBZMQ +#define ZMQ_EXPORT __declspec(dllexport) +#else +#define ZMQ_EXPORT +#endif + +// 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 & notification types. +#define ZMQ_GAP 1 +#define ZMQ_DELIMITER 31 +#define ZMQ_VSM 32 + +// Socket options. +#define ZMQ_HWM 1 +#define ZMQ_LWM 2 +#define ZMQ_SWAP 3 +#define ZMQ_MASK 4 +#define ZMQ_AFFINITY 5 +#define ZMQ_IDENTITY 6 + +// The operation should be performed in non-blocking mode. I.e. if it cannot +// be processed immediately, error should be returned with errno set to EAGAIN. +#define ZMQ_NOBLOCK 1 + +// zmq_send should not flush the message downstream immediately. Instead, it +// should batch ZMQ_NOFLUSH messages and send them downstream only if zmq_flush +// is invoked. This is an optimisation for cases where several messages are +// sent in a single business transaction. However, the effect is measurable +// only in extremely high-perf scenarios (million messages a second or so). +// If that's not your case, use standard flushing send instead. See exchange +// example for illustration of ZMQ_NOFLUSH functionality. +#define ZMQ_NOFLUSH 2 + +// Socket to communicate with a single peer. Allows for a singe connect or a +// single accept. There's no message routing or message filtering involved. +#define ZMQ_P2P 0 + +// Socket to distribute data. Recv fuction is not implemented for this socket +// type. Messages are distributed in fanout fashion to all peers. +#define ZMQ_PUB 1 + +// Socket to subscribe to distributed data. Send function is not implemented +// for this socket type. However, subscribe function can be used to modify the +// message filter. +#define ZMQ_SUB 2 + +// Socket to send requests on and receive replies from. Requests are +// load-balanced among all the peers. This socket type doesn't allow for more +// recv's that there were send's. +#define ZMQ_REQ 3 + +// Socket to receive requests from and send replies to. This socket type allows +// only an alternated sequence of recv's and send's. Each send is routed to +// the peer that the previous recv delivered message from. +#define ZMQ_REP 4 + +// Prototype for the message body deallocation functions. +// It is deliberately defined in the way to comply with standard C free. +typedef void (zmq_free_fn) (void *data); + +// A message. If 'shared' is true, message content pointed to by 'content' +// is shared, i.e. reference counting is used to manage its lifetime +// rather than straighforward malloc/free. struct zmq_msg_content is +// not declared in the API. +struct zmq_msg_t +{ + void *content; + unsigned char shared; + unsigned char vsm_size; + unsigned char vsm_data [ZMQ_MAX_VSM_SIZE]; +}; + +// Initialise an empty message (zero bytes long). +ZMQ_EXPORT int zmq_msg_init (struct zmq_msg_t *msg); + +// Initialise a message 'size' bytes long. +// +// Errors: ENOMEM - the size is too large to allocate. +ZMQ_EXPORT int zmq_msg_init_size (struct zmq_msg_t *msg, size_t size); + +// Initialise a message from an existing buffer. Message isn't copied, +// instead 0MQ infrastructure take ownership of the buffer and call +// deallocation functio (ffn) once it's not needed anymore. +ZMQ_EXPORT int zmq_msg_init_data (struct zmq_msg_t *msg, void *data, + size_t size, zmq_free_fn *ffn); + +// Deallocate the message. +ZMQ_EXPORT int zmq_msg_close (struct zmq_msg_t *msg); + +// Move the content of the message from 'src' to 'dest'. The content isn't +// copied, just moved. 'src' is an empty message after the call. Original +// content of 'dest' message is deallocated. +ZMQ_EXPORT int zmq_msg_move (struct zmq_msg_t *dest, struct zmq_msg_t *src); + +// Copy the 'src' message to 'dest'. The content isn't copied, instead +// reference count is increased. Don't modify the message data after the +// call as they are shared between two messages. Original content of 'dest' +// message is deallocated. +ZMQ_EXPORT int zmq_msg_copy (struct zmq_msg_t *dest, struct zmq_msg_t *src); + +// Returns pointer to message data. +ZMQ_EXPORT void *zmq_msg_data (struct zmq_msg_t *msg); + +// Return size of message data (in bytes). +ZMQ_EXPORT size_t zmq_msg_size (struct zmq_msg_t *msg); + +// Returns type of the message. +ZMQ_EXPORT int zmq_msg_type (struct zmq_msg_t *msg); + +// Initialise 0MQ context. 'app_threads' specifies maximal number +// of application threads that can have open sockets at the same time. +// 'io_threads' specifies the size of thread pool to handle I/O operations. +// +// Errors: EINVAL - one of the arguments is less than zero or there are no +// threads declared at all. +ZMQ_EXPORT void *zmq_init (int app_threads, int io_threads); + +// Deinitialise 0MQ context including all the open sockets. Closing +// sockets after zmq_term has been called will result in undefined behaviour. +ZMQ_EXPORT int zmq_term (void *context); + +// Open a socket. +// +// Errors: EINVAL - invalid socket type. +// EMFILE - the number of application threads entitled to hold open +// sockets at the same time was exceeded. +ZMQ_EXPORT void *zmq_socket (void *context, int type); + +// Close the socket. +ZMQ_EXPORT int zmq_close (void *s); + +// Sets an option on the socket. +// EINVAL - unknown option, a value with incorrect length or an invalid value. +ZMQ_EXPORT int zmq_setsockopt (void *s, int option_, const void *optval_, + size_t optvallen_); + +// Bind the socket to a particular address. +ZMQ_EXPORT int zmq_bind (void *s, const char *addr); + +// Connect the socket to a particular address. +ZMQ_EXPORT int zmq_connect (void *s, const char *addr); + +// Send the message 'msg' to the socket 's'. 'flags' argument can be +// combination of following values: +// ZMQ_NOBLOCK - if message cannot be sent, return immediately. +// ZMQ_NOFLUSH - message won't be sent immediately. It'll be sent with either +// subsequent flushing send or explicit call to zmq_flush +// function. +// +// Errors: EAGAIN - message cannot be sent at the moment (applies only to +// non-blocking send). +// ENOTSUP - function isn't supported by particular socket type. +ZMQ_EXPORT int zmq_send (void *s, struct zmq_msg_t *msg, int flags); + +// Flush the messages that were send using ZMQ_NOFLUSH flag down the stream. +// +// Errors: ENOTSUP - function isn't supported by particular socket type. +ZMQ_EXPORT int zmq_flush (void *s); + +// Send a message from the socket 's'. 'flags' argument can be combination +// of following values: +// ZMQ_NOBLOCK - if message cannot be received, return immediately. +// +// Errors: EAGAIN - message cannot be received at the moment (applies only to +// non-blocking receive). +// ENOTSUP - function isn't supported by particular socket type. +ZMQ_EXPORT int zmq_recv (void *s, struct zmq_msg_t *msg, int flags); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/configure.in b/configure.in index 8feef7b..6d69333 100644 --- a/configure.in +++ b/configure.in @@ -164,11 +164,29 @@ 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 + # Python pyzmq="no" AC_ARG_WITH(python_headersdir, - AC_HELP_STRING([--with-python-headersdir], [Python.h header file location]), + AS_HELP_STRING([--with-python-headersdir], [Python.h header file location]), [python_headersdir="$withval"], [python_headersdir="no"]) AC_ARG_WITH([python], [AS_HELP_STRING([--with-python], [build Python language binding [default=no]])], [with_python=yes], [with_python=no]) @@ -209,7 +227,7 @@ fi rbzmq="no" AC_ARG_WITH(ruby_headersdir, - AC_HELP_STRING([--with-ruby-headersdir], [ruby.h header file location]), + AS_HELP_STRING([--with-ruby-headersdir], [ruby.h header file location]), [ruby_headersdir="$withval"], [ruby_headersdir="no"]) if test "x$ruby_headersdir" != "xno"; then @@ -217,7 +235,7 @@ if test "x$ruby_headersdir" != "xno"; then fi AC_ARG_WITH(ruby_libdir, - AC_HELP_STRING([--with-ruby-libdir],[libruby library file location]), + AS_HELP_STRING([--with-ruby-libdir],[libruby library file location]), [ruby_libdir="$withval"], [ruby_libdir="no"]) if test "x$ruby_libdir" != "xno"; then @@ -249,17 +267,12 @@ RUBYDIR="$rubydir" AC_SUBST([RUBYDIR]) if test "x$pyzmq" != "xyes"; then - AC_CHECK_PROG(have_python, python, yes, no) - if test "x$have_python" != "xyes"; then - AC_MSG_ERROR([Could not find python.]) - fi + AC_CHECK_PROG(have_python, python, yes, no) + if test "x$have_python" != "xyes"; then + AC_MSG_ERROR([Could not find python.]) fi +fi - # Generate version.c - AC_CONFIG_COMMANDS([version.c], - [python third-party/openpgm/libpgm-1.0.0/openpgm/pgm/version_generator.py > \ - third-party/openpgm/libpgm-1.0.0/openpgm/pgm/version.c]) - # Java language binding jzmq="no" AC_ARG_WITH([java], [AS_HELP_STRING([--with-java], [build Java language binding [default=no]])], [with_java=yes], [with_java=no]) @@ -312,6 +325,10 @@ fi AM_CONDITIONAL(BUILD_PYTHON, test "x$pyzmq" = "xyes") AM_CONDITIONAL(BUILD_JAVA, test "x$jzmq" = "xyes") +AM_CONDITIONAL(BUILD_PYTHON, test "x$pyzmq" = "xyes") +AM_CONDITIONAL(BUILD_RUBY, test "x$rbzmq" = "xyes") +AM_CONDITIONAL(BUILD_C, test "x$czmq" = "xyes") +AM_CONDITIONAL(BUILD_CPP, test "x$cppzmq" = "xyes") AC_SUBST(stdint) AC_SUBST(inttypes) @@ -319,8 +336,6 @@ AC_SUBST(inttypes) # Subst ZMQ_EXTRA_CXXFLAGS AC_SUBST(ZMQ_EXTRA_CXXFLAGS) -AM_CONDITIONAL(BUILD_PYTHON, test "x$pyzmq" = "xyes") -AM_CONDITIONAL(BUILD_RUBY, test "x$rbzmq" = "xyes") # Checks for library functions. AC_FUNC_MALLOC @@ -342,6 +357,8 @@ AC_MSG_RESULT([ license text. ]) AC_MSG_RESULT([ ******************************************************** ]) AC_MSG_RESULT([]) AC_MSG_RESULT([ 0MQ install dir: $prefix]) +AC_MSG_RESULT([ C language binding: $czmq]) +AC_MSG_RESULT([ C++ language binding: $cppzmq]) AC_MSG_RESULT([ Python language binding: $pyzmq]) AC_MSG_RESULT([ Ruby language binding: $rbzmq]) if test "x$rbzmq" = "xyes"; then diff --git a/cpp/zmq.hpp b/cpp/zmq.hpp new file mode 100644 index 0000000..ffdea7b --- /dev/null +++ b/cpp/zmq.hpp @@ -0,0 +1,276 @@ +/* + Copyright (c) 2007-2009 FastMQ Inc. + + 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 +#include + +namespace zmq +{ + + typedef zmq_free_fn free_fn; + + enum message_type_t + { + message_data = 1 << 0, + message_gap = 1 << ZMQ_GAP, + message_delimiter = 1 << ZMQ_DELIMITER + }; + + // The class masquerades POSIX-style errno error as a C++ exception. + class error_t : public std::exception + { + public: + + error_t () : errnum (errno) {} + + virtual const char *what () const throw () + { + return strerror (errnum); + } + + private: + + int errnum; + }; + + // A message. Caution: Don't change the body of the message once you've + // copied it - the behaviour is undefined. Don't change the body of the + // received message either - other threads may be accessing it in parallel. + + class message_t : private zmq_msg_t + { + friend class socket_t; + + public: + + // Creates message size_ bytes long. + inline message_t (size_t size_ = 0) + { + int rc = zmq_msg_init_size (this, size_); + if (rc != 0) + throw error_t (); + } + + // Creates message from the supplied buffer. 0MQ takes care of + // deallocating the buffer once it is not needed. The deallocation + // function is supplied in ffn_ parameter. If ffn_ is NULL, no + // deallocation happens - this is useful for sending static buffers. + inline message_t (void *data_, size_t size_, + free_fn *ffn_) + { + int rc = zmq_msg_init_data (this, data_, size_, ffn_); + if (rc != 0) + throw error_t (); + } + + // Destroys the message. + inline ~message_t () + { + int rc = zmq_msg_close (this); + if (rc != 0) + throw error_t (); + } + + // Destroys old content of the message and allocates buffer for the + // new message body. Having this as a separate function allows user + // to reuse once-allocated message for multiple times. + 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 (); + } + + // Same as above, however, the message is rebuilt from the supplied + // buffer. See appropriate constructor for discussion of buffer + // deallocation mechanism. + inline void rebuild (void *data_, size_t size_, free_fn *ffn_) + { + int rc = zmq_msg_close (this); + if (rc != 0) + throw error_t (); + rc = zmq_msg_init_data (this, data_, size_, ffn_); + if (rc != 0) + throw error_t (); + } + + // Moves the message content from one message to the another. If the + // destination message have contained data prior to the operation + // these get deallocated. The source message will contain 0 bytes + // of data after the operation. + inline void move_to (message_t *msg_) + { + int rc = zmq_msg_move (this, (zmq_msg_t*) msg_); + if (rc != 0) + throw error_t (); + } + + // Copies the message content from one message to the another. If the + // destination message have contained data prior to the operation + // these get deallocated. + inline void copy_to (message_t *msg_) + { + int rc = zmq_msg_copy (this, (zmq_msg_t*) msg_); + if (rc != 0) + throw error_t (); + } + + // Returns message type. + inline message_type_t type () + { + return (message_type_t) (1 << zmq_msg_type (this)); + } + + // Returns pointer to message's data buffer. + inline void *data () + { + return zmq_msg_data (this); + } + + // Returns the size of message data buffer. + 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_) + { + ptr = zmq_init (app_threads_, io_threads_); + if (ptr == NULL) + throw error_t (); + } + + inline ~context_t () + { + int rc = zmq_term (ptr); + assert (rc == 0); + } + + private: + + void *ptr; + + // Disable copying. + context_t (const context_t&); + void operator = (const context_t&); + }; + + class socket_t + { + public: + + inline socket_t (context_t &context_, int type_ = 0) + { + 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 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 && 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 && errno == EAGAIN) + return false; + throw error_t (); + } + + private: + + void *ptr; + + // Disable copying. + socket_t (const socket_t&); + void operator = (const socket_t&); + }; + +} + +#endif diff --git a/include/zmq.h b/include/zmq.h deleted file mode 100644 index a8394ed..0000000 --- a/include/zmq.h +++ /dev/null @@ -1,206 +0,0 @@ -/* - Copyright (c) 2007-2009 FastMQ Inc. - - 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 - -#if defined MSC_VER && defined ZMQ_BUILDING_LIBZMQ -#define ZMQ_EXPORT __declspec(dllexport) -#else -#define ZMQ_EXPORT -#endif - -// 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 & notification types. -#define ZMQ_GAP 1 -#define ZMQ_DELIMITER 31 -#define ZMQ_VSM 32 - -// Socket options. -#define ZMQ_HWM 1 -#define ZMQ_LWM 2 -#define ZMQ_SWAP 3 -#define ZMQ_MASK 4 -#define ZMQ_AFFINITY 5 -#define ZMQ_IDENTITY 6 - -// The operation should be performed in non-blocking mode. I.e. if it cannot -// be processed immediately, error should be returned with errno set to EAGAIN. -#define ZMQ_NOBLOCK 1 - -// zmq_send should not flush the message downstream immediately. Instead, it -// should batch ZMQ_NOFLUSH messages and send them downstream only if zmq_flush -// is invoked. This is an optimisation for cases where several messages are -// sent in a single business transaction. However, the effect is measurable -// only in extremely high-perf scenarios (million messages a second or so). -// If that's not your case, use standard flushing send instead. See exchange -// example for illustration of ZMQ_NOFLUSH functionality. -#define ZMQ_NOFLUSH 2 - -// Socket to communicate with a single peer. Allows for a singe connect or a -// single accept. There's no message routing or message filtering involved. -#define ZMQ_P2P 0 - -// Socket to distribute data. Recv fuction is not implemented for this socket -// type. Messages are distributed in fanout fashion to all peers. -#define ZMQ_PUB 1 - -// Socket to subscribe to distributed data. Send function is not implemented -// for this socket type. However, subscribe function can be used to modify the -// message filter. -#define ZMQ_SUB 2 - -// Socket to send requests on and receive replies from. Requests are -// load-balanced among all the peers. This socket type doesn't allow for more -// recv's that there were send's. -#define ZMQ_REQ 3 - -// Socket to receive requests from and send replies to. This socket type allows -// only an alternated sequence of recv's and send's. Each send is routed to -// the peer that the previous recv delivered message from. -#define ZMQ_REP 4 - -// Prototype for the message body deallocation functions. -// It is deliberately defined in the way to comply with standard C free. -typedef void (zmq_free_fn) (void *data); - -// A message. If 'shared' is true, message content pointed to by 'content' -// is shared, i.e. reference counting is used to manage its lifetime -// rather than straighforward malloc/free. struct zmq_msg_content is -// not declared in the API. -struct zmq_msg_t -{ - void *content; - unsigned char shared; - unsigned char vsm_size; - unsigned char vsm_data [ZMQ_MAX_VSM_SIZE]; -}; - -// Initialise an empty message (zero bytes long). -ZMQ_EXPORT int zmq_msg_init (struct zmq_msg_t *msg); - -// Initialise a message 'size' bytes long. -// -// Errors: ENOMEM - the size is too large to allocate. -ZMQ_EXPORT int zmq_msg_init_size (struct zmq_msg_t *msg, size_t size); - -// Initialise a message from an existing buffer. Message isn't copied, -// instead 0MQ infrastructure take ownership of the buffer and call -// deallocation functio (ffn) once it's not needed anymore. -ZMQ_EXPORT int zmq_msg_init_data (struct zmq_msg_t *msg, void *data, - size_t size, zmq_free_fn *ffn); - -// Deallocate the message. -ZMQ_EXPORT int zmq_msg_close (struct zmq_msg_t *msg); - -// Move the content of the message from 'src' to 'dest'. The content isn't -// copied, just moved. 'src' is an empty message after the call. Original -// content of 'dest' message is deallocated. -ZMQ_EXPORT int zmq_msg_move (struct zmq_msg_t *dest, struct zmq_msg_t *src); - -// Copy the 'src' message to 'dest'. The content isn't copied, instead -// reference count is increased. Don't modify the message data after the -// call as they are shared between two messages. Original content of 'dest' -// message is deallocated. -ZMQ_EXPORT int zmq_msg_copy (struct zmq_msg_t *dest, struct zmq_msg_t *src); - -// Returns pointer to message data. -ZMQ_EXPORT void *zmq_msg_data (struct zmq_msg_t *msg); - -// Return size of message data (in bytes). -ZMQ_EXPORT size_t zmq_msg_size (struct zmq_msg_t *msg); - -// Returns type of the message. -ZMQ_EXPORT int zmq_msg_type (struct zmq_msg_t *msg); - -// Initialise 0MQ context. 'app_threads' specifies maximal number -// of application threads that can have open sockets at the same time. -// 'io_threads' specifies the size of thread pool to handle I/O operations. -// -// Errors: EINVAL - one of the arguments is less than zero or there are no -// threads declared at all. -ZMQ_EXPORT void *zmq_init (int app_threads, int io_threads); - -// Deinitialise 0MQ context including all the open sockets. Closing -// sockets after zmq_term has been called will result in undefined behaviour. -ZMQ_EXPORT int zmq_term (void *context); - -// Open a socket. -// -// Errors: EINVAL - invalid socket type. -// EMFILE - the number of application threads entitled to hold open -// sockets at the same time was exceeded. -ZMQ_EXPORT void *zmq_socket (void *context, int type); - -// Close the socket. -ZMQ_EXPORT int zmq_close (void *s); - -// Sets an option on the socket. -// EINVAL - unknown option, a value with incorrect length or an invalid value. -ZMQ_EXPORT int zmq_setsockopt (void *s, int option_, const void *optval_, - size_t optvallen_); - -// Bind the socket to a particular address. -ZMQ_EXPORT int zmq_bind (void *s, const char *addr); - -// Connect the socket to a particular address. -ZMQ_EXPORT int zmq_connect (void *s, const char *addr); - -// Send the message 'msg' to the socket 's'. 'flags' argument can be -// combination of following values: -// ZMQ_NOBLOCK - if message cannot be sent, return immediately. -// ZMQ_NOFLUSH - message won't be sent immediately. It'll be sent with either -// subsequent flushing send or explicit call to zmq_flush -// function. -// -// Errors: EAGAIN - message cannot be sent at the moment (applies only to -// non-blocking send). -// ENOTSUP - function isn't supported by particular socket type. -ZMQ_EXPORT int zmq_send (void *s, struct zmq_msg_t *msg, int flags); - -// Flush the messages that were send using ZMQ_NOFLUSH flag down the stream. -// -// Errors: ENOTSUP - function isn't supported by particular socket type. -ZMQ_EXPORT int zmq_flush (void *s); - -// Send a message from the socket 's'. 'flags' argument can be combination -// of following values: -// ZMQ_NOBLOCK - if message cannot be received, return immediately. -// -// Errors: EAGAIN - message cannot be received at the moment (applies only to -// non-blocking receive). -// ENOTSUP - function isn't supported by particular socket type. -ZMQ_EXPORT int zmq_recv (void *s, struct zmq_msg_t *msg, int flags); - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/include/zmq.hpp b/include/zmq.hpp deleted file mode 100644 index ffdea7b..0000000 --- a/include/zmq.hpp +++ /dev/null @@ -1,276 +0,0 @@ -/* - Copyright (c) 2007-2009 FastMQ Inc. - - 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 -#include - -namespace zmq -{ - - typedef zmq_free_fn free_fn; - - enum message_type_t - { - message_data = 1 << 0, - message_gap = 1 << ZMQ_GAP, - message_delimiter = 1 << ZMQ_DELIMITER - }; - - // The class masquerades POSIX-style errno error as a C++ exception. - class error_t : public std::exception - { - public: - - error_t () : errnum (errno) {} - - virtual const char *what () const throw () - { - return strerror (errnum); - } - - private: - - int errnum; - }; - - // A message. Caution: Don't change the body of the message once you've - // copied it - the behaviour is undefined. Don't change the body of the - // received message either - other threads may be accessing it in parallel. - - class message_t : private zmq_msg_t - { - friend class socket_t; - - public: - - // Creates message size_ bytes long. - inline message_t (size_t size_ = 0) - { - int rc = zmq_msg_init_size (this, size_); - if (rc != 0) - throw error_t (); - } - - // Creates message from the supplied buffer. 0MQ takes care of - // deallocating the buffer once it is not needed. The deallocation - // function is supplied in ffn_ parameter. If ffn_ is NULL, no - // deallocation happens - this is useful for sending static buffers. - inline message_t (void *data_, size_t size_, - free_fn *ffn_) - { - int rc = zmq_msg_init_data (this, data_, size_, ffn_); - if (rc != 0) - throw error_t (); - } - - // Destroys the message. - inline ~message_t () - { - int rc = zmq_msg_close (this); - if (rc != 0) - throw error_t (); - } - - // Destroys old content of the message and allocates buffer for the - // new message body. Having this as a separate function allows user - // to reuse once-allocated message for multiple times. - 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 (); - } - - // Same as above, however, the message is rebuilt from the supplied - // buffer. See appropriate constructor for discussion of buffer - // deallocation mechanism. - inline void rebuild (void *data_, size_t size_, free_fn *ffn_) - { - int rc = zmq_msg_close (this); - if (rc != 0) - throw error_t (); - rc = zmq_msg_init_data (this, data_, size_, ffn_); - if (rc != 0) - throw error_t (); - } - - // Moves the message content from one message to the another. If the - // destination message have contained data prior to the operation - // these get deallocated. The source message will contain 0 bytes - // of data after the operation. - inline void move_to (message_t *msg_) - { - int rc = zmq_msg_move (this, (zmq_msg_t*) msg_); - if (rc != 0) - throw error_t (); - } - - // Copies the message content from one message to the another. If the - // destination message have contained data prior to the operation - // these get deallocated. - inline void copy_to (message_t *msg_) - { - int rc = zmq_msg_copy (this, (zmq_msg_t*) msg_); - if (rc != 0) - throw error_t (); - } - - // Returns message type. - inline message_type_t type () - { - return (message_type_t) (1 << zmq_msg_type (this)); - } - - // Returns pointer to message's data buffer. - inline void *data () - { - return zmq_msg_data (this); - } - - // Returns the size of message data buffer. - 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_) - { - ptr = zmq_init (app_threads_, io_threads_); - if (ptr == NULL) - throw error_t (); - } - - inline ~context_t () - { - int rc = zmq_term (ptr); - assert (rc == 0); - } - - private: - - void *ptr; - - // Disable copying. - context_t (const context_t&); - void operator = (const context_t&); - }; - - class socket_t - { - public: - - inline socket_t (context_t &context_, int type_ = 0) - { - 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 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 && 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 && errno == EAGAIN) - return false; - throw error_t (); - } - - private: - - void *ptr; - - // Disable copying. - socket_t (const socket_t&); - void operator = (const socket_t&); - }; - -} - -#endif diff --git a/perf/c/Makefile.am b/perf/c/Makefile.am index 6762e66..430a9f2 100644 --- a/perf/c/Makefile.am +++ b/perf/c/Makefile.am @@ -1,6 +1,6 @@ -INCLUDES = -I$(top_builddir)/include +INCLUDES = -I$(top_builddir)/c -bin_PROGRAMS = local_lat remote_lat local_thr remote_thr +noinst_PROGRAMS = local_lat remote_lat local_thr remote_thr local_lat_LDADD = $(top_builddir)/src/libzmq.la local_lat_SOURCES = local_lat.c diff --git a/perf/cpp/Makefile.am b/perf/cpp/Makefile.am index 7870943..1ea01a0 100644 --- a/perf/cpp/Makefile.am +++ b/perf/cpp/Makefile.am @@ -1,6 +1,6 @@ -INCLUDES = -I$(top_builddir)/include +INCLUDES = -I$(top_srcdir)/cpp -I$(top_srcdir)/c -bin_PROGRAMS = local_lat remote_lat local_thr remote_thr +noinst_PROGRAMS = local_lat remote_lat local_thr remote_thr local_lat_LDADD = $(top_builddir)/src/libzmq.la local_lat_SOURCES = local_lat.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 88a6f4b..da442f4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,8 +1,17 @@ lib_LTLIBRARIES = libzmq.la -pkginclude_HEADERS = \ - ../include/zmq.h \ - ../include/zmq.hpp + +if BUILD_CPP +include_HEADERS = ../cpp/zmq.hpp ../c/zmq.h +endif + +if BUILD_C +if BUILD_CPP + +else +include_HEADERS = ../c/zmq.h +endif +endif libzmq_la_SOURCES = \ app_thread.hpp \ diff --git a/src/app_thread.cpp b/src/app_thread.cpp index 847fcc1..bdceca5 100644 --- a/src/app_thread.cpp +++ b/src/app_thread.cpp @@ -19,7 +19,7 @@ #include -#include "../include/zmq.h" +#include "../c/zmq.h" #include "platform.hpp" diff --git a/src/dispatcher.cpp b/src/dispatcher.cpp index 49c2197..530238d 100644 --- a/src/dispatcher.cpp +++ b/src/dispatcher.cpp @@ -17,7 +17,7 @@ along with this program. If not, see . */ -#include "../include/zmq.h" +#include "../c/zmq.h" #include "dispatcher.hpp" #include "app_thread.hpp" diff --git a/src/i_inout.hpp b/src/i_inout.hpp index 89b9fbd..4664b13 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 "../include/zmq.h" +#include "../c/zmq.h" namespace zmq { diff --git a/src/io_thread.cpp b/src/io_thread.cpp index 1d85292..d5de497 100644 --- a/src/io_thread.cpp +++ b/src/io_thread.cpp @@ -17,7 +17,7 @@ along with this program. If not, see . */ -#include "../include/zmq.h" +#include "../c/zmq.h" #include "io_thread.hpp" #include "command.hpp" diff --git a/src/msg_content.hpp b/src/msg_content.hpp index b468746..6c91966 100644 --- a/src/msg_content.hpp +++ b/src/msg_content.hpp @@ -22,7 +22,7 @@ #include -#include "../include/zmq.h" +#include "../c/zmq.h" #include "atomic_counter.hpp" diff --git a/src/pipe.cpp b/src/pipe.cpp index 392d380..a5a18be 100644 --- a/src/pipe.cpp +++ b/src/pipe.cpp @@ -17,7 +17,7 @@ along with this program. If not, see . */ -#include "../include/zmq.h" +#include "../c/zmq.h" #include "pipe.hpp" diff --git a/src/pipe.hpp b/src/pipe.hpp index b4e592a..81316e4 100644 --- a/src/pipe.hpp +++ b/src/pipe.hpp @@ -20,7 +20,7 @@ #ifndef __ZMQ_PIPE_HPP_INCLUDED__ #define __ZMQ_PIPE_HPP_INCLUDED__ -#include "../include/zmq.h" +#include "../c/zmq.h" #include "stdint.hpp" #include "i_endpoint.hpp" diff --git a/src/socket_base.cpp b/src/socket_base.cpp index 93a0a4c..ac5a88c 100644 --- a/src/socket_base.cpp +++ b/src/socket_base.cpp @@ -20,7 +20,7 @@ #include #include -#include "../include/zmq.h" +#include "../c/zmq.h" #include "socket_base.hpp" #include "app_thread.hpp" diff --git a/src/zmq.cpp b/src/zmq.cpp index 0ffd530..ad4839f 100644 --- a/src/zmq.cpp +++ b/src/zmq.cpp @@ -17,7 +17,7 @@ along with this program. If not, see . */ -#include "../include/zmq.h" +#include "../c/zmq.h" #include #include diff --git a/src/zmq_decoder.hpp b/src/zmq_decoder.hpp index 212e68e..16b5312 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 "../include/zmq.h" +#include "../c/zmq.h" #include "decoder.hpp" diff --git a/src/zmq_encoder.hpp b/src/zmq_encoder.hpp index 29563fc..55826a5 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 "../include/zmq.h" +#include "../c/zmq.h" #include "encoder.hpp" -- cgit v1.2.3