/* 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. */
if (MC_is_active()) {
/* the model-checker wants two separate simcalls */
- smx_action_t comm = simcall_comm_isend(rdv, task_size, rate,
+ smx_action_t comm = NULL; /* MC needs the comm to be set to NULL during the simcall */
+ comm = simcall_comm_isend(rdv, task_size, rate,
src_buff, src_buff_size, match_fun, NULL, data, 0);
simcall_comm_wait(comm, timeout);
+ comm = NULL;
}
else {
simcall_BODY_comm_send(rdv, task_size, rate, src_buff, src_buff_size,
if (MC_is_active()) {
/* the model-checker wants two separate simcalls */
- smx_action_t comm = simcall_comm_irecv(rdv, dst_buff, dst_buff_size,
+ 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, data);
simcall_comm_wait(comm, timeout);
+ comm = NULL;
}
else {
simcall_BODY_comm_recv(rdv, dst_buff, dst_buff_size,
* \ingroup simix_file_management
*
*/
-size_t simcall_file_read(size_t size, smx_file_t fd)
+sg_storage_size_t simcall_file_read(smx_file_t fd, sg_storage_size_t size)
{
- return simcall_BODY_file_read(size, fd);
+ 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);
}
/**
* \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);
}
/**
* \ingroup simix_storage_management
- * \brief Return the free space size on a given storage element.
+ * \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 size_t)
+ * \return Return the free space size on a given storage element (as sg_storage_size_t)
*/
-size_t simcall_storage_get_free_size (const char* name){
+sg_storage_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.
+ * \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 size_t)
+ * \return Return the used space size on a given storage element (as sg_storage_size_t)
*/
-size_t simcall_storage_get_used_size (const char* name){
+sg_storage_size_t simcall_storage_get_used_size (const char* name){
return simcall_BODY_storage_get_used_size(name);
}
/**
- * \ingroup simix_host_management
- * \brief Return the list of storages mounted on an host.
+ * \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