X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ofproto%2Fofproto-dpif-governor.c;h=459f8715edb1cc1e8b433292a6d52e3e841afb9f;hb=69fc54f47bbc35e81bfe2e38e57f5dcfd9858df4;hp=506dadb6df4fdb009937ef49be2d8cf461e5bd61;hpb=8706009e555bb9fa04a5679e4be2c7c67506802b;p=sliver-openvswitch.git

diff --git a/ofproto/ofproto-dpif-governor.c b/ofproto/ofproto-dpif-governor.c
index 506dadb6d..459f8715e 100644
--- a/ofproto/ofproto-dpif-governor.c
+++ b/ofproto/ofproto-dpif-governor.c
@@ -18,7 +18,6 @@
 
 #include "ofproto-dpif-governor.h"
 
-#include <assert.h>
 #include <stdlib.h>
 
 #include "coverage.h"
@@ -54,13 +53,11 @@ enum { MAX_ELAPSED = 5000 }; /* In milliseconds. */
 
 static void governor_new_generation(struct governor *, unsigned int size);
 
-/* Creates and returns a new governor named 'name' (which is used only for log
- * messages). */
+/* Creates and returns a new governor. */
 struct governor *
-governor_create(const char *name)
+governor_create(void)
 {
     struct governor *g = xzalloc(sizeof *g);
-    g->name = xstrdup(name);
     governor_new_generation(g, MIN_SIZE);
     return g;
 }
@@ -70,7 +67,7 @@ void
 governor_destroy(struct governor *g)
 {
     if (g) {
-        VLOG_INFO("%s: disengaging", g->name);
+        VLOG_INFO("disengaging");
         free(g->table);
         free(g);
     }
@@ -120,7 +117,7 @@ governor_should_install_flow(struct governor *g, uint32_t hash, int n)
     bool install_flow;
     uint8_t *e;
 
-    assert(n > 0);
+    ovs_assert(n > 0);
 
     /* Count these packets and begin a new generation if necessary. */
     g->n_packets += n;
@@ -176,19 +173,18 @@ governor_should_install_flow(struct governor *g, uint32_t hash, int n)
 static void
 governor_new_generation(struct governor *g, unsigned int size)
 {
-    assert(size >= MIN_SIZE && size <= MAX_SIZE);
-    assert(is_pow2(size));
+    ovs_assert(size >= MIN_SIZE && size <= MAX_SIZE);
+    ovs_assert(is_pow2(size));
 
     /* Allocate new table, if necessary. */
     if (g->size != size) {
         if (!g->size) {
-            VLOG_INFO("%s: engaging governor with %u kB hash table",
-                      g->name, size / 1024);
+            VLOG_INFO("engaging governor with %u kB hash table", size / 1024);
         } else {
-            VLOG_INFO("%s: processed %u packets in %.2f s, "
+            VLOG_INFO("processed %u packets in %.2f s, "
                       "%s hash table to %u kB "
                       "(%u hashes, %u setups, %u shortcuts)",
-                      g->name, g->n_packets,
+                      g->n_packets,
                       (time_msec() - g->start) / 1000.0,
                       size > g->size ? "enlarging" : "shrinking",
                       size / 1024,
@@ -199,9 +195,9 @@ governor_new_generation(struct governor *g, unsigned int size)
         g->table = xmalloc(size * sizeof *g->table);
         g->size = size;
     } else {
-        VLOG_DBG("%s: processed %u packets in %.2f s with %u kB hash table "
+        VLOG_DBG("processed %u packets in %.2f s with %u kB hash table "
                  "(%u hashes, %u setups, %u shortcuts)",
-                 g->name, g->n_packets, (time_msec() - g->start) / 1000.0,
+                 g->n_packets, (time_msec() - g->start) / 1000.0,
                  size / 1024, g->n_flows, g->n_setups, g->n_shortcuts);
     }