merge

[c11tester.git] / history.h

diff --git a/history.h b/history.h
index d6d090baa741e83cb1d9fe0f49580c70ac7fc1b9..2edf12a8c790d95f4ef56b18812220861cec4f7b 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, 0, model_malloc, model_calloc, model_free> write_set_t;
+
 class ModelHistory {
 public:
        ModelHistory();
@@ -14,6 +20,7 @@ public:
        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, model_malloc, model_calloc, model_free> * getFuncMap() { return &func_map; }
@@ -21,8 +28,12 @@ public:
 
        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();
+       void print_write();
+       void print_func_node();
 
        MEMALLOC
 private:
@@ -34,4 +45,9 @@ private:
        ModelVector<const char *> func_map_rev;
 
        ModelVector<FuncNode *> func_nodes;
+
+       HashTable<void *, write_set_t *, uintptr_t, 4, model_malloc, model_calloc, model_free> write_history;
+       HashSet<void *, uintptr_t, 4, model_malloc, model_calloc, model_free> write_locations;
 };
+
+#endif /* __HISTORY_H__ */