Changeset 2498008 for lib/data-struct

Timestamp:

09/16/14 02:35:10 (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:

d994324

Parents:

50b1bee

Message:

Refactor the combining step to allow user defined functions here.

Remove the old trace_get_results, now instead simply provide a reporter function which gets called as soon as results are ready.
The combiner function used determines the order of these results and when they are released etc.
The combiner function can be selected from those built-in or a custom version can be defined results are provided when ready.
Quickly hacked the parallel tests to work with this update, these are still a bit messy.

Also some fixes some compile warnings.

Location:

lib/data-struct

Files:

• vector.c (modified) (2 diffs)
• vector.h (modified) (1 diff)

lib/data-struct/vector.c

@@ -59 +59 @@
         }
         v->size--;
-        // Of coarse this is mega slow 
+        // Of course this is mega slow
         for (i = 0; i < v->size * v->element_size; i++)
                 v->elements[i] = v->elements[i+v->element_size];
@@ -132 +132 @@
         ASSERT_RET(pthread_mutex_unlock(&v->lock), == 0);
 }
+
+DLLEXPORT void libtrace_vector_qsort(libtrace_vector_t *v, int (*compar)(const void *, const void*)) {
+        ASSERT_RET(pthread_mutex_lock(&v->lock), == 0);
+        qsort(v->elements, v->element_size, v->element_size, compar);
+        ASSERT_RET(pthread_mutex_unlock(&v->lock), == 0);
+}

lib/data-struct/vector.h

@@ -30 +30 @@
 DLLEXPORT void libtrace_vector_apply_function(libtrace_vector_t *v, vector_data_fn fn);
 
+// Sort the vector using qsort
+DLLEXPORT void libtrace_vector_qsort(libtrace_vector_t *v, int (*compar)(const void *, const void*));
 #endif