debugging

Author: kaajalbgupta

software/include/enso/helpers.h

@@ -54,6 +54,8 @@
 #include <iostream>
 #include <string>
 #include <thread>
+#include <tuple>
+#include <unordered_map>
 #include <vector>
 
 namespace enso {
@@ -79,6 +81,23 @@ struct stats_t {
   uint64_t nb_pkts;
 } __attribute__((aligned(64)));
 
+// RSS 5-tuple containing dst port, src port, dst ip, src ip, protocol
+typedef std::tuple<uint16_t, uint16_t, uint32_t, uint32_t, uint32_t>
+    config_tuple;
+
+// A hash function used to hash the config tuple
+struct hash_config_tuple {
+  template <class T1, class T2, class T3, class T4, class T5>
+
+  size_t operator()(const std::tuple<T1, T2, T3, T4, T5>& x) const {
+    return std::get<0>(x) ^ std::get<1>(x) ^ std::get<2>(x) ^ std::get<3>(x) ^
+           std::get<4>(x);
+  }
+};
+
+// Hash map containing bindings of configurations to enso pipe IDs
+extern std::unordered_map<config_tuple, int, hash_config_tuple> config_hashmap;
+
 /**
  * @brief Returns RTT, in number of cycles, for a given packet.
  *

software/src/enso/config.cpp

@@ -42,7 +42,6 @@
 #include <enso/helpers.h>
 #include <enso/internals.h>
 #include <immintrin.h>
-#include <mock_pcie.h>
 
 #include <cstdio>
 

software/src/enso/helpers.cpp

@@ -38,14 +38,16 @@
  */
 
 #include <enso/helpers.h>
-#include <mock_pcie.h>
 
 #include <cstdio>
 #include <iostream>
 #include <thread>
 #include <vector>
+
 namespace enso {
 
+std::unordered_map<config_tuple, int, hash_config_tuple> config_hashmap;
+
 uint16_t get_bdf_from_pcie_addr(const std::string& pcie_addr) {
   uint32_t domain, bus, dev, func;
   uint16_t bdf = 0;
@@ -168,8 +170,8 @@ int rss_hash_packet(uint8_t* pkt_buf, int mod) {
 
   // check if this configuration has already been bound
   config_tuple tup(dst_port, src_port, dst_ip, src_ip, protocol);
-  if (config_hashmap.contains(tup)) {
-    return config_hahsmap[tup];
+  if (config_hashmap.find(tup) != config_hashmap.end()) {
+    return config_hashmap[tup];
   }
 
   return (src_ip ^ dst_ip ^ protocol ^ src_port ^ dst_port) % mod;

software/src/mock_pcie.h

@@ -18,8 +18,6 @@
 #include <iostream>
 #include <limits>
 #include <stdexcept>
-#include <tuple>
-#include <unordered_map>
 #include <vector>
 
 #include "pcie.h"
@@ -49,10 +47,4 @@ typedef struct enso_pipe {
  * @brief Vector of all enso pipes in mock
  *
  */
-std::vector<enso_pipe_t*> enso_pipes_vector;
-
-// RSS 5-tuple containing dst port, src port, dst ip, src ip, protocol
-typedef tuple<uint16_t, uint16_t, uint32_t, uint32_t, uint32_t> config_tuple;
-
-// Hash map containing bindings of configurations to enso pipe IDs
-unordered_map<config_tuple, int> config_hashmap;
+std::vector<enso_pipe_t*> enso_pipes_vector;