detect sub_policies whose classifiers have been invalidated

Author: Joshua Reich

pyretic/core/language.py

@@ -73,6 +73,9 @@ def eval(self, pkt):
         """
         raise NotImplementedError
 
+    def invalidate_classifier(self):
+        self._classifier = None
+
     def compile(self):
         """
         Produce a Classifier for this policy
@@ -1064,7 +1067,7 @@ def detach(self):
 
     def changed(self):
         if self.notify:
-            self.notify()
+            self.notify(self)
 
     @property
     def policy(self):
@@ -1242,6 +1245,38 @@ def queries_in_eval(acc, policy):
     return acc
 
 
+def on_recompile_path(acc,pol_id,policy):
+    if (  policy == identity or
+          policy == drop or
+          isinstance(policy,match) or
+          isinstance(policy,modify) or
+          policy == Controller or
+          isinstance(policy,Query)):
+        return set()
+    elif (isinstance(policy,negate) or
+          isinstance(policy,parallel) or
+          isinstance(policy,union) or
+          isinstance(policy,sequential) or
+          isinstance(policy,intersection)):
+        sub_acc = set()
+        for sub_policy in policy.policies:
+            sub_acc |= on_recompile_path(sub_acc,pol_id,sub_policy)
+        if sub_acc:
+            return acc | {policy} | sub_acc
+        else:
+            return sub_acc
+    elif isinstance(policy,DerivedPolicy):
+        if id(policy) == pol_id:
+            return acc | {policy}
+        else:
+            sub_acc = on_recompile_path(set(),pol_id,policy.policy)
+            if sub_acc:
+                return acc | {policy} | sub_acc
+            else:
+                return set()
+    else:
+        raise NotImplementedError
+
 
 ###############################################################################
 # Classifiers

pyretic/core/runtime.py

@@ -124,11 +124,14 @@ def handle_packet_in(self, concrete_pkt):
 # DYNAMICS  
 #############
 
-    def handle_policy_change(self):
+    def handle_policy_change(self,sub_pol):
         """
         Updates runtime behavior (both interpreter and switch classifiers)
         some sub-policy in self.policy changes.
         """
+        map(lambda p: p.invalidate_classifier(), 
+            on_recompile_path(set(),id(sub_pol),self.policy))
+
         if self.in_update_network:
             return