[WIP] Refactor RateMon for RWND project

ratemon/model/loss_event_rate.py

@@ -8,7 +8,7 @@
 
 class LossTracker:
     def __init__(self, flow, window_sizes=[8]):
-        assert window_sizes, "Must specific window_sizes."
+        assert window_sizes, "Must specify window_sizes."
         self.flow = flow
         self.window_sizes = window_sizes
         self.largest_window = max(self.window_sizes)

ratemon/model/models.py

@@ -1371,6 +1371,18 @@ def predict(self, dat_in):
         raise NotImplementedError("ServicePolicyModel does not support prediction.")
 
 
+class VoidModel:
+    """An empty model. Used to maintain API compatibility."""
+
+    # win_size = 8
+
+    in_spc = ()
+
+    def predict(self, dat_in):
+        """Predicts the fairness of a flow."""
+        raise NotImplementedError("VoidModel does not support prediction.")
+
+
 #################################################################
 # Old models. Present for archival purposes only. These are not #
 # guaranteed to function.                                       #

ratemon/runtime/flow_utils.py

@@ -84,7 +84,10 @@ def __init__(self, fourtuple, loss_event_windows, start_time_us):
         self.latest_time_sec = time.time()
         self.label = defaults.Class.NEAR_TARGET
         self.decision = (defaults.Decision.NOT_PACED, None)
-        self.loss_tracker = loss_event_rate.LossTracker(self, loss_event_windows)
+        if loss_event_windows:
+            self.loss_tracker = loss_event_rate.LossTracker(self, loss_event_windows)
+        else:
+            self.loss_tracker = None
 
     def __str__(self):
         """Create a string representation of this flow."""

ratemon/runtime/policies.py

@@ -3,7 +3,7 @@
 from enum import IntEnum
 import logging
 
-from ratemon.model import features, utils, defaults
+from ratemon.model import defaults, models, features, utils
 from ratemon.runtime import reaction_strategy
 
 
@@ -55,6 +55,23 @@ def choices():
     return [to_str(policy) for policy in POLICIES]
 
 
+def get_model_for_policy(policy, model_file):
+    if policy == Policy.NOPOLICY:
+        model = models.VoidModel()
+    elif policy == Policy.SERVICEPOLICY:
+        model = models.ServicePolicyModel()
+    elif policy == Policy.FLOWPOLICY:
+        assert model_file is not None
+        model = models.load_model(model_file)
+    elif policy == Policy.STATIC_RWND:
+        model = models.VoidModel()
+    elif policy == Policy.SCHEDULED_RWND:
+        model = models.VoidModel()
+    else:
+        raise RuntimeError(f"Unknown policy: {to_str(policy)}")
+    return model
+
+
 def make_decision(
     policy,
     flowkeys,
@@ -296,5 +313,5 @@ def make_decision_staticrwnd(schedule):
     return (
         defaults.Decision.PACED,
         None,
-        reaction_strategy.get_scheduled_pacing(schedule),
+        reaction_strategy.get_static_rwnd(schedule),
     )

ratemon/runtime/policy_engine.py

@@ -48,11 +48,7 @@ def signal_handler(sig, frame):
 def main_loop(args, flow_to_rwnd, que, flags, done):
     """Receive packets and run evaluate the policy on them."""
     logging.info("Loading model: %s", args.model_file)
-    net = (
-        models.ServicePolicyModel()
-        if args.policy == Policy.SERVICEPOLICY
-        else models.load_model(args.model_file)
-    )
+    net = policies.get_model_for_policy(args.policy, args.model_file)
     logging.info("Model features:\n\t%s", "\n\t".join(net.in_spc))
     flow_to_prev_features = {}
     # Maps flowkey to (decision, desired throughput, corresponding RWND)
@@ -378,8 +374,8 @@ def batch_eval(
             all_fets,
             smooth(flw_labels),
             flow_to_decisions,
-            args.schedule,
             args.reaction_strategy,
+            args.schedule,
         )
         if new_decision is not None:
             for flowkey in flowkeys: