* Cleanup the DTD by renaming:

[simgrid.git] / include / gras / virtu.h

diff --git a/include/gras/virtu.h b/include/gras/virtu.h
index ff0b874..8669ebf 100644 (file)
--- a/include/gras/virtu.h
+++ b/include/gras/virtu.h
@@ -11,6 +11,7 @@
 #define GRAS_VIRTU_H
 
 #include "xbt/misc.h" /* SG_BEGIN_DECL */
+#include "xbt/time.h"
 
 SG_BEGIN_DECL()
 
@@ -35,13 +36,11 @@ void gras_main(void);
  *  @return number of second since the Epoch.
  *  (00:00:00 UTC, January 1, 1970 in Real Life, and begining of simulation in SG)
  */
-XBT_PUBLIC(double) gras_os_time(void);
-
+#define gras_os_time() xbt_time()
 /** @brief sleeps for the given amount of time.
  *  @param sec: number of seconds to sleep
  */
-XBT_PUBLIC(void) gras_os_sleep(double sec);
-
+#define gras_os_sleep(sec) xbt_sleep(sec) 
 /** @brief get the fully-qualified name of the current host
  *
  * Returns the fully-qualified name of the host machine, or "localhost" if the name
@@ -54,6 +53,13 @@ gras_os_myname(void);
 /** @brief returns the number on which this process is listening for incoming messages */
 XBT_PUBLIC(int) gras_os_myport(void);
 
+/** @brief get the uri of the current process
+ *
+ * Returns the concatenation of gras_os_myname():gras_os_myport(). Please do not free the result.
+ */
+XBT_PUBLIC(const char *)
+gras_os_hostport(void);
+
 /** @brief get process identification
  *
  * Returns the process ID of the current process.  (This is often used
@@ -61,6 +67,15 @@ XBT_PUBLIC(int) gras_os_myport(void);
  */
 XBT_PUBLIC(int) gras_os_getpid(void);
 
+
+/* The following functions handle process property query */
+XBT_PUBLIC(xbt_dict_t) gras_process_properties(void);
+XBT_PUBLIC(const char*) gras_process_property_value(char* name);
+
+/* The following functions handle host/cpu property query */
+XBT_PUBLIC(xbt_dict_t) gras_os_host_properties(void);
+XBT_PUBLIC(const char*) gras_os_property_value(char* name);   
+
 /** @} */
 SG_END_DECL()