X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/111463df0d9a94d78e136d3d81ff828ea96a2cac..f0eb9ed1492509eeaa51629e9dc95b729a8481e3:/src/xbt/xbt_sg_time.c

diff --git a/src/xbt/xbt_sg_time.c b/src/xbt/xbt_sg_time.c
index b706ff12c0..96fab4bb7b 100644
--- a/src/xbt/xbt_sg_time.c
+++ b/src/xbt/xbt_sg_time.c
@@ -1,45 +1,33 @@
-/* $Id$ */
-
 /* time - time related syscal wrappers                                      */
 
-/* Copyright (c) 2003-2007 Martin Quinson.  All rights reserved.            */
+/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+ * 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. */
 
 #include "gras/Virtu/virtu_sg.h"
+#include "simix/simix.h"
 
-/* 
+/*
  * Time elapsed since the begining of the simulation.
  */
-double xbt_os_time() {
+double xbt_time()
+{
+  /* FIXME: check if we should use the request mechanism or not */
   return SIMIX_get_clock();
 }
 
 /*
  * Freeze the process for the specified amount of time
  */
-void xbt_os_sleep(double sec) {
-	smx_action_t act_sleep;
-	smx_process_t proc = SIMIX_process_self();
-	smx_mutex_t mutex;
-	smx_cond_t cond;
-	/* create action to sleep */
-	act_sleep = SIMIX_action_sleep(SIMIX_process_get_host(proc),sec);
-	
-	mutex = SIMIX_mutex_init();
-	SIMIX_mutex_lock(mutex);
-	/* create conditional and register action to it */
-	cond = SIMIX_cond_init();
-
-	SIMIX_register_condition_to_action(act_sleep, cond);
-	SIMIX_register_action_to_condition(act_sleep, cond);
-	SIMIX_cond_wait(cond,mutex);
-	SIMIX_mutex_unlock(mutex);
-
-	/* remove variables */
-	SIMIX_cond_destroy(cond);
-	SIMIX_mutex_destroy(mutex);
-	SIMIX_action_destroy(act_sleep);
+void xbt_sleep(double sec)
+{
+  SIMIX_req_process_sleep(sec);
+}
 
+const char *xbt_procname(void)
+{
+  return SIMIX_process_self_get_name();
 }
+