Changeset 136c19e

Timestamp:

02/09/15 13:28:14 (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:

4bdc4c2

Parents:

34dafcc

Message:

Fix parsing of DPDK PCI addresses which should be hex not base 10.

This also simplifies that code by using scanf, however one minor
downside of this is that the core mask after the "-" can be
set to a non-number and it will be ignored rather than alerting
the user that it was invalid.

File:

• lib/format_dpdk.c (modified) (1 diff)

lib/format_dpdk.c

@@ -356 +356 @@
  */
 static int parse_pciaddr(char * str, struct rte_pci_addr * addr, long * core) {
-    char * wrkstr;
-    char * pch;
+    int matches;
     assert(str);
-    wrkstr = strdup(str);
-    
-    pch = strtok(wrkstr,":");
-    if (pch == NULL || pch[0] == 0) {
-        free(wrkstr); return -1;
-    }
-    addr->domain = (uint16_t) atoi(pch);
-
-    pch = strtok(NULL,":");
-    if (pch == NULL || pch[0] == 0) {
-        free(wrkstr); return -1;
-    }
-    addr->bus = (uint8_t) atoi(pch);
-
-    pch = strtok(NULL,".");
-    if (pch == NULL || pch[0] == 0) {
-        free(wrkstr); return -1;
-    }
-    addr->devid = (uint8_t) atoi(pch);
-
-    pch = strtok(NULL,"-"); /* Might not find the '-' it's optional */
-    if (pch == NULL || pch[0] == 0) {
-        free(wrkstr); return -1;
-    }
-    addr->function = (uint8_t) atoi(pch);
-
-    pch = strtok(NULL, ""); /* Find end of string */
-    
-    if (pch != NULL && pch[0] != 0) {
-        *core = (long) atoi(pch);
-    }
-
-    free(wrkstr);
-    return 0;
+    matches = sscanf(str, "%4"SCNx16":%2"SCNx8":%2"SCNx8".%2"SCNx8"-%ld",
+                     &addr->domain, &addr->bus, &addr->devid, &addr->function, core);
+    if (matches >= 4) {
+        return 0;
+    } else {
+        return -1;
+    }
 }