[Commit-gnuradio] [gnuradio] 28/46: zeromq: removed stray debug code and cleanup

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 4f43490a99e41dce2cf8a5a34e154d08889bcb52
Author: Johnathan Corgan <address@hidden>
Date:   Wed May 7 13:03:43 2014 -0700

    zeromq: removed stray debug code and cleanup
---
 gr-zeromq/lib/pull_source_impl.cc | 26 ++++++++++++--------------
 gr-zeromq/lib/push_sink_impl.cc   |  2 --
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/gr-zeromq/lib/pull_source_impl.cc 
b/gr-zeromq/lib/pull_source_impl.cc
index b29a056..8d90b0e 100644
--- a/gr-zeromq/lib/pull_source_impl.cc
+++ b/gr-zeromq/lib/pull_source_impl.cc
@@ -71,22 +71,20 @@ namespace gr {
       //  If we got a reply, process
       if (items[0].revents & ZMQ_POLLIN) {
 
-           // Receive data
-           zmq::message_t msg;
-        std::cout << "pull before" << std::endl;
-           d_socket->recv(&msg);
-        std::cout << "pull after" << std::endl;
-           // Copy to ouput buffer and return
-           if (msg.size() >= d_itemsize*d_vlen*noutput_items) {
-             memcpy(out, (void *)msg.data(), d_itemsize*d_vlen*noutput_items);
+        // Receive data
+        zmq::message_t msg;
+        d_socket->recv(&msg);
+        // Copy to ouput buffer and return
+        if (msg.size() >= d_itemsize*d_vlen*noutput_items) {
+          memcpy(out, (void *)msg.data(), d_itemsize*d_vlen*noutput_items);
 
-             return noutput_items;
-           }
-           else {
-             memcpy(out, (void *)msg.data(), msg.size());
+          return noutput_items;
+        }
+        else {
+          memcpy(out, (void *)msg.data(), msg.size());
 
-             return msg.size()/(d_itemsize*d_vlen);
-           }
+          return msg.size()/(d_itemsize*d_vlen);
+        }
       }
       else {
        return 0; // FIXME: someday when the scheduler does all the poll/selects
diff --git a/gr-zeromq/lib/push_sink_impl.cc b/gr-zeromq/lib/push_sink_impl.cc
index 1438e52..11a4967 100644
--- a/gr-zeromq/lib/push_sink_impl.cc
+++ b/gr-zeromq/lib/push_sink_impl.cc
@@ -65,9 +65,7 @@ namespace gr {
       // create message copy and send
       zmq::message_t msg(d_itemsize*d_vlen*noutput_items);
       memcpy((void *)msg.data(), in, d_itemsize*d_vlen*noutput_items);
-      std::cout << "before" << std::endl;
       d_socket->send(msg, d_blocking ? 0 : ZMQ_NOBLOCK);
-      std::cout << "after" << std::endl;
       return noutput_items;
     }