-/* Copyright (c) 2012-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2012-2020. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
constexpr int BUFFSIZE = 204800;
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);
XBT_INFO("Allocating a new heap");
unsigned long mask = ~((unsigned long)xbt_pagesize - 1);
- void *addr = (void*)(((unsigned long)sbrk(0) + BUFFSIZE) & mask);
+ auto* addr = reinterpret_cast<void*>(((unsigned long)sbrk(0) + BUFFSIZE) & mask);
heapA = xbt_mheap_new(-1, addr);
- if (heapA == NULL) {
+ if (heapA == nullptr) {
perror("attach 1 failed");
fprintf(stderr, "bye\n");
exit(1);
pointers[i] = mmalloc(heapA, size);
}
- XBT_INFO("free all blocks (each one twice, to check that double free are correctly catched)");
+ XBT_INFO("free all blocks (each one twice, to check that double free are correctly caught)");
for (i = 0; i < TESTSIZE; i++) {
bool gotit = false;
mfree(heapA, pointers[i]);
try {
mfree(heapA, pointers[i]);
- } catch (const xbt_ex&) {
+ } catch (const simgrid::Exception&) {
gotit = true;
}
if (not gotit)
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 catched)");
+ XBT_INFO("free again all blocks (to really check that double free are correctly caught)");
for (i = 0; i < TESTSIZE; i++) {
bool gotit = false;
try {
mfree(heapA, pointers[i]);
- } catch (const xbt_ex&) {
+ } catch (const simgrid::Exception&) {
gotit = true;
}
if (not gotit)
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)
- 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);
}