Wrong namming scheme.

Corrected. I hope, I couldn't compile it yet.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3794 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/include/xbt/time.h b/include/xbt/time.h
index 20ebc93..ba74316 100644 (file)
--- a/include/xbt/time.h
+++ b/include/xbt/time.h
@@ -15,7 +15,7 @@ SG_BEGIN_DECL()
  * Time management functions, returns the system time or sleeps a process. They work both on the simulated and real systems(GRAS). 
  */
 
  * Time management functions, returns the system time or sleeps a process. They work both on the simulated and real systems(GRAS). 
  */
 

-XBT_PUBLIC(double) xbt_os_time(void);
-XBT_PUBLIC(void) xbt_os_sleep(double sec);
+XBT_PUBLIC(double) xbt_time(void);
+XBT_PUBLIC(void) xbt_sleep(double sec);

 
 SG_END_DECL()
 
 SG_END_DECL()

diff --git a/src/include/xbt/xbt_os_time.h b/src/include/xbt/xbt_os_time.h
index 533bbf6..3597ac8 100644 (file)
--- a/src/include/xbt/xbt_os_time.h
+++ b/src/include/xbt/xbt_os_time.h
@@ -18,6 +18,7 @@
   * Most users should use gras_os_time and should not use this function unless 
     they really know what they are doing. */
 XBT_PUBLIC(double) xbt_os_time(void);
   * Most users should use gras_os_time and should not use this function unless 
     they really know what they are doing. */
 XBT_PUBLIC(double) xbt_os_time(void);

+XBT_PUBLIC(void) xbt_os_sleep(double sec);

 
 typedef struct s_xbt_os_timer *xbt_os_timer_t;
 xbt_os_timer_t xbt_os_timer_new(void);
 
 typedef struct s_xbt_os_timer *xbt_os_timer_t;
 xbt_os_timer_t xbt_os_timer_new(void);

diff --git a/src/xbt/xbt_os_time.c b/src/xbt/xbt_os_time.c
index c74b4dd..b93b0f1 100644 (file)
--- a/src/xbt/xbt_os_time.c
+++ b/src/xbt/xbt_os_time.c
@@ -13,7 +13,41 @@
 #include "xbt/xbt_os_time.h" /* this module */
 #include "xbt/log.h"
 #include "portable.h"
 #include "xbt/xbt_os_time.h" /* this module */
 #include "xbt/log.h"
 #include "portable.h"

+#include <math.h> /* floor */

 
 

+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? */        
+}
+
+void xbt_os_sleep(double sec) {
+#ifdef HAVE_USLEEP
+  sleep(sec);
+  (void)usleep( (sec - floor(sec)) * 1000000);
+
+#elif _WIN32
+
+     Sleep((floor(sec) * 1000) +((sec - floor(sec)) * 1000));
+
+        
+#else /* don't have usleep. Use select to sleep less than one second */
+  struct timeval timeout;
+
+  
+  timeout.tv_sec =  (unsigned long)(sec);
+  timeout.tv_usec = (sec - floor(sec)) * 1000000;
+              
+  select(0, NULL, NULL, NULL, &timeout);
+#endif
+}

 
 /** @brief like free 
     @hideinitializer */
 
 /** @brief like free 
     @hideinitializer */

diff --git a/src/xbt/xbt_rl_time.c b/src/xbt/xbt_rl_time.c
index f8f1c05..34dde86 100644 (file)
--- a/src/xbt/xbt_rl_time.c
+++ b/src/xbt/xbt_rl_time.c
@@ -17,38 +17,9 @@
 #include "xbt/xbt_os_time.h" /* private */
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(gras_virtu);
 #include "xbt/xbt_os_time.h" /* private */
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(gras_virtu);

-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? */        
+double xbt_time(void) {
+       return xbt_os_time();

 }
 }

-void xbt_os_sleep(double sec) {
-#ifdef HAVE_USLEEP
-  DEBUG1("Do sleep %f sec", sec);
-  sleep(sec);
-  (void)usleep( (sec - floor(sec)) * 1000000);
-
-#elif _WIN32
-     DEBUG1("Do sleep %f sec", sec);
-
-     Sleep((floor(sec) * 1000) +((sec - floor(sec)) * 1000));
-
-        
-#else /* don't have usleep. Use select to sleep less than one second */
-  struct timeval timeout;
-
-  DEBUG1("Do sleep %f sec", sec);
-  
-  timeout.tv_sec =  (unsigned long)(sec);
-  timeout.tv_usec = (sec - floor(sec)) * 1000000;
-              
-  select(0, NULL, NULL, NULL, &timeout);
-#endif
+void xbt_sleep(double sec) {
+       return xbt_os_sleep(sec);

 }
 }

diff --git a/src/xbt/xbt_sg_time.c b/src/xbt/xbt_sg_time.c
index b706ff1..b933c1f 100644 (file)
--- a/src/xbt/xbt_sg_time.c
+++ b/src/xbt/xbt_sg_time.c
@@ -12,14 +12,14 @@
 /* 
  * Time elapsed since the begining of the simulation.
  */
 /* 
  * Time elapsed since the begining of the simulation.
  */

-double xbt_os_time() {
+double xbt_time() {

   return SIMIX_get_clock();
 }
 
 /*
  * Freeze the process for the specified amount of time
  */
   return SIMIX_get_clock();
 }
 
 /*
  * Freeze the process for the specified amount of time
  */

-void xbt_os_sleep(double sec) {
+void xbt_sleep(double sec) {

        smx_action_t act_sleep;
        smx_process_t proc = SIMIX_process_self();
        smx_mutex_t mutex;
        smx_action_t act_sleep;
        smx_process_t proc = SIMIX_process_self();
        smx_mutex_t mutex;