Changeset 773d5e2

Timestamp:

03/24/15 12:54:51 (6 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:

e0be8382

Parents:

6b98325

Message:

Fix some portability issues we'll run into with non-portable pthread functions.

Location:

lib

Files:

• format_dpdk.c (modified) (1 diff)
• trace_parallel.c (modified) (7 diffs)

lib/format_dpdk.c

@@ -163 +163 @@
 #include <rte_cycles.h>
 #include <pthread.h>
+#ifdef __FreeBSD__
+#include <pthread_np.h>
+#endif
+
 
 /* The default size of memory buffers to use - This is the max size of standard

lib/trace_parallel.c

@@ -119 +119 @@
 static void print_memory_stats() {
 #if 0
+        uint64_t total;
+#ifdef __linux__
         char t_name[50];
-        uint64_t total;
         pthread_getname_np(pthread_self(), t_name, sizeof(t_name));
 
         fprintf(stderr, "Thread ID#%d - %s\n", (int) pthread_self(), t_name);
+#else
+        fprintf(stderr, "Thread ID#%d\n", (int) pthread_self());
+#endif
 
         total = mem_hits.read.cache_hit + mem_hits.read.ring_hit + mem_hits.read.miss;
@@ -165 +169 @@
 /*
  * This can be used once the hasher thread has been started and internally after
- * verfiy_configuration.
+ * verify_configuration.
  */
 DLLEXPORT bool trace_has_dedicated_hasher(libtrace_t * libtrace)
@@ -1347 +1351 @@
  */
 SIMPLE_FUNCTION static int get_nb_cores() {
-        // TODO add BSD support
-        return sysconf(_SC_NPROCESSORS_ONLN);
+        int numCPU;
+#ifdef _SC_NPROCESSORS_ONLN
+        /* Most systems do this now */
+        numCPU = sysconf(_SC_NPROCESSORS_ONLN);
+
+#else
+        int mib[] = {CTL_HW, HW_AVAILCPU};
+        size_t len = sizeof(numCPU);
+
+        /* get the number of CPUs from the system */
+        sysctl(mib, 2, &numCPU, &len, NULL, 0);
+#endif
+        return numCPU <= 0 ? 1 : numCPU;
 }
 
@@ -1412 +1427 @@
                        int perpkt_num,
                        const char *name) {
+#ifdef __linux__
         pthread_attr_t attrib;
         cpu_set_t cpus;
+#endif
         int ret, i;
         assert(t->type == THREAD_EMPTY);
@@ -1422 +1439 @@
         t->state = THREAD_RUNNING;
 
+#ifdef __linux__
         CPU_ZERO(&cpus);
         for (i = 0; i < get_nb_cores(); i++)
@@ -1427 +1445 @@
         pthread_attr_init(&attrib);
         pthread_attr_setaffinity_np(&attrib, sizeof(cpus), &cpus);
-
         ret = pthread_create(&t->tid, &attrib, start_routine, (void *) trace);
         pthread_attr_destroy(&attrib);
+#else
+        ret = pthread_create(&t->tid, NULL, start_routine, (void *) trace);
+#endif
         if (ret != 0) {
                 libtrace_zero_thread(t);
@@ -1443 +1463 @@
                                                  LIBTRACE_RINGBUFFER_BLOCKING);
         }
+#ifdef __linux__
         if(name)
                 pthread_setname_np(t->tid, name);
+#endif
         t->perpkt_num = perpkt_num;
         return 0;