X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8751ce2fc793fff5b7b5f492add834d9f77ec0e3..220a6109b767302515959ba7b80a36cfd9fd94ca:/src/simix/smx_user.c

diff --git a/src/simix/smx_user.c b/src/simix/smx_user.c
index 84382c5286..16e1f6a097 100644
--- a/src/simix/smx_user.c
+++ b/src/simix/smx_user.c
@@ -1,12 +1,13 @@
 /* smx_user.c - public interface to simix                                   */
 
-/* Copyright (c) 2010-2012. Da SimGrid team. All rights reserved.          */
+/* Copyright (c) 2010-2014. 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 "smx_private.h"
-#include "mc/mc.h"
+#include "mc/mc_interface.h"
 #include "xbt/ex.h"
 #include <math.h>         /* isfinite() */
 
@@ -14,11 +15,11 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix);
 
 /* generate strings from the enumeration values */
 static const char* simcall_names[] = {
-SIMCALL_LIST(SIMCALL_STRING_TYPE, SIMCALL_SEP_COMMA)
+#include "simcalls_generated_string.c"
 [SIMCALL_NONE] = "NONE"
 };
 
-SIMCALL_LIST(SIMCALL_FUNC, SIMCALL_SEP_NOTHING)
+#include "simcalls_generated_body.c"
 
 /**
  * \ingroup simix_host_management
@@ -116,6 +117,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);
+}
 
 
 /**
@@ -144,29 +156,66 @@ int simcall_host_get_state(smx_host_t host)
 
 /**
  * \ingroup simix_host_management
- * \brief Returns the user data associated to a host.
+ * \brief Returns the power peak of a host.
+ *
+ * \param host A SIMIX host
+ * \return the current power peak value (double)
+ */
+double simcall_host_get_current_power_peak(smx_host_t host)
+{
+  return simcall_BODY_host_get_current_power_peak(host);
+}
+
+/**
+ * \ingroup simix_host_management
+ * \brief Returns one power peak (in flops/s) of a host at a given pstate
+ *
+ * \param host A SIMIX host
+ * \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)
+{
+  return simcall_BODY_host_get_power_peak_at(host, pstate_index);
+}
+
+/**
+ * \ingroup simix_host_management
+ * \brief Returns the number of power states for a host.
  *
- * \param host SIMIX host
- * \return the user data of this host
+ * \param host A SIMIX host
+ * \return the number of power states
  */
-void* simcall_host_get_data(smx_host_t host)
+int simcall_host_get_nb_pstates(smx_host_t host)
 {
-  return simcall_BODY_host_get_data(host);
+  return simcall_BODY_host_get_nb_pstates(host);
 }
 
 /**
  * \ingroup simix_host_management
- * \brief Sets the user data associated to a host.
+ * \brief Sets a new power peak for a host.
  *
- * The host must not have previous user data associated to it.
  * \param host A SIMIX host
- * \param data The user data to set
+ * \param pstate_index The pstate to which the CPU power will be set
  */
-void simcall_host_set_data(smx_host_t host, void *data)
+void simcall_host_set_power_peak_at(smx_host_t host, int pstate_index)
 {
-  simcall_host_set_data(host, data);
+	simcall_BODY_host_set_power_peak_at(host, pstate_index);
 }
 
+/**
+ * \ingroup simix_host_management
+ * \brief Returns the total energy consumed by the host (in Joules)
+ *
+ * \param host A SIMIX host
+ * \return the energy consumed by the host (double)
+ */
+double simcall_host_get_consumed_energy(smx_host_t host)
+{
+  return simcall_BODY_host_get_consumed_energy(host);
+}
+
+
 /**
  * \ingroup simix_host_management
  * \brief Creates an action that executes some computation of an host.
@@ -178,9 +227,10 @@ void simcall_host_set_data(smx_host_t host, void *data)
  * \param host SIMIX host where the action will be executed
  * \param computation_amount amount Computation amount (in bytes)
  * \param priority computation priority
+ * \param bound
+ * \param affinity_mask
  * \return A new SIMIX execution action
  */
