Changeset 9857d1c for lib

Timestamp:

06/24/14 17:54:32 (8 years ago)

Author:

Richard Sanger <rsangerarj@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

aa5a642

Parents:

10e183f

Message:

Fix some memory leaks

Location:

lib

Files:

• trace.c (modified) (2 diffs)
• trace_parallel.c (modified) (2 diffs)

lib/trace.c

@@ -642 +642 @@
 DLLEXPORT void trace_destroy(libtrace_t *libtrace) {
     int i;
-        assert(libtrace);
+        assert(libtrace);
+
+        /* destroy any packet that are still around */
+        if (libtrace->first_packets.packets) {
+                for (i = 0; i < libtrace->perpkt_thread_count; ++i) {
+                        if(libtrace->first_packets.packets[i].packet) {
+                                trace_destroy_packet(libtrace->first_packets.packets[i].packet);
+                        }
+                }
+                free(libtrace->first_packets.packets);
+        }
+
         if (libtrace->format) {
                 if (libtrace->started && libtrace->format->pause_input)
@@ -681 +692 @@
                  free(libtrace->event.packet);
         }
-        free(libtrace);
+        free(libtrace);
 }
 

lib/trace_parallel.c

@@ -332 +332 @@
         message.additional.uint64 = 0;
         (*trace->per_pkt)(trace, NULL, &message, t);
+
+        // Free our last packet
+        if (packet)
+                trace_destroy_packet(packet);
 
         // And we're at the end free the memories
@@ -1182 +1186 @@
         }
         libtrace_ringbuffer_init(&libtrace->packet_freelist, libtrace->packet_freelist_size, LIBTRACE_RINGBUFFER_BLOCKING);
-        libtrace_slidingwindow_init(&libtrace->sliding_window, libtrace->packet_freelist_size, 0);
+        //libtrace_slidingwindow_init(&libtrace->sliding_window, libtrace->packet_freelist_size, 0);
         assert(sem_init(&libtrace->sem, 0, libtrace->packet_freelist_size) == 0);
         // This will be applied to every new thread that starts, i.e. they will block all signals