Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / src / simix / smx_user.c

diff --git a/src/simix/smx_user.c b/src/simix/smx_user.c
index 598047b..0c02e5e 100644 (file)
--- a/src/simix/smx_user.c
+++ b/src/simix/smx_user.c
@@ -94,6 +94,17 @@ int simcall_host_get_core(smx_host_t host)
   return simcall_BODY_host_get_core(host);
 }
 
+/**
+ * \ingroup simix_host_management
+ * \brief Returns the list of processes attached to the host.
+ *
+ * \param host A SIMIX host
+ * \return the swag of attached processes
+ */
+xbt_swag_t simcall_host_get_process_list(smx_host_t host)
+{
+  return simcall_BODY_host_get_process_list(host);
+}
 
 
 /**
@@ -159,10 +170,11 @@ double simcall_host_get_current_power_peak(smx_host_t host)
 
 /**
  * \ingroup simix_host_management
- * \brief Returns one power peak of a host.
+ * \brief Returns one power peak (in flops/s) of a host at a given pstate
  *
  * \param host A SIMIX host
- * \return the current power peak value (double)
+ * \param pstate_index pstate to test
+ * \return the current power peak value (double) for pstate_index
  */
 double simcall_host_get_power_peak_at(smx_host_t host, int pstate_index)
 {
@@ -186,7 +198,7 @@ int simcall_host_get_nb_pstates(smx_host_t host)
  * \brief Sets a new power peak for a host.
  *
  * \param host A SIMIX host
- * \param pstate_index The state index to which the CPU power will be set
+ * \param pstate_index The pstate to which the CPU power will be set
  * \return void
  */
 void simcall_host_set_power_peak_at(smx_host_t host, int pstate_index)
@@ -196,7 +208,7 @@ void simcall_host_set_power_peak_at(smx_host_t host, int pstate_index)
 
 /**
  * \ingroup simix_host_management
- * \brief Returns the total energy consumed by the host
+ * \brief Returns the total energy consumed by the host (in Joules)
  *
  * \param host A SIMIX host
  * \return the energy consumed by the host (double)
@@ -1162,6 +1174,30 @@ int simcall_sem_get_capacity(smx_sem_t sem)
   return simcall_BODY_sem_get_capacity(sem);
 }
 
+/**
+ * \ingroup simix_file_management
+ * \brief Returns the user data associated to a file.
+ *
+ * \param fd A simix file
+ * \return the user data of this file
+ */
+void* simcall_file_get_data(smx_file_t fd)
+{
+  return simcall_BODY_file_get_data(fd);
+}
+
+/**
+ * \ingroup simix_file_management
+ * \brief Sets the user data associated to a file.
+ *
+ * \param fd A SIMIX file
+ * \param data The user data to set
+ */
+void simcall_file_set_data(smx_file_t fd, void *data)
+{
+  simcall_file_set_data(fd, data);
+}
+
 /**
  * \ingroup simix_file_management
  *
@@ -1223,6 +1259,47 @@ size_t simcall_file_get_size (smx_file_t fd){
   return simcall_BODY_file_get_size(fd);
 }
 
+/**
+ * \ingroup simix_file_management
+ *
+ */
+xbt_dynar_t simcall_file_get_info(smx_file_t fd)
+{
+  return simcall_BODY_file_get_info(fd);
+}
+
+/**
+ * \ingroup simix_storage_management
+ * \brief Return the free space size on a given storage element.
+ * \param storage name
+ * \return Return the free space size on a given storage element (as size_t)
+ */
+size_t simcall_storage_get_free_size (const char* name){
+  return simcall_BODY_storage_get_free_size(name);
+}
+
+/**
+ * \ingroup simix_storage_management
+ * \brief Return the used space size on a given storage element.
+ * \param storage name
+ * \return Return the used space size on a given storage element (as size_t)
+ */
+size_t simcall_storage_get_used_size (const char* name){
+  return simcall_BODY_storage_get_used_size(name);
+}
+
+/**
+ * \ingroup simix_storage_management
+ * \brief Return the list of storages mounted on an host.
+ * \param host A SIMIX host
+ * \return a dynar containing all storages mounted on the host
+ */
+xbt_dynar_t simcall_host_get_storage_list(smx_host_t host)
+{
+  return simcall_BODY_host_get_storage_list(host);
+}
+
+
 #ifdef HAVE_MC
 
 void *simcall_mc_snapshot(void)
@@ -1234,9 +1311,9 @@ int simcall_mc_compare_snapshots(void *s1, void *s2){
   return simcall_BODY_mc_compare_snapshots(s1, s2);
 }
 
-int simcall_mc_random(void)
+int simcall_mc_random(int min, int max)
 {
-  return simcall_BODY_mc_random();
+  return simcall_BODY_mc_random(min, max);
 }