Pre-compiled devices removed

Along with the devices, xmlParser which is no longer needed
is removed.
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>

MAINTAINERS

@@ -34,10 +34,6 @@ Component: Multiplexing (zmq_poll)
 Maintainer: Martin Sustrik
 Contact: sustrik@250bpm.com
 
-Component: Devices
-Maintainer: Martin Sustrik
-Contact: sustrik@250bpm.com
-
 Component: Generic Infrastructure (context, mailbox, command, pipe)
 Maintainer: Martin Sustrik
 Contact: sustrik@250bpm.com

Makefile.am

 ACLOCAL_AMFLAGS = -I config
 
-SUBDIRS = src doc perf devices tests
-DIST_SUBDIRS = src doc perf devices tests builds/msvc
+SUBDIRS = src doc perf tests
+DIST_SUBDIRS = src doc perf tests builds/msvc
 
 EXTRA_DIST = \
 	autogen.sh	\
 	version.sh	\
 	MAINTAINERS	\
-	foreign/openpgm/@pgm_basename@.tar.gz	\
-	foreign/xmlParser/xmlParser.cpp		\
-	foreign/xmlParser/xmlParser.hpp
+	foreign/openpgm/@pgm_basename@.tar.gz
 MAINTAINERCLEANFILES = \
 	$(srcdir)/aclocal.m4		\
 	$(srcdir)/autom4te.cache	\

configure.in

@@ -424,8 +424,6 @@ AC_SUBST(LIBZMQ_EXTRA_LDFLAGS)
 
 AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile
     perf/Makefile src/libzmq.pc \
-    devices/Makefile devices/zmq_forwarder/Makefile \
-    devices/zmq_streamer/Makefile devices/zmq_queue/Makefile \
     builds/msvc/Makefile tests/Makefile])
 AC_OUTPUT
 

devices/Makefile.am

-
-SUBDIRS = zmq_forwarder zmq_streamer zmq_queue
-DIST_SUBDIRS = zmq_forwarder zmq_streamer zmq_queue

devices/zmq_forwarder/Makefile.am

-INCLUDES = -I$(top_srcdir)/include
-
-bin_PROGRAMS = zmq_forwarder
-
-zmq_forwarder_LDADD = $(top_builddir)/src/libzmq.la
-zmq_forwarder_SOURCES = zmq_forwarder.cpp
-
-

devices/zmq_forwarder/zmq_forwarder.cpp

