A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Typos.
[simgrid.git]
/
teshsuite
/
xbt
/
mmalloc
/
mmalloc_test.cpp
diff --git
a/teshsuite/xbt/mmalloc/mmalloc_test.cpp
b/teshsuite/xbt/mmalloc/mmalloc_test.cpp
index
1220c58
..
e5ddf72
100644
(file)
--- a/
teshsuite/xbt/mmalloc/mmalloc_test.cpp
+++ b/
teshsuite/xbt/mmalloc/mmalloc_test.cpp
@@
-22,10
+22,8
@@
constexpr int TESTSIZE = 100;
#define size_of_block(i) (((i % 50)+1)* 100)
#define size_of_block(i) (((i % 50)+1)* 100)
-static void check_block(const
void* s, int c
, int n)
+static void check_block(const
unsigned char* p, unsigned char b
, int n)
{
{
- const unsigned char* p = static_cast<const unsigned char*>(s);
- unsigned char b = static_cast<unsigned char>(c);
for (int i = 0; i < n; i++)
if (p[i] != b)
xbt_die("value mismatch: %p[%d] = %#hhx, expected %#hhx", p, i, p[i], b);
for (int i = 0; i < n; i++)
if (p[i] != b)
xbt_die("value mismatch: %p[%d] = %#hhx, expected %#hhx", p, i, p[i], b);
@@
-71,7
+69,7
@@
int main(int argc, char**argv)
pointers[i] = mmalloc(heapA, size);
}
pointers[i] = mmalloc(heapA, size);
}
- XBT_INFO("free all blocks (each one twice, to check that double free are correctly ca
tched
)");
+ XBT_INFO("free all blocks (each one twice, to check that double free are correctly ca
ught
)");
for (i = 0; i < TESTSIZE; i++) {
bool gotit = false;
mfree(heapA, pointers[i]);
for (i = 0; i < TESTSIZE; i++) {
bool gotit = false;
mfree(heapA, pointers[i]);
@@
-84,7
+82,7
@@
int main(int argc, char**argv)
xbt_die("FAIL: A double-free went undetected (for size:%d)",size_of_block(i));
}
xbt_die("FAIL: A double-free went undetected (for size:%d)",size_of_block(i));
}
- XBT_INFO("free again all blocks (to really check that double free are correctly ca
tched
)");
+ XBT_INFO("free again all blocks (to really check that double free are correctly ca
ught
)");
for (i = 0; i < TESTSIZE; i++) {
bool gotit = false;
try {
for (i = 0; i < TESTSIZE; i++) {
bool gotit = false;
try {
@@
-98,14
+96,15
@@
int main(int argc, char**argv)
XBT_INFO("Let's try different codepaths for mrealloc");
for (i = 0; i < TESTSIZE; i++) {
XBT_INFO("Let's try different codepaths for mrealloc");
for (i = 0; i < TESTSIZE; i++) {
- const std::vector<std::pair<int,
int
>> requests = {
+ const std::vector<std::pair<int,
unsigned char
>> requests = {
{size_of_block(i) / 2, 0x77}, {size_of_block(i) * 2, 0xaa}, {1, 0xc0}, {0, 0}};
pointers[i] = nullptr;
for (unsigned k = 0; k < requests.size(); ++k) {
size = requests[k].first;
pointers[i] = mrealloc(heapA, pointers[i], size);
if (k > 0)
{size_of_block(i) / 2, 0x77}, {size_of_block(i) * 2, 0xaa}, {1, 0xc0}, {0, 0}};
pointers[i] = nullptr;
for (unsigned k = 0; k < requests.size(); ++k) {
size = requests[k].first;
pointers[i] = mrealloc(heapA, pointers[i], size);
if (k > 0)
- check_block(pointers[i], requests[k - 1].second, std::min(size, requests[k - 1].first));
+ check_block(static_cast<unsigned char*>(pointers[i]), requests[k - 1].second,
+ std::min(size, requests[k - 1].first));
if (size > 0)
memset(pointers[i], requests[k].second, size);
}
if (size > 0)
memset(pointers[i], requests[k].second, size);
}