/* 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-2014. The SimGrid Team.
+/* Copyright (c) 2004-2015. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#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"
+SG_BEGIN_DECL()
+
#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 */
/**
*/
#define xbt_die(...) \
do { \
- XBT_LOG_EXTERNAL_CATEGORY(xbt); \
XBT_CCRITICAL(xbt, __VA_ARGS__); \
xbt_abort(); \
} while (0)
/** @} */
+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 */
* @{
*/
-#if defined(__GNUC__) || defined(DOXYGEN)
+#ifdef _MSC_VER /* Microsoft wants to improve the code quality blah blah blah */
+/* warning C4996: '_strdup': The POSIX name for this item is deprecated. Instead, use the ISO C and C++ conformant name: _strdup. */
+# define strdup _strdup
+/* warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. */
+# define _CRT_SECURE_NO_WARNINGS
+#endif
+
/** @brief Like strdup, but xbt_die() on error */
-static inline __attribute__ ((always_inline))
-char *xbt_strdup(const char *s)
-{
+static XBT_ALWAYS_INLINE char *xbt_strdup(const char *s) {
char *res = NULL;
if (s) {
res = strdup(s);
/** @brief Like malloc, but xbt_die() on error
@hideinitializer */
-static inline __attribute__ ((always_inline))
-void *xbt_malloc(size_t n)
-{
+static XBT_ALWAYS_INLINE void *xbt_malloc(size_t n) {
void *res;
/* if (n==0) {
xbt_backtrace_display_current();
/** @brief like malloc, but xbt_die() on error and memset data to 0
@hideinitializer */
-static inline __attribute__ ((always_inline))
-void *xbt_malloc0(size_t n)
-{
+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);
/** @brief like realloc, but xbt_die() on error
@hideinitializer */
-static inline __attribute__ ((always_inline))
-void *xbt_realloc(void *p, size_t s)
-{
+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) {
}
return res;
}
-#else /* non __GNUC__ */
-# define xbt_strdup(s) strdup(s)
-# define xbt_malloc(n) malloc(n)
-# define xbt_malloc0(n) calloc(n,1)
-# define xbt_realloc(p,s) realloc(p,s)
-#endif /* __GNUC__ ? */
/** @brief like free
@hideinitializer */
/** @brief should be given a pointer to pointer, and frees the second one */
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
+
+/** @} */
-SG_END_DECL()
#endif /* _XBT_SYSDEP_H */
