X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5b3677b425b9cc6949c1573d59ac772540cbf4b2..37d3feec77dbbee15fd81cac77b96e535db70292:/src/simix/smx_user.c

diff --git a/src/simix/smx_user.c b/src/simix/smx_user.c
index 5e1d9d8680..43085e4746 100644
--- a/src/simix/smx_user.c
+++ b/src/simix/smx_user.c
@@ -154,31 +154,6 @@ int simcall_host_get_state(smx_host_t host)
   return simcall_BODY_host_get_state(host);
 }
 
-/**
- * \ingroup simix_host_management
- * \brief Returns the user data associated to a host.
- *
- * \param host SIMIX host
- * \return the user data of this host
- */
-void* simcall_host_get_data(smx_host_t host)
-{
-  return simcall_BODY_host_get_data(host);
-}
-
-/**
- * \ingroup simix_host_management
- * \brief Sets the user data associated to 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
- */
-void simcall_host_set_data(smx_host_t host, void *data)
-{
-  simcall_host_set_data(host, data);
-}
-
 /**
  * \ingroup simix_host_management
  * \brief Returns the power peak of a host.
@@ -913,13 +888,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);
 }
 
@@ -1043,7 +1011,6 @@ smx_action_t simcall_comm_irecv(smx_rdv_t rdv, void *dst_buff, size_t *dst_buff_
                                  match_fun, data, rate);
 }
 
-
 /**
  * \ingroup simix_comm_management
  */
@@ -1055,22 +1022,6 @@ smx_action_t simcall_comm_iprobe(smx_rdv_t rdv, int src, int tag,
   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);
-  */
-}
-
 /**
  * \ingroup simix_comm_management
  */
@@ -1314,7 +1265,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);
 }
 
 /**
@@ -1363,30 +1314,6 @@ 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
  *
@@ -1409,9 +1336,9 @@ sg_size_t simcall_file_write(smx_file_t fd, sg_size_t size)
  * \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)
 {
-  return simcall_BODY_file_open(mount, path);
+  return simcall_BODY_file_open(fullpath);
 }
 
 /**
@@ -1475,11 +1402,22 @@ int simcall_file_seek(smx_file_t fd, sg_size_t offset, int origin){
 
 /**
  * \ingroup simix_file_management
+ * \brief Move a file to another location on the *same mount point*.
  *
  */
-void simcall_storage_file_rename(smx_storage_t storage, const char* src,  const char* dest)
+int simcall_file_move(smx_file_t fd, const char* fullpath)
 {
-  return simcall_BODY_storage_file_rename(storage, src, dest);
+  return simcall_BODY_file_move(fd, fullpath);
+}
+
+/**
+ * \ingroup simix_file_management
+ * \brief Copy a file to another location on a remote host.
+ *
+ */
+int simcall_file_rcopy(smx_file_t fd, smx_host_t host, const char* fullpath)
+{
+  return simcall_BODY_file_rcopy(fd, host, fullpath);
 }
 
 /**
@@ -1508,9 +1446,20 @@ sg_size_t simcall_storage_get_used_size (const char* name){
  * \param host A SIMIX host
  * \return a dict containing all storages mounted on the host
  */
-xbt_dict_t simcall_host_get_storage_list(smx_host_t 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_storage_list(host);
+  return simcall_BODY_host_get_attached_storage_list(host);
 }
 
 /**