debug code removed from PGM engines

1 files changed, 8 insertions, 84 deletions

diff --git a/src/pgm_socket.cpp b/src/pgm_socket.cpp
index 60712f4..3b67b76 100644
--- a/src/pgm_socket.cpp
+++ b/src/pgm_socket.cpp
@@ -41,20 +41,6 @@
 #include "err.hpp"
 #include "uuid.hpp"
 
-//#define PGM_SOCKET_DEBUG
-//#define PGM_SOCKET_DEBUG_LEVEL 4
-
-// level 1 = key behaviour
-// level 2 = processing flow
-// level 4 = infos
-
-#ifndef PGM_SOCKET_DEBUG
-#   define zmq_log(n, ...)  while (0)
-#else
-#   define zmq_log(n, ...)    do { if ((n) <= PGM_SOCKET_DEBUG_LEVEL) \
-        { printf (__VA_ARGS__);}} while (0)
-#endif
-
 zmq::pgm_socket_t::pgm_socket_t (bool receiver_, const options_t &options_) :
     transport (NULL),
     options (options_),
@@ -91,10 +77,6 @@ int zmq::pgm_socket_t::init (bool udp_encapsulation_, const char *network_)
     memset (network, '\0', sizeof (network));
     memcpy (network, network_, port_delim - network_);
 
-    zmq_log (1, "parsed: network  %s, port %i, udp encaps. %s, %s(%i)\n", 
-        network, port_number, udp_encapsulation ? "yes" : "no",
-        __FILE__, __LINE__);
-
     //  Open PGM transport.
     int rc = open_transport ();
     if (rc != 0)
@@ -105,20 +87,13 @@ int zmq::pgm_socket_t::init (bool udp_encapsulation_, const char *network_)
     if (receiver) {
         pgm_msgv_len = get_max_apdu_at_once (in_batch_size);
         pgm_msgv = new pgm_msgv_t [pgm_msgv_len];
-        zmq_log (1, "PGM transport: pgm_msgv_len %i, %s(%i)\n", 
-            (int) pgm_msgv_len, __FILE__, __LINE__);
     }
 
     return 0;
 }
 
-int zmq::pgm_socket_t::open_transport (void)
+int zmq::pgm_socket_t::open_transport ()
 {
-
-    zmq_log (1, "Opening PGM: network  %s, port %i, udp encaps. %s, %s(%i)\n",
-        network, port_number, udp_encapsulation ? "yes" : "no", 
-        __FILE__, __LINE__);
-
     //  Can not open transport before destroying old one. 
     zmq_assert (transport == NULL);
 
@@ -193,8 +168,6 @@ int zmq::pgm_socket_t::open_transport (void)
 
     pgm_if_free_transport_info (res);
 
-    zmq_log (1, "PGM transport created, %s(%i)\n", __FILE__, __LINE__);
-
     //  Common parameters for receiver and sender.
 
     //  Set maximum transport protocol data unit size (TPDU).
@@ -211,13 +184,11 @@ int zmq::pgm_socket_t::open_transport (void)
         return -1;
     }
 
-#ifdef ZMQ_HAVE_OPENPGM2
     //  Set nonblocking send/recv sockets.
     if (!pgm_transport_set_nonblocking (transport, true)) {
         errno = EINVAL;
         return -1;
     }
-#endif
 
     if (receiver) {
 
@@ -338,8 +309,6 @@ int zmq::pgm_socket_t::open_transport (void)
         return -1;
     }
 
-    zmq_log (1, "PGM transport bound, %s(%i)\n", __FILE__, __LINE__);
-
     return 0;
 }
 
@@ -354,7 +323,7 @@ zmq::pgm_socket_t::~pgm_socket_t ()
         close_transport ();
 }
 
