#ifndef __HISTORY_H__
#define __HISTORY_H__
-#include "stl-model.h"
#include "common.h"
#include "classlist.h"
#include "hashtable.h"
#include "threads-model.h"
+#define INIT_SEQ_NUMBER 0xffffffff
+
class ModelHistory {
public:
ModelHistory();
FuncNode * get_curr_func_node(thread_id_t tid);
void update_write_history(void * location, uint64_t write_val);
- HashTable<void *, value_set_t *, uintptr_t, 4> * getWriteHistory() { return write_history; }
- void update_loc_func_nodes_map(void * location, FuncNode * node);
+ HashTable<void *, value_set_t *, uintptr_t, 0> * getWriteHistory() { return write_history; }
+ void update_loc_rd_func_nodes_map(void * location, FuncNode * node);
void update_loc_wr_func_nodes_map(void * location, FuncNode * node);
+ SnapVector<FuncNode *> * getRdFuncNodes(void * location);
+ SnapVector<FuncNode *> * getWrFuncNodes(void * location);
void add_waiting_write(ConcretePredicate * concrete);
void remove_waiting_write(thread_id_t tid);
void check_waiting_write(ModelAction * write_act);
SnapVector<ConcretePredicate *> * getThrdWaitingWrite() { return thrd_waiting_write; }
- SnapVector<inst_act_map_t *> * getThrdInstActMap(uint32_t func_id);
+ WaitObj * getWaitObj(thread_id_t tid);
+ void add_waiting_thread(thread_id_t self_id, thread_id_t waiting_for_id, FuncNode * target_node, int dist);
+ void remove_waiting_thread(thread_id_t tid);
+ void stop_waiting_for_node(thread_id_t self_id, thread_id_t waiting_for_id, FuncNode * target_node);
void set_new_exec_flag();
void dump_func_node_graph();
void print_func_node();
+ void print_waiting_threads();
MEMALLOC
private:
uint32_t func_counter;
+ modelclock_t last_seq_number;
/* Map function names to integer ids */
HashTable<const char *, uint32_t, uintptr_t, 4, model_malloc, model_calloc, model_free> func_map;
ModelVector<FuncNode *> func_nodes;
/* Map a location to a set of values that have been written to it */
- HashTable<void *, value_set_t *, uintptr_t, 4> * write_history;
+ HashTable<void *, value_set_t *, uintptr_t, 0> * write_history;
/* Map a location to FuncNodes that may read from it */
- HashTable<void *, SnapList<FuncNode *> *, uintptr_t, 0> * loc_func_nodes_map;
+ HashTable<void *, SnapVector<FuncNode *> *, uintptr_t, 0> * loc_rd_func_nodes_map;
/* Map a location to FuncNodes that may write to it */
- HashTable<void *, SnapList<FuncNode *> *, uintptr_t, 0> * loc_wr_func_nodes_map;
+ HashTable<void *, SnapVector<FuncNode *> *, uintptr_t, 0> * loc_wr_func_nodes_map;
HashTable<void *, SnapVector<ConcretePredicate *> *, uintptr_t, 0> * loc_waiting_writes_map;
+
+ /* thrd_func_list stores a list of function ids for each thread.
+ * Each element in thrd_func_list stores the functions that
+ * thread i has entered and yet to exit from
+ */
+ SnapVector<func_id_list_t> * thrd_func_list;
+ SnapVector<uint32_t> * thrd_last_entered_func;
+
+ /* The write values each paused thread is waiting for */
SnapVector<ConcretePredicate *> * thrd_waiting_write;
+ SnapVector<WaitObj *> * thrd_wait_obj;
- /* A run-time map from FuncInst to ModelAction per each FuncNode, per each thread.
- * Manipulated by FuncNode, and needed by NewFuzzer */
- HashTable<uint32_t, SnapVector<inst_act_map_t *> *, int, 0> * func_inst_act_maps;
+ bool skip_action(ModelAction * act);
+ void monitor_waiting_thread(uint32_t func_id, thread_id_t tid);
+ void monitor_waiting_thread_counter(thread_id_t tid);
- bool skip_action(ModelAction * act, SnapList<ModelAction *> * curr_act_list);
};
#endif /* __HISTORY_H__ */