Marginally more robust glibc version test for sync_file_range detection.

[redis.git] / src / dict.h

diff --git a/src/dict.h b/src/dict.h
index 93331ab34616a50ef725142c3f916152ab003117..3a311f171110f52602f485c9889633baa5c0c899 100644 (file)
--- a/src/dict.h
+++ b/src/dict.h
@@ -1,11 +1,11 @@
 /* Hash Tables Implementation.
  *
 /* Hash Tables Implementation.
  *

- * This file implements in memory hash tables with insert/del/replace/find/
- * get-random-element operations. Hash tables will auto resize if needed
+ * This file implements in-memory hash tables with insert/del/replace/find/
+ * get-random-element operations. Hash tables will auto-resize if needed

  * tables of power of two in size are used, collisions are handled by
  * chaining. See the source code for more information... :)
  *
  * tables of power of two in size are used, collisions are handled by
  * chaining. See the source code for more information... :)
  *

- * Copyright (c) 2006-2010, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2006-2012, Salvatore Sanfilippo <antirez at gmail dot com>

  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without


@@ -80,7 +80,7 @@ typedef struct dict {
     int iterators; /* number of iterators currently running */
 } dict;
 
     int iterators; /* number of iterators currently running */
 } dict;
 

-/* If safe is set to 1 this is a safe iteartor, that means, you can call
+/* If safe is set to 1 this is a safe iterator, that means, you can call

  * dictAdd, dictFind, and other functions against the dictionary even while
  * iterating. Otherwise it is a non safe iterator, and only dictNext()
  * should be called while iterating. */
  * dictAdd, dictFind, and other functions against the dictionary even while
  * iterating. Otherwise it is a non safe iterator, and only dictNext()
  * should be called while iterating. */


@@ -105,10 +105,10 @@ typedef struct dictIterator {
         entry->v.val = (_val_); \
 } while(0)
 
         entry->v.val = (_val_); \
 } while(0)
 

-#define dictSetSignedIntegerVal(d, entry, _val_) \
+#define dictSetSignedIntegerVal(entry, _val_) \

     do { entry->v.s64 = _val_; } while(0)
 
     do { entry->v.s64 = _val_; } while(0)
 

-#define dictSetUnsignedIntegerVal(d, entry, _val_) \
+#define dictSetUnsignedIntegerVal(entry, _val_) \

     do { entry->v.u64 = _val_; } while(0)
 
 #define dictFreeKey(d, entry) \
     do { entry->v.u64 = _val_; } while(0)
 
 #define dictFreeKey(d, entry) \


@@ -130,8 +130,8 @@ typedef struct dictIterator {
 #define dictHashKey(d, key) (d)->type->hashFunction(key)
 #define dictGetKey(he) ((he)->key)
 #define dictGetVal(he) ((he)->v.val)
 #define dictHashKey(d, key) (d)->type->hashFunction(key)
 #define dictGetKey(he) ((he)->key)
 #define dictGetVal(he) ((he)->v.val)

-#define dictGetSignedIntegerVal ((he)->v.s64)
-#define dictGetUnsignedIntegerVal ((he)->v.u64)
+#define dictGetSignedIntegerVal(he) ((he)->v.s64)
+#define dictGetUnsignedIntegerVal(he) ((he)->v.u64)

 #define dictSlots(d) ((d)->ht[0].size+(d)->ht[1].size)
 #define dictSize(d) ((d)->ht[0].used+(d)->ht[1].used)
 #define dictIsRehashing(ht) ((ht)->rehashidx != -1)
 #define dictSlots(d) ((d)->ht[0].size+(d)->ht[1].size)
 #define dictSize(d) ((d)->ht[0].used+(d)->ht[1].used)
 #define dictIsRehashing(ht) ((ht)->rehashidx != -1)


@@ -155,13 +155,15 @@ dictEntry *dictNext(dictIterator *iter);
 void dictReleaseIterator(dictIterator *iter);
 dictEntry *dictGetRandomKey(dict *d);
 void dictPrintStats(dict *d);
 void dictReleaseIterator(dictIterator *iter);
 dictEntry *dictGetRandomKey(dict *d);
 void dictPrintStats(dict *d);

-unsigned int dictGenHashFunction(const unsigned char *buf, int len);
+unsigned int dictGenHashFunction(const void *key, int len);

 unsigned int dictGenCaseHashFunction(const unsigned char *buf, int len);
 void dictEmpty(dict *d);
 void dictEnableResize(void);
 void dictDisableResize(void);
 int dictRehash(dict *d, int n);
 int dictRehashMilliseconds(dict *d, int ms);
 unsigned int dictGenCaseHashFunction(const unsigned char *buf, int len);
 void dictEmpty(dict *d);
 void dictEnableResize(void);
 void dictDisableResize(void);
 int dictRehash(dict *d, int n);
 int dictRehashMilliseconds(dict *d, int ms);

+void dictSetHashFunctionSeed(unsigned int initval);
+unsigned int dictGetHashFunctionSeed(void);

 
 /* Hash table types */
 extern dictType dictTypeHeapStringCopyKey;
 
 /* Hash table types */
 extern dictType dictTypeHeapStringCopyKey;