projects
/
c11tester.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
get rid of redundant mallocs
[c11tester.git]
/
clockvector.cc
diff --git
a/clockvector.cc
b/clockvector.cc
index 15e65909d0a16890b6de65a7a961fb36bf807028..da459d0e0faf461aab67af55ab7f3338082fdd9d 100644
(file)
--- a/
clockvector.cc
+++ b/
clockvector.cc
@@
-11,7
+11,7
@@
ClockVector::ClockVector(ClockVector *parent, ModelAction *act)
num_threads = parent ? parent->num_threads : 1;
if (act && act->get_type() == THREAD_CREATE)
num_threads++;
num_threads = parent ? parent->num_threads : 1;
if (act && act->get_type() == THREAD_CREATE)
num_threads++;
- clock = (int *)
myMalloc
(num_threads * sizeof(int));
+ clock = (int *)
MYMALLOC
(num_threads * sizeof(int));
if (parent)
std::memcpy(clock, parent->clock, parent->num_threads * sizeof(int));
else
if (parent)
std::memcpy(clock, parent->clock, parent->num_threads * sizeof(int));
else
@@
-23,7
+23,7
@@
ClockVector::ClockVector(ClockVector *parent, ModelAction *act)
ClockVector::~ClockVector()
{
ClockVector::~ClockVector()
{
-
myFree
(clock);
+
MYFREE
(clock);
}
void ClockVector::merge(ClockVector *cv)
}
void ClockVector::merge(ClockVector *cv)
@@
-35,7
+35,7
@@
void ClockVector::merge(ClockVector *cv)
if (cv->num_threads > num_threads) {
resize = true;
if (cv->num_threads > num_threads) {
resize = true;
- clk = (int *)
myMalloc
(cv->num_threads * sizeof(int));
+ clk = (int *)
MYMALLOC
(cv->num_threads * sizeof(int));
}
/* Element-wise maximum */
}
/* Element-wise maximum */
@@
-46,7
+46,7
@@
void ClockVector::merge(ClockVector *cv)
for (int i = num_threads; i < cv->num_threads; i++)
clk[i] = cv->clock[i];
num_threads = cv->num_threads;
for (int i = num_threads; i < cv->num_threads; i++)
clk[i] = cv->clock[i];
num_threads = cv->num_threads;
-
myFree
(clock);
+
MYFREE
(clock);
}
clock = clk;
}
}
clock = clk;
}