Move non Machnet apps out of src/apps to src/tools

microsoft · Jul 9, 2024 · d51fbf2 · d51fbf2
1 parent ecd6dfd
commit d51fbf2
Show file tree

Hide file tree

Showing 14 changed files with 13 additions and 14 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -34,6 +34,7 @@ if(LIBDPDK_STATIC_FOUND)
   enable_testing()
   add_subdirectory(tests)
   add_subdirectory(apps)
+  add_subdirectory(tools)
 else()
   message(WARNING "DPDK not found and RTE_SDK is not set. Building only msg_gen.")
   add_subdirectory(apps/msg_gen)

diff --git a/src/apps/CMakeLists.txt b/src/apps/CMakeLists.txt
@@ -1,9 +1,5 @@
 include_directories(../modules)
 
-add_subdirectory(pktgen)
 add_subdirectory(machnet)
 add_subdirectory(msg_gen)
-add_subdirectory(ping)
 add_subdirectory(rocksdb_server)
-add_subdirectory(jring_perf)
-add_subdirectory(jring2_perf)
diff --git a/src/apps/hello_world/CMakeLists.txt b/src/apps/hello_world/CMakeLists.txt
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
@@ -0,0 +1,6 @@
+include_directories(../modules)
+
+add_subdirectory(pktgen)
+add_subdirectory(ping)
+add_subdirectory(jring_perf)
+add_subdirectory(jring2_perf)
diff --git a/src/apps/jring2_perf/CMakeLists.txt → src/tools/jring2_perf/CMakeLists.txt b/src/apps/jring2_perf/CMakeLists.txt → src/tools/jring2_perf/CMakeLists.txt
diff --git a/src/apps/jring2_perf/main.cc → src/tools/jring2_perf/main.cc b/src/apps/jring2_perf/main.cc → src/tools/jring2_perf/main.cc
diff --git a/src/apps/jring_perf/CMakeLists.txt → src/tools/jring_perf/CMakeLists.txt b/src/apps/jring_perf/CMakeLists.txt → src/tools/jring_perf/CMakeLists.txt
diff --git a/src/apps/jring_perf/main.cc → src/tools/jring_perf/main.cc b/src/apps/jring_perf/main.cc → src/tools/jring_perf/main.cc
diff --git a/src/apps/ping/CMakeLists.txt → src/tools/ping/CMakeLists.txt b/src/apps/ping/CMakeLists.txt → src/tools/ping/CMakeLists.txt
diff --git a/src/apps/ping/README.md → src/tools/ping/README.md b/src/apps/ping/README.md → src/tools/ping/README.md
@@ -33,9 +33,8 @@ Other legal configuration options are safely ignored (for example, `engine_threa
 
 ### Running
 
-From `${REPOROOT}/build/src/apps/ping`:
+From `${REPOROOT}/build/src/tools/ping`:
 
 ```bash
 sudo GLOG_logtostderr=1 ./ping --remote_ip 10.0.0.1
 ```
-**Attention**: Currently the utility expects the remote host to be specified with its IP address. This will be fixed in the future to support hostnames as well.
diff --git a/src/apps/ping/main.cc → src/tools/ping/main.cc b/src/apps/ping/main.cc → src/tools/ping/main.cc
diff --git a/src/apps/pktgen/CMakeLists.txt → src/tools/pktgen/CMakeLists.txt b/src/apps/pktgen/CMakeLists.txt → src/tools/pktgen/CMakeLists.txt
diff --git a/src/apps/pktgen/README.md → src/tools/pktgen/README.md b/src/apps/pktgen/README.md → src/tools/pktgen/README.md
@@ -30,7 +30,7 @@ When running in this mode the application is actively generating packets. It als
 # Send packets to a remote host.
 REMOTE_IP="10.0.0.254"
 cd ${REPOROOT}/build/
-sudo GLOG_logtostderr=1 ./src/apps/pktgen/pktgen --remote_ip $REMOTE_IP --active-generator
+sudo GLOG_logtostderr=1 ./src/tools/pktgen/pktgen --remote_ip $REMOTE_IP --active-generator
 
 # If ran from a different directory, you may need to specify the path to the config file:
 sudo GLOG_logtostderr=1 ./pktgen --config_file ${REPOROOT}/src/apps/machnet/config.json --remote_ip $REMOTE_IP --active-generator
@@ -41,7 +41,7 @@ The above command will run the `pktgen` application to a remote machine with IP
 
 ```bash
 # From ${REPOROOT}/build/
-sudo GLOG_logtostderr=1 ./src/apps/pktgen/pktgen --remote_ip $REMOTE_IP --active-generator --pkt_size 1500
+sudo GLOG_logtostderr=1 ./src/tools/pktgen/pktgen --remote_ip $REMOTE_IP --active-generator --pkt_size 1500
 ```
 
 ### Running in ping mode (RTT measurement)
@@ -53,7 +53,7 @@ The `pktgen` is collecting roundtrip time measurements. When stopping the apppli
 ```bash
 REMOTE_IP="10.0.0.254"
 # From ${REPOROOT}/build/
-sudo GLOG_logtostderr=1 ./src/apps/pktgen/pktgen --remote_ip $REMOTE_IP --ping
+sudo GLOG_logtostderr=1 ./src/tools/pktgen/pktgen --remote_ip $REMOTE_IP --ping
 ```
 
 If you want RTT measurements printed every 1 second, add option `--v=1` to the previous invocation.
@@ -66,12 +66,12 @@ To save the samples in a log file add option: `--rtt_log path/to/file`.
 When running in this mode the application is only bouncing packets to the remote host. It does not generate any other packets.
 
 
-From `${REPOROOT}/build/src/apps/pktgen`:
+From `${REPOROOT}/build/src/tools/pktgen`:
 
 ```bash
 REMOTE_IP="10.0.0.254"
 # From ${REPOROOT}/build/
-sudo GLOG_logtostderr=1 ./src/apps/pktgen/pktgen
+sudo GLOG_logtostderr=1 ./src/tools/pktgen/pktgen
 ```
 
 The above command will run the `pktgen` application in **passive** mode on local machine. It will send all received packets to the originating remote server.
diff --git a/src/apps/pktgen/main.cc → src/tools/pktgen/main.cc b/src/apps/pktgen/main.cc → src/tools/pktgen/main.cc