Changeset 6e41e73 for lib/data-struct/object_cache.c

Timestamp:

11/27/14 14:19:19 (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:

d7fd648

Parents:

21f5f0f

Message:

Fixes bug where packets could be destroyed by unregistered threads
We now destroy the packet object cache thread caches before unresistering a thread

Also includes some whitespace fixes.

File:

• lib/data-struct/object_cache.c (modified) (4 diffs)

lib/data-struct/object_cache.c

@@ -1 @@
-
 #include "object_cache.h"
 #include <assert.h>
@@ -34 +33 @@
 
 /**
- * @brief free_array assumes we DONT hold spin
+ * @brief unregister_thread assumes we DONT hold spin
  */
 static inline void unregister_thread(struct local_cache *lc) {
@@ -71 +70 @@
 
 /**
- * @brief free_array assumes we hold spin!!!
+ * @brief register_thread assumes we DONT hold spin
  */
 static inline void register_thread(libtrace_ocache_t *oc, struct local_cache *lc) {
@@ -429 +428 @@
 }
 
+/**
+ * @brief ocache_unregister_thread removes a thread from an ocache.
+ * @param The ocache to remove this thread, this will free any packets in the TLS cache
+ */
+DLLEXPORT void libtrace_ocache_unregister_thread(libtrace_ocache_t *oc) {
+        size_t i;
+        struct local_cache *lc = find_cache(oc);
+
+        if (lc) {
+                for (i = 0; i < t_mem_caches_used; ++i) {
+                        if (&t_mem_caches[i] == lc) {
+                                // Free the cache against the ocache
+                                unregister_thread(&t_mem_caches[i]);
+                                free(t_mem_caches[i].cache);
+                                // And remove it from the thread itself
+                                --t_mem_caches_used;
+                                t_mem_caches[i] = t_mem_caches[t_mem_caches_used];
+                                memset(&t_mem_caches[t_mem_caches_used], 0, sizeof(struct local_cache));
+                        }
+                }
+        }
+}