X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6ccd57a953c53876aaa887293d2e580043010178..fdc1a282a7200e7131298083d6dd41f6aa8beb89:/src/simix/smx_user.c

diff --git a/src/simix/smx_user.c b/src/simix/smx_user.c
index 15b9899de3..bcc6ba83c1 100644
--- a/src/simix/smx_user.c
+++ b/src/simix/smx_user.c
@@ -1,6 +1,7 @@
 /* smx_user.c - public interface to simix                                   */
 
-/* Copyright (c) 2010-2012. Da SimGrid team. All rights reserved.          */
+/* Copyright (c) 2010-2013. 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. */
@@ -1176,20 +1177,44 @@ int simcall_sem_get_capacity(smx_sem_t 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
  */
-size_t simcall_file_read(size_t size, smx_file_t fd)
+void* simcall_file_get_data(smx_file_t fd)
 {
-  return simcall_BODY_file_read(size, 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
+ *
+ */
+sg_storage_size_t simcall_file_read(smx_file_t fd, sg_storage_size_t size)
+{
+  return simcall_BODY_file_read(fd, size);
 }
 
 /**
  * \ingroup simix_file_management
  *
  */
-size_t simcall_file_write(size_t size, smx_file_t fd)
+sg_storage_size_t simcall_file_write(smx_file_t fd, sg_storage_size_t size)
 {
-  return simcall_BODY_file_write(size, fd);
+  return simcall_BODY_file_write(fd, size);
 }
 
 /**
@@ -1231,7 +1256,7 @@ xbt_dict_t simcall_file_ls(const char* mount, const char* path)
  * \ingroup simix_file_management
  *
  */
-size_t simcall_file_get_size (smx_file_t fd){
+sg_storage_size_t simcall_file_get_size (smx_file_t fd){
   return simcall_BODY_file_get_size(fd);
 }
 
@@ -1246,25 +1271,58 @@ xbt_dynar_t simcall_file_get_info(smx_file_t fd)
 
 /**
  * \ingroup simix_storage_management
- * \brief Return the free size on a given storage element.
- * \param storage A SIMIX storage
- * \return a dynar containing all mounted storages on the host
+ * \brief Returns the free space size on a given storage element.
+ * \param storage name
+ * \return Return the free space size on a given storage element (as sg_storage_size_t)
  */
-size_t simcall_storage_get_free_size (smx_storage_t storage){
-  return simcall_BODY_storage_get_free_size(storage);
+sg_storage_size_t simcall_storage_get_free_size (const char* name){
+  return simcall_BODY_storage_get_free_size(name);
 }
 
 /**
- * \ingroup simix_host_management
- * \brief Return the list of storages mounted on an host.
+ * \ingroup simix_storage_management
+ * \brief Returns the used space size on a given storage element.
+ * \param storage name
+ * \return Return the used space size on a given storage element (as sg_storage_size_t)
+ */
+sg_storage_size_t simcall_storage_get_used_size (const char* name){
+  return simcall_BODY_storage_get_used_size(name);
+}
+
+/**
+ * \ingroup simix_storage_management
+ * \brief Returns the list of storages mounted on an host.
  * \param host A SIMIX host
- * \return a dynar containing all storages mounted on the host
+ * \return a dict containing all storages mounted on the host
  */
-xbt_dynar_t simcall_host_get_storage_list(smx_host_t host)
+xbt_dict_t simcall_host_get_storage_list(smx_host_t host)
 {
   return simcall_BODY_host_get_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
 
@@ -1277,9 +1335,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);
 }