cosmetics

[simgrid.git] / include / xbt / sysdep.h

diff --git a/include/xbt/sysdep.h b/include/xbt/sysdep.h
index 4f65736..e75b40f 100644 (file)
--- a/include/xbt/sysdep.h
+++ b/include/xbt/sysdep.h
@@ -13,17 +13,29 @@
 
 #include <string.h>
 #include <stdlib.h> 
 
 #include <string.h>
 #include <stdlib.h> 

+#include <stdio.h>
+#include <stdarg.h> /* va_list */

    
 #include "xbt/misc.h"
    
 #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 */
+
+void xbt_abort(void) _XBT_GNUC_NORETURN;
+void xbt_die(const char *msg) _XBT_GNUC_NORETURN;
+
+

 /** @addtogroup XBT_syscall
 /** @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);
   char *res = NULL;
   if (s) {
     res=strdup(s);


@@ -32,9 +44,9 @@ static __inline__ char *xbt_strdup(const char *s) {
   } 
   return res;
 }
   } 
   return res;
 }

-/** @brief like malloc, but xbt_die() on error 
+/** @brief Like malloc, but xbt_die() on error 

     @hideinitializer */
     @hideinitializer */

-static __inline__ void *xbt_malloc(int n){
+static XBT_INLINE void *xbt_malloc(int n){

   void *res=malloc(n);
   if (!res)
      xbt_die("Memory allocation failed");
   void *res=malloc(n);
   if (!res)
      xbt_die("Memory allocation failed");


@@ -43,7 +55,7 @@ static __inline__ void *xbt_malloc(int n){
 
 /** @brief like malloc, but xbt_die() on error and memset data to 0
     @hideinitializer */
 
 /** @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(int n) {

   void *res=calloc(n,1);
   if (!res)
      xbt_die("Memory callocation failed");
   void *res=calloc(n,1);
   if (!res)
      xbt_die("Memory callocation failed");


@@ -52,7 +64,7 @@ static __inline__ void *xbt_malloc0(int n) {
   
 /** @brief like realloc, but xbt_die() on error 
     @hideinitializer */
   
 /** @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,int s){

   void *res=res;
   if (s) {
     if (p) {
   void *res=res;
   if (s) {
     if (p) {


@@ -69,6 +81,13 @@ static __inline__ void *xbt_realloc(void*p,int s){
   }
   return res;
 }
   }
   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?*/
 /** @brief like free
     @hideinitializer */
 #define xbt_free free /*nothing specific to do here. A poor valgrind replacement?*/


@@ -83,6 +102,11 @@ static __inline__ void *xbt_realloc(void*p,int s){
 
 /** @} */  
 
 
 /** @} */  
 

-END_DECL()
+/* FIXME: better place? */
+int   asprintf  (char **ptr, const char *fmt, /*args*/ ...) _XBT_GNUC_PRINTF(2,3);
+int   vasprintf (char **ptr, const char *fmt, va_list ap);
+char *bprintf   (const char*fmt, ...) _XBT_GNUC_PRINTF(1,2);
+  
+SG_END_DECL()

 
 #endif /* _XBT_SYSDEP_H */
 
 #endif /* _XBT_SYSDEP_H */