X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fe36671bd9796b7c10d67c261d3f362254127e5b..22b96fa759d3b97167b2eb450d35f45cb7827bd7:/include/xbt/sysdep.h

diff --git a/include/xbt/sysdep.h b/include/xbt/sysdep.h
index 4f6573608a..fd1ecf0726 100644
--- a/include/xbt/sysdep.h
+++ b/include/xbt/sysdep.h
@@ -13,52 +13,76 @@
 
 #include <string.h>
 #include <stdlib.h> 
+#include <stdarg.h> /* va_list */
    
 #include "xbt/misc.h"
-#include "xbt/error.h"
+#include "xbt/asserts.h"
   
-BEGIN_DECL()
+SG_BEGIN_DECL()
+
+/* They live in asserts.h, but need to be declared before this module.
+   double declaration to cut dependency cycle */
+/**
+ * @addtogroup XBT_error
+ * 
+ * @{
+ */
+XBT_PUBLIC(void) xbt_abort(void) _XBT_GNUC_NORETURN;
+XBT_PUBLIC(void) xbt_die(const char *msg) _XBT_GNUC_NORETURN;
+/** @} */
+
+/* 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 like strdup, but xbt_die() on error */
-static __inline__ char *xbt_strdup(const char *s) {
+#if defined(__GNUC__) || defined(DOXYGEN)
+/** @brief Like strdup, but xbt_die() on error */
+static XBT_INLINE char *xbt_strdup(const char *s) {
   char *res = NULL;
   if (s) {
     res=strdup(s);
     if (!res) 
-      xbt_die("memory allocation error");
+      xbt_die("memory allocation error (strdup returned NULL)");
   } 
   return res;
 }
-/** @brief like malloc, but xbt_die() on error 
+/** @brief Like malloc, but xbt_die() on error 
     @hideinitializer */
-static __inline__ void *xbt_malloc(int n){
+static XBT_INLINE void *xbt_malloc(unsigned int n){
   void *res=malloc(n);
   if (!res)
-     xbt_die("Memory allocation failed");
+     xbt_die(bprintf("Memory allocation of %d bytes failed",n));
   return res;
 }
 
 /** @brief like malloc, but xbt_die() on error and memset data to 0
     @hideinitializer */
-static __inline__ void *xbt_malloc0(int n) {
+static XBT_INLINE void *xbt_malloc0(unsigned int n) {
   void *res=calloc(n,1);
   if (!res)
-     xbt_die("Memory callocation failed");
+     xbt_die(bprintf("Memory callocation of %d bytes failed",n));
   return res;
 }
   
 /** @brief like realloc, but xbt_die() on error 
     @hideinitializer */
-static __inline__ void *xbt_realloc(void*p,int s){
+static XBT_INLINE void *xbt_realloc(void*p,unsigned int s){
   void *res=res;
   if (s) {
     if (p) {
       res=realloc(p,s);
       if (!res) 
-	xbt_die("memory allocation error");
+	xbt_die(bprintf("memory (re)allocation of %d bytes failed",s));
     } else {
       res=xbt_malloc(s);
     }
@@ -69,11 +93,22 @@ static __inline__ void *xbt_realloc(void*p,int 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 */
 #define xbt_free free /*nothing specific to do here. A poor valgrind replacement?*/
 /*#define xbt_free_fct free * replacement with the guareenty of being a function  FIXME:KILLME*/
-   
+
+/** @brief like free 
+    @hideinitializer */
+XBT_PUBLIC(void) xbt_free_f(void* p);
+
 /** @brief like calloc, but xbt_die() on error and don't memset to 0
     @hideinitializer */
 #define xbt_new(type, count)  ((type*)xbt_malloc (sizeof (type) * (count)))
@@ -83,6 +118,7 @@ static __inline__ void *xbt_realloc(void*p,int s){
 
 /** @} */  
 
-END_DECL()
+  
+SG_END_DECL()
 
 #endif /* _XBT_SYSDEP_H */