Changeset fed9152 for lib/data-struct

Timestamp:

01/20/15 10:52:15 (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:

1b59edf, cb39d35

Parents:

18bf317 (diff), 04bf7c5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'tidy_parallel_libtrace' into develop

Location:

lib/data-struct

Files:

• object_cache.c (modified) (3 diffs)
• object_cache.h (modified) (1 diff)
• ring_buffer.c (modified) (2 diffs)
• ring_buffer.h (modified) (1 diff)

lib/data-struct/object_cache.c

@@ -175 +175 @@
   *             reads will block (free never should).Otherwise packets can be freely
   *     allocated upon requested and are free'd if there is not enough space for them.
-  * @return Returns The number of packets outstanding, or extra object recevied
-  *             Ideally this should be zero (0) otherwise some form of memory leak
-  *             is likely present.
+  * @return If successful returns 0 otherwise -1.
   */
-DLLEXPORT void libtrace_ocache_init(libtrace_ocache_t *oc, void *(*alloc)(void), void (*free)(void *),
-                                                                          size_t thread_cache_size, size_t buffer_size, bool limit_size) {
+DLLEXPORT int libtrace_ocache_init(libtrace_ocache_t *oc, void *(*alloc)(void),
+                                    void (*free)(void *),
+                                    size_t thread_cache_size,
+                                    size_t buffer_size, bool limit_size) {
 
         assert(buffer_size);
         assert(alloc);
         assert(free);
-        libtrace_ringbuffer_init(&oc->rb, buffer_size, LIBTRACE_RINGBUFFER_BLOCKING);
+        if (libtrace_ringbuffer_init(&oc->rb, buffer_size, LIBTRACE_RINGBUFFER_BLOCKING) != 0) {
+                return -1;
+        }
         oc->alloc = alloc;
         oc->free = free;
@@ -193 +195 @@
         oc->max_nb_thread_list = 0x10;
         oc->thread_list = calloc(0x10, sizeof(void*));
+        if (oc->thread_list == NULL) {
+                libtrace_ringbuffer_destroy(&oc->rb);
+                return -1;
+        }
         pthread_spin_init(&oc->spin, 0);
         if (limit_size)
@@ -198 +204 @@
         else
                 oc->max_allocations = 0;
+        return 0;
 }
 

lib/data-struct/object_cache.h

@@ -20 +20 @@
 } libtrace_ocache_t;
 
-DLLEXPORT void libtrace_ocache_init(libtrace_ocache_t *oc, void *(*alloc)(void), void (*free)(void*),
+DLLEXPORT int libtrace_ocache_init(libtrace_ocache_t *oc, void *(*alloc)(void), void (*free)(void*),
                                     size_t thread_cache_size, size_t buffer_size, bool limit_size);
 DLLEXPORT int libtrace_ocache_destroy(libtrace_ocache_t *oc);

lib/data-struct/ring_buffer.c

@@ -47 +47 @@
  *                              becomes available. LIBTRACE_RINGBUFFER_BLOCKING or LIBTRACE_RINGBUFFER_POLLING.
  *                              NOTE: this mainly applies to the blocking functions
- */
-DLLEXPORT void libtrace_ringbuffer_init(libtrace_ringbuffer_t * rb, size_t size, int mode) {
+ * @return If successful returns 0 otherwise -1 upon failure.
+ */
+DLLEXPORT int libtrace_ringbuffer_init(libtrace_ringbuffer_t * rb, size_t size, int mode) {
         size = size + 1;
-        assert (size > 1);
-        rb->size = size; // Only this -1 actually usable :)
+        if (!(size > 1))
+                return -1;
+        rb->size = size;
         rb->start = 0;
         rb->end = 0;
         rb->elements = calloc(rb->size, sizeof(void*));
-        assert(rb->elements);
+        if (!rb->elements)
+                return -1;
         rb->mode = mode;
         if (mode == LIBTRACE_RINGBUFFER_BLOCKING) {
-                /* The signaling part - i.e. release when data's ready to read */
+                /* The signaling part - i.e. release when data is ready to read */
                 pthread_cond_init(&rb->full_cond, NULL);
                 pthread_cond_init(&rb->empty_cond, NULL);
@@ -75 +78 @@
         ASSERT_RET(pthread_mutex_init(&rb->rlock, NULL), == 0);
 #endif
+        return 0;
 }
 

lib/data-struct/ring_buffer.h

@@ -32 +32 @@
 } libtrace_ringbuffer_t;
 
-DLLEXPORT void libtrace_ringbuffer_init(libtrace_ringbuffer_t * rb, size_t size, int mode);
+DLLEXPORT int libtrace_ringbuffer_init(libtrace_ringbuffer_t * rb, size_t size, int mode);
 DLLEXPORT void libtrace_zero_ringbuffer(libtrace_ringbuffer_t * rb);
 DLLEXPORT void libtrace_ringbuffer_destroy(libtrace_ringbuffer_t * rb);