Merge branch 'master' of github.com:simbricks/simbricks

experiments/run.py

@@ -52,6 +52,8 @@ parser.add_argument('--force', action='store_const', const=True, default=False,
 parser.add_argument('--verbose', action='store_const', const=True,
         default=False,
         help='Verbose output')
+parser.add_argument('--pcap', action='store_const', const=True, default=False,
+        help='Dump pcap file (if supported by simulator)')
 
 g_env = parser.add_argument_group('Environment')
 g_env.add_argument('--repo', metavar='DIR', type=str,
@@ -104,6 +106,9 @@ def add_exp(e, run, prereq, create_cp, restore_cp):
     env = exp.ExpEnv(args.repo, workdir, cpdir)
     env.create_cp = create_cp
     env.restore_cp = restore_cp
+    env.pcap_file = ''
+    if args.pcap:
+        env.pcap_file = workdir+'/pcap'
 
     run = runtime.Run(e, run, env, outpath, prereq)
     rt.add_run(run)

experiments/simbricks/simulators.py

@@ -239,15 +239,20 @@ class I40eNIC(NICSim):
 class WireNet(NetSim):
     def run_cmd(self, env):
         assert len(self.nics) == 2
-        return '%s/sims/net/wire/net_wire %s %s %d %d %d' % \
+        cmd = '%s/sims/net/wire/net_wire %s %s %d %d %d' % \
                 (env.repodir, env.nic_eth_path(self.nics[0]),
                         env.nic_eth_path(self.nics[1]),
                         self.sync_mode, self.sync_period, self.eth_latency)
+        if len(env.pcap_file) > 0:
+            cmd += ' ' + env.pcap_file
+        return cmd
 
 class SwitchNet(NetSim):
     def run_cmd(self, env):
         cmd = env.repodir + '/sims/net/switch/net_switch'
         cmd += f' -m {self.sync_mode} -S {self.sync_period} -E {self.eth_latency}'
+        if len(env.pcap_file) > 0:
+            cmd += ' -p ' + env.pcap_file
         for n in self.nics:
             cmd += ' -s ' + env.nic_eth_path(n)
         return cmd

sims/net/switch/net_switch.cc

@@ -23,6 +23,7 @@
  */
 
 #include <unistd.h>
+#include <pcap/pcap.h>
 
 #include <cassert>
 #include <climits>
@@ -40,6 +41,7 @@ extern "C" {
 
 static uint64_t sync_period = (500 * 1000ULL);  // 500ns
 static uint64_t eth_latency = (500 * 1000ULL);  // 500ns
+static pcap_dumper_t *dumpfile = nullptr;
 
 /* MAC address type */
 struct MAC {
@@ -85,6 +87,18 @@ static void sigint_handler(int dummy) {
 static void forward_pkt(volatile struct SimbricksProtoNetD2NSend *tx,
                         size_t port) {
   volatile union SimbricksProtoNetN2D *msg_to;
+  struct pcap_pkthdr ph;
+
+  // log to pcap file if initialized
+  if (dumpfile) {
+      memset(&ph, 0, sizeof(ph));
+      ph.ts.tv_sec = cur_ts / 1000000000000ULL;
+      ph.ts.tv_usec = (cur_ts % 1000000000000ULL) / 1000ULL;
+      ph.caplen = tx->len;
+      ph.len = tx->len;
+      pcap_dump((unsigned char *)dumpfile, &ph, (unsigned char *)tx->data);
+  }
+
   msg_to = SimbricksNetIfN2DAlloc(&nsifs[port], cur_ts, eth_latency);
   if (msg_to != NULL) {
     volatile struct SimbricksProtoNetN2DRecv *rx;
@@ -143,9 +157,10 @@ int main(int argc, char *argv[]) {
   int c;
   int bad_option = 0;
   int sync_mode = SIMBRICKS_PROTO_SYNC_SIMBRICKS;
+  pcap_t *pc = nullptr;
 
   // Parse command line argument
-  while ((c = getopt(argc, argv, "s:S:E:m:")) != -1 && !bad_option) {
+  while ((c = getopt(argc, argv, "s:S:E:m:p:")) != -1 && !bad_option) {
     switch (c) {
       case 's': {
         struct SimbricksNetIf nsif;
@@ -172,6 +187,17 @@ int main(int argc, char *argv[]) {
                sync_mode == SIMBRICKS_PROTO_SYNC_BARRIER);
         break;
 
+      case 'p':
+        pc = pcap_open_dead_with_tstamp_precision(DLT_EN10MB, 65535,
+                                                  PCAP_TSTAMP_PRECISION_NANO);
+        if (pc == nullptr) {
+            perror("pcap_open_dead failed");
+            return EXIT_FAILURE;
+        }
+
+        dumpfile = pcap_dump_open(pc, optarg);
+        break;
+
       default:
         fprintf(stderr, "unknown option %c\n", c);
         bad_option = 1;