Changeset 147 for trunk/lib/lru_cache.c

Timestamp:

02/22/09 14:31:52 (15 years ago)

Author:

tim

Message:

added talloc library

incorporated talloc into winsec and lru_cache modules

introduced talloc into SK caching system

File:

• trunk/lib/lru_cache.c (modified) (12 diffs)

trunk/lib/lru_cache.c

@@ -1 +1 @@
 /*
- * Copyright (C) 2008 Timothy D. Morgan
+ * Copyright (C) 2008-2009 Timothy D. Morgan
  *
  * This program is free software; you can redistribute it and/or modify
@@ -18 +18 @@
  */
 
-#include "../include/lru_cache.h"
+#include "lru_cache.h"
 
 
@@ -97 +97 @@
 #endif
 
-lru_cache* lru_cache_create(uint32_t max_keys, uint32_t secret, bool free_data)
+
+lru_cache* lru_cache_create(uint32_t max_keys, uint32_t secret)
+{
+  return lru_cache_create_ctx(NULL, max_keys, secret, false);
+}
+
+
+lru_cache* lru_cache_create_ctx(void* talloc_ctx, uint32_t max_keys, 
+                                uint32_t secret, bool talloc_data)
 {
   lru_cache* ret_val;
 
-  ret_val = (lru_cache*)malloc(sizeof(lru_cache));
+  ret_val = talloc(talloc_ctx, lru_cache);
   if(ret_val == NULL)
     return NULL;
@@ -114 +122 @@
   }
 
-  ret_val->table 
-    = (lru_cache_element**)malloc(sizeof(lru_cache_element*) 
-                                  * ret_val->num_buckets);
+  ret_val->table = talloc_array(ret_val, 
+                                lru_cache_element*, ret_val->num_buckets);
   if(ret_val->table == NULL)
   {
-    free(ret_val);
+    talloc_free(ret_val);
     return NULL;
   }
@@ -127 +134 @@
   ret_val->max_keys = max_keys;
   ret_val->secret = secret;
-  ret_val->free_data = free_data;
+  ret_val->talloc_data = talloc_data;
   ret_val->num_keys = 0;
   memset(ret_val->table, 0, ret_val->num_buckets*sizeof(lru_cache_element*));
@@ -137 +144 @@
 void lru_cache_destroy(lru_cache* ht)
 {
-  lru_cache_element* cur;
-  lru_cache_element* last = NULL;
-  
-  for(cur=ht->oldest; cur != NULL; last=cur,cur=cur->newer)
-  {
-    if(last != NULL)
-    {
-      if(ht->free_data)
-        free(last->data);
-      free(last->index);
-      free(last);
-    }
-  }
-  free(ht->table);
   ht->secret = 0;
-  free(ht);
+  talloc_free(ht);
 }
 
@@ -179 +172 @@
      * so remove it from the list for now.
      */
-    if(ht->free_data)
-      free(e->data);
+    if(ht->talloc_data)
+      talloc_free(e->data);
 
     if(e->newer == NULL)
@@ -226 +219 @@
       e->next = NULL;
 
-      if(ht->free_data)
-        free(e->data);
-
-      tmp_index = realloc(e->index, index_len);
+      if(ht->talloc_data)
+        talloc_free(e->data);
+
+      tmp_index = talloc_realloc_size(e, e->index, index_len);
       if(tmp_index == NULL)
       {
-        free(e->index);
-        free(e);
+        talloc_free(e);
         return false;
       }
@@ -242 +234 @@
     { /* Brand new element because we have room to spare. */
 
-      e = (lru_cache_element*)malloc(sizeof(lru_cache_element));
+      e = talloc(ht->table, lru_cache_element);
       if(e == NULL)
         return false;
       
-      e->index = malloc(index_len);
+      e->index = talloc_size(e, index_len);
       if(e->index == NULL)
       {
-        free(e);
+        talloc_free(e);
         return false;
       }
@@ -264 +256 @@
   }
   e->data = data;
+  if(ht->talloc_data)
+    talloc_steal(e, e->data);
 
   /* Finally, let's insert the element to the newest position in the LRU list.*/
@@ -336 +330 @@
     return false;
 
-  if(ht->free_data)
-    free(cur->data);
-
   /* Detach from list */
   if(cur->newer == NULL)
@@ -356 +347 @@
     last->next = cur->next;
 
-  free(cur->index);
-  free(cur);
+  talloc_free(cur);
   
   /* Removing entry, decrement counters. */