diff --git a/src/common/ConcurrentQueue.h b/src/common/ConcurrentQueue.h index 8719abe8..4c58a64c 100644 --- a/src/common/ConcurrentQueue.h +++ b/src/common/ConcurrentQueue.h @@ -79,7 +79,6 @@ class ConcurrentQueue (ownerName.empty() ? "" : ownerName.c_str()), maxEntries-pushSemaphore.getCount()); if (!popSemaphore.wait()) { - DPRINTF_INFO("(%s) failed to pop element, program is being shut down?", ownerName.c_str()); return false; } @@ -102,11 +101,9 @@ class ConcurrentQueue // of the timeout has been reached, res will be set to NULL and false will be returned inline bool pop(long timeout_ms, T *res) { - DPRINTF_DEBUG( "(%s) trying to pop element (%d elements in queue)", ownerName.c_str(), count); // try to get an item from the queue if(!popSemaphore.wait(timeout_ms)) { // timeout occured - DPRINTF_DEBUG( "(%s) timeout", ownerName.c_str()); return false; } @@ -129,8 +126,6 @@ class ConcurrentQueue // use this instead of the above, makes things easier! inline bool popAbs(const struct timespec& timeout, T *res) { - DPRINTF_DEBUG( "(%s) trying to pop element (%d elements in queue)", ownerName.c_str(), count); - if (popSemaphore.waitAbs(timeout)) { // popSemaphore.wait() succeeded, now pop the frontmost element lock.lock(); @@ -148,7 +143,6 @@ class ConcurrentQueue } else { // timeout occured - DPRINTF_DEBUG( "(%s) timeout or program shutdown", ownerName.c_str()); *res = 0; return false; diff --git a/src/common/TimeoutSemaphore.h b/src/common/TimeoutSemaphore.h index 6e530870..e0ebd8f8 100644 --- a/src/common/TimeoutSemaphore.h +++ b/src/common/TimeoutSemaphore.h @@ -106,8 +106,6 @@ class TimeoutSemaphore return false; break; default: - // semaphore could not be aquired because of several reasons, but none are fatal - DPRINTF_DEBUG( "timedwait (<0) returned with %d (%s)", errno, strerror(errno)); return false; } } @@ -120,7 +118,6 @@ class TimeoutSemaphore retval = sem_timedwait(sem, &timeout); #endif if (retval != 0 && errno != ETIMEDOUT) { - DPRINTF_DEBUG( "timedwait (>=0) returned with %d: %s", errno, strerror(errno)); switch (errno) { case EINVAL: /* @@ -141,8 +138,7 @@ class TimeoutSemaphore return false; break; default: - // semaphore could not be aquired because of several reasons, but none are fatal - DPRINTF_DEBUG( "timedwait (>=0) returned with %d", errno); + break; } } if (errno == ETIMEDOUT) { @@ -201,9 +197,6 @@ class TimeoutSemaphore return false; break; default: - // semaphore not acquired for non-fatal reasons - DPRINTF_DEBUG( "timedwait returned with %s", - strerror(errno)); return false; } } diff --git a/src/core/ConnectionQueue.h b/src/core/ConnectionQueue.h index 44a8cfd0..7797feb3 100644 --- a/src/core/ConnectionQueue.h +++ b/src/core/ConnectionQueue.h @@ -239,12 +239,10 @@ class ConnectionQueue : public Adapter, public Timer struct timespec nexttimeout; if (!processTimeouts(nexttimeout)) { if (!queue.pop(&element)) { - DPRINTF_INFO("queue.pop failed - timeout?"); continue; } } else { if (!queue.popAbs(nexttimeout, &element)) { - DPRINTF_INFO("queue.pop failed - timeout?"); continue; } } diff --git a/src/modules/ipfix/aggregator/BaseAggregator.cpp b/src/modules/ipfix/aggregator/BaseAggregator.cpp index d2229342..59550477 100644 --- a/src/modules/ipfix/aggregator/BaseAggregator.cpp +++ b/src/modules/ipfix/aggregator/BaseAggregator.cpp @@ -171,15 +171,12 @@ void BaseAggregator::exporterThread() } gettimeofday(&curtime, 0); - DPRINTF_DEBUG("Aggregator: starting Export"); for (size_t i = 0; i < rules->count; i++) { rules->rule[i]->hashtable->expireFlows(); } struct timeval endtime; gettimeofday(&endtime, 0); timeval_subtract(&difftime, &endtime, &curtime); - - DPRINTF_DEBUG("Aggregator: export took %.03f secs", (float)difftime.tv_usec/1000000+difftime.tv_sec); } if (getShutdownProperly()) {