From 35e82b460549e227f6c3409be32d2c657955628c Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Tue, 15 Sep 2009 09:45:32 +0200 Subject: forwarder renamed to zmq_forwarder --- configure.in | 2 +- devices/Makefile.am | 4 +- devices/forwarder/Makefile.am | 9 --- devices/forwarder/forwarder.cpp | 122 -------------------------------- devices/zmq_forwarder/Makefile.am | 9 +++ devices/zmq_forwarder/zmq_forwarder.cpp | 122 ++++++++++++++++++++++++++++++++ 6 files changed, 134 insertions(+), 134 deletions(-) delete mode 100644 devices/forwarder/Makefile.am delete mode 100644 devices/forwarder/forwarder.cpp create mode 100644 devices/zmq_forwarder/Makefile.am create mode 100644 devices/zmq_forwarder/zmq_forwarder.cpp diff --git a/configure.in b/configure.in index dd6d7ea..dd9f0b6 100644 --- a/configure.in +++ b/configure.in @@ -491,7 +491,7 @@ AC_CHECK_FUNCS(perror gettimeofday memset socket getifaddrs freeifaddrs) AC_OUTPUT(Makefile src/Makefile python/Makefile python/setup.py ruby/Makefile \ java/Makefile perf/Makefile perf/c/Makefile perf/cpp/Makefile \ perf/python/Makefile perf/ruby/Makefile perf/java/Makefile src/libzmq.pc \ - devices/Makefile devices/forwarder/Makefile) + devices/Makefile devices/zmq_forwarder/Makefile) AC_MSG_RESULT([]) AC_MSG_RESULT([ ******************************************************** ]) diff --git a/devices/Makefile.am b/devices/Makefile.am index b5bbd37..4cbad14 100644 --- a/devices/Makefile.am +++ b/devices/Makefile.am @@ -1,6 +1,6 @@ if BUILD_FORWARDER -FORWARDER_DIR = forwarder +FORWARDER_DIR = zmq_forwarder endif SUBDIRS = $(FORWARDER_DIR) -DIST_SUBDIRS = forwarder +DIST_SUBDIRS = zmq_forwarder diff --git a/devices/forwarder/Makefile.am b/devices/forwarder/Makefile.am deleted file mode 100644 index 63230c4..0000000 --- a/devices/forwarder/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -INCLUDES = -I$(top_builddir)/c -I$(top_builddir)/cpp - -bin_PROGRAMS = forwarder - -forwarder_LDADD = $(top_builddir)/src/libzmq.la -forwarder_SOURCES = forwarder.cpp -forwarder_CXXFLAGS = -Wall -pedantic -Werror - - diff --git a/devices/forwarder/forwarder.cpp b/devices/forwarder/forwarder.cpp deleted file mode 100644 index 8acbc85..0000000 --- a/devices/forwarder/forwarder.cpp +++ /dev/null @@ -1,122 +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 . -*/ - -#include "../../cpp/zmq.hpp" -#include "../../foreign/xmlParser/xmlParser.cpp" - -int main (int argc, char *argv []) -{ - if (argc != 2) { - fprintf (stderr, "usage: forwarder \n"); - return 1; - } - - XMLNode root = XMLNode::parseFile (argv [1]); - if (root.isEmpty ()) { - fprintf (stderr, "configuration file not found\n"); - return 1; - } - - if (strcmp (root.getName (), "forwarder") != 0) { - fprintf (stderr, "root element in the configuration file should be " - "named 'forwarder'\n"); - return 1; - } - - XMLNode in_node = root.getChildNode ("in"); - if (in_node.isEmpty ()) { - fprintf (stderr, "'in' node is missing in the configuration file\n"); - return 1; - } - - XMLNode out_node = root.getChildNode ("out"); - if (out_node.isEmpty ()) { - fprintf (stderr, "'out' node is missing in the configuration file\n"); - return 1; - } - - // TODO: make the number of I/O threads configurable. - zmq::context_t ctx (1, 1); - zmq::socket_t in_socket (ctx, ZMQ_P2P); - zmq::socket_t out_socket (ctx, ZMQ_P2P); - - int n = 0; - while (true) { - XMLNode bind = in_node.getChildNode ("bind", n); - if (bind.isEmpty ()) - break; - const char *addr = bind.getAttribute ("addr"); - if (!addr) { - fprintf (stderr, "'bind' node is missing 'addr' attribute\n"); - return 1; - } - in_socket.bind (addr); - n++; - } - - n = 0; - while (true) { - XMLNode connect = in_node.getChildNode ("connect", n); - if (connect.isEmpty ()) - break; - const char *addr = connect.getAttribute ("addr"); - if (!addr) { - fprintf (stderr, "'connect' node is missing 'addr' attribute\n"); - return 1; - } - in_socket.connect (addr); - n++; - } - - n = 0; - while (true) { - XMLNode bind = out_node.getChildNode ("bind", n); - if (bind.isEmpty ()) - break; - const char *addr = bind.getAttribute ("addr"); - if (!addr) { - fprintf (stderr, "'bind' node is missing 'addr' attribute\n"); - return 1; - } - out_socket.bind (addr); - n++; - } - - n = 0; - while (true) { - XMLNode connect = out_node.getChildNode ("connect", n); - if (connect.isEmpty ()) - break; - const char *addr = connect.getAttribute ("addr"); - if (!addr) { - fprintf (stderr, "'connect' node is missing 'addr' attribute\n"); - return 1; - } - out_socket.connect (addr); - n++; - } - - zmq::message_t msg; - while (true) { - in_socket.recv (&msg); - out_socket.send (msg); - } - - return 0; -} diff --git a/devices/zmq_forwarder/Makefile.am b/devices/zmq_forwarder/Makefile.am new file mode 100644 index 0000000..892b7fe --- /dev/null +++ b/devices/zmq_forwarder/Makefile.am @@ -0,0 +1,9 @@ +INCLUDES = -I$(top_builddir)/c -I$(top_builddir)/cpp + +bin_PROGRAMS = zmq_forwarder + +zmq_forwarder_LDADD = $(top_builddir)/src/libzmq.la +zmq_forwarder_SOURCES = zmq_forwarder.cpp +zmq_forwarder_CXXFLAGS = -Wall -pedantic -Werror + + diff --git a/devices/zmq_forwarder/zmq_forwarder.cpp b/devices/zmq_forwarder/zmq_forwarder.cpp new file mode 100644 index 0000000..8acbc85 --- /dev/null +++ b/devices/zmq_forwarder/zmq_forwarder.cpp @@ -0,0 +1,122 @@ +/* + 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 . +*/ + +#include "../../cpp/zmq.hpp" +#include "../../foreign/xmlParser/xmlParser.cpp" + +int main (int argc, char *argv []) +{ + if (argc != 2) { + fprintf (stderr, "usage: forwarder \n"); + return 1; + } + + XMLNode root = XMLNode::parseFile (argv [1]); + if (root.isEmpty ()) { + fprintf (stderr, "configuration file not found\n"); + return 1; + } + + if (strcmp (root.getName (), "forwarder") != 0) { + fprintf (stderr, "root element in the configuration file should be " + "named 'forwarder'\n"); + return 1; + } + + XMLNode in_node = root.getChildNode ("in"); + if (in_node.isEmpty ()) { + fprintf (stderr, "'in' node is missing in the configuration file\n"); + return 1; + } + + XMLNode out_node = root.getChildNode ("out"); + if (out_node.isEmpty ()) { + fprintf (stderr, "'out' node is missing in the configuration file\n"); + return 1; + } + + // TODO: make the number of I/O threads configurable. + zmq::context_t ctx (1, 1); + zmq::socket_t in_socket (ctx, ZMQ_P2P); + zmq::socket_t out_socket (ctx, ZMQ_P2P); + + int n = 0; + while (true) { + XMLNode bind = in_node.getChildNode ("bind", n); + if (bind.isEmpty ()) + break; + const char *addr = bind.getAttribute ("addr"); + if (!addr) { + fprintf (stderr, "'bind' node is missing 'addr' attribute\n"); + return 1; + } + in_socket.bind (addr); + n++; + } + + n = 0; + while (true) { + XMLNode connect = in_node.getChildNode ("connect", n); + if (connect.isEmpty ()) + break; + const char *addr = connect.getAttribute ("addr"); + if (!addr) { + fprintf (stderr, "'connect' node is missing 'addr' attribute\n"); + return 1; + } + in_socket.connect (addr); + n++; + } + + n = 0; + while (true) { + XMLNode bind = out_node.getChildNode ("bind", n); + if (bind.isEmpty ()) + break; + const char *addr = bind.getAttribute ("addr"); + if (!addr) { + fprintf (stderr, "'bind' node is missing 'addr' attribute\n"); + return 1; + } + out_socket.bind (addr); + n++; + } + + n = 0; + while (true) { + XMLNode connect = out_node.getChildNode ("connect", n); + if (connect.isEmpty ()) + break; + const char *addr = connect.getAttribute ("addr"); + if (!addr) { + fprintf (stderr, "'connect' node is missing 'addr' attribute\n"); + return 1; + } + out_socket.connect (addr); + n++; + } + + zmq::message_t msg; + while (true) { + in_socket.recv (&msg); + out_socket.send (msg); + } + + return 0; +} -- cgit v1.2.3