X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/292f1e462fb93371edac5ca1a291a2572870e36c..59a1aff0fbe12fa74b7d0b9fb46492fa7a822acc:/include/xbt/sysdep.h

diff --git a/include/xbt/sysdep.h b/include/xbt/sysdep.h
index 2d7c63cd63..b405a7afd2 100644
--- a/include/xbt/sysdep.h
+++ b/include/xbt/sysdep.h
@@ -1,64 +1,96 @@
 /* $Id$ */
-
-/* gras/sysdep.h -- all system dependency                                   */
+/*  xbt/sysdep.h -- all system dependency                                   */
 /*  no system header should be loaded out of this file so that we have only */
 /*  one file to check when porting to another OS                            */
 
-/* Authors: Martin Quinson                                                  */
-/* Copyright (C) 2004 the OURAGAN project.                                  */
+/* Copyright (c) 2004 Martin Quinson. 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 _GRAS_SYSDEP_H
-#define _GRAS_SYSDEP_H
-
-#include <string.h> /* Included directly for speed */
-
-#include <time.h> /* FIXME: remove */
-#include <unistd.h> /* FIXME: remove */
-
-#ifdef  __cplusplus
-extern "C" 
-#endif
-
-void* gras_malloc  (long int bytes);
-void* gras_malloc0 (long int bytes);
-void* gras_realloc (void  *memory, long int bytes);
-void  gras_free    (void  *memory);
-
-#define gras_new(type, count)  ((type*)gras_malloc (sizeof (type) * (count)))
-#define gras_new0(type, count) ((type*)gras_malloc0 (sizeof (type) * (count)))
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#if     __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
-#define _GRAS_GNUC_PRINTF( format_idx, arg_idx )    \
-	   __attribute__((__format__ (__printf__, format_idx, arg_idx)))
-#define _GRAS_GNUC_SCANF( format_idx, arg_idx )     \
-	       __attribute__((__format__ (__scanf__, format_idx, arg_idx)))
-#define _GRAS_GNUC_FORMAT( arg_idx )                \
-		   __attribute__((__format_arg__ (arg_idx)))
-#define _GRAS_GNUC_NORETURN                         \
-     __attribute__((__noreturn__))
-#else   /* !__GNUC__ */
-#define _GRAS_GNUC_PRINTF( format_idx, arg_idx )
-#define _GRAS_GNUC_SCANF( format_idx, arg_idx )
-#define _GRAS_GNUC_FORMAT( arg_idx )
-#define _GRAS_GNUC_NORETURN
-#endif  /* !__GNUC__ */
+#ifndef _XBT_SYSDEP_H
+#define _XBT_SYSDEP_H
 
-void gras_abort(void) _GRAS_GNUC_NORETURN;
+#include <string.h>
+#include <stdlib.h> 
+   
+#include "xbt/misc.h"
+#include "xbt/error.h"
+  
+BEGIN_DECL()
+/** @addtogroup XBT_syscall
+ *  @{
+ */
+
+#ifdef __GNUC__
+/** @brief like strdup, but xbt_die() on error */
+static inline char *xbt_strdup(const char *s) {
+  char *res = NULL;
+  if (s) {
+    res=strdup(s);
+    if (!res) 
+      xbt_die("memory allocation error");
+  } 
+  return res;
+}
+/** @brief like malloc, but xbt_die() on error 
+    @hideinitializer */
+static inline void *xbt_malloc(int n){
+  void *res=malloc(n);
+  if (!res)
+     xbt_die("Memory allocation failed");
+  return res;
+}
 
-/* FIXME: This is a very good candidate to rewrite (along with a proper string stuff) 
-   but I'm too lazy right now, so copy the definition */
-long int strtol(const char *nptr, char **endptr, int base);
-double strtod(const char *nptr, char **endptr);
-int atoi(const char *nptr);
+/** @brief like malloc, but xbt_die() on error and memset data to 0
+    @hideinitializer */
+static inline void *xbt_malloc0(int n) {
+  void *res=calloc(n,1);
+  if (!res)
+     xbt_die("Memory callocation failed");
+  return res;
+}
+  
+/** @brief like realloc, but xbt_die() on error 
+    @hideinitializer */
+static inline void *xbt_realloc(void*p,int s){
+  void *res=res;
+  if (s) {
+    if (p) {
+      res=realloc(p,s);
+      if (!res) 
+	xbt_die("memory allocation error");
+    } else {
+      res=xbt_malloc(s);
+    }
+  } else {
+    if (p) {
+      free(p);
+    }
+  }
+  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 calloc, but xbt_die() on error and don't memset to 0
+    @hideinitializer */
+#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)))
 
+/** @} */  
 
-   
-#ifdef  __cplusplus
-}
-#endif
+END_DECL()
 
-#endif /* _GRAS_SYSDEP_H */
+#endif /* _XBT_SYSDEP_H */