Changeset 32a3ec5 for lib

Timestamp:

10/02/15 16:07:24 (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:

6cf2770

Parents:

7fe6dfa

Message:

Various DAG fixes

• Use CSAPI for configuring snap length if available
• Don't die if the number of streams doesn't exactly match the number of processing threads. Instead, just choose the minimum of the two and work with that.
• Remove debug output re: thread starting

Location:

lib

Files:

• format_dag25.c (modified) (9 diffs)
• trace_parallel.c (modified) (1 diff)

lib/format_dag25.c

@@ -54 +54 @@
 #include <pthread.h>
 
+
+#ifdef HAVE_DAG_CONFIG_API_H
+#include <dag_config_api.h>
+#endif
 
 #ifdef WIN32
@@ -549 +553 @@
 }
 
+#ifdef HAVE_DAG_CONFIG_API_H
+static int dag_csapi_set_snaplen(libtrace_t *libtrace, int slen) {
+        dag_card_ref_t card_ref = NULL;
+        dag_component_t root = NULL;
+        attr_uuid_t uuid = 0;
+
+        if (slen < 0)
+                slen = 0; 
+
+        card_ref = dag_config_init(FORMAT_DATA->device->dev_name);
+        root = dag_config_get_root_component(card_ref);
+        
+        uuid = dag_component_get_config_attribute_uuid(root, kBooleanAttributeVarlen);
+        dag_config_set_boolean_attribute(card_ref, uuid, true);
+
+        uuid = dag_component_get_config_attribute_uuid(root, kUint32AttributeSnaplength);
+        dag_config_set_uint32_attribute(card_ref, uuid, (uint32_t)slen);
+
+        return 0;
+        
+
+} 
+#endif /* HAVE_DAG_CONFIG_API_H */
+
 /* Configures a DAG input trace */
 static int dag_config_input(libtrace_t *libtrace, trace_option_t option,
                             void *data)
 {
-        char conf_str[4096];
         switch(option) {
         case TRACE_OPTION_META_FREQ:
@@ -561 +588 @@
                 return 0;
         case TRACE_OPTION_SNAPLEN:
+#ifdef HAVE_DAG_CONFIG_API_H
+                return dag_csapi_set_snaplen(libtrace, *(int *)data);
+#else
                 /* Tell the card our new snap length */
+        {
+                char conf_str[4096];
                 snprintf(conf_str, 4096, "varlen slen=%i", *(int *)data);
                 if (dag_configure(FORMAT_DATA->device->fd,
@@ -570 +602 @@
                         return -1;
                 }
+        }
+#endif /* HAVE_DAG_CONFIG_API_H */
+
                 return 0;
         case TRACE_OPTION_PROMISC:
@@ -693 +728 @@
         max_streams = dag_rx_get_stream_count(FORMAT_DATA->device->fd);
         if (libtrace->perpkt_thread_count > max_streams) {
-                trace_set_err(libtrace, TRACE_ERR_BAD_FORMAT,
+                fprintf(stderr,
                               "WARNING: DAG has only %u streams available, "
                               "capping total number of threads at this value.",
@@ -714 +749 @@
                 /* Ensure we haven't specified too many streams */
                 if (stream_count >= libtrace->perpkt_thread_count) {
-                        trace_set_err(libtrace, TRACE_ERR_BAD_FORMAT,
+                        fprintf(stderr,
                                       "WARNING: Format uri specifies too many "
                                       "streams. Maximum is %u, so only using "
                                       "the first %u from the uri.",
-                                      max_streams);
+                                      libtrace->perpkt_thread_count, 
+                                      libtrace->perpkt_thread_count);
                         break;
                 }
@@ -738 +774 @@
         }
 
+        if (stream_count < libtrace->perpkt_thread_count) {
+                libtrace->perpkt_thread_count = stream_count;
+        }
+        
         FORMAT_DATA->stream_attached = 1;
 
@@ -1492 +1532 @@
 
         if (reader && t->type == THREAD_PERPKT) {
-                fprintf(stderr, "t%u: registered reader thread", t->perpkt_num);
                 node = libtrace_list_get_index(FORMAT_DATA->per_stream,
                                                 t->perpkt_num);
                 if (node == NULL) {
-                        trace_set_err(libtrace, TRACE_ERR_INIT_FAILED,
-                                      "Too few streams supplied for the"
-                                      " number of threads lanuched");
                         return -1;
                 }
@@ -1507 +1543 @@
 
                 /* Attach and start the DAG stream */
-                printf("t%u: starting and attaching stream #%u\n",
-                       t->perpkt_num, stream_data->dagstream);
                 if (dag_start_input_stream(libtrace, stream_data) < 0)
                         return -1;
         }
-
-        fprintf(stderr, "t%u: registered thread\n", t->perpkt_num);
 
         return 0;

lib/trace_parallel.c

@@ -625 +625 @@
 
         if (trace->format->pregister_thread) {
-                trace->format->pregister_thread(trace, t, trace_is_parallel(trace));
+                if (trace->format->pregister_thread(trace, t, 
+                                trace_is_parallel(trace)) < 0) {
+                        thread_change_state(trace, t, THREAD_FINISHED, false);
+                        pthread_exit(NULL);
+                }
         }