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
Update copyright lines for 2022.
[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
5c9d4be
..
22ec933
100644
(file)
--- a/
teshsuite/xbt/mmalloc/mmalloc_test.cpp
+++ b/
teshsuite/xbt/mmalloc/mmalloc_test.cpp
@@
-1,11
+1,13
@@
-/* Copyright (c) 2012-2018. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2012-2022. 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. */
/* 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. */
-#include "
xbt/mmalloc.h
"
+#include "
simgrid/Exception.hpp
"
#include "xbt.h"
#include "xbt.h"
+#include "xbt/mmalloc.h"
+
+#include <array>
#include <cassert>
#include <cstdio>
#include <cstdlib>
#include <cassert>
#include <cstdio>
#include <cstdlib>
@@
-13,35
+15,32
@@
#include <fcntl.h>
#include <sys/stat.h>
#include <unistd.h>
#include <fcntl.h>
#include <sys/stat.h>
#include <unistd.h>
-
-#include <xbt/ex.hpp>
+#include <vector>
XBT_LOG_NEW_DEFAULT_CATEGORY(test,"this test");
XBT_LOG_NEW_DEFAULT_CATEGORY(test,"this test");
-#define BUFFSIZE 204800
-#define TESTSIZE 100
-#define size_of_block(i) (((i % 50)+1)* 100)
+constexpr int BUFFSIZE = 204800;
+constexpr int TESTSIZE = 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++)
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_assert(p[i] == b, "value mismatch: %p[%d] = %#hhx, expected %#hhx", p, i, p[i], b);
}
int main(int argc, char**argv)
{
xbt_mheap_t heapA = nullptr;
}
int main(int argc, char**argv)
{
xbt_mheap_t heapA = nullptr;
-
void *pointers[TESTSIZE]
;
+
std::array<void*, TESTSIZE> pointers
;
xbt_init(&argc,argv);
XBT_INFO("Allocating a new heap");
unsigned long mask = ~((unsigned long)xbt_pagesize - 1);
xbt_init(&argc,argv);
XBT_INFO("Allocating a new heap");
unsigned long mask = ~((unsigned long)xbt_pagesize - 1);
-
void *addr = (void*)
(((unsigned long)sbrk(0) + BUFFSIZE) & mask);
- heapA
= xbt_mheap_new(-1, addr
);
- if (heapA ==
NULL
) {
+
auto* addr = reinterpret_cast<void*>
(((unsigned long)sbrk(0) + BUFFSIZE) & mask);
+ heapA
= xbt_mheap_new(addr, 0
);
+ if (heapA ==
nullptr
) {
perror("attach 1 failed");
fprintf(stderr, "bye\n");
exit(1);
perror("attach 1 failed");
fprintf(stderr, "bye\n");
exit(1);
@@
-71,41
+70,40
@@
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]);
try {
mfree(heapA, pointers[i]);
for (i = 0; i < TESTSIZE; i++) {
bool gotit = false;
mfree(heapA, pointers[i]);
try {
mfree(heapA, pointers[i]);
- } catch
(xbt_ex& e
) {
+ } catch
(const simgrid::Exception&
) {
gotit = true;
}
gotit = true;
}
- if (not gotit)
- xbt_die("FAIL: A double-free went undetected (for size:%d)",size_of_block(i));
+ xbt_assert(gotit, "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 {
mfree(heapA, pointers[i]);
for (i = 0; i < TESTSIZE; i++) {
bool gotit = false;
try {
mfree(heapA, pointers[i]);
- } catch
(xbt_ex& e
) {
+ } catch
(const simgrid::Exception&
) {
gotit = true;
}
gotit = true;
}
- if (not gotit)
- xbt_die("FAIL: A double-free went undetected (for size:%d)",size_of_block(i));
+ xbt_assert(gotit, "FAIL: A double-free went undetected (for size:%d)", size_of_block(i));
}
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);
}