-
 smx_action_t simcall_host_execute(const char *name, smx_host_t host,
                                     double computation_amount,
                                     double priority, double bound, unsigned long affinity_mask)
@@ -188,7 +238,7 @@ smx_action_t simcall_host_execute(const char *name, smx_host_t host,
   /* checking for infinite values */
   xbt_assert(isfinite(computation_amount), "computation_amount is not finite!");
   xbt_assert(isfinite(priority), "priority is not finite!");
-  
+
   return simcall_BODY_host_execute(name, host, computation_amount, priority, bound, affinity_mask);
 }
 
@@ -220,14 +270,14 @@ smx_action_t simcall_host_parallel_execute(const char *name,
   for (i = 0 ; i < host_nb ; ++i) {
      xbt_assert(isfinite(computation_amount[i]), "computation_amount[%d] is not finite!", i);
      for (j = 0 ; j < host_nb ; ++j) {
-        xbt_assert(isfinite(communication_amount[i + host_nb * j]), 
+        xbt_assert(isfinite(communication_amount[i + host_nb * j]),
              "communication_amount[%d+%d*%d] is not finite!", i, host_nb, j);
-     }   
-  }   
- 
+     }
+  }
+
   xbt_assert(isfinite(amount), "amount is not finite!");
   xbt_assert(isfinite(rate), "rate is not finite!");
-  
+
   return simcall_BODY_host_parallel_execute(name, host_nb, host_list,
                                             computation_amount,
                                             communication_amount,
@@ -295,7 +345,7 @@ void simcall_host_execution_set_priority(smx_action_t execution, double priority
 {
   /* checking for infinite values */
   xbt_assert(isfinite(priority), "priority is not finite!");
-  
+
   simcall_BODY_host_execution_set_priority(execution, priority);
 }
 
@@ -386,7 +436,7 @@ int simcall_vm_get_state(smx_host_t vm)
  */
 void *simcall_vm_get_pm(smx_host_t vm)
 {
-  /* will jump to SIMIX_pre_vm_migrate in src/simix/smx_smurf_private.h */
+  /* will jump to SIMIX_pre_vm_get_pm in src/simix/smx_smurf_private.h */
   return simcall_BODY_vm_get_pm(vm);
 }
 
@@ -578,6 +628,11 @@ void simcall_process_change_host(smx_process_t process, smx_host_t dest)
   simcall_BODY_process_change_host(process, dest);
 }
 
+void simcall_process_join(smx_process_t process, double timeout)
+{
+  simcall_BODY_process_join(process, timeout);
+}
+
 /**
  * \ingroup simix_process_management
  * \brief Suspends a process.
@@ -763,7 +818,7 @@ xbt_dict_t simcall_process_get_properties(smx_process_t process)
  * \brief Add an on_exit function
  * Add an on_exit function which will be executed when the process exits/is killed.
  */
-XBT_PUBLIC(void) simcall_process_on_exit(smx_process_t process, int_f_pvoid_t fun, void *data)
+XBT_PUBLIC(void) simcall_process_on_exit(smx_process_t process, int_f_pvoid_pvoid_t fun, void *data)
 {
   simcall_BODY_process_on_exit(process, fun, data);
 }
@@ -837,13 +892,6 @@ smx_rdv_t simcall_rdv_get_by_name(const char *name)
    * skipping the simcall (for now). It works in parallel, it won't work on
    * distributed but probably we will change MSG for that. */
 
-  /*
-  smx_simcall_t simcall = simcall_mine();
-  simcall->call = SIMCALL_RDV_GEY_BY_NAME;
-  simcall->rdv_get_by_name.name = name;
-  SIMIX_simcall_push(simcall->issuer);
-  return simcall->rdv_get_by_name.result;*/
-
   return SIMIX_rdv_get_by_name(name);
 }
 
