Changeset 16840ea

Timestamp:

02/19/15 17:01:12 (6 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:

e8c0a9c

Parents:

92020b8

Message:

Revert "Attempt at fixing DAG device name memory leak"

This reverts commit 4bd639385249b21fc565a990eb5d1787976d1266.

Turns out there was no memory leak this was being free()d.
I was not obvious but it was stored against the dag device
and free()d when it was.

I have also added a comment for future developers.

Conflicts:

lib/format_dag25.c

File:

• lib/format_dag25.c (modified) (12 diffs)

lib/format_dag25.c

@@ -108 +108 @@
 /* "Global" data that is stored for each DAG output trace */
 struct dag_format_data_out_t {
-        /* String containing the DAG device name */
-        char *device_name;
         /* The DAG device being used for writing */
         struct dag_dev_t *device;
@@ -160 +158 @@
         /* DAG device */
         struct dag_dev_t *device;
-        /* String containing the DAG device name */
-        char *device_name;
         /* Boolean flag indicating whether the trace is currently attached */
         int stream_attached;
@@ -228 +224 @@
         FORMAT_DATA_OUT->stream_attached = 0;
         FORMAT_DATA_OUT->device = NULL;
-        FORMAT_DATA_OUT->device_name = NULL;
         FORMAT_DATA_OUT->dagstream = 0;
         FORMAT_DATA_OUT->waiting = 0;
@@ -254 +249 @@
         memset(&stream_data, 0, sizeof(stream_data));
         libtrace_list_push_back(FORMAT_DATA->per_stream, &stream_data);
-        FORMAT_DATA->device_name = NULL;
 }
 
@@ -419 +413 @@
 static int dag_init_output(libtrace_out_t *libtrace)
 {
+        /* Upon successful creation, the device name is stored against the
+         * device and free when it is free()d */
+        char *dag_dev_name = NULL;
         char *scan = NULL;
         struct dag_dev_t *dag_device = NULL;
@@ -441 +438 @@
          * If no stream is specified, we will write using stream 1 */
         if ((scan = strchr(libtrace->uridata,',')) == NULL) {
-                FORMAT_DATA_OUT->device_name = strdup(libtrace->uridata);
+                dag_dev_name = strdup(libtrace->uridata);
         } else {
-                FORMAT_DATA_OUT->device_name =
-                                (char *)strndup(libtrace->uridata,
+                dag_dev_name = (char *)strndup(libtrace->uridata,
                                 (size_t)(scan - libtrace->uridata));
                 stream = atoi(++scan);
@@ -451 +447 @@
 
         /* See if our DAG device is already open */
-        dag_device = dag_find_open_device(FORMAT_DATA_OUT->device_name);
+        dag_device = dag_find_open_device(dag_dev_name);
 
         if (dag_device == NULL) {
                 /* Device not yet opened - open it ourselves */
-                dag_device = dag_open_output_device(libtrace,
-                                FORMAT_DATA_OUT->device_name);
+                dag_device = dag_open_output_device(libtrace, dag_dev_name);
+        } else {
+                /* Otherwise, just use the existing one */
+                free(dag_dev_name);
+                dag_dev_name = NULL;
         }
 
         /* Make sure we have successfully opened a DAG device */
         if (dag_device == NULL) {
-                if (FORMAT_DATA_OUT->device_name) {
-                        free(FORMAT_DATA_OUT->device_name);
-                        FORMAT_DATA_OUT->device_name = NULL;
+                if (dag_dev_name) {
+                        free(dag_dev_name);
                 }
                 pthread_mutex_unlock(&open_dag_mutex);
@@ -476 +474 @@
 /* Creates and initialises a DAG input trace */
 static int dag_init_input(libtrace_t *libtrace) {
+        /* Upon successful creation, the device name is stored against the
+         * device and free when it is free()d */
+        char *dag_dev_name = NULL;
         char *scan = NULL;
         int stream = 0;
@@ -494 +495 @@
          */
         if ((scan = strchr(libtrace->uridata,',')) == NULL) {
-                FORMAT_DATA->device_name = strdup(libtrace->uridata);
+                dag_dev_name = strdup(libtrace->uridata);
         } else {
-                FORMAT_DATA->device_name = (char *)strndup(libtrace->uridata,
+                dag_dev_name = (char *)strndup(libtrace->uridata,
                                 (size_t)(scan - libtrace->uridata));
                 stream = atoi(++scan);
@@ -504 +505 @@
 
         /* See if our DAG device is already open */
-        dag_device = dag_find_open_device(FORMAT_DATA->device_name);
+        dag_device = dag_find_open_device(dag_dev_name);
 
         if (dag_device == NULL) {
                 /* Device not yet opened - open it ourselves */
-                dag_device=dag_open_device(libtrace, FORMAT_DATA->device_name);
+                dag_device = dag_open_device(libtrace, dag_dev_name);
+        } else {
+                /* Otherwise, just use the existing one */
+                free(dag_dev_name);
+                dag_dev_name = NULL;
         }
 
         /* Make sure we have successfully opened a DAG device */
         if (dag_device == NULL) {
-                if (FORMAT_DATA->device_name)
-                        free(FORMAT_DATA->device_name);
-                FORMAT_DATA->device_name = NULL;
+                if (dag_dev_name)
+                        free(dag_dev_name);
+                dag_dev_name = NULL;
                 pthread_mutex_unlock(&open_dag_mutex);
                 return -1;
@@ -806 +811 @@
         /* Clear the list */
         libtrace_list_deinit(FORMAT_DATA->per_stream);
-
-        if (FORMAT_DATA->device_name)
-                free(FORMAT_DATA->device_name);
         free(libtrace->format_data);
         pthread_mutex_unlock(&open_dag_mutex);
@@ -844 +846 @@
         if (FORMAT_DATA_OUT->device->ref_count == 0)
                 dag_close_device(FORMAT_DATA_OUT->device);
-        if (FORMAT_DATA_OUT->device_name)
-                free(FORMAT_DATA_OUT->device_name);
         free(libtrace->format_data);
         pthread_mutex_unlock(&open_dag_mutex);