projects
/
c11tester.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update readme
[c11tester.git]
/
clockvector.cc
diff --git
a/clockvector.cc
b/clockvector.cc
index 5e25e00f1ac625fc0c116b563dd83ffd4040d296..ba5d1f4b2e627a76e41a8e40589b833fc00dd584 100644
(file)
--- a/
clockvector.cc
+++ b/
clockvector.cc
@@
-24,7
+24,7
@@
ClockVector::ClockVector(ClockVector *parent, const ModelAction *act)
clock = (modelclock_t *)snapshot_calloc(num_threads, sizeof(int));
if (parent)
clock = (modelclock_t *)snapshot_calloc(num_threads, sizeof(int));
if (parent)
-
std::
memcpy(clock, parent->clock, parent->num_threads * sizeof(modelclock_t));
+
real_
memcpy(clock, parent->clock, parent->num_threads * sizeof(modelclock_t));
if (act != NULL)
clock[id_to_int(act->get_tid())] = act->get_seq_number();
if (act != NULL)
clock[id_to_int(act->get_tid())] = act->get_seq_number();
@@
-78,7
+78,7
@@
bool ClockVector::minmerge(const ClockVector *cv)
num_threads = cv->num_threads;
}
num_threads = cv->num_threads;
}
- /* Element-wise m
ax
imum */
+ /* Element-wise m
in
imum */
for (int i = 0;i < cv->num_threads;i++)
if (cv->clock[i] < clock[i]) {
clock[i] = cv->clock[i];
for (int i = 0;i < cv->num_threads;i++)
if (cv->clock[i] < clock[i]) {
clock[i] = cv->clock[i];