@@ -884,141 +932,102 @@ smx_process_t simcall_rdv_get_receiver(smx_rdv_t rdv)
 /**
  * \ingroup simix_comm_management
  */
-void simcall_comm_send(smx_rdv_t rdv, double task_size, double rate,
+void simcall_comm_send(smx_process_t src, smx_rdv_t rdv, double task_size, double rate,
                          void *src_buff, size_t src_buff_size,
-                         int (*match_fun)(void *, void *, smx_action_t), void *data,
+                         int (*match_fun)(void *, void *, smx_action_t),
+                         void (*copy_data_fun)(smx_action_t, void*, size_t), void *data,
                          double timeout)
 {
   /* checking for infinite values */
   xbt_assert(isfinite(task_size), "task_size is not finite!");
   xbt_assert(isfinite(rate), "rate is not finite!");
   xbt_assert(isfinite(timeout), "timeout is not finite!");
-  
+
   xbt_assert(rdv, "No rendez-vous point defined for send");
 
   if (MC_is_active()) {
     /* the model-checker wants two separate simcalls */
-    smx_action_t comm = simcall_comm_isend(rdv, task_size, rate,
-        src_buff, src_buff_size, match_fun, NULL, data, 0);
+    smx_action_t comm = NULL; /* MC needs the comm to be set to NULL during the simcall */
+    comm = simcall_comm_isend(src, rdv, task_size, rate,
+        src_buff, src_buff_size, match_fun, NULL, copy_data_fun, data, 0);
     simcall_comm_wait(comm, timeout);
+    comm = NULL;
   }
   else {
-    simcall_BODY_comm_send(rdv, task_size, rate, src_buff, src_buff_size,
-                         match_fun, data, timeout);
+    simcall_BODY_comm_send(src, rdv, task_size, rate, src_buff, src_buff_size,
+                         match_fun, copy_data_fun, data, timeout);
   }
 }
 
 /**
  * \ingroup simix_comm_management
  */
-smx_action_t simcall_comm_isend(smx_rdv_t rdv, double task_size, double rate,
+smx_action_t simcall_comm_isend(smx_process_t src, smx_rdv_t rdv, double task_size, double rate,
                               void *src_buff, size_t src_buff_size,
                               int (*match_fun)(void *, void *, smx_action_t),
                               void (*clean_fun)(void *),
+                              void (*copy_data_fun)(smx_action_t, void*, size_t),
                               void *data,
                               int detached)
 {
   /* checking for infinite values */
   xbt_assert(isfinite(task_size), "task_size is not finite!");
   xbt_assert(isfinite(rate), "rate is not finite!");
-  
+
   xbt_assert(rdv, "No rendez-vous point defined for isend");
 
-  return simcall_BODY_comm_isend(rdv, task_size, rate, src_buff,
+  return simcall_BODY_comm_isend(src, rdv, task_size, rate, src_buff,
                                  src_buff_size, match_fun,
-                                 clean_fun, data, detached);
+                                 clean_fun, copy_data_fun, data, detached);
 }
+
 /**
  * \ingroup simix_comm_management
  */
 void simcall_comm_recv(smx_rdv_t rdv, void *dst_buff, size_t * dst_buff_size,
-                         int (*match_fun)(void *, void *, smx_action_t), void *data, double timeout)
+                       int (*match_fun)(void *, void *, smx_action_t),
+                       void (*copy_data_fun)(smx_action_t, void*, size_t),
+                       void *data, double timeout, double rate)
 {
   xbt_assert(isfinite(timeout), "timeout is not finite!");
   xbt_assert(rdv, "No rendez-vous point defined for recv");
 
   if (MC_is_active()) {
     /* the model-checker wants two separate simcalls */
-    smx_action_t comm = simcall_comm_irecv(rdv, dst_buff, dst_buff_size,
-        match_fun, data);
+    smx_action_t comm = NULL; /* MC needs the comm to be set to NULL during the simcall */
+    comm = simcall_comm_irecv(rdv, dst_buff, dst_buff_size,
+                              match_fun, copy_data_fun, data, rate);
     simcall_comm_wait(comm, timeout);
+    comm = NULL;
   }
   else {
     simcall_BODY_comm_recv(rdv, dst_buff, dst_buff_size,
-                           match_fun, data, timeout);
+                           match_fun, copy_data_fun, data, timeout, rate);
   }
 }
 /**
  * \ingroup simix_comm_management
  */
 smx_action_t simcall_comm_irecv(smx_rdv_t rdv, void *dst_buff, size_t *dst_buff_size,
-                                  int (*match_fun)(void *, void *, smx_action_t), void *data)
-{
-  xbt_assert(rdv, "No rendez-vous point defined for irecv");
-
-  return simcall_BODY_comm_irecv(rdv, dst_buff, dst_buff_size, 
-                                 match_fun, data);
-}
-
-
-/**
- * \ingroup simix_comm_management
- */
-void simcall_comm_recv_bounded(smx_rdv_t rdv, void *dst_buff, size_t * dst_buff_size,
-                         int (*match_fun)(void *, void *, smx_action_t), void *data, double timeout, double rate)
-{
-  xbt_assert(isfinite(timeout), "timeout is not finite!");
-  xbt_assert(rdv, "No rendez-vous point defined for recv");
-
-  if (MC_is_active()) {
-    /* the model-checker wants two separate simcalls */
-    smx_action_t comm = simcall_comm_irecv_bounded(rdv, dst_buff, dst_buff_size,
-        match_fun, data, rate);
-    simcall_comm_wait(comm, timeout);
-  }
-  else {
-    simcall_BODY_comm_recv_bounded(rdv, dst_buff, dst_buff_size,
-                           match_fun, data, timeout, rate);
-  }
-}
-/**
- * \ingroup simix_comm_management
- */
-smx_action_t simcall_comm_irecv_bounded(smx_rdv_t rdv, void *dst_buff, size_t *dst_buff_size,
-                                  int (*match_fun)(void *, void *, smx_action_t), void *data, double rate)
+                                int (*match_fun)(void *, void *, smx_action_t),
+                                void (*copy_data_fun)(smx_action_t, void*, size_t),
+                                void *data, double rate)
 {
   xbt_assert(rdv, "No rendez-vous point defined for irecv");
 
-  return simcall_BODY_comm_irecv_bounded(rdv, dst_buff, dst_buff_size,
-                                 match_fun, data, rate);
+  return simcall_BODY_comm_irecv(rdv, dst_buff, dst_buff_size,
+                                 match_fun, copy_data_fun, data, rate);
 }
 
