X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6f48d1a65eeb69ebae17feb1d714db4a60764a51..e76db741f886560cbf49a0dd833b35489c778ac1:/include/xbt/sysdep.h

diff --git a/include/xbt/sysdep.h b/include/xbt/sysdep.h
index fa2012a84b..280093dced 100644
--- a/include/xbt/sysdep.h
+++ b/include/xbt/sysdep.h
@@ -2,104 +2,62 @@
 /*  no system header should be loaded out of this file so that we have only */
 /*  one file to check when porting to another OS                            */
 
-/* Copyright (c) 2004-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2004-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. */
 
-#ifndef _XBT_SYSDEP_H
-#define _XBT_SYSDEP_H
+#ifndef XBT_SYSDEP_H
+#define XBT_SYSDEP_H
 
-#include "xbt/log.h"
-#include "xbt/misc.h"
-#include "xbt/asserts.h"
+#include <xbt/asserts.h>
+#include <xbt/log.h>
 
-#include "simgrid_config.h"
-
-SG_BEGIN_DECL()
+#include <simgrid/config.h>
 
 #include <string.h>
 #include <stdlib.h>
 #include <stdarg.h>             /* va_list */
 
-/* They live in asserts.h, but need to be declared before this module.
-   double declaration to cut dependency cycle */
-/**
- * @addtogroup XBT_error
- *
- * @{
- */
-/** @brief Kill the program in silence */
-XBT_PUBLIC(void) XBT_ATTRIB_NORETURN xbt_abort(void);
-
-/**
- * @brief Kill the program with an error message
- * \param ... a format string and its arguments
- *
- * Things are so messed up that the only thing to do now, is to stop the program.
- *
- * The message is handled by a CRITICAL logging request, and may consist of a format string with arguments.
- */
-#define xbt_die(...)                            \
-  do {                                          \
-    XBT_CCRITICAL(xbt, __VA_ARGS__);            \
-    xbt_abort();                                \
-  } while (0)
-/** @} */
+SG_BEGIN_DECL
 
 #ifdef XBT_LOG_LOCALLY_DEFINE_XBT_CHANNEL
 XBT_LOG_NEW_CATEGORY(xbt, "All XBT categories (simgrid toolbox)");
+XBT_LOG_NEW_SUBCATEGORY(xbt_help, xbt, "Help messages");
 #else
 XBT_LOG_EXTERNAL_CATEGORY(xbt);
+XBT_LOG_EXTERNAL_CATEGORY(xbt_help);
 #endif
 
 /** @addtogroup XBT_syscall
- *  @brief Malloc and associated functions, killing the program on error (with \ref XBT_ex)
+ *  @brief Malloc and associated functions, killing the program on error (with @ref XBT_ex)
  *
  *  @{
  */
 
-#if defined(_MSC_VER) && !defined(strdup)
-#  define strdup _strdup /* POSIX name is not ANSI complient blabla */
-#endif
-
 /** @brief Like strdup, but xbt_die() on error */
 static XBT_ALWAYS_INLINE char *xbt_strdup(const char *s) {
   char *res = NULL;
   if (s) {
     res = strdup(s);
-    if (!res)
-      xbt_die("memory allocation error (strdup returned NULL)");
+    xbt_assert(res, "memory allocation error (strdup returned NULL)");
   }
   return res;
 }
 
-XBT_PUBLIC(void) xbt_backtrace_display_current(void);
-
 /** @brief Like malloc, but xbt_die() on error
     @hideinitializer */
 static XBT_ALWAYS_INLINE void *xbt_malloc(size_t n) {
-  void *res;
-/*  if (n==0) {
-     xbt_backtrace_display_current();
-     xbt_die("malloc(0) is not portable");
-  }*/
-
-  res = malloc(n);
-  if (!res)
-    xbt_die("Memory allocation of %lu bytes failed", (unsigned long)n);
+  void* res = malloc(n);
+  xbt_assert(res, "Memory allocation of %lu bytes failed", (unsigned long)n);
   return res;
 }
 
 /** @brief like malloc, but xbt_die() on error and memset data to 0
     @hideinitializer */
 static XBT_ALWAYS_INLINE void *xbt_malloc0(size_t n) {
-  void *res;
-  //if (n==0) xbt_die("calloc(0) is not portable");
-  res = calloc(n, 1);
-  if (!res)
-    xbt_die("Memory callocation of %lu bytes failed", (unsigned long)n);
+  void* res = calloc(n, 1);
+  xbt_assert(res, "Memory callocation of %lu bytes failed", (unsigned long)n);
   return res;
 }
 
@@ -107,12 +65,10 @@ static XBT_ALWAYS_INLINE void *xbt_malloc0(size_t n) {
     @hideinitializer */
 static XBT_ALWAYS_INLINE void *xbt_realloc(void *p, size_t s) {
   void *res = NULL;
-  //if (s==0) xbt_die("realloc(0) is not portable");
   if (s) {
     if (p) {
       res = realloc(p, s);
-      if (!res)
-        xbt_die("memory (re)allocation of %lu bytes failed", (unsigned long)s);
+      xbt_assert(res, "memory (re)allocation of %lu bytes failed", (unsigned long)s);
     } else {
       res = xbt_malloc(s);
     }
@@ -126,12 +82,18 @@ static XBT_ALWAYS_INLINE void *xbt_realloc(void *p, size_t s) {
     @hideinitializer */
 #define xbt_free(p) free(p) /*nothing specific to do here. A poor valgrind replacement? */
 
+#ifdef __cplusplus
+#define XBT_FREE_NOEXCEPT noexcept(noexcept(::free))
+#else
+#define XBT_FREE_NOEXCEPT
+#endif
+
 /** @brief like free, but you can be sure that it is a function  */
-XBT_PUBLIC(void) xbt_free_f(void *p);
+XBT_PUBLIC void xbt_free_f(void* p) XBT_FREE_NOEXCEPT;
 /** @brief should be given a pointer to pointer, and frees the second one */
-XBT_PUBLIC(void) xbt_free_ref(void *d);
+XBT_PUBLIC void xbt_free_ref(void* d) XBT_FREE_NOEXCEPT;
 
-SG_END_DECL()
+SG_END_DECL
 
 #define xbt_new(type, count)  ((type*)xbt_malloc (sizeof (type) * (count)))
 /** @brief like calloc, but xbt_die() on error
@@ -140,4 +102,4 @@ SG_END_DECL()
 
 /** @} */
 
-#endif                          /* _XBT_SYSDEP_H */
+#endif                          /* XBT_SYSDEP_H */