-/*
-    Copyright (c) 2007-2011 iMatix Corporation
-    Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
-
-    This file is part of 0MQ.
-
-    0MQ is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser 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
-    GNU Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "../../include/zmq.hpp"
-#include "../../foreign/xmlParser/xmlParser.cpp"
-
-int main (int argc, char *argv [])
-{
-    if (argc != 2) {
-        fprintf (stderr, "usage: zmq_forwarder <config-file>\n");
-        return 1;
-    }
-
-    XMLNode root = XMLNode::parseFile (argv [1]);
-    if (root.isEmpty ()) {
-        fprintf (stderr, "configuration file not found or not an XML file\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);
-    zmq::socket_t in_socket (ctx, ZMQ_SUB);
-    in_socket.setsockopt (ZMQ_SUBSCRIBE, "", 0);
-    zmq::socket_t out_socket (ctx, ZMQ_PUB);
-
-    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++;
-    }
-
-    try {
-        zmq::device (ZMQ_FORWARDER, in_socket, out_socket);
-    } catch (zmq::error_t& e) {
-        fprintf(stderr, "device exit: %s\n", e.what());
-    }
-
-    return 0;
-}

devices/zmq_queue/Makefile.am

-INCLUDES = -I$(top_srcdir)/include
-
-bin_PROGRAMS = zmq_queue
-
-zmq_queue_LDADD = $(top_builddir)/src/libzmq.la
-zmq_queue_SOURCES = zmq_queue.cpp
-
-

devices/zmq_queue/zmq_queue.cpp

-/*
-    Copyright (c) 2007-2011 iMatix Corporation
-    Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
-
-    This file is part of 0MQ.
-
-    0MQ is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser 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
-    GNU Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "../../include/zmq.hpp"
-#include "../../foreign/xmlParser/xmlParser.cpp"
-
-int main (int argc, char *argv [])
-{
-    if (argc != 2) {
-        fprintf (stderr, "usage: zmq_queue <config-file>\n");
-        return 1;
-    }
-
-    XMLNode root = XMLNode::parseFile (argv [1]);
-    if (root.isEmpty ()) {
-        fprintf (stderr, "configuration file not found or not an XML file\n");
-        return 1;
-    }
-
-    if (strcmp (root.getName (), "queue") != 0) {
-        fprintf (stderr, "root element in the configuration file should be "
-            "named 'queue'\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);
-    zmq::socket_t in_socket (ctx, ZMQ_XREP);
-    zmq::socket_t out_socket (ctx, ZMQ_XREQ);
-
-    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++;
-    }
-
-    try {
-        zmq::device (ZMQ_QUEUE, in_socket, out_socket);
-    } catch (zmq::error_t& e) {
-        fprintf(stderr, "device exit: %s\n", e.what());
-    }
-
-    return 0;
-}

devices/zmq_streamer/Makefile.am

-INCLUDES = -I$(top_srcdir)/include
-
-bin_PROGRAMS = zmq_streamer
-
-zmq_streamer_LDADD = $(top_builddir)/src/libzmq.la
-zmq_streamer_SOURCES = zmq_streamer.cpp
-
-

devices/zmq_streamer/zmq_streamer.cpp

-/*
-    Copyright (c) 2007-2011 iMatix Corporation
-    Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
-
-    This file is part of 0MQ.
-
-    0MQ is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser 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
-    GNU Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "../../include/zmq.hpp"
-#include "../../foreign/xmlParser/xmlParser.cpp"
-
-int main (int argc, char *argv [])
-{
-    if (argc != 2) {
-        fprintf (stderr, "usage: zmq_streamer <config-file>\n");
-        return 1;
-    }
-
-    XMLNode root = XMLNode::parseFile (argv [1]);
-    if (root.isEmpty ()) {
-        fprintf (stderr, "configuration file not found or not an XML file\n");
-        return 1;
-    }
-
-    if (strcmp (root.getName (), "streamer") != 0) {
-        fprintf (stderr, "root element in the configuration file should be "
-            "named 'streamer'\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);
-    zmq::socket_t in_socket (ctx, ZMQ_PULL);
-    zmq::socket_t out_socket (ctx, ZMQ_PUSH);
-
-    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++;
-    }
-
-    try {
-        zmq::device (ZMQ_STREAMER, in_socket, out_socket);
-    } catch (zmq::error_t& e) {
-        fprintf(stderr, "device exit: %s\n", e.what());
-    }
-
-    return 0;
-}

doc/Makefile.am

-MAN1 = zmq_forwarder.1 zmq_streamer.1 zmq_queue.1
 MAN3 = zmq_bind.3 zmq_close.3 zmq_connect.3 zmq_init.3 \
     zmq_msg_close.3 zmq_msg_copy.3 zmq_msg_data.3 zmq_msg_init.3 \
     zmq_msg_init_data.3 zmq_msg_init_size.3 zmq_msg_move.3 zmq_msg_size.3 \
@@ -8,8 +7,7 @@ MAN7 = zmq.7 zmq_tcp.7 zmq_pgm.7 zmq_epgm.7 zmq_inproc.7 zmq_ipc.7 \
     zmq_cpp.7
 MAN_DOC = $(MAN1) $(MAN3) $(MAN7)
 
-MAN_TXT = $(MAN1:%.1=%.txt)
-MAN_TXT += $(MAN3:%.3=%.txt)
+MAN_TXT = $(MAN3:%.3=%.txt)
 MAN_TXT += $(MAN7:%.7=%.txt)
 MAN_HTML = $(MAN_TXT:%.txt=%.html)
 
@@ -27,7 +25,7 @@ MAINTAINERCLEANFILES = $(MAN_DOC) $(MAN_HTML)
 dist-hook : $(MAN_DOC) $(MAN_HTML)
 
 if BUILD_DOC
-SUFFIXES=.html .txt .xml .1 .3 .7
+SUFFIXES=.html .txt .xml .3 .7
 
 .txt.html:
 	asciidoc -d manpage -b xhtml11 -f asciidoc.conf \

doc/zmq_forwarder.txt

-zmq_forwarder(1)
-================
-
-
-NAME
-----
-zmq_forwarder - forwarding device for publish-subscribe messaging
-
-
-SYNOPSIS
---------
-To be written.
-
-
-DESCRIPTION
------------
-To be written.
-
-
-OPTIONS
--------
-To be written.
-
-
-SEE ALSO
---------
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-The 0MQ documentation was written by Martin Sustrik <sustrik@250bpm.com> and
-Martin Lucina <mato@kotelna.sk>.

doc/zmq_queue.txt

-zmq_queue(1)
-============
-
-
-NAME
-----
-zmq_queue - forwarding device for request-reply messaging
-
-
-SYNOPSIS
---------
-To be written.
-
-
-DESCRIPTION
------------
-To be written.
-
-
-OPTIONS
--------
-To be written.
-
-
-SEE ALSO
---------
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-The 0MQ documentation was written by Martin Sustrik <sustrik@250bpm.com> and
-Martin Lucina <mato@kotelna.sk>.

doc/zmq_streamer.txt

-zmq_streamer(1)
-===============
-
-
-NAME
-----
-zmq_streamer - streamer device for parallelized pipeline messaging
-
-
-SYNOPSIS
---------
-To be written.
-
-
-DESCRIPTION
------------
-To be written.
-
-
-OPTIONS
--------
-To be written.
-
-
-SEE ALSO
---------
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-The 0MQ documentation was written by Martin Sustrik <sustrik@250bpm.com> and
-Martin Lucina <mato@kotelna.sk>.