X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3d0d626e19a7b79320e7d922c9c1dcf122076cea..20caf382b20af687ee1ba042b68bb87df38e8fdf:/src/xbt/sysdep.c

diff --git a/src/xbt/sysdep.c b/src/xbt/sysdep.c
index 2575bf97fb..ebb24551b5 100644
--- a/src/xbt/sysdep.c
+++ b/src/xbt/sysdep.c
@@ -1,61 +1,87 @@
 /* $Id$ */
 
-/* gras/sysdep.h -- all system dependency                                   */
+/* sysdep.c -- 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. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "gras_private.h"
+#include "xbt/sysdep.h"
+#include "xbt/xbt_portability.h" /* private */
+#include "xbt/log.h"
+#include "portable.h"
 
-#include <stdlib.h>
 
-GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(sysdep, gros, "System dependency");
+/** @brief like free 
+    @hideinitializer */
+XBT_PUBLIC(void) xbt_free_f(void* p)
+{
+	free(p);
+}
 
-/****
- **** Memory management
- ****/
 
-void* gras_malloc  (long int bytes) {
-   void *ptr = (bytes == 0 ? NULL : (void*) malloc ((size_t) bytes));
-   gras_assert1(ptr, "Malloc of %ld bytes failed",bytes);
-   return ptr;
-}
-void* gras_malloc0 (long int bytes) {
-   void *ptr = (bytes == 0 ? NULL : (void*) calloc ((size_t) bytes, 1));
-   gras_assert1(ptr, "Malloc of %ld bytes failed",bytes);
-   return ptr;
-}
+/* TSC (tick-level) timers are said to be unreliable on SMP hosts and thus 
+   disabled in SDL source code */ 
 
-void* gras_realloc (void  *memory, long int bytes) {
-   if (bytes == 0) {
-      gras_free(memory);
-      return NULL;
-   } else {
-      void *ptr = (void*) realloc (memory, (size_t) bytes);
-      gras_assert1(ptr, "Realloc of %ld bytes failed",bytes);
-      return ptr;
-   }
-}
-char* gras_strdup  (const char* str) {
-   char *ret = (char*)strdup(str);
-   gras_assert0(ret, "String duplication failed");
-   return ret;
-}
 
-void  gras_free (void  *memory) {
-   if (memory)
-     free (memory);
+/* \defgroup XBT_sysdep All system dependency
+ * \brief This section describes many macros/functions that can serve as
+ *  an OS abstraction.
+ */
+
+double xbt_os_time(void) {
+#ifdef HAVE_GETTIMEOFDAY
+  struct timeval tv;
+
+  gettimeofday(&tv, NULL);
+
+  return (double)(tv.tv_sec + tv.tv_usec / 1000000.0);
+#else
+  /* Poor resolution */
+  return (double)(time(NULL));
+#endif /* HAVE_GETTIMEOFDAY? */ 	
 }
 
-/****
- **** Misc
- ****/
+/*XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sysdep, xbt, "System dependency");*/
 
-void gras_abort(void) {
-   abort();
+
+struct s_xbt_os_timer {
+#ifdef HAVE_GETTIMEOFDAY
+   struct timeval start,stop;
+#else
+   unsigned long int start,stop;
+#endif
+};
+
+xbt_os_timer_t xbt_os_timer_new(void) {
+   return xbt_new0(struct s_xbt_os_timer,1);
+}
+void xbt_os_timer_free(xbt_os_timer_t timer) {
+   free (timer);
+}
+void xbt_os_timer_start(xbt_os_timer_t timer) {
+#ifdef HAVE_GETTIMEOFDAY
+  gettimeofday(&(timer->start), NULL);
+#else 
+  timer->start = (unsigned long int)(time(NULL));
+#endif
 }
+void xbt_os_timer_stop(xbt_os_timer_t timer) {
+#ifdef HAVE_GETTIMEOFDAY
+  gettimeofday(&(timer->stop), NULL);
+#else 
+  timer->stop = (unsigned long int)(time(NULL));
+#endif
+}
+double xbt_os_timer_elapsed(xbt_os_timer_t timer) {
+#ifdef HAVE_GETTIMEOFDAY
+   return  ((double)timer->stop.tv_sec)  - ((double)timer->start.tv_sec) +
+         ((((double)timer->stop.tv_usec) - ((double)timer->start.tv_usec)) / 1000000.0);
+#else 
+   return  (double)timer->stop  - (double)timer->start;
+#endif
+}
+