Changeset d83ba86a for lib

Timestamp:

12/05/17 16:36:17 (3 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

cachetimestamps, develop, dpdk-ndag, etsilive, master, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance

Children:

7ff881a

Parents:

c7e547e

Message:

Don't do string conversions and comparisons for every packet

Since the expected address is never going to change, it is a lot
more efficient to just convert that string to a sockaddr and
compare sockaddrs instead.

File:

• lib/format_dpdkndag.c (modified) (11 diffs)

lib/format_dpdkndag.c

@@ -14 +14 @@
 #include <unistd.h>
 #include <stdlib.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
 
 #include "format_dpdk.h"
@@ -50 +53 @@
         libtrace_t *dpdkrecv;
 
-        char *multicastgroup;
-        uint16_t beaconport;
+        struct addrinfo *multicastgroup;
         char *localiface;
 
@@ -79 +81 @@
         char *next = NULL;
         char dpdkuri[1280];
+        struct addrinfo hints, *result;
 
         libtrace->format_data = (dpdkndag_format_data_t *)malloc(
                         sizeof(dpdkndag_format_data_t));
 
-        FORMAT_DATA->multicastgroup = NULL;
-        FORMAT_DATA->beaconport = 9001;
         FORMAT_DATA->localiface = NULL;
         FORMAT_DATA->threaddatas = NULL;
@@ -92 +93 @@
         if (scan == NULL) {
                 trace_set_err(libtrace, TRACE_ERR_BAD_FORMAT,
-                        "Bad ndag URI. Should be ndag:<interface>,<multicast group>,<port number>");
+                        "Bad dpdkndag URI. Should be dpdkndag:<interface>,<multicast group>");
                 return -1;
         }
@@ -99 +100 @@
         next = scan + 1;
 
-        scan = strchr(next, ',');
-        if (scan == NULL) {
-                FORMAT_DATA->multicastgroup = strdup(next);
-        } else {
-                FORMAT_DATA->multicastgroup = strndup(next, (size_t)(scan - next));
-
-                FORMAT_DATA->beaconport = strtoul(scan + 1, NULL, 0);
-        }
+        memset(&hints, 0, sizeof(struct addrinfo));
+        hints.ai_family = AF_UNSPEC;
+        hints.ai_socktype = SOCK_DGRAM;
+        hints.ai_flags = AI_PASSIVE;
+        hints.ai_protocol = 0;
+
+        if (getaddrinfo(next, NULL, &hints, &result) != 0) {
+                perror("getaddrinfo");
+                trace_set_err(libtrace, TRACE_ERR_BAD_FORMAT,
+                        "Invalid multicast address: %s", next);
+                return -1;
+        }
+
+        FORMAT_DATA->multicastgroup = result;
 
         snprintf(dpdkuri, 1279, "dpdk:%s", FORMAT_DATA->localiface);
@@ -227 +234 @@
 
         if (FORMAT_DATA->multicastgroup) {
-                free(FORMAT_DATA->multicastgroup);
+                freeaddrinfo(FORMAT_DATA->multicastgroup);
         }
 
@@ -338 +345 @@
 }
 
-static int process_fresh_packet(perthread_t *pt, char *expectedaddr) {
+static int sockaddr_same(struct sockaddr *a, struct sockaddr *b) {
+
+        if (a->sa_family != b->sa_family) {
+                return 0;
+        }
+
+        if (a->sa_family == AF_INET) {
+                struct sockaddr_in *ain = (struct sockaddr_in *)a;
+                struct sockaddr_in *bin = (struct sockaddr_in *)b;
+
+                if (ain->sin_addr.s_addr != bin->sin_addr.s_addr) {
+                        return 0;
+                }
+                return 1;
+        } else if (a->sa_family == AF_INET6) {
+                struct sockaddr_in6 *ain6 = (struct sockaddr_in6 *)a;
+                struct sockaddr_in6 *bin6 = (struct sockaddr_in6 *)b;
+
+                if (memcmp(ain6->sin6_addr.s6_addr, bin6->sin6_addr.s6_addr,
+                                sizeof(ain6->sin6_addr.s6_addr)) != 0) {
+                        return 0;
+                }
+                return 1;
+        }
+        return 0;
+}
+
+static int process_fresh_packet(perthread_t *pt, struct addrinfo *expectedaddr) {
 
         ndag_common_t *header = (ndag_common_t *)pt->ndagheader;
@@ -344 +378 @@
                         sizeof(ndag_common_t));
         uint16_t targetport;
-        char targetaddr[INET6_ADDRSTRLEN];
+        struct sockaddr_storage targetaddr;
+        struct sockaddr *p;
         capstream_t *cap = NULL;
         int i;
 
+        memset((&targetaddr), 0, sizeof(targetaddr));
         if (header->type != NDAG_PKT_ENCAPERF) {
                 pt->nextrec = NULL;
@@ -355 +391 @@
         }
 
-        /* TODO check for missing records */
-        targetport = trace_get_destination_port(pt->dpdkpkt);
-        if (trace_get_destination_address_string(pt->dpdkpkt, targetaddr,
-                        INET6_ADDRSTRLEN) == NULL) {
+        if ((p = trace_get_destination_address(pt->dpdkpkt,
+                        (struct sockaddr *)(&targetaddr))) == NULL) {
                 pt->nextrec = NULL;
                 pt->ndagsize = 0;
@@ -365 +399 @@
         }
 
-        if (strcmp(targetaddr, expectedaddr) != 0) {
+        if (!(sockaddr_same(p, expectedaddr->ai_addr))) {
                 pt->nextrec = NULL;
                 pt->ndagsize = 0;
@@ -372 +406 @@
         }
 
+        targetport = trace_get_destination_port(pt->dpdkpkt);
         if (pt->streamcount == 0) {
                 pt->capstreams = (capstream_t *)malloc(sizeof(capstream_t));