Dropped a line of configuration.
authorsapanb <sapanb@8c455092-636d-4788-adf5-e71def0336e8>
Fri, 8 Jul 2011 18:14:39 +0000 (18:14 +0000)
committersapanb <sapanb@8c455092-636d-4788-adf5-e71def0336e8>
Fri, 8 Jul 2011 18:14:39 +0000 (18:14 +0000)
git-svn-id: http://svn.planet-lab.org/svn/fprobe-ulog/trunk@18795 8c455092-636d-4788-adf5-e71def0336e8

src/fprobe-ulog.c

index 3add97c..519bf8f 100644 (file)
@@ -825,8 +825,6 @@ void *emit_thread()
 
        setuser();
         
 
        setuser();
         
-    //pthread_mutexattr_setprotocol(&md->MutexAttr,PTHREAD_PRIO_INHERIT);
-
        for (;;) {
                pthread_mutex_lock(&emit_mutex);
                while (!flows_emit) {
        for (;;) {
                pthread_mutex_lock(&emit_mutex);
                while (!flows_emit) {
@@ -834,7 +832,7 @@ void *emit_thread()
                        timeout.tv_sec = now.tv_sec + emit_timeout;
                        /* Do not wait until emit_packet will filled - it may be too long */
                        if (pthread_cond_timedwait(&emit_cond, &emit_mutex, &timeout) && emit_count) {
                        timeout.tv_sec = now.tv_sec + emit_timeout;
                        /* Do not wait until emit_packet will filled - it may be too long */
                        if (pthread_cond_timedwait(&emit_cond, &emit_mutex, &timeout) && emit_count) {
-                my_log(LOG_INFO,"Timeout: %d, %d",emit_count, timeout.tv_sec);
+                //my_log(LOG_INFO,"Timeout: %d, %d",emit_count, timeout.tv_sec);
                                pthread_mutex_unlock(&emit_mutex);
                                goto sendit;
                        }
                                pthread_mutex_unlock(&emit_mutex);
                                goto sendit;
                        }