Changes in lib/trace.c [bdc8b36:04bf7c5]

File:

• lib/trace.c (modified) (7 diffs)

lib/trace.c

@@ -108 +108 @@
 static struct libtrace_format_t *formats_list = NULL;
 
-int libtrace_halt = 0;
+volatile int libtrace_halt = 0;
 
 /* Set once pstart is called used for backwards compatibility reasons */
@@ -261 +261 @@
         
         /* Parallel inits */
-        // libtrace->libtrace_lock
-        // libtrace->perpkt_cond;
+        ASSERT_RET(pthread_mutex_init(&libtrace->libtrace_lock, NULL), == 0);
+        ASSERT_RET(pthread_cond_init(&libtrace->perpkt_cond, NULL), == 0);
         libtrace->state = STATE_NEW;
         libtrace->perpkt_queue_full = false;
@@ -273 +273 @@
         libtrace_zero_thread(&libtrace->reporter_thread);
         libtrace_zero_thread(&libtrace->keepalive_thread);
-        libtrace_zero_slidingwindow(&libtrace->sliding_window);
         libtrace->reporter_thread.type = THREAD_EMPTY;
         libtrace->perpkt_thread_count = 0;
@@ -381 +380 @@
         
         /* Parallel inits */
-        // libtrace->libtrace_lock
-        // libtrace->perpkt_cond;
+        ASSERT_RET(pthread_mutex_init(&libtrace->libtrace_lock, NULL), == 0);
+        ASSERT_RET(pthread_cond_init(&libtrace->perpkt_cond, NULL), == 0);
         libtrace->state = STATE_NEW; // TODO MAYBE DEAD
         libtrace->perpkt_queue_full = false;
@@ -393 +392 @@
         libtrace_zero_thread(&libtrace->reporter_thread);
         libtrace_zero_thread(&libtrace->keepalive_thread);
-        libtrace_zero_slidingwindow(&libtrace->sliding_window);
         libtrace->reporter_thread.type = THREAD_EMPTY;
         libtrace->perpkt_thread_count = 0;
@@ -634 +632 @@
  */
 DLLEXPORT void trace_destroy(libtrace_t *libtrace) {
-    int i;
+        int i;
         assert(libtrace);
 
-        /* destroy any packet that are still around */
+        ASSERT_RET(pthread_mutex_destroy(&libtrace->libtrace_lock), == 0);
+        ASSERT_RET(pthread_cond_destroy(&libtrace->perpkt_cond), == 0);
+
+        /* destroy any packets that are still around */
         if (libtrace->state != STATE_NEW && libtrace->first_packets.packets) {
                 for (i = 0; i < libtrace->perpkt_thread_count; ++i) {
@@ -687 +688 @@
 DLLEXPORT void trace_destroy_dead(libtrace_t *libtrace) {
         assert(libtrace);
+
+        ASSERT_RET(pthread_mutex_destroy(&libtrace->libtrace_lock), == 0);
+        ASSERT_RET(pthread_cond_destroy(&libtrace->perpkt_cond), == 0);
 
         /* Don't call pause_input or fin_input, because we should never have