Changeset 704229c

Timestamp:

09/04/14 16:38:39 (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:

66baa54

Parents:

354e54a

Message:

Allows multiple instances of libtrace to use the DPDK format simultaneously

• Each must be bound to a separate port (And currently either reading or writing but not both)
• Each process tries to allocate 250Mb of huge pages and will fail if it cannot (this should be configurable in the future)
• It's up to the user to ensure they don't try bind to the same port twice

File:

• lib/format_dpdk.c (modified) (3 diffs)

lib/format_dpdk.c

@@ -377 +377 @@
     struct rte_pci_addr use_addr; /* The only address that we don't blacklist */   
     char cpu_number[10] = {0}; /* The CPU mask we want to bind to */
+    char mem_map[20] = {0}; /* The memory name */
     long nb_cpu; /* The number of CPUs in the system */
     long my_cpu; /* The CPU number we want to bind to */
@@ -385 +386 @@
     rte_set_log_level(RTE_LOG_WARNING);
 #endif
-    /* Using proc-type auto allows this to be either primary or secondary 
-     * Secondary allows two intances of libtrace to be used on different
-     * ports. However current version of DPDK doesn't support this on the
-     * same card (My understanding is this should work with two seperate
-     * cards).
+    /*
+     * Using unique file prefixes mean separate memory is used, unlinking
+     * the two processes. However be careful we still cannot access a 
+     * port that already in use.
      */
-    char* argv[] = {"libtrace", "-c", NULL, "-n", "1", "--proc-type", "auto", NULL};
+    char* argv[] = {"libtrace", "-c", cpu_number, "-n", "1", "--proc-type", "auto",
+                "--file-prefix", mem_map, "-m", "256", NULL};
     int argc = sizeof(argv) / sizeof(argv[0]) - 1;
     
@@ -438 +439 @@
     /* Make our mask */
     snprintf(cpu_number, sizeof(cpu_number), "%x", 0x1 << (my_cpu - 1));
-    argv[2] = cpu_number;
-
+
+
+        /* Give the memory map a unique name */
+        snprintf(mem_map, sizeof(mem_map), "libtrace-%d", (int) getpid());
     /* rte_eal_init it makes a call to getopt so we need to reset the 
      * global optind variable of getopt otherwise this fails */