additional diagnostics on the breakup of returned query counters

Author: ngsrinivas

pyretic/core/language.py

@@ -709,6 +709,12 @@ def __init__(self):
         self.byte_count_table = 0
         self.packet_count_persistent = 0
         self.byte_count_persistent = 0
+        self.packet_count_persistent_apply = 0
+        self.packet_count_persistent_removed = 0
+        self.packet_count_persistent_existing = 0
+        self.byte_count_persistent_apply = 0
+        self.byte_count_persistent_removed = 0
+        self.byte_count_persistent_existing = 0
         self.in_update_cv = Condition()
         self.in_update = False
         self.new_bucket = True
@@ -744,6 +750,8 @@ def apply(self):
                                + ' Packet is:\n' + repr(pkt))
                 self.packet_count_persistent += 1
                 self.byte_count_persistent += pkt['payload_len']
+                self.packet_count_persistent_apply += 1
+                self.byte_count_persistent_apply += pkt['payload_len']
             self.bucket.clear()
         self.log.debug('In bucket ' +  str(id(self)) + ' apply(): ' +
                        'persistent packet count is ' +
@@ -881,6 +889,8 @@ def handle_flow_removed(self, match, priority, version, flow_stat):
                                          packet_count) ) )
                     self.packet_count_persistent += packet_count
                     self.byte_count_persistent += byte_count
+                    self.packet_count_persistent_removed += packet_count
+                    self.byte_count_persistent_removed += byte_count
                 # Note that there is no else action. We just forget
                 # that this rule was ever associated with the bucket
                 # if we get a "flow removed" message before we got
@@ -1034,6 +1044,10 @@ def stat_in_bucket(flow_stat, s):
                                                 ' %d') % id(self))
                                 self.packet_count_persistent -= extracted_pkts
                                 self.byte_count_persistent -= extracted_bytes
+                                self.packet_count_persistent_existing += (
+                                    extracted_pkts)
+                                self.byte_count_persistent_existing += (
+                                    extracted_bytes)
                                 self.clear_existing_rule_flag(me)
                     else:
                         raise RuntimeError("weird flow entry")
@@ -1048,6 +1062,15 @@ def stat_in_bucket(flow_stat, s):
                     self.packet_count_table + self.packet_count_persistent ) ) )
         if not self.outstanding_switches:
             self.log.debug("No outstanding switches; calling callbacks")
+            self.log.debug("*** Returning bucket %d counts.\n%s%s%s%s%s%s" % (
+                    id(self),
+                    "table counts: %d\n" % self.packet_count_table,
+                    "perst. apply: %d\n" % self.packet_count_persistent_apply,
+                    "perst. remov: %d\n" % self.packet_count_persistent_removed,
+                    "perst. exist: %d\n" % self.packet_count_persistent_existing,
+                    "perst. total: %d\n" % self.packet_count_persistent,
+                    "bucket total: %d\n" % (self.packet_count_table +
+                                            self.packet_count_persistent)))
             self.call_callbacks([(self.packet_count_table +
                                   self.packet_count_persistent),
                                  (self.byte_count_table   +

pyretic/core/runtime.py

@@ -124,6 +124,7 @@ def __init__(self, backend, main, path_main, kwargs, mode='interpreted',
         self.packet_in_time = 0
         self.num_packet_ins = 0
         self.update_dynamic_sub_pols()
+        self.total_packets_removed = 0 # pkt count from flow removed messages
 
     def verbosity_numeric(self,verbosity_option):
         numeric_map = { 'low': 1,
@@ -1405,6 +1406,10 @@ def str_convert_match(m):
                 self.log.debug("Got removed flow\n%s with counts %d %d" %
                                (str(match_entry), f['packet_count'],
                                 f['byte_count']) )
+                if version > 0:
+                    self.total_packets_removed += f['packet_count']
+                    self.log.debug("Total packets removed: %d" %
+                                   self.total_packets_removed)
                 self.log.debug('Printing global structure for deleted rules:')
                 for k,v in self.global_outstanding_deletes.iteritems():
                     self.log.debug(str(k) + " : " + str(v))