Changeset ab3fa18 for lib/trace_parallel.c

Timestamp:

03/05/15 19:27:46 (7 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:

6a082f8

Parents:

62b3c4e

git-author:

Richard Sanger <rsangerarj@…> (03/05/15 19:16:08)

git-committer:

Richard Sanger <rsangerarj@…> (03/05/15 19:27:46)

Message:

Make trace_set_global thread-safe

File:

• lib/trace_parallel.c (modified) (1 diff)

lib/trace_parallel.c

@@ -2102 +2102 @@
 DLLEXPORT void * trace_set_global(libtrace_t *trace, void * data)
 {
-        if (trace->global_blob && trace->global_blob != data) {
-                void * ret = trace->global_blob;
-                trace->global_blob = data;
-                return ret;
-        } else {
-                trace->global_blob = data;
-                return NULL;
-        }
+        void *ret;
+        pthread_mutex_lock(trace->libtrace_lock);
+        ret = trace->global_blob;
+        trace->global_blob = data;
+        pthread_mutex_unlock(trace->libtrace_lock);
+        return ret;
 }