Merge branch 'branch-weiyu' of /home/git/random-fuzzer into new_fuzzer

[c11tester.git] / history.h

diff --git a/history.h b/history.h
index fff5712629057311811bebde6401a42f57bf56db..5709ab6cc9baa405dc2f5febc00b3910b639c4bf 100644 (file)
--- a/history.h
+++ b/history.h
@@ -1,39 +1,50 @@
+#ifndef __HISTORY_H__
+#define __HISTORY_H__
+
 #include "stl-model.h"
 #include "common.h"
 #include "hashtable.h"
-#include "modeltypes.h"
-
-/* forward declaration */
-class ModelAction;
+#include "hashset.h"
+#include "threads-model.h"
 
-typedef ModelList<ModelAction *> action_mlist_t;
+typedef HashSet<uint64_t, uint64_t, 4, model_malloc, model_calloc, model_free> write_set_t;
 
 class ModelHistory {
 public:
        ModelHistory();
-       
+       ~ModelHistory();
+
        void enter_function(const uint32_t func_id, thread_id_t tid);
        void exit_function(const uint32_t func_id, thread_id_t tid);
 
-        uint32_t get_func_counter() { return func_id; }
-        void incr_func_counter() { func_id++; }
+       uint32_t get_func_counter() { return func_counter; }
+       void incr_func_counter() { func_counter++; }
+
+       void resize_func_nodes(uint32_t max_func_id);
+       void process_action(ModelAction *act, thread_id_t tid);
 
-        HashTable<const char *, uint32_t, uintptr_t, 4> * getFuncMap() { return &func_map; }
-       HashTable<uint32_t, action_mlist_t *, uintptr_t, 4> * getFuncHistory() { return &func_history; }
+       HashTable<const char *, uint32_t, uintptr_t, 4, model_malloc, model_calloc, model_free> * getFuncMap() { return &func_map; }
+       ModelVector<const char *> * getFuncMapRev() { return &func_map_rev; }
+
+       ModelVector<FuncNode *> * getFuncNodes() { return &func_nodes; }
+       FuncNode * get_func_node(uint32_t func_id);
+       uint64_t query_last_read(void * location, thread_id_t tid);
+
+       void add_to_write_history(void * location, uint64_t write_val);
 
        void print();
 
+       MEMALLOC
 private:
-       uint32_t func_id;
+       uint32_t func_counter;
 
-        /* map function names to integer ids */ 
-        HashTable<const char *, uint32_t, uintptr_t, 4> func_map;
+       /* map function names to integer ids */
+       HashTable<const char *, uint32_t, uintptr_t, 4, model_malloc, model_calloc, model_free> func_map;
+       /* map integer ids to function names */
+       ModelVector<const char *> func_map_rev;
 
-       HashTable<uint32_t, action_mlist_t *, uintptr_t, 4> func_history;
-
-       /* work_list stores a list of function ids for each thread
-        * SnapList<uint32_t> is intended to be used as a stack storing
-        * the functions that thread i has entered and yet to exit from 
-        */
-       HashTable<thread_id_t, SnapList<uint32_t> *, uintptr_t, 4> work_list;
+       ModelVector<FuncNode *> func_nodes;
+       HashTable<void *, write_set_t *, uintptr_t, 4, model_malloc, model_calloc, model_free> write_history;
 };
+
+#endif /* __HISTORY_H__ */