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 b6707f9fe6d2cd9f2343ae820080fe53f63eda79..5709ab6cc9baa405dc2f5febc00b3910b639c4bf 100644 (file)
--- a/history.h
+++ b/history.h
@@ -1,8 +1,14 @@
+#ifndef __HISTORY_H__
+#define __HISTORY_H__
+
 #include "stl-model.h"
 #include "common.h"
 #include "hashtable.h"
+#include "hashset.h"
 #include "threads-model.h"
 
+typedef HashSet<uint64_t, uint64_t, 4, model_malloc, model_calloc, model_free> write_set_t;
+
 class ModelHistory {
 public:
        ModelHistory();
@@ -14,24 +20,31 @@ public:
        uint32_t get_func_counter() { return func_counter; }
        void incr_func_counter() { func_counter++; }
 
-       void add_func_atomic(ModelAction *act, thread_id_t tid);
+       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, model_malloc, model_calloc, model_free> * getFuncMap() { return &func_map; }
        ModelVector<const char *> * getFuncMapRev() { return &func_map_rev; }
 
-       ModelVector<FuncNode *> * getFuncAtomics() { return &func_atomics; }
+       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 link_insts(func_inst_list_t * inst_list);
        void print();
 
        MEMALLOC
 private:
        uint32_t func_counter;
 
-       /* map function names to integer ids */ 
+       /* 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 */ 
+       /* map integer ids to function names */
        ModelVector<const char *> func_map_rev;
 
-       ModelVector<FuncNode *> func_atomics;
+       ModelVector<FuncNode *> func_nodes;
+       HashTable<void *, write_set_t *, uintptr_t, 4, model_malloc, model_calloc, model_free> write_history;
 };
+
+#endif /* __HISTORY_H__ */