[lcd4linux @ 2004-02-27 06:07:55 by reinelt]

hash improvements from Martin

git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@378 3ae390bd-cb1e-0410-b409-cd5a39f66f1f

diff --git a/hash.c b/hash.c
index 44152c62ea2a6c6687dba7775e501498d2065696..0167466b6e2efc8217c3a993b4a3fa0452377512 100644 (file)
--- a/hash.c
+++ b/hash.c
@@ -1,4 +1,4 @@
-/* $Id: hash.c,v 1.12 2004/01/30 20:57:56 reinelt Exp $
+/* $Id: hash.c,v 1.13 2004/02/27 06:07:55 reinelt Exp $
  *
  * hashes (associative arrays)
  *
@@ -23,6 +23,9 @@
  *
  *
  * $Log: hash.c,v $
+ * Revision 1.13  2004/02/27 06:07:55  reinelt
+ * hash improvements from Martin
+ *
  * Revision 1.12  2004/01/30 20:57:56  reinelt
  * HD44780 patch from Martin Hejl
  * dmalloc integrated
@@ -181,9 +184,10 @@ static HASH_ITEM* hash_set_string (HASH *Hash, char *key, char *val)
 
   Item=&(Hash->Items[Hash->nItems-1]);
   
-  Item->key   = strdup(key);
-  Item->val   = strdup(val);
-  Item->Slot  = NULL;
+  Item->key  = strdup(key);
+  Item->val  = strdup(val);
+  Item->root = 0;
+  Item->Slot = NULL;
 
  hash_got_string:
   // set timestamps
@@ -213,16 +217,23 @@ void hash_set_delta (HASH *Hash, char *key, char *val)
   
   // allocate delta table
   if (Item->Slot==NULL) {
+    Item->root = 0;
     Item->Slot  = malloc(DELTA_SLOTS*sizeof(HASH_SLOT));
     memset(Item->Slot, 0, DELTA_SLOTS*sizeof(HASH_SLOT));
   }
   
   // shift delta table
-  memmove (Item->Slot+1, Item->Slot, (DELTA_SLOTS-1)*sizeof(HASH_SLOT));
+  // <--- don't move 63 bytes just to insert one byte - this is _very_
+  // slow on my Elan SC520 or GEODE SC1100
+  //memmove (Item->Slot+1, Item->Slot, (DELTA_SLOTS-1)*sizeof(HASH_SLOT));
+
+  // move the pointer to the next free slot (wrapping around if necessary
+  if (--Item->root < 0) Item->root = DELTA_SLOTS-1;
 
   // set first entry
-  gettimeofday(&(Item->Slot[0].time), NULL);
-  Item->Slot[0].val=number;
+  gettimeofday(&(Item->Slot[Item->root].time), NULL);
+  Item->Slot[Item->root].val=number;
+
 }
 
 
@@ -270,6 +281,7 @@ double hash_get_delta (HASH *Hash, char *key, int delay)
   timeval now, end;
   int i;
   double dv, dt;
+  HASH_SLOT *pSlot;  
   
   // lookup item
   Item=hash_lookup(Hash, key, 1);
@@ -277,33 +289,38 @@ double hash_get_delta (HASH *Hash, char *key, int delay)
   if (Item->Slot==NULL) return 0.0;
   
   // if delay is zero, return absolute value
-  if (delay==0) return Item->Slot[0].val;
+  if (delay==0) return Item->Slot[Item->root].val;
     
   // prepare timing values
-  now=Item->Slot[0].time;
+  now=Item->Slot[Item->root].time;
   end.tv_sec  = now.tv_sec;
   end.tv_usec = now.tv_usec-1000*delay;
   if (end.tv_usec<0) {
     end.tv_sec--;
     end.tv_usec += 1000000;
   }
-  
+
   // search delta slot
-  for (i=1; i<DELTA_SLOTS; i++) {
-    if (Item->Slot[i].time.tv_sec==0) break;
-    if (timercmp(&Item->Slot[i].time, &end, <)) break;
-    dt = (now.tv_sec - Item->Slot[i].time.tv_sec) + (now.tv_usec - Item->Slot[i].time.tv_usec)/1000000.0; 
+  for (i=1; i<DELTA_SLOTS; i++) {   
+    pSlot = &(Item->Slot[(Item->root+i) % DELTA_SLOTS]);
+    if (pSlot->time.tv_sec==0) break;
+    if (timercmp(&(pSlot->time), &end, <)) break;
+    dt = (now.tv_sec - pSlot->time.tv_sec) + (now.tv_usec - pSlot->time.tv_usec)/1000000.0; 
   }
-
+  
+  
   // empty slot => use the one before
-  if (Item->Slot[i].time.tv_sec==0) i--;
+  if (pSlot->time.tv_sec==0) {
+    i--;
+    pSlot = &(Item->Slot[(Item->root+i) % DELTA_SLOTS]);
+  }
   
   // not enough slots available...
   if (i==0) return 0.0;
 
   // delta value, delta time
-  dv = Item->Slot[0].val - Item->Slot[i].val; 
-  dt = (now.tv_sec - Item->Slot[i].time.tv_sec) + (now.tv_usec - Item->Slot[i].time.tv_usec)/1000000.0; 
+  dv = Item->Slot[Item->root].val - pSlot->val; 
+  dt = (now.tv_sec - pSlot->time.tv_sec) + (now.tv_usec - pSlot->time.tv_usec)/1000000.0; 
 
   if (dt > 0.0 && dv >= 0.0) return dv/dt;
   return 0.0;
@@ -360,4 +377,3 @@ void hash_destroy (HASH *Hash)
   Hash->sorted=0;
   Hash->Items=NULL;
 }
-

diff --git a/hash.h b/hash.h
index 6ae658f34b761fbc403cab87142a7fe2c770fe49..cefdc5069ccd0bcd22c0012a51db490bcde4554d 100644 (file)
--- a/hash.h
+++ b/hash.h
@@ -1,4 +1,4 @@
-/* $Id: hash.h,v 1.7 2004/01/21 14:29:03 reinelt Exp $
+/* $Id: hash.h,v 1.8 2004/02/27 06:07:55 reinelt Exp $
  *
  * hashes (associative arrays)
  *
@@ -23,6 +23,9 @@
  *
  *
  * $Log: hash.h,v $
+ * Revision 1.8  2004/02/27 06:07:55  reinelt
+ * hash improvements from Martin
+ *
  * Revision 1.7  2004/01/21 14:29:03  reinelt
  * new helper 'hash_get_regex' which delivers the sum over regex matched items
  * new function 'disk()' which uses this regex matching
@@ -72,6 +75,7 @@ typedef struct {
   char      *key;
   char      *val;
   timeval   time;
+  int       root;
   HASH_SLOT *Slot;
 } HASH_ITEM;
 
@@ -91,5 +95,4 @@ char  *hash_get       (HASH *Hash, char *key);
 double hash_get_delta (HASH *Hash, char *key, int delay);
 double hash_get_regex (HASH *Hash, char *key, int delay);
 void   hash_destroy   (HASH *Hash);
-
 #endif