X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/152117af2fbcf4c99d0da5d10a6813aac7eee007..9e6224ecd95ff7b6452fe9b2c088138877797542:/src/simix/smx_user.c

diff --git a/src/simix/smx_user.c b/src/simix/smx_user.c
index 448eace625..81cef92c70 100644
--- a/src/simix/smx_user.c
+++ b/src/simix/smx_user.c
@@ -82,6 +82,31 @@ double simcall_host_get_speed(smx_host_t host)
   return simcall_BODY_host_get_speed(host);
 }
 
+/**
+ * \ingroup simix_host_management
+ * \brief Returns the number of core of the processor.
+ *
+ * \param host A SIMIX host
+ * \return The number of core
+ */
+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);
+}
+
+
 /**
  * \ingroup simix_host_management
  * \brief Returns the available speed of the processor.
@@ -145,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)
 {
@@ -172,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)
@@ -182,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)
@@ -1152,63 +1178,61 @@ int simcall_sem_get_capacity(smx_sem_t sem)
  * \ingroup simix_file_management
  *
  */
-double simcall_file_read(void* ptr, size_t size, size_t nmemb, smx_file_t stream)
+size_t simcall_file_read(size_t size, smx_file_t fd)
 {
-  return simcall_BODY_file_read(ptr, size, nmemb, stream);
+  return simcall_BODY_file_read(size, fd);
 }
 
 /**
  * \ingroup simix_file_management
  *
  */
-size_t simcall_file_write(const void* ptr, size_t size, size_t nmemb, smx_file_t stream)
+size_t simcall_file_write(size_t size, smx_file_t fd)
 {
-  return simcall_BODY_file_write(ptr, size, nmemb, stream);
+  return simcall_BODY_file_write(size, fd);
 }
 
 /**
  * \ingroup simix_file_management
  * \brief
  */
-smx_file_t simcall_file_open(const char* mount, const char* path, const char* mode)
+smx_file_t simcall_file_open(const char* mount, const char* path)
 {
-  return simcall_BODY_file_open(mount, path, mode);
+  return simcall_BODY_file_open(mount, path);
 }
 
 /**
  * \ingroup simix_file_management
  *
  */
-int simcall_file_close(smx_file_t fp)
+int simcall_file_close(smx_file_t fd)
 {
-  return simcall_BODY_file_close(fp);  
+  return simcall_BODY_file_close(fd);
 }
 
 /**
  * \ingroup simix_file_management
  *
  */
-int simcall_file_stat(smx_file_t fd, s_file_stat_t *buf)
+int simcall_file_unlink(smx_file_t fd)
 {
-  return simcall_BODY_file_stat(fd, buf);
+  return simcall_BODY_file_unlink(fd);
 }
 
 /**
  * \ingroup simix_file_management
  *
  */
-int simcall_file_unlink(smx_file_t fd)
+xbt_dict_t simcall_file_ls(const char* mount, const char* path)
 {
-  return simcall_BODY_file_unlink(fd);
+  return simcall_BODY_file_ls(mount, path);
 }
-
 /**
  * \ingroup simix_file_management
  *
  */
-xbt_dict_t simcall_file_ls(const char* mount, const char* path)
-{
-  return simcall_BODY_file_ls(mount, path);
+size_t simcall_file_get_size (smx_file_t fd){
+  return simcall_BODY_file_get_size(fd);
 }
 
 #ifdef HAVE_MC