/* 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-2018. 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
-#ifdef __cplusplus
-#include <type_traits>
-#endif
-
-#include "xbt/log.h"
-#include "xbt/misc.h"
-#include "xbt/asserts.h"
-
-#include "simgrid_config.h"
+#include <xbt/asserts.h>
+#include <xbt/log.h>
+#include <xbt/misc.h>
-SG_BEGIN_DECL()
+#include <simgrid/config.h>
#include <string.h>
#include <stdlib.h>
#include <stdarg.h> /* va_list */
+SG_BEGIN_DECL()
+
/* They live in asserts.h, but need to be declared before this module.
double declaration to cut dependency cycle */
/**
* @{
*/
/** @brief Kill the program in silence */
-XBT_PUBLIC(void) xbt_abort(void) _XBT_GNUC_NORETURN;
+XBT_ATTRIB_NORETURN XBT_PUBLIC void xbt_abort(void);
/**
* @brief Kill the program with an error message
- * \param ... a format string and its arguments
+ * @param ... a format string and its arguments
*
- * Things are so messed up that the only thing to do now, is to stop the
- * program.
+ * 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.
+ * The message is handled by a CRITICAL logging request, and may consist of a format string with arguments.
*/
#define xbt_die(...) \
do { \
} while (0)
/** @} */
+#ifdef XBT_LOG_LOCALLY_DEFINE_XBT_CHANNEL
+XBT_LOG_NEW_CATEGORY(xbt, "All XBT categories (simgrid toolbox)");
+#else
XBT_LOG_EXTERNAL_CATEGORY(xbt);
-
-/* these ones live in str.h, but redeclare them here so that we do
- not need to load the whole str.h and its heavy dependencies */
-#ifndef __USE_GNU /* do not redeclare existing headers */
-XBT_PUBLIC(int) asprintf(char **ptr, const char *fmt, /*args */
- ...) _XBT_GNUC_PRINTF(2, 3);
-XBT_PUBLIC(int) vasprintf(char **ptr, const char *fmt, va_list ap);
#endif
-XBT_PUBLIC(char *) bprintf(const char *fmt, ...) _XBT_GNUC_PRINTF(1, 2);
/** @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;
return res;
}
-XBT_PUBLIC(void) xbt_backtrace_display_current(void);
+XBT_PUBLIC void xbt_backtrace_display_current();
/** @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);
+ void* res = malloc(n);
if (!res)
xbt_die("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);
+ void* res = calloc(n, 1);
if (!res)
xbt_die("Memory callocation of %lu bytes failed", (unsigned long)n);
return res;
@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);
#define xbt_free(p) free(p) /*nothing specific to do here. A poor valgrind replacement? */
/** @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);
/** @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);
SG_END_DECL()
-/** @brief like calloc, but xbt_die() on error and don't memset to 0
- @hideinitializer */
-#ifndef __cplusplus
-
#define xbt_new(type, count) ((type*)xbt_malloc (sizeof (type) * (count)))
/** @brief like calloc, but xbt_die() on error
@hideinitializer */
#define xbt_new0(type, count) ((type*)xbt_malloc0 (sizeof (type) * (count)))
-#else
-
-/** C++ wrapper for xtb_new
- *
- * This ensures that we do not xbt_new things that need a constructor.
- */
-template<typename T> inline
-T* xbt_new_(size_t count)
-{
- static_assert(std::is_trivial<T>(),
- "Cannot xbt_new this type");
- return (T*) xbt_malloc(sizeof(T) * count);
-}
-
-template<typename T> inline
-T* xbt_new0_(size_t count)
-{
- static_assert(std::is_trivial<T>(),
- "Cannot xbt_new0 this type");
- return (T*) xbt_malloc0(sizeof(T) * count);
-}
-
-#define xbt_new(type, count) ::xbt_new_<type>(count)
-#define xbt_new0(type, count) ::xbt_new0_<type>(count)
-
-#endif
-
/** @} */
-#endif /* _XBT_SYSDEP_H */
+#endif /* XBT_SYSDEP_H */
