projects
/
c11tester.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c6d52a2
)
fix warnings
author
Derek Yeh
<djyeh@plrg-1.ics.uci.edu>
Wed, 22 Jul 2020 00:56:16 +0000
(17:56 -0700)
committer
Derek Yeh
<djyeh@plrg-1.ics.uci.edu>
Wed, 22 Jul 2020 00:56:16 +0000
(17:56 -0700)
model.cc
patch
|
blob
|
history
model.h
patch
|
blob
|
history
diff --git
a/model.cc
b/model.cc
index 03f4648ea2da536360de815f4ac53c4bbf01b8d8..0493e7e2039914988dea1172cf84b5a169132a51 100644
(file)
--- a/
model.cc
+++ b/
model.cc
@@
-373,9
+373,9
@@
uint64_t ModelChecker::switch_thread(ModelAction *act)
} while (next->is_model_thread() || next->is_complete() || next->get_pending() && curr_thread_num < get_num_threads());
*/
} while (next->is_model_thread() || next->is_complete() || next->get_pending() && curr_thread_num < get_num_threads());
*/
- Thread *next;
+ Thread *next
= NULL
;
curr_thread_num++;
curr_thread_num++;
- while (curr_thread_num < get_num_threads) {
+ while (curr_thread_num < get_num_threads
()
) {
thread_id_t tid = int_to_id(curr_thread_num);
next = get_thread(tid);
if (!next->is_model_thread() && !next->is_complete() && !next->get_pending())
thread_id_t tid = int_to_id(curr_thread_num);
next = get_thread(tid);
if (!next->is_model_thread() && !next->is_complete() && !next->get_pending())
@@
-450,7
+450,7
@@
void ModelChecker::run()
curr_thread_num = 0;
thread_id_t tid = int_to_id(0);
Thread *thr = get_thread(tid);
curr_thread_num = 0;
thread_id_t tid = int_to_id(0);
Thread *thr = get_thread(tid);
- switch_from_master(t
id
);
+ switch_from_master(t
hr
);
/*
for (unsigned int i = 0;i < get_num_threads();i++) {
thread_id_t tid = int_to_id(i);
/*
for (unsigned int i = 0;i < get_num_threads();i++) {
thread_id_t tid = int_to_id(i);
diff --git
a/model.h
b/model.h
index a1a04d138cb31d4fe5936d648303073871a7d400..8a2f9c6516350b1f8b2c7c2b5be76975658a4f9d 100644
(file)
--- a/
model.h
+++ b/
model.h
@@
-78,7
+78,7
@@
private:
int execution_number;
int execution_number;
- int curr_thread_num;
+
unsigned
int curr_thread_num;
unsigned int get_num_threads() const;
unsigned int get_num_threads() const;