projects
/
c11tester.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
temporarily remove assertion for 'lock access before initialization'; to be improve...
[c11tester.git]
/
history.cc
diff --git
a/history.cc
b/history.cc
index ec90a5a4826a06d42a7cb3cff1599ec621a99c25..c896511ebc5033545890f50d926eee2296ba7eed 100644
(file)
--- a/
history.cc
+++ b/
history.cc
@@
-3,24
+3,31
@@
#include "action.h"
#include "funcnode.h"
#include "action.h"
#include "funcnode.h"
+#include "model.h"
+#include "execution.h"
+
/** @brief Constructor */
ModelHistory::ModelHistory() :
func_counter(0), /* function id starts with 0 */
func_map(),
/** @brief Constructor */
ModelHistory::ModelHistory() :
func_counter(0), /* function id starts with 0 */
func_map(),
- func_
atomics
(),
- work_list(2) /* we have at least two threads */
+ func_
map_rev
(),
+ func_atomics()
{}
void ModelHistory::enter_function(const uint32_t func_id, thread_id_t tid)
{
{}
void ModelHistory::enter_function(const uint32_t func_id, thread_id_t tid)
{
+ //model_print("thread %d entering func %d\n", tid, func_id);
uint32_t id = id_to_int(tid);
uint32_t id = id_to_int(tid);
- if ( work_list.size() <= id )
- work_list.resize( id + 1 );
+ SnapVector<func_id_list_t *> * thrd_func_list = model->get_execution()->get_thrd_func_list();
+
+ if ( thrd_func_list->size() <= id )
+ thrd_func_list->resize( id + 1 );
+
+ func_id_list_t * func_list = thrd_func_list->at(id);
- func_id_list_t * func_list = work_list[id];
if (func_list == NULL) {
func_list = new func_id_list_t();
if (func_list == NULL) {
func_list = new func_id_list_t();
-
work_list[id]
= func_list;
+
thrd_func_list->at(id)
= func_list;
}
func_list->push_back(func_id);
}
func_list->push_back(func_id);
@@
-28,7
+35,9
@@
void ModelHistory::enter_function(const uint32_t func_id, thread_id_t tid)
void ModelHistory::exit_function(const uint32_t func_id, thread_id_t tid)
{
void ModelHistory::exit_function(const uint32_t func_id, thread_id_t tid)
{
- func_id_list_t * func_list = work_list[ id_to_int(tid) ];
+ SnapVector<func_id_list_t *> * thrd_func_list = model->get_execution()->get_thrd_func_list();
+
+ func_id_list_t * func_list = thrd_func_list->at( id_to_int(tid) );
uint32_t last_func_id = func_list->back();
if (last_func_id == func_id) {
uint32_t last_func_id = func_list->back();
if (last_func_id == func_id) {
@@
-37,19
+46,23
@@
void ModelHistory::exit_function(const uint32_t func_id, thread_id_t tid)
model_print("trying to exit with a wrong function id\n");
model_print("--- last_func: %d, func_id: %d\n", last_func_id, func_id);
}
model_print("trying to exit with a wrong function id\n");
model_print("--- last_func: %d, func_id: %d\n", last_func_id, func_id);
}
+ //model_print("thread %d exiting func %d\n", tid, func_id);
}
}
-void ModelHistory::add_func_atomic(ModelAction *act, thread_id_t tid) {
+void ModelHistory::add_func_atomic(ModelAction *act, thread_id_t tid)
+{
/* return if thread i has not entered any function or has exited
from all functions */
/* return if thread i has not entered any function or has exited
from all functions */
+ SnapVector<func_id_list_t *> * thrd_func_list = model->get_execution()->get_thrd_func_list();
+
uint32_t id = id_to_int(tid);
uint32_t id = id_to_int(tid);
- if (
work_list.
size() <= id )
+ if (
thrd_func_list->
size() <= id )
return;
return;
- else if (
work_list[id]
== NULL)
+ else if (
thrd_func_list->at(id)
== NULL)
return;
/* get the function id that thread i is currently in */
return;
/* get the function id that thread i is currently in */
- func_id_list_t * func_list =
work_list[id]
;
+ func_id_list_t * func_list =
thrd_func_list->at(id)
;
uint32_t func_id = func_list->back();
if ( func_atomics.size() <= func_id )
uint32_t func_id = func_list->back();
if ( func_atomics.size() <= func_id )
@@
-57,14
+70,19
@@
void ModelHistory::add_func_atomic(ModelAction *act, thread_id_t tid) {
FuncNode * func_node = func_atomics[func_id];
if (func_node == NULL) {
FuncNode * func_node = func_atomics[func_id];
if (func_node == NULL) {
+ const char * func_name = func_map_rev[func_id];
func_node = new FuncNode();
func_node = new FuncNode();
+ func_node->set_func_id(func_id);
+ func_node->set_func_name(func_name);
+
func_atomics[func_id] = func_node;
}
func_node->add_action(act);
}
func_atomics[func_id] = func_node;
}
func_node->add_action(act);
}
-void ModelHistory::print() {
+void ModelHistory::print()
+{
for (uint32_t i = 0; i < func_atomics.size(); i++ ) {
FuncNode * funcNode = func_atomics[i];
func_inst_list_t * inst_list = funcNode->get_inst_list();
for (uint32_t i = 0; i < func_atomics.size(); i++ ) {
FuncNode * funcNode = func_atomics[i];
func_inst_list_t * inst_list = funcNode->get_inst_list();
@@
-72,7
+90,7
@@
void ModelHistory::print() {
if (funcNode == NULL)
continue;
if (funcNode == NULL)
continue;
- model_print("function
with id: %d has following actions\n", i
);
+ model_print("function
%s has following actions\n", funcNode->get_func_name()
);
func_inst_list_t::iterator it;
for (it = inst_list->begin(); it != inst_list->end(); it++) {
FuncInst *inst = *it;
func_inst_list_t::iterator it;
for (it = inst_list->begin(); it != inst_list->end(); it++) {
FuncInst *inst = *it;