framework work well

src/maat_ex_data.cpp

@@ -9,53 +9,50 @@
 */
 
 #include <stddef.h>
+#include <stdio.h>
 
 #include "uthash/uthash.h"
 #include "uthash/utarray.h"
-#include "maat_rhash.h"
+#include "rcu_hash.h"
+#include "utils.h"
 #include "maat_utils.h"
-
-typedef void ex_data_schema_new_func_t(int table_id, const char *key, const char *table_line, void* ad, long argl, void *argp);
-typedef void ex_data_schema_free_func_t(int table_id, void* ad, long argl, void *argp);
-typedef void ex_data_schema_dup_func_t(int table_id, void *to, void *from, long argl, void *argp);
-/*
-struct ex_data_schema
-{
-	ex_data_schema_new_func_t* new_func;
-	ex_data_schema_free_func_t* free_func;
-	ex_data_schema_dup_func_t* dup_func;
-	//Maat_plugin_EX_key2index_func_t* key2index_func;
-	long argl;
-	void *argp;
-}; */
+#include "maat_table_schema.h"
+#include "maat_ex_data.h"
 
 struct ex_data_runtime {
     UT_array *cache_rows;
     size_t cache_row_num;
     size_t cache_size;
 
-    struct rhash_table *htable;
-	//const struct ex_data_schema* ex_schema;
+    struct rcu_hash_table *htable;
+    struct ex_data_schema *ex_schema;
 	int table_id;
 };
 
-void cache_row_free(void*p)
+void cache_row_free(void *p)
 {
-	free(*(char**)p);
+	free(*(char **)p);
 }
 
 UT_icd ut_cache_row_icd = {sizeof(char*), NULL, NULL, cache_row_free};
 
