Reorganize runtime files

cmu-snap · May 2, 2024 · 140a36a · 140a36a
1 parent d351665
commit 140a36a
Show file tree

Hide file tree

Showing 34 changed files with 11 additions and 11 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -8,7 +8,7 @@
             "name": "(d) runtime",
             "type": "debugpy",
             "request": "launch",
-            "program": "${workspaceFolder}/ratemon/runtime/ratemon_runtime.py",
+            "program": "${workspaceFolder}/ratemon/runtime/python/ratemon_runtime.py",
             "console": "integratedTerminal",
             "args": [
                 "-h"
@@ -26,7 +26,7 @@
             "name": "(r) runtime",
             "type": "debugpy",
             "request": "launch",
-            "program": "${workspaceFolder}/ratemon/runtime/ratemon_runtime.py",
+            "program": "${workspaceFolder}/ratemon/runtime/python/ratemon_runtime.py",
             "console": "integratedTerminal",
             "args": [
                 "--model=HistGbdtSklearn",
@@ -55,7 +55,7 @@
             "name": "(r) runtime, schedule",
             "type": "debugpy",
             "request": "launch",
-            "program": "${workspaceFolder}/ratemon/runtime/ratemon_runtime.py",
+            "program": "${workspaceFolder}/ratemon/runtime/python/ratemon_runtime.py",
             "console": "integratedTerminal",
             "args": [
                 "--model=HistGbdtSklearn",
@@ -85,7 +85,7 @@
             "args": [
                 "-o",
                 "/tmp/tmp.prof",
-                "${workspaceFolder}/ratemon/runtime/ratemon_runtime.py",
+                "${workspaceFolder}/ratemon/runtime/python/ratemon_runtime.py",
                 "--model=HistGbdtSklearn",
                 "--model-file=${workspaceFolder}/test/HistGbdtSklearn_fewer_features.pickle",
                 "--interface=ens3",

diff --git a/ratemon/runtime/Makefile → ratemon/runtime/c/Makefile b/ratemon/runtime/Makefile → ratemon/runtime/c/Makefile
diff --git a/ratemon/runtime/experimental/Makefile → ratemon/runtime/c/experimental/Makefile b/ratemon/runtime/experimental/Makefile → ratemon/runtime/c/experimental/Makefile
diff --git a/ratemon/runtime/c/experimental/client_server/.output/client.o b/ratemon/runtime/c/experimental/client_server/.output/client.o
diff --git a/ratemon/runtime/c/experimental/client_server/.output/server.o b/ratemon/runtime/c/experimental/client_server/.output/server.o
diff --git a/...ntime/experimental/client_server/Makefile → ...ime/c/experimental/client_server/Makefile b/...ntime/experimental/client_server/Makefile → ...ime/c/experimental/client_server/Makefile
diff --git a/ratemon/runtime/c/experimental/client_server/client b/ratemon/runtime/c/experimental/client_server/client
diff --git a/...ntime/experimental/client_server/client.c → ...ime/c/experimental/client_server/client.c b/...ntime/experimental/client_server/client.c → ...ime/c/experimental/client_server/client.c
diff --git a/...ntime/experimental/client_server/common.h → ...ime/c/experimental/client_server/common.h b/...ntime/experimental/client_server/common.h → ...ime/c/experimental/client_server/common.h
diff --git a/...xperimental/client_server/libinterptest.c → ...xperimental/client_server/libinterptest.c b/...xperimental/client_server/libinterptest.c → ...xperimental/client_server/libinterptest.c
diff --git a/...ental/client_server/libinterptest_cpp.cpp → ...ental/client_server/libinterptest_cpp.cpp b/...ental/client_server/libinterptest_cpp.cpp → ...ental/client_server/libinterptest_cpp.cpp
diff --git a/ratemon/runtime/c/experimental/client_server/server b/ratemon/runtime/c/experimental/client_server/server
diff --git a/...ntime/experimental/client_server/server.c → ...ime/c/experimental/client_server/server.c b/...ntime/experimental/client_server/server.c → ...ime/c/experimental/client_server/server.c
diff --git a/...n/runtime/experimental/ratemon_test.bpf.c → ...runtime/c/experimental/ratemon_test.bpf.c b/...n/runtime/experimental/ratemon_test.bpf.c → ...runtime/c/experimental/ratemon_test.bpf.c
diff --git a/ratemon/runtime/experimental/ratemon_test.c → ...mon/runtime/c/experimental/ratemon_test.c b/ratemon/runtime/experimental/ratemon_test.c → ...mon/runtime/c/experimental/ratemon_test.c
diff --git a/ratemon/runtime/experimental/ratemon_test.h → ...mon/runtime/c/experimental/ratemon_test.h b/ratemon/runtime/experimental/ratemon_test.h → ...mon/runtime/c/experimental/ratemon_test.h
diff --git a/ratemon/runtime/libratemon_interp.cpp → ratemon/runtime/c/libratemon_interp.cpp b/ratemon/runtime/libratemon_interp.cpp → ratemon/runtime/c/libratemon_interp.cpp
diff --git a/ratemon/runtime/ratemon.h → ratemon/runtime/c/ratemon.h b/ratemon/runtime/ratemon.h → ratemon/runtime/c/ratemon.h
diff --git a/ratemon/runtime/ratemon_main.c → ratemon/runtime/c/ratemon_main.c b/ratemon/runtime/ratemon_main.c → ratemon/runtime/c/ratemon_main.c
diff --git a/ratemon/runtime/ratemon_maps.h → ratemon/runtime/c/ratemon_maps.h b/ratemon/runtime/ratemon_maps.h → ratemon/runtime/c/ratemon_maps.h
diff --git a/ratemon/runtime/ratemon_sockops.bpf.c → ratemon/runtime/c/ratemon_sockops.bpf.c b/ratemon/runtime/ratemon_sockops.bpf.c → ratemon/runtime/c/ratemon_sockops.bpf.c
diff --git a/ratemon/runtime/ratemon_structops.bpf.c → ratemon/runtime/c/ratemon_structops.bpf.c b/ratemon/runtime/ratemon_structops.bpf.c → ratemon/runtime/c/ratemon_structops.bpf.c
diff --git a/ratemon/runtime/ratemon_tc.bpf.c → ratemon/runtime/c/ratemon_tc.bpf.c b/ratemon/runtime/ratemon_tc.bpf.c → ratemon/runtime/c/ratemon_tc.bpf.c
diff --git a/ratemon/runtime/python/__init__.py b/ratemon/runtime/python/__init__.py
diff --git a/ratemon/runtime/old/ebpf.py → ratemon/runtime/python/ebpf.py b/ratemon/runtime/old/ebpf.py → ratemon/runtime/python/ebpf.py
diff --git a/ratemon/runtime/experimental/iter_map.cc → ...n/runtime/python/experimental/iter_map.cc b/ratemon/runtime/experimental/iter_map.cc → ...n/runtime/python/experimental/iter_map.cc
diff --git a/ratemon/runtime/flow_utils.py → ratemon/runtime/python/flow_utils.py b/ratemon/runtime/flow_utils.py → ratemon/runtime/python/flow_utils.py
diff --git a/ratemon/runtime/mitigation_strategy.py → ...mon/runtime/python/mitigation_strategy.py b/ratemon/runtime/mitigation_strategy.py → ...mon/runtime/python/mitigation_strategy.py
diff --git a/ratemon/runtime/pacing_notes.py → ratemon/runtime/python/pacing_notes.py b/ratemon/runtime/pacing_notes.py → ratemon/runtime/python/pacing_notes.py
diff --git a/ratemon/runtime/policies.py → ratemon/runtime/python/policies.py b/ratemon/runtime/policies.py → ratemon/runtime/python/policies.py
@@ -4,7 +4,7 @@
 import logging
 
 from ratemon.model import defaults, models, features, utils
-from ratemon.runtime import reaction_strategy
+from ratemon.runtime.python import reaction_strategy
 
 
 class Policy(IntEnum):

diff --git a/ratemon/runtime/policy_engine.py → ratemon/runtime/python/policy_engine.py b/ratemon/runtime/policy_engine.py → ratemon/runtime/python/policy_engine.py
@@ -12,8 +12,8 @@
 
 from ratemon.model import data, defaults, features, gen_features, models, utils
 from ratemon.model.defaults import Class
-from ratemon.runtime import ebpf, flow_utils, policies
-from ratemon.runtime.policies import Policy
+from ratemon.runtime.python import ebpf, flow_utils, policies
+from ratemon.runtime.python.policies import Policy
 
 
 def run(args, que, flags, done):

diff --git a/ratemon/runtime/old/ratemon_runtime.c → ratemon/runtime/python/ratemon_runtime.c b/ratemon/runtime/old/ratemon_runtime.c → ratemon/runtime/python/ratemon_runtime.c
diff --git a/ratemon/runtime/old/ratemon_runtime.py → ratemon/runtime/python/ratemon_runtime.py b/ratemon/runtime/old/ratemon_runtime.py → ratemon/runtime/python/ratemon_runtime.py
@@ -18,16 +18,16 @@
 import pcapy
 
 from ratemon.model import features, utils
-from ratemon.runtime import (
+from ratemon.runtime.python import (
     flow_utils,
     mitigation_strategy,
     policies,
     policy_engine,
     reaction_strategy,
 )
-from ratemon.runtime.policies import Policy
-from ratemon.runtime.mitigation_strategy import MitigationStrategy
-from ratemon.runtime.reaction_strategy import ReactionStrategy
+from ratemon.runtime.python.policies import Policy
+from ratemon.runtime.python.mitigation_strategy import MitigationStrategy
+from ratemon.runtime.python.reaction_strategy import ReactionStrategy
 
 
 LOCALHOST = utils.ip_str_to_int("127.0.0.1")

diff --git a/ratemon/runtime/reaction_strategy.py → ratemon/runtime/python/reaction_strategy.py b/ratemon/runtime/reaction_strategy.py → ratemon/runtime/python/reaction_strategy.py