-
 /**
  * \ingroup simix_comm_management
  */
-smx_action_t simcall_comm_iprobe(smx_rdv_t rdv, int src, int tag,
+smx_action_t simcall_comm_iprobe(smx_rdv_t rdv, int type, int src, int tag,
                                 int (*match_fun)(void *, void *, smx_action_t), void *data)
 {
   xbt_assert(rdv, "No rendez-vous point defined for iprobe");
 
-  return simcall_BODY_comm_iprobe(rdv, src, tag, match_fun, data);
-}
-
-void simcall_comm_destroy(smx_action_t comm)
-{
-  xbt_assert(comm, "Invalid parameter");
-
-  /* FIXME remove this simcall type: comms are auto-destroyed now */
-
-  /*
-  smx_simcall_t simcall = simcall_mine();
-
-  simcall->call = SIMCALL_COMM_DESTROY;
-  simcall->comm_destroy.comm = comm;
-
-  SIMIX_simcall_push(simcall->issuer);
-  */
+  return simcall_BODY_comm_iprobe(rdv, type, src, tag, match_fun, data);
 }
 
 /**
@@ -1133,7 +1142,7 @@ smx_process_t simcall_comm_get_src_proc(smx_action_t comm)
  */
 smx_process_t simcall_comm_get_dst_proc(smx_action_t comm)
 {
-  return simcall_BODY_comm_get_dst_proc(comm);  
+  return simcall_BODY_comm_get_dst_proc(comm);
 }
 
 #ifdef HAVE_LATENCY_BOUND_TRACKING
@@ -1171,7 +1180,7 @@ void simcall_mutex_destroy(smx_mutex_t mutex)
  */
 void simcall_mutex_lock(smx_mutex_t mutex)
 {
-  simcall_BODY_mutex_lock(mutex);  
+  simcall_BODY_mutex_lock(mutex);
 }
 
 /**
@@ -1180,7 +1189,7 @@ void simcall_mutex_lock(smx_mutex_t mutex)
  */
 int simcall_mutex_trylock(smx_mutex_t mutex)
 {
-  return simcall_BODY_mutex_trylock(mutex);  
+  return simcall_BODY_mutex_trylock(mutex);
 }
 
 /**
@@ -1189,7 +1198,7 @@ int simcall_mutex_trylock(smx_mutex_t mutex)
  */
 void simcall_mutex_unlock(smx_mutex_t mutex)
 {
-  simcall_BODY_mutex_unlock(mutex); 
+  simcall_BODY_mutex_unlock(mutex);
 }
 
 /**
@@ -1255,7 +1264,7 @@ void simcall_cond_broadcast(smx_cond_t cond)
  */
 smx_sem_t simcall_sem_init(int capacity)
 {
-  return simcall_BODY_sem_init(capacity);  
+  return simcall_BODY_sem_init(capacity);
 }
 
 /**
@@ -1264,7 +1273,7 @@ smx_sem_t simcall_sem_init(int capacity)
  */
 void simcall_sem_destroy(smx_sem_t sem)
 {
-  simcall_sem_destroy(sem);
+  simcall_BODY_sem_destroy(sem);
 }
 
 /**
@@ -1273,7 +1282,7 @@ void simcall_sem_destroy(smx_sem_t sem)
  */
 void simcall_sem_release(smx_sem_t sem)
 {
-  simcall_BODY_sem_release(sem);  
+  simcall_BODY_sem_release(sem);
 }
 
 /**
@@ -1317,62 +1326,154 @@ int simcall_sem_get_capacity(smx_sem_t sem)
  * \ingroup simix_file_management
  *
  */
-size_t simcall_file_read(void* ptr, size_t size, smx_file_t fd)
+sg_size_t simcall_file_read(smx_file_t fd, sg_size_t size, smx_host_t host)
 {
-  return simcall_BODY_file_read(ptr, size, fd);
+  return simcall_BODY_file_read(fd, size, host);
 }
 
 /**
  * \ingroup simix_file_management
  *
  */
-size_t simcall_file_write(const void* ptr, size_t size,
-                          smx_file_t fd)
+sg_size_t simcall_file_write(smx_file_t fd, sg_size_t size, smx_host_t host)
 {
-  return simcall_BODY_file_write(ptr, size, fd);
+  return simcall_BODY_file_write(fd, size, host);
 }
 
 /**
  * \ingroup simix_file_management
  * \brief
  */
-smx_file_t simcall_file_open(const char* mount, const char* path)
+smx_file_t simcall_file_open(const char* fullpath, smx_host_t host)
 {
-  return simcall_BODY_file_open(mount, path);
+  return simcall_BODY_file_open(fullpath, host);
 }
 
 /**
  * \ingroup simix_file_management
  *
  */
-int simcall_file_close(smx_file_t fd)
+int simcall_file_close(smx_file_t fd, smx_host_t host)
 {
-  return simcall_BODY_file_close(fd);
+  return simcall_BODY_file_close(fd, host);
 }
 
 /**
  * \ingroup simix_file_management
  *
  */
-int simcall_file_unlink(smx_file_t fd)
+int simcall_file_unlink(smx_file_t fd, smx_host_t host)
 {
-  return simcall_BODY_file_unlink(fd);
+  return simcall_BODY_file_unlink(fd, host);
+}
+
+/**
+ * \ingroup simix_file_management
+ *
+ */
+sg_size_t simcall_file_get_size(smx_file_t fd){
+  return simcall_BODY_file_get_size(fd);
+}
+
+/**
+ * \ingroup simix_file_management
+ *
+ */
+sg_size_t simcall_file_tell(smx_file_t fd){
+  return simcall_BODY_file_tell(fd);
 }
 
 /**
  * \ingroup simix_file_management
  *
  */
-xbt_dict_t simcall_file_ls(const char* mount, const char* path)
+xbt_dynar_t simcall_file_get_info(smx_file_t fd)
 {
-  return simcall_BODY_file_ls(mount, path);
+  return simcall_BODY_file_get_info(fd);
 }
+
 /**
  * \ingroup simix_file_management
  *
  */
-size_t simcall_file_get_size (smx_file_t fd){
-  return simcall_BODY_file_get_size(fd);
+int simcall_file_seek(smx_file_t fd, sg_offset_t offset, int origin){
+  return simcall_BODY_file_seek(fd, offset, origin);
+}
+
+/**
+ * \ingroup simix_file_management
+ * \brief Move a file to another location on the *same mount point*.
+ *
+ */
+int simcall_file_move(smx_file_t fd, const char* fullpath)
+{
+  return simcall_BODY_file_move(fd, fullpath);
+}
+
+/**
+ * \ingroup simix_storage_management
+ * \brief Returns the free space size on a given storage element.
+ * \param storage a storage
+ * \return Return the free space size on a given storage element (as sg_size_t)
+ */
+sg_size_t simcall_storage_get_free_size (smx_storage_t storage){
+  return simcall_BODY_storage_get_free_size(storage);
+}
+
+/**
+ * \ingroup simix_storage_management
+ * \brief Returns the used space size on a given storage element.
+ * \param storage a storage
+ * \return Return the used space size on a given storage element (as sg_size_t)
+ */
+sg_size_t simcall_storage_get_used_size (smx_storage_t storage){
+  return simcall_BODY_storage_get_used_size(storage);
+}
+
+/**
+ * \ingroup simix_storage_management
+ * \brief Returns the list of storages mounted on an host.
+ * \param host A SIMIX host
+ * \return a dict containing all storages mounted on the host
+ */
+xbt_dict_t simcall_host_get_mounted_storage_list(smx_host_t host)
+{
+  return simcall_BODY_host_get_mounted_storage_list(host);
+}
+
+/**
+ * \ingroup simix_storage_management
+ * \brief Returns the list of storages attached to an host.
+ * \param host A SIMIX host
+ * \return a dict containing all storages attached to the host
+ */
+xbt_dynar_t simcall_host_get_attached_storage_list(smx_host_t host)
+{
+  return simcall_BODY_host_get_attached_storage_list(host);
+}
+
+/**
+ * \ingroup simix_storage_management
+ * \brief Returns a dict of the properties assigned to a storage element.
+ *
+ * \param storage A storage element
+ * \return The properties of this storage element
+ */
+xbt_dict_t simcall_storage_get_properties(smx_storage_t storage)
+{
+  return simcall_BODY_storage_get_properties(storage);
+}
+
+/**
+ * \ingroup simix_storage_management
+ * \brief Returns a dict containing the content of a storage element.
+ *
+ * \param storage A storage element
+ * \return The content of this storage element as a dict (full path file => size)
+ */
+xbt_dict_t simcall_storage_get_content(smx_storage_t storage)
+{
+  return simcall_BODY_storage_get_content(storage);
 }
 
 #ifdef HAVE_MC
@@ -1382,13 +1483,13 @@ void *simcall_mc_snapshot(void)
   return simcall_BODY_mc_snapshot();
 }
 
-int simcall_mc_compare_snapshots(void *s1, void *s2){ 
+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);
 }