-struct ex_data_runtime *ex_data_runtime_new(void (* data_free)(void *data))
+struct ex_data_runtime *ex_data_runtime_new(int table_id, rcu_hash_data_free_fn *data_free_fn)
 {
     struct ex_data_runtime *ex_data_rt = ALLOC(struct ex_data_runtime, 1);
 
     utarray_new(ex_data_rt->cache_rows, &ut_cache_row_icd);
-    ex_data_rt->htable = rhash_table_create(data_free);
+    ex_data_rt->htable = rcu_hash_new(data_free_fn);
+    ex_data_rt->table_id = table_id;
+
+    return ex_data_rt;
 }
 
 void ex_data_runtime_free(struct ex_data_runtime *ex_data_rt)
 {
+    if (NULL == ex_data_rt) {
+        return;
+    }
+
     if (ex_data_rt->cache_rows != NULL) {
 		utarray_free(ex_data_rt->cache_rows);
 		ex_data_rt->cache_rows=NULL;
@@ -63,8 +60,128 @@ void ex_data_runtime_free(struct ex_data_runtime *ex_data_rt)
 	}
 
     if (ex_data_rt->htable != NULL) {
-        rhash_table_destroy(ex_data_rt->htable);
+        rcu_hash_free(ex_data_rt->htable);
     }
 
     free(ex_data_rt);
+}
+
+void ex_data_runtime_commit(struct ex_data_runtime *ex_data_rt)
+{
+    rcu_hash_commit(ex_data_rt->htable);
+}
+
+void ex_data_runtime_cache_row_put(struct ex_data_runtime *ex_data_rt, const char *row)
+{
+	size_t len = strlen(row) + 1;
+	char* row_copy = ALLOC(char, len);
+
+	memcpy(row_copy, row, len);
+	ex_data_rt->cache_size += len;
+	utarray_push_back(ex_data_rt->cache_rows, &row_copy);
+	ex_data_rt->cache_row_num++;	
+}
+
+const char *ex_data_runtime_cached_row_get(struct ex_data_runtime *ex_data_rt, size_t index)
+{
+    const char** row = NULL;
+	row = (const char **)utarray_eltptr(ex_data_rt->cache_rows, index);
+	return *row;
+}
+
+void ex_data_runtime_clear_cached_row(struct ex_data_runtime *ex_data_rt)
+{
+	utarray_free(ex_data_rt->cache_rows);
+	ex_data_rt->cache_rows = NULL;
+	ex_data_rt->cache_row_num = 0;
+	ex_data_rt->cache_size = 0;
+}
+
+size_t ex_data_runtime_cached_row_count(struct ex_data_runtime *ex_data_rt)
+{
+    if (NULL == ex_data_rt) {
+        return 0;
+    }
+
+    return ex_data_rt->cache_row_num;
+}
+
+void ex_data_runtime_clear_row_cache(struct ex_data_runtime *ex_data_rt)
+{
+    utarray_free(ex_data_rt->cache_rows);
+    ex_data_rt->cache_rows = NULL;
+    ex_data_rt->cache_row_num = 0;
+    ex_data_rt->cache_size = 0;
+}
+
+void ex_data_runtime_set_schema(struct ex_data_runtime *ex_data_rt, struct ex_data_schema *schema)
+{
+    ex_data_rt->ex_schema = schema;
+}
+
+void ex_data_runtime_set_user_ctx(struct ex_data_runtime *ex_data_rt, void *user_ctx)
+{
+    rcu_hash_set_user_ctx(ex_data_rt->htable, user_ctx);
+}
+
+void *ex_data_runtime_row2ex_data(struct ex_data_runtime *ex_data_rt, const char *row, const char *key, size_t key_len)
+{   
+    void *ex_data = NULL;
+    struct ex_data_schema *ex_schema = ex_data_rt->ex_schema;
+    ex_schema->new_func(ex_data_rt->table_id, key, row, &ex_data, ex_schema->argl, ex_schema->argp);
+
+    return ex_data;
+}
+
+void ex_data_runtime_add_ex_data(struct ex_data_runtime *ex_data_rt, const char *key, size_t key_len, void *data)
+{
+    void *tmp_data = rcu_hash_find(ex_data_rt->htable, key, key_len);
+    if (tmp_data != NULL) {
+        return;
+    }
+
+    rcu_hash_add(ex_data_rt->htable, key, key_len, data);
+}
+
+void ex_data_runtime_del_ex_data(struct ex_data_runtime *ex_data_rt, const char *key, size_t key_len)
+{
+    void *tmp_data = rcu_hash_find(ex_data_rt->htable, key, key_len);
+    if (NULL == tmp_data) {
+        fprintf(stderr, "ex data del error: no such key:%s", key);
+        return;
+    }
+
+    rcu_hash_del(ex_data_rt->htable, key, key_len);
+}
+
+void *ex_data_runtime_get_ex_data(struct ex_data_runtime *ex_data_rt, const char *key, size_t key_len)
+{
+    void *ex_data = rcu_hash_find(ex_data_rt->htable, key, key_len);
+    if (NULL == ex_data) {
+        return NULL;
+    }
+
+    void *dup_ex_data = NULL;
+    ex_data_rt->ex_schema->dup_func(ex_data_rt->table_id, &dup_ex_data, &ex_data, 
+                                    ex_data_rt->ex_schema->argl, ex_data_rt->ex_schema->argp);
+    return dup_ex_data;
+}
+
+size_t ex_data_runtime_ex_data_count(struct ex_data_runtime *ex_data_rt)
+{
+    return rcu_hash_count(ex_data_rt->htable);
+}
+
+size_t ex_data_runtime_list_updating_ex_data(struct ex_data_runtime *ex_data_rt, void ***ex_data_array)
+{
+    if (NULL == ex_data_rt->ex_schema) {
+        return 0;
+    }
+
+    return rcu_hash_list_updating_data(ex_data_rt->htable, ex_data_array);
+}
+
+int ex_data_runtime_updating_flag(struct ex_data_runtime *ex_data_rt)
+{
+    return rcu_hash_updating_flag(ex_data_rt->htable);
 }