X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/01c284ecf81d34d027161e822ecde23f81fd9f48..84402e8e2ee2a2d0bef25fdceb0a263ed8b471f6:/teshsuite/xbt/mmalloc/mmalloc_test.cpp

diff --git a/teshsuite/xbt/mmalloc/mmalloc_test.cpp b/teshsuite/xbt/mmalloc/mmalloc_test.cpp
index a20ee38dbf..63007c6db0 100644
--- a/teshsuite/xbt/mmalloc/mmalloc_test.cpp
+++ b/teshsuite/xbt/mmalloc/mmalloc_test.cpp
@@ -1,11 +1,12 @@
-/* Copyright (c) 2012-2014, 2016-2017. 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. */
 
-#include "xbt/mmalloc.h"
+#include "simgrid/Exception.hpp"
 #include "xbt.h"
+#include "xbt/mmalloc.h"
+
 #include <cassert>
 #include <cstdio>
 #include <cstdlib>
@@ -14,18 +15,15 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include <xbt/ex.hpp>
-
 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++)
     if (p[i] != b)
       xbt_die("value mismatch: %p[%d] = %#hhx, expected %#hhx", p, i, p[i], b);
@@ -71,25 +69,25 @@ int main(int argc, char**argv)
     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(xbt_ex& e) {
+    } 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(xbt_ex& e) {
+    } catch (const simgrid::Exception&) {
       gotit = true;
     }
     if (not gotit)
@@ -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++) {
-    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);
     }