bugfixes and various improvements

2 files changed, 32 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index ead10f28..b7507762 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Feb 24 15:43:14 MST 2007
+        Improved performance of statistics querying code
+        (O(n^2) to O(n) where n is number of stats).
+        
 Thu Feb 15 21:54:15 MST 2007
         Added IO load statistics.
         
diff --git a/src/plugins/stats/functions.c b/src/plugins/stats/functions.c
index c3f4a9ee..846dd67b 100644
--- a/src/plugins/stats/functions.c
+++ b/src/plugins/stats/functions.c
@@ -440,19 +440,36 @@ static int getEffectivenessStats(const void * closure,
   return OK;
 }
 
-
 static int statsProcessor(const char * optName,
                           unsigned long long value,
                           void * data) {
-  cron_t * delta = data;
+  /**
+   * Keep track of last match (or, more precisely, position
+   * of next expected match) since 99.99% of the time we
+   * go over the same stats in the same order and thus
+   * this will predict correctly).
+   */
+  static unsigned int last;
+  cron_t * delta = data; 
   int j;
   int found;
 
+  if (last >= lsv_size)
+    last = 0;
+  j = last;
   found = -1;
-  for (j=0;j<lsv_size;j++)
-    if (0 == strcmp(optName,
-                    lastStatValues[j].statName))
-      found = j;
+  if (0 == strcmp(optName,
+                  lastStatValues[j].statName)) 
+    found = j;
+  if (found == -1) {
+    for (j=0;j<lsv_size;j++) {
+      if (0 == strcmp(optName,
+                      lastStatValues[j].statName)) {
+        found = j;
+        break;
+      }
+    }
+  }
   if (found == -1) {
     found = lsv_size;
     GROW(lastStatValues,
@@ -467,6 +484,7 @@ static int statsProcessor(const char * optName,
     = value;
   lastStatValues[found].delta
     = *delta;
+  last = found + 1;
   return OK;
 }
 
@@ -481,10 +499,10 @@ static void updateStatValues(void * unused) {
   now = get_time();
   delta = now - lastUpdate;
   MUTEX_LOCK(lock);
-  if (OK == requestStatistics(ectx,
-                              sock,
-                              &statsProcessor,
-                              &delta))
+  if (OK == STATS_getStatistics(ectx,
+                                sock,
+                                &statsProcessor,
+                                &delta))
     lastUpdate = now;
   MUTEX_UNLOCK(lock);
 }