-void zmq::pgm_socket_t::close_transport (void)
+void zmq::pgm_socket_t::close_transport ()
 {   
     //  transport has to be valid.
     zmq_assert (transport);
@@ -366,7 +335,7 @@ void zmq::pgm_socket_t::close_transport (void)
 
 //   Get receiver fds. recv_fd is from transport->recv_sock
 //   waiting_pipe_fd is from transport->waiting_pipe [0]
-int zmq::pgm_socket_t::get_receiver_fds (int *receive_fd_, 
+void zmq::pgm_socket_t::get_receiver_fds (int *receive_fd_, 
     int *waiting_pipe_fd_)
 {
     zmq_assert (receive_fd_);
@@ -382,15 +351,13 @@ int zmq::pgm_socket_t::get_receiver_fds (int *receive_fd_,
     //  Take FDs directly from transport.
     *receive_fd_ = pgm_transport_get_recv_fd (transport);
     *waiting_pipe_fd_ = pgm_transport_get_pending_fd (transport);
-
-    return pgm_receiver_fd_count;
 }
 
 //  Get fds and store them into user allocated memory. 
 //  sender_fd is from pgm_transport->send_sock.
 //  receive_fd_ is from  transport->recv_sock.
 //  rdata_notify_fd_ is from transport->rdata_notify (PGM2 only).
-int zmq::pgm_socket_t::get_sender_fds (int *send_fd_, int *receive_fd_, 
+void zmq::pgm_socket_t::get_sender_fds (int *send_fd_, int *receive_fd_, 
     int *rdata_notify_fd_)
 {
     zmq_assert (send_fd_);
@@ -409,8 +376,6 @@ int zmq::pgm_socket_t::get_sender_fds (int *send_fd_, int *receive_fd_,
     *receive_fd_ = pgm_transport_get_recv_fd (transport);
     *rdata_notify_fd_ = pgm_transport_get_repair_fd (transport);
     *send_fd_ = pgm_transport_get_send_fd (transport);
-
-    return pgm_sender_fd_count;
 }
 
 //  Send one APDU, transmit window owned memory.
@@ -421,28 +386,19 @@ size_t zmq::pgm_socket_t::send (unsigned char *data_, size_t data_len_)
     PGMIOStatus status = pgm_send (transport, data_, data_len_, &nbytes);
 
     if (nbytes != data_len_) {
-        zmq_log (1, "status %i, data_len %i, wrote %iB, %s(%i)\n", 
-            (int) status, (int) data_len_, (int) nbytes, __FILE__, __LINE__);
-
         zmq_assert (status == PGM_IO_STATUS_RATE_LIMITED);
         zmq_assert (nbytes == 0);
     }
-
-    zmq_log (4, "wrote %i/%iB, %s(%i)\n", (int) nbytes, (int) data_len_,
-        __FILE__, __LINE__);
     
     // We have to write all data as one packet.
-    if (nbytes > 0) {
-        zmq_log (1, "data sent %iB, %s(%i)\n", (int) nbytes, 
-            __FILE__, __LINE__);
+    if (nbytes > 0)
         zmq_assert ((ssize_t) nbytes == (ssize_t) data_len_);
-    }
 
     return nbytes;
 }
 
 //  Return max TSDU size without fragmentation from current PGM transport.
-size_t zmq::pgm_socket_t::get_max_tsdu_size (void)
+size_t zmq::pgm_socket_t::get_max_tsdu_size ()
 {
     return (size_t)pgm_transport_max_tsdu (transport, false);
 }
@@ -494,7 +450,6 @@ void zmq::pgm_socket_t::free_buffer (void *data_)
 //  returned.
 ssize_t zmq::pgm_socket_t::receive (void **raw_data_, const pgm_tsi_t **tsi_)
 {
-
     size_t raw_data_len = 0;
 
     //  We just sent all data from pgm_transport_recvmsgv up 
@@ -505,7 +460,6 @@ ssize_t zmq::pgm_socket_t::receive (void **raw_data_, const pgm_tsi_t **tsi_)
         nbytes_rec = 0;
         nbytes_processed = 0;
         pgm_msgv_processed = 0;
-
         return 0;
     }
 
@@ -525,11 +479,6 @@ ssize_t zmq::pgm_socket_t::receive (void **raw_data_, const pgm_tsi_t **tsi_)
         const PGMIOStatus status = pgm_recvmsgv (transport, pgm_msgv,
             pgm_msgv_len, MSG_DONTWAIT, &nbytes_rec, &pgm_error);
      
-        if (nbytes_rec > 0) {
-            zmq_log (1, "PGMIOStatus %i, nbytes_rec %i, %s(%i).\n", 
-                status, (int) nbytes_rec, __FILE__, __LINE__);
-        }
-
         //  In a case when no ODATA/RDATA fired POLLIN event (SPM...)
         //  pgm_recvmsg returns ?.
         if (status == PGM_IO_STATUS_TIMER_PENDING) {
@@ -545,17 +494,10 @@ ssize_t zmq::pgm_socket_t::receive (void **raw_data_, const pgm_tsi_t **tsi_)
         //  Data loss.
         if (status == PGM_IO_STATUS_RESET) {
 
-            zmq_log (1, "PGMIOStatus %i, nbytes_rec %i, %s(%i).\n", 
-                status, (int) nbytes_rec, __FILE__, __LINE__);
-
             pgm_peer_t* peer = (pgm_peer_t*) transport->peers_pending->data;
 
             //  Save lost data TSI.
             *tsi_ = &peer->tsi;
-
-            zmq_log (1, "Data loss detected %s, %s(%i)\n", pgm_tsi_print (&peer->tsi),
-                __FILE__, __LINE__);
-
             nbytes_rec = 0;
 
             //  In case of dala loss -1 is returned.
@@ -563,18 +505,7 @@ ssize_t zmq::pgm_socket_t::receive (void **raw_data_, const pgm_tsi_t **tsi_)
         }
 
         //  Catch the rest of the errors. 
-        if (status != PGM_IO_STATUS_NORMAL) {
-            zmq_log (1, "PGMIOStatus %i, nbytes_rec %i, %s(%i).\n", 
-                status, (int) nbytes_rec, __FILE__, __LINE__);
-
-            zmq_assert (false);
-
-            nbytes_rec = 0;
-            return -1;
-        }
-
-        zmq_log (4, "received %i bytes\n", (int)nbytes_rec);
-
+        zmq_assert (status == PGM_IO_STATUS_NORMAL);
     }
 
     zmq_assert (nbytes_rec > 0);
@@ -596,15 +527,11 @@ ssize_t zmq::pgm_socket_t::receive (void **raw_data_, const pgm_tsi_t **tsi_)
     pgm_msgv_processed++;
     nbytes_processed +=raw_data_len;
 
-    zmq_log (4, "sendig up %i bytes\n", (int)raw_data_len);
-
     return raw_data_len;
 }
 
-void zmq::pgm_socket_t::process_upstream (void)
+void zmq::pgm_socket_t::process_upstream ()
 {
-    zmq_log (1, "On upstream packet, %s(%i)\n", __FILE__, __LINE__);
-
     pgm_msgv_t dummy_msg;
 
     size_t dummy_bytes = 0;
@@ -613,9 +540,6 @@ void zmq::pgm_socket_t::process_upstream (void)
     PGMIOStatus status = pgm_recvmsgv (transport, &dummy_msg,
         1, MSG_DONTWAIT, &dummy_bytes, &pgm_error);
 
-    zmq_log (1, "upstream status %i, nbytes %i, %s(%i)\n",
-        (int) status, (int) dummy_bytes, __FILE__, __LINE__);
-
     //  No data should be returned.
     zmq_assert (dummy_bytes == 0 && (status == PGM_IO_STATUS_TIMER_PENDING || 
         status == PGM_IO_STATUS_RATE_LIMITED));