X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libhashkit%2Fhashkit.h;h=2d8ad3a2d38aafdaa66737a29921227b96deedc7;hb=f40a312c617295543fb09864a8be80cc027cac79;hp=9b0b32efda6bcd00e7c66bc8deb3b334596b7f0c;hpb=acd4e556bf8e21005dc42500e3f76b40adb89949;p=m6w6%2Flibmemcached

diff --git a/libhashkit/hashkit.h b/libhashkit/hashkit.h
index 9b0b32ef..2d8ad3a2 100644
--- a/libhashkit/hashkit.h
+++ b/libhashkit/hashkit.h
@@ -1,5 +1,5 @@
 /* HashKit
- * Copyright (C) 2009 Brian Aker
+ * Copyright (C) 2009-2010 Brian Aker
  * All rights reserved.
  *
  * Use and distribution licensed under the BSD license.  See
@@ -9,67 +9,121 @@
 #ifndef HASHKIT_H
 #define HASHKIT_H
 
+
 #if !defined(__cplusplus)
 # include <stdbool.h>
 #endif
 #include <inttypes.h>
 #include <sys/types.h>
 #include <libhashkit/visibility.h>
+#include <libhashkit/configure.h>
 #include <libhashkit/types.h>
 #include <libhashkit/algorithm.h>
 #include <libhashkit/behavior.h>
+#include <libhashkit/digest.h>
+#include <libhashkit/function.h>
+#include <libhashkit/str_algorithm.h>
 #include <libhashkit/strerror.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+HASHKIT_API
+hashkit_st *hashkit_create(hashkit_st *hash);
+
+HASHKIT_API
+hashkit_st *hashkit_clone(hashkit_st *destination, const hashkit_st *ptr);
+
+HASHKIT_API
+bool hashkit_compare(const hashkit_st *first, const hashkit_st *second);
+
+HASHKIT_API
+void hashkit_free(hashkit_st *hash);
+
+#define hashkit_is_allocated(__object) ((__object)->options.is_allocated)
+#define hashkit_is_initialized(__object) ((__object)->options.is_initialized)
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 struct hashkit_st
 {
-  struct {
+  struct hashkit_function_st {
     hashkit_hash_fn function;
     void *context;
-  } base_hash;
+  } base_hash, distribution_hash;
+
+  struct {
+    bool is_base_same_distributed:1;
+  } flags;
 
   struct {
     bool is_allocated:1;
   } options;
 };
 
-HASHKIT_API
-hashkit_st *hashkit_create(hashkit_st *hash);
+#ifdef __cplusplus
 
-HASHKIT_API
-hashkit_st *hashkit_clone(hashkit_st *destination, const hashkit_st *ptr);
+#include <string>
 
-HASHKIT_API
-bool hashkit_compare(const hashkit_st *first, const hashkit_st *second);
+class Hashkit {
 
-HASHKIT_API
-void hashkit_free(hashkit_st *hash);
+public:
 
-HASHKIT_API
-uint32_t hashkit_generate_value(const hashkit_st *self, const char *key, size_t key_length);
+  Hashkit()
+  {
+    hashkit_create(&self);
+  }
 
-HASHKIT_API
-hashkit_return_t hashkit_set_base_function(hashkit_st *hash, hashkit_hash_algorithm_t hash_algorithm);
+  Hashkit(const Hashkit& source)
+  {
+    hashkit_clone(&self, &source.self);
+  }
 
-HASHKIT_API
-hashkit_hash_algorithm_t hashkit_get_base_function(const hashkit_st *hash);
+  Hashkit& operator=(const Hashkit& source)
+  {
+    hashkit_free(&self);
+    hashkit_clone(&self, &source.self);
 
-HASHKIT_API
-hashkit_return_t hashkit_set_base_function_custom(hashkit_st *hash, hashkit_hash_fn function, void *context);
+    return *this;
+  }
 
-HASHKIT_API
-uint32_t libhashkit_generate_value(const char *key, size_t key_length, hashkit_hash_algorithm_t hash_algorithm);
+  friend bool operator==(const Hashkit &left, const Hashkit &right)
+  {
+    return hashkit_compare(&left.self, &right.self);
+  }
 
-#define hashkit_is_allocated(__object) ((__object)->options.is_allocated)
-#define hashkit_is_initialized(__object) ((__object)->options.is_initialized)
+  uint32_t digest(std::string& str)
+  {
+    return hashkit_digest(&self, str.c_str(), str.length());
+  }
 
-/** @} */
+  uint32_t digest(const char *key, size_t key_length)
+  {
+    return hashkit_digest(&self, key, key_length);
+  }
 
-#ifdef __cplusplus
-}
+  hashkit_return_t set_function(hashkit_hash_algorithm_t hash_algorithm)
+  {
+    return hashkit_set_function(&self, hash_algorithm);
+  }
+
+  hashkit_return_t set_distribution_function(hashkit_hash_algorithm_t hash_algorithm)
+  {
+    return hashkit_set_function(&self, hash_algorithm);
+  }
+
+  ~Hashkit()
+  {
+    hashkit_free(&self);
+  }
+private:
+
+  hashkit_st self;
+};
 #endif
 
+
 #endif /* HASHKIT_H */