Changeset 2193905 for lib/format_dpdk.c

Timestamp:

11/29/18 10:12:59 (2 years ago)

Author:

Jacob Van Walraven <jcv9@…>

Branches:

develop

Children:

fdf23b8

Parents:

d74ca03

Message:

Apply changes required for pull request #81

File:

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

lib/format_dpdk.c

@@ -51 +51 @@
 
 #include <stdlib.h>
-#include <assert.h>
 #include <unistd.h>
 #include <endian.h>
@@ -213 +212 @@
 static int parse_pciaddr(char * str, struct rte_pci_addr * addr, long * core) {
         int matches;
-        assert(str);
+
+        if (!str) {
+                fprintf(stderr, "NULL str passed into parse_pciaddr()\n");
+                return -1;
+        }
 #if RTE_VERSION >= RTE_VERSION_NUM(17, 8, 0, 1)
         matches = sscanf(str, "%8"SCNx32":%2"SCNx8":%2"SCNx8".%2"SCNx8"-%ld",
@@ -325 +328 @@
         int i;
 
-        assert (core < RTE_MAX_LCORE);
-        assert (rte_get_master_lcore() == rte_lcore_id());
+        if (core >= RTE_MAX_LCORE) {
+                fprintf(stderr, "Core must be a value less than the number of cores "
+                        "in dpdk_move_master_lcore()\n");
+                return -1;
+        }
+        if (rte_get_master_lcore() != rte_lcore_id()) {
+                fprintf(stderr, "Master core not equal to core id in dpdk_move_master_lcore()\n");
+                return -1;
+        }
 
         if (core == rte_lcore_id())
@@ -332 +342 @@
 
         /* Make sure we are not overwriting someone else */
-        assert(!rte_lcore_is_enabled(core));
+        if (rte_lcore_is_enabled(core)) {
+                fprintf(stderr, "Cannot override another core in dpdk_move_master_lcore()\n");
+                return -1;
+        }
 
         /* Move the core */
@@ -470 +483 @@
                         int max_node_cpu = -1;
                         struct bitmask *mask = numa_allocate_cpumask();
-                        assert(mask);
+                        if (!mask) {
+                                fprintf(stderr, "Unable to allocate cpu mask in dpdk_init_environment()\n");
+                                return -1;
+                        }
                         numa_node_to_cpus(format_data->nic_numa_node, mask);
                         for (i = 0 ; i < nb_cpu; ++i) {
@@ -530 +546 @@
         }
         // Only the master should be running
-        assert(cfg->lcore_count == 1);
+        if (cfg->lcore_count != 1) {
+                fprintf(stderr, "Expected only the master core to be running in dpdk_init_environment()\n");
+                return -1;
+        }
 
         // TODO XXX TODO
@@ -589 +608 @@
 
         if (!libtrace->format_data) {
-                trace_set_err(libtrace, TRACE_ERR_INIT_FAILED, "Unable to allocate memory dpdk_init_input()");
+                trace_set_err(libtrace, TRACE_ERR_INIT_FAILED, "Unable to allocate memory for "
+                        "format data inside dpdk_init_input()");
                 return 1;
         }
@@ -636 +656 @@
 
         if (!libtrace->format_data) {
-                trace_set_err_out(libtrace, TRACE_ERR_INIT_FAILED, "Unable to allocate memory dpdk_init_output()");
+                trace_set_err_out(libtrace, TRACE_ERR_INIT_FAILED, "Unable to allocate memory for "
+                        "format data inside dpdk_init_output()");
                 return -1;
         }
@@ -843 +864 @@
         struct dpdk_format_data_t * format_data = cb_arg;
         struct rte_eth_link link_info;
-        assert(event == RTE_ETH_EVENT_INTR_LSC);
-        assert(port == format_data->port);
+        if (event != RTE_ETH_EVENT_INTR_LSC) {
+                fprintf(stderr, "Received unexpected event in dpdk_lsc_callback()\n");
+                #if RTE_VERSION >= RTE_VERSION_NUM(17, 8, 0, 1)
+                return -1;
+                #else
+                return;
+                #endif
+        }
+        if (port != format_data->port) {
+                fprintf(stderr, "Port does not match port in format data in dpdk_lsc_callback()\n");
+                return -1;
+        }
 
         rte_eth_link_get_nowait(port, &link_info);
@@ -1456 +1487 @@
         struct rte_config *cfg = rte_eal_get_configuration();
 
-        assert(rte_lcore_id() < RTE_MAX_LCORE);
+        if (rte_lcore_id() >= RTE_MAX_LCORE) {
+                fprintf(stderr, "Expected core id less than or equal to RTE_MAX_LCORE in "
+                        "dpdk_punregister_thread()\n");
+                return;
+        }
         pthread_mutex_lock(&dpdk_lock);
         /* Skip if master */
@@ -1469 +1504 @@
         cfg->lcore_count--;
         RTE_PER_LCORE(_lcore_id) = -1; // Might make the world burn if used again
-        assert(cfg->lcore_count >= 1); // We cannot unregister the master LCORE!!
+        if (cfg->lcore_count < 1) {
+                fprintf(stderr, "You cannot unregister the master lcore in dpdk_punregister_thread()\n");
+                return;
+        }
         pthread_mutex_unlock(&dpdk_lock);
         return;
@@ -1595 +1633 @@
  */
 static inline struct dpdk_addt_hdr * get_addt_hdr (const libtrace_packet_t *packet) {
-        assert(packet);
-        assert(packet->buffer);
+        if (!packet) {
+                fprintf(stderr, "NULL packet passed into dpdk_addt_hdr()\n");
+                return NULL;
+        }
+        if (!packet->buffer) {
+                fprintf(stderr, "NULL packet buffer passed into dpdk_addt_hdr()\n");
+                return NULL;
+        }
         /* Our header sits straight after the mbuf header */
         return (struct dpdk_addt_hdr *) ((struct rte_mbuf*) packet->buffer + 1);
@@ -1648 +1692 @@
                                libtrace_packet_t *packet, void *buffer,
                                libtrace_rt_types_t rt_type, uint32_t flags) {
-        assert(packet);
+        if (!packet) {
+                fprintf(stderr, "NULL packet passed into dpdk_prepare_packet()\n");
+                return TRACE_ERR_NULL_PACKET;
+        }
         if (packet->buffer != buffer &&
             packet->buf_control == TRACE_CTRL_PACKET) {
@@ -1950 +1997 @@
                         if (packets[i]->buffer != NULL) {
                                 /* The packet should always be finished */
-                                assert(packets[i]->buf_control == TRACE_CTRL_PACKET);
+                                if (packets[i]->buf_control != TRACE_CTRL_PACKET) {
+                                        trace_set_err(libtrace, TRACE_ERR_BAD_PACKET, "Expected packet buffer "
+                                                "to be empty in dpdk_pread_packets()\n");
+                                        return -1;
+                                }
                                 free(packets[i]->buffer);
                         }
@@ -1975 +2026 @@
         if (packet->buffer != NULL) {
                 /* The packet should always be finished */
-                assert(packet->buf_control == TRACE_CTRL_PACKET);
+                if (packet->buf_control != TRACE_CTRL_PACKET) {
+                        trace_set_err(libtrace, TRACE_ERR_BAD_PACKET, "Expected packet buffer to be "
+                                "empty in dpdk_read_packet()\n");
+                        return -1;
+                }
                 free(packet->buffer);
                 packet->buffer = NULL;
@@ -2097 +2152 @@
                         if (packet->buffer != NULL) {
                                 /* The packet should always be finished */
-                                assert(packet->buf_control == TRACE_CTRL_PACKET);
+                                if (packet->buf_control != TRACE_CTRL_PACKET) {
+                                        trace_set_err(libtrace, TRACE_ERR_BAD_PACKET, "Expected packet "
+                                                "buffer to be empty in dpdk_trace_event()\n");
+                                        return -1;
+                                }
                                 free(packet->buffer);
                                 packet->buffer = NULL;