Changeset a31e166

Timestamp:

09/15/15 15:08:34 (6 years ago)

Author:

Shane Alcock <salcock@…>

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:

ccb89e4

Parents:

c968cfc

Message:

Rename libtrace_get_perpkt_count to trace_get_perpkt_threads

This is to be consistent with trace_set_perpkt_threads.

Remove 'packet' parameter from the first_packet callback.
trace_get_first_packet should be used to get the first packet instead.

Location:

lib

Files:

• combiner_ordered.c (modified) (8 diffs)
• combiner_sorted.c (modified) (4 diffs)
• combiner_unordered.c (modified) (3 diffs)
• libtrace_parallel.h (modified) (2 diffs)
• trace_parallel.c (modified) (2 diffs)

lib/combiner_ordered.c

@@ -9 +9 @@
 static int init_combiner(libtrace_t *t, libtrace_combine_t *c) {
         int i = 0;
-        assert(libtrace_get_perpkt_count(t) > 0);
+        assert(trace_get_perpkt_threads(t) > 0);
         libtrace_queue_t *queues;
-        c->queues = calloc(sizeof(libtrace_queue_t), libtrace_get_perpkt_count(t));
+        c->queues = calloc(sizeof(libtrace_queue_t), trace_get_perpkt_threads(t));
         queues = c->queues;
-        for (i = 0; i < libtrace_get_perpkt_count(t); ++i) {
+        for (i = 0; i < trace_get_perpkt_threads(t); ++i) {
                 libtrace_deque_init(&queues[i], sizeof(libtrace_result_t));
         }
@@ -116 +116 @@
         libtrace_queue_t *queues = c->queues;
         bool allactive = true;
-        bool live[libtrace_get_perpkt_count(trace)]; // Set if a trace is alive
-        uint64_t key[libtrace_get_perpkt_count(trace)]; // Cached keys
+        bool live[trace_get_perpkt_threads(trace)]; // Set if a trace is alive
+        uint64_t key[trace_get_perpkt_threads(trace)]; // Cached keys
         uint64_t min_key = UINT64_MAX;
         uint64_t prev_min = 0;
@@ -124 +124 @@
 
         /* Loop through check all are alive (have data) and find the smallest */
-        for (i = 0; i < libtrace_get_perpkt_count(trace); ++i) {
+        for (i = 0; i < trace_get_perpkt_threads(trace); ++i) {
                 libtrace_queue_t *v = &queues[i];
                 if (libtrace_deque_get_size(v) != 0) {
@@ -172 +172 @@
                                 min_key = key[min_queue]; // Update our minimum
                                 // Check all find the smallest again - all are alive
-                                for (i = 0; i < libtrace_get_perpkt_count(trace); ++i) {
+                                for (i = 0; i < trace_get_perpkt_threads(trace); ++i) {
                                         if (live[i] && min_key >= key[i]) {
                                                 min_key = key[i];
@@ -186 +186 @@
                         min_key = UINT64_MAX; // Update our minimum
                         // Check all find the smallest again - all are alive
-                        for (i = 0; i < libtrace_get_perpkt_count(trace); ++i) {
+                        for (i = 0; i < trace_get_perpkt_threads(trace); ++i) {
                                 if (live[i] && min_key >= key[i]) {
                                         min_key = key[i];
@@ -207 +207 @@
                 read_internal(trace, c, true);
                 empty = 0;
-                for (i = 0; i < libtrace_get_perpkt_count(trace); ++i) {
+                for (i = 0; i < trace_get_perpkt_threads(trace); ++i) {
                         if (libtrace_deque_get_size(&q[i]) == 0)
                                 empty ++;
                 }
         }
-        while (empty < libtrace_get_perpkt_count(trace));
+        while (empty < trace_get_perpkt_threads(trace));
 }
 
@@ -219 +219 @@
         libtrace_queue_t *queues = c->queues;
 
-        for (i = 0; i < libtrace_get_perpkt_count(trace); i++) {
+        for (i = 0; i < trace_get_perpkt_threads(trace); i++) {
                 assert(libtrace_deque_get_size(&queues[i]) == 0);
         }
@@ -230 +230 @@
         libtrace_queue_t *queues = c->queues;
         int i;
-        for (i = 0; i < libtrace_get_perpkt_count(trace); i++) {
+        for (i = 0; i < trace_get_perpkt_threads(trace); i++) {
                 libtrace_deque_apply_function(&queues[i], (deque_data_fn) libtrace_make_result_safe);
         }

lib/combiner_sorted.c

@@ -7 +7 @@
 static int init_combiner(libtrace_t *t, libtrace_combine_t *c) {
         int i = 0;
-        assert(libtrace_get_perpkt_count(t) > 0);
+        assert(trace_get_perpkt_threads(t) > 0);
         libtrace_vector_t *queues;
-        c->queues = calloc(sizeof(libtrace_vector_t), libtrace_get_perpkt_count(t));
+        c->queues = calloc(sizeof(libtrace_vector_t), trace_get_perpkt_threads(t));
         queues = c->queues;
-        for (i = 0; i < libtrace_get_perpkt_count(t); ++i) {
+        for (i = 0; i < trace_get_perpkt_threads(t); ++i) {
                 libtrace_vector_init(&queues[i], sizeof(libtrace_result_t));
         }
@@ -41 +41 @@
         libtrace_vector_t *queues = c->queues;
         int i;
-        for (i = 0; i < libtrace_get_perpkt_count(trace); ++i) {
+        for (i = 0; i < trace_get_perpkt_threads(trace); ++i) {
                 libtrace_vector_apply_function(&queues[i], (vector_data_fn) libtrace_make_result_safe);
         }
@@ -51 +51 @@
         size_t a;
         // Combine all results into queue 1
-        for (i = 1; i < libtrace_get_perpkt_count(trace); ++i)
+        for (i = 1; i < trace_get_perpkt_threads(trace); ++i)
         {
                 libtrace_vector_append(&queues[0],&queues[i]);
@@ -77 +77 @@
         libtrace_vector_t *queues = c->queues;
 
-        for (i = 0; i < libtrace_get_perpkt_count(trace); i++) {
+        for (i = 0; i < trace_get_perpkt_threads(trace); i++) {
                 assert(libtrace_vector_get_size(&queues[i]) == 0);
                 libtrace_vector_destroy(&queues[i]);

lib/combiner_unordered.c

@@ -7 +7 @@
 static int init_combiner(libtrace_t *t, libtrace_combine_t *c) {
         int i = 0;
-        assert(libtrace_get_perpkt_count(t) > 0);
+        assert(trace_get_perpkt_threads(t) > 0);
         libtrace_queue_t *queues;
-        c->queues = calloc(sizeof(libtrace_queue_t), libtrace_get_perpkt_count(t));
+        c->queues = calloc(sizeof(libtrace_queue_t), trace_get_perpkt_threads(t));
         queues = c->queues;
-        for (i = 0; i < libtrace_get_perpkt_count(t); ++i) {
+        for (i = 0; i < trace_get_perpkt_threads(t); ++i) {
                 libtrace_deque_init(&queues[i], sizeof(libtrace_result_t));
         }
@@ -31 +31 @@
 
         /* Loop through and read all that are here */
-        for (i = 0; i < libtrace_get_perpkt_count(trace); ++i) {
+        for (i = 0; i < trace_get_perpkt_threads(trace); ++i) {
                 libtrace_queue_t *v = &queues[i];
                 while (libtrace_deque_get_size(v) != 0) {
@@ -59 +59 @@
         libtrace_queue_t *queues = c->queues;
 
-        for (i = 0; i < libtrace_get_perpkt_count(trace); i++) {
+        for (i = 0; i < trace_get_perpkt_threads(trace); i++) {
                 assert(libtrace_deque_get_size(&queues[i]) == 0);
         }

lib/libtrace_parallel.h

@@ -509 +509 @@
                                    void *global,
                                    void *tls,
-                                   libtrace_packet_t *first_packet,
                                    libtrace_thread_t *sender);
 
@@ -1281 +1280 @@
 DLLEXPORT int trace_set_configuration_file(libtrace_t *trace, FILE *file);
 
-DLLEXPORT int libtrace_get_perpkt_count(libtrace_t* t); // TODO MATCH WITH THE SET_PERPKT
+DLLEXPORT int trace_get_perpkt_threads(libtrace_t* t); 
 
 /**

lib/trace_parallel.c

@@ -205 +205 @@
                                 (*cbs->message_first_packet)(trace, thread,
                                 trace->global_blob, thread->user_data,
-                                data.pkt, sender);
+                                sender);
                 return;
         case MESSAGE_TICK_COUNT:
@@ -287 +287 @@
  * @return
  */
-DLLEXPORT int libtrace_get_perpkt_count(libtrace_t * t) {
+DLLEXPORT int trace_get_perpkt_threads(libtrace_t * t) {
         return t->perpkt_thread_count;
 }