A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix initialization order.
[simgrid.git]
/
src
/
simix
/
smx_io.c
diff --git
a/src/simix/smx_io.c
b/src/simix/smx_io.c
index
6755bba
..
9f1585b
100644
(file)
--- a/
src/simix/smx_io.c
+++ b/
src/simix/smx_io.c
@@
-5,7
+5,7
@@
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "smx_private.h"
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "smx_private.h"
-#include "surf/storage_private.h"
+
//
#include "surf/storage_private.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
#include "xbt/dict.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
#include "xbt/dict.h"
@@
-71,21
+71,20
@@
void SIMIX_file_set_data(smx_file_t fd, void *data){
}
//SIMIX FILE READ
}
//SIMIX FILE READ
-void SIMIX_pre_file_read(smx_simcall_t simcall, smx_file_t fd, sg_s
torage_s
ize_t size)
+void SIMIX_pre_file_read(smx_simcall_t simcall, smx_file_t fd, sg_size_t size)
{
smx_action_t action = SIMIX_file_read(simcall->issuer, fd, size);
xbt_fifo_push(action->simcalls, simcall);
simcall->issuer->waiting_action = action;
}
{
smx_action_t action = SIMIX_file_read(simcall->issuer, fd, size);
xbt_fifo_push(action->simcalls, simcall);
simcall->issuer->waiting_action = action;
}
-smx_action_t SIMIX_file_read(smx_process_t process, smx_file_t fd, sg_s
torage_s
ize_t size)
+smx_action_t SIMIX_file_read(smx_process_t process, smx_file_t fd, sg_size_t size)
{
smx_action_t action;
smx_host_t host = process->smx_host;
/* check if the host is active */
{
smx_action_t action;
smx_host_t host = process->smx_host;
/* check if the host is active */
- if (surf_workstation_model->extension.
- workstation.get_state(host) != SURF_RESOURCE_ON) {
+ if (surf_resource_get_state(surf_workstation_resource_priv(host)) != SURF_RESOURCE_ON) {
THROWF(host_error, 0, "Host %s failed, you cannot call this function",
sg_host_name(host));
}
THROWF(host_error, 0, "Host %s failed, you cannot call this function",
sg_host_name(host));
}
@@
-98,31
+97,29
@@
smx_action_t SIMIX_file_read(smx_process_t process, smx_file_t fd, sg_storage_si
#endif
action->io.host = host;
#endif
action->io.host = host;
- action->io.surf_io =
- surf_workstation_model->extension.workstation.read(host, fd->surf_file, size);
+ action->io.surf_io = surf_workstation_read(host, fd->surf_file, size);
- surf_
workstation_model->action_data_set
(action->io.surf_io, action);
+ surf_
action_set_data
(action->io.surf_io, action);
XBT_DEBUG("Create io action %p", action);
return action;
}
//SIMIX FILE WRITE
XBT_DEBUG("Create io action %p", action);
return action;
}
//SIMIX FILE WRITE
-void SIMIX_pre_file_write(smx_simcall_t simcall, smx_file_t fd, sg_s
torage_s
ize_t size)
+void SIMIX_pre_file_write(smx_simcall_t simcall, smx_file_t fd, sg_size_t size)
{
smx_action_t action = SIMIX_file_write(simcall->issuer, fd, size);
xbt_fifo_push(action->simcalls, simcall);
simcall->issuer->waiting_action = action;
}
{
smx_action_t action = SIMIX_file_write(simcall->issuer, fd, size);
xbt_fifo_push(action->simcalls, simcall);
simcall->issuer->waiting_action = action;
}
-smx_action_t SIMIX_file_write(smx_process_t process, smx_file_t fd, sg_s
torage_s
ize_t size)
+smx_action_t SIMIX_file_write(smx_process_t process, smx_file_t fd, sg_size_t size)
{
smx_action_t action;
smx_host_t host = process->smx_host;
/* check if the host is active */
{
smx_action_t action;
smx_host_t host = process->smx_host;
/* check if the host is active */
- if (surf_workstation_model->extension.
- workstation.get_state(host) != SURF_RESOURCE_ON) {
+ if (surf_resource_get_state(surf_workstation_resource_priv(host)) != SURF_RESOURCE_ON) {
THROWF(host_error, 0, "Host %s failed, you cannot call this function",
sg_host_name(host));
}
THROWF(host_error, 0, "Host %s failed, you cannot call this function",
sg_host_name(host));
}
@@
-135,10
+132,9
@@
smx_action_t SIMIX_file_write(smx_process_t process, smx_file_t fd, sg_storage_s
#endif
action->io.host = host;
#endif
action->io.host = host;
- action->io.surf_io =
- surf_workstation_model->extension.workstation.write(host, fd->surf_file, size);
+ action->io.surf_io = surf_workstation_write(host, fd->surf_file, size);
- surf_
workstation_model->action_data_set
(action->io.surf_io, action);
+ surf_
action_set_data
(action->io.surf_io, action);
XBT_DEBUG("Create io action %p", action);
return action;
XBT_DEBUG("Create io action %p", action);
return action;
@@
-160,8
+156,7
@@
smx_action_t SIMIX_file_open(smx_process_t process ,const char* mount,
smx_host_t host = process->smx_host;
/* check if the host is active */
smx_host_t host = process->smx_host;
/* check if the host is active */
- if (surf_workstation_model->extension.
- workstation.get_state(host) != SURF_RESOURCE_ON) {
+ if (surf_resource_get_state(surf_workstation_resource_priv(host)) != SURF_RESOURCE_ON) {
THROWF(host_error, 0, "Host %s failed, you cannot call this function",
sg_host_name(host));
}
THROWF(host_error, 0, "Host %s failed, you cannot call this function",
sg_host_name(host));
}
@@
-174,10
+169,9
@@
smx_action_t SIMIX_file_open(smx_process_t process ,const char* mount,
#endif
action->io.host = host;
#endif
action->io.host = host;
- action->io.surf_io =
- surf_workstation_model->extension.workstation.open(host, mount, path);
+ action->io.surf_io = surf_workstation_open(host, mount, path);
- surf_
workstation_model->action_data_set
(action->io.surf_io, action);
+ surf_
action_set_data
(action->io.surf_io, action);
XBT_DEBUG("Create io action %p", action);
return action;
XBT_DEBUG("Create io action %p", action);
return action;
@@
-197,8
+191,7
@@
smx_action_t SIMIX_file_close(smx_process_t process, smx_file_t fd)
smx_host_t host = process->smx_host;
/* check if the host is active */
smx_host_t host = process->smx_host;
/* check if the host is active */
- if (surf_workstation_model->extension.
- workstation.get_state(host) != SURF_RESOURCE_ON) {
+ if (surf_resource_get_state(surf_workstation_resource_priv(host)) != SURF_RESOURCE_ON) {
THROWF(host_error, 0, "Host %s failed, you cannot call this function",
sg_host_name(host));
}
THROWF(host_error, 0, "Host %s failed, you cannot call this function",
sg_host_name(host));
}
@@
-211,9
+204,9
@@
smx_action_t SIMIX_file_close(smx_process_t process, smx_file_t fd)
#endif
action->io.host = host;
#endif
action->io.host = host;
- action->io.surf_io = surf_workstation_
model->extension.workstation.
close(host, fd->surf_file);
+ action->io.surf_io = surf_workstation_close(host, fd->surf_file);
- surf_
workstation_model->action_data_set
(action->io.surf_io, action);
+ surf_
action_set_data
(action->io.surf_io, action);
XBT_DEBUG("Create io action %p", action);
return action;
XBT_DEBUG("Create io action %p", action);
return action;
@@
-230,13
+223,12
@@
int SIMIX_file_unlink(smx_process_t process, smx_file_t fd)
{
smx_host_t host = process->smx_host;
/* check if the host is active */
{
smx_host_t host = process->smx_host;
/* check if the host is active */
- if (surf_workstation_model->extension.
- workstation.get_state(host) != SURF_RESOURCE_ON) {
+ if (surf_resource_get_state(surf_workstation_resource_priv(host)) != SURF_RESOURCE_ON) {
THROWF(host_error, 0, "Host %s failed, you cannot call this function",
sg_host_name(host));
}
THROWF(host_error, 0, "Host %s failed, you cannot call this function",
sg_host_name(host));
}
- if (surf_workstation_
model->extension.workstation.
unlink(host, fd->surf_file)){
+ if (surf_workstation_unlink(host, fd->surf_file)){
xbt_free(fd);
return 1;
} else
xbt_free(fd);
return 1;
} else
@@
-256,7
+248,7
@@
smx_action_t SIMIX_file_ls(smx_process_t process, const char* mount, const char
smx_action_t action;
smx_host_t host = process->smx_host;
/* check if the host is active */
smx_action_t action;
smx_host_t host = process->smx_host;
/* check if the host is active */
- if (surf_
workstation_model->extension.workstation.get_state(host
) != SURF_RESOURCE_ON) {
+ if (surf_
resource_get_state(surf_workstation_resource_priv(host)
) != SURF_RESOURCE_ON) {
THROWF(host_error, 0, "Host %s failed, you cannot call this function",
sg_host_name(host));
}
THROWF(host_error, 0, "Host %s failed, you cannot call this function",
sg_host_name(host));
}
@@
-269,23
+261,22
@@
smx_action_t SIMIX_file_ls(smx_process_t process, const char* mount, const char
#endif
action->io.host = host;
#endif
action->io.host = host;
- action->io.surf_io = surf_workstation_
model->extension.workstation.
ls(host,mount,path);
+ action->io.surf_io = surf_workstation_ls(host,mount,path);
- surf_
workstation_model->action_data_set
(action->io.surf_io, action);
+ surf_
action_set_data
(action->io.surf_io, action);
XBT_DEBUG("Create io action %p", action);
return action;
}
XBT_DEBUG("Create io action %p", action);
return action;
}
-sg_s
torage_s
ize_t SIMIX_pre_file_get_size(smx_simcall_t simcall, smx_file_t fd)
+sg_size_t SIMIX_pre_file_get_size(smx_simcall_t simcall, smx_file_t fd)
{
return SIMIX_file_get_size(simcall->issuer, fd);
}
{
return SIMIX_file_get_size(simcall->issuer, fd);
}
-sg_s
torage_s
ize_t SIMIX_file_get_size(smx_process_t process, smx_file_t fd)
+sg_size_t SIMIX_file_get_size(smx_process_t process, smx_file_t fd)
{
smx_host_t host = process->smx_host;
{
smx_host_t host = process->smx_host;
- return surf_workstation_model->extension.workstation.get_size(host,
- fd->surf_file);
+ return surf_workstation_get_size(host, fd->surf_file);
}
xbt_dynar_t SIMIX_pre_file_get_info(smx_simcall_t simcall, smx_file_t fd)
}
xbt_dynar_t SIMIX_pre_file_get_info(smx_simcall_t simcall, smx_file_t fd)
@@
-296,8
+287,7
@@
xbt_dynar_t SIMIX_pre_file_get_info(smx_simcall_t simcall, smx_file_t fd)
xbt_dynar_t SIMIX_file_get_info(smx_process_t process, smx_file_t fd)
{
smx_host_t host = process->smx_host;
xbt_dynar_t SIMIX_file_get_info(smx_process_t process, smx_file_t fd)
{
smx_host_t host = process->smx_host;
- return surf_workstation_model->extension.workstation.get_info(host,
- fd->surf_file);
+ return surf_workstation_get_info(host, fd->surf_file);
}
void SIMIX_pre_storage_file_rename(smx_simcall_t simcall, smx_storage_t storage, const char* src, const char* dest)
}
void SIMIX_pre_storage_file_rename(smx_simcall_t simcall, smx_storage_t storage, const char* src, const char* dest)
@@
-307,29
+297,29
@@
void SIMIX_pre_storage_file_rename(smx_simcall_t simcall, smx_storage_t storage,
void SIMIX_storage_file_rename(smx_process_t process, smx_storage_t storage, const char* src, const char* dest)
{
void SIMIX_storage_file_rename(smx_process_t process, smx_storage_t storage, const char* src, const char* dest)
{
- return surf_
workstation_model->extension.storage.
rename(storage, src, dest);
+ return surf_
storage_
rename(storage, src, dest);
}
}
-sg_s
torage_s
ize_t SIMIX_pre_storage_get_free_size(smx_simcall_t simcall, const char* name)
+sg_size_t SIMIX_pre_storage_get_free_size(smx_simcall_t simcall, const char* name)
{
return SIMIX_storage_get_free_size(simcall->issuer, name);
}
{
return SIMIX_storage_get_free_size(simcall->issuer, name);
}
-sg_s
torage_s
ize_t SIMIX_storage_get_free_size(smx_process_t process, const char* name)
+sg_size_t SIMIX_storage_get_free_size(smx_process_t process, const char* name)
{
smx_host_t host = process->smx_host;
{
smx_host_t host = process->smx_host;
- return surf_workstation_
model->extension.workstation.get_free_size(host,
name);
+ return surf_workstation_
get_free_size(host,
name);
}
}
-sg_s
torage_s
ize_t SIMIX_pre_storage_get_used_size(smx_simcall_t simcall, const char* name)
+sg_size_t SIMIX_pre_storage_get_used_size(smx_simcall_t simcall, const char* name)
{
return SIMIX_storage_get_used_size(simcall->issuer, name);
}
{
return SIMIX_storage_get_used_size(simcall->issuer, name);
}
-sg_s
torage_s
ize_t SIMIX_storage_get_used_size(smx_process_t process, const char* name)
+sg_size_t SIMIX_storage_get_used_size(smx_process_t process, const char* name)
{
smx_host_t host = process->smx_host;
{
smx_host_t host = process->smx_host;
- return surf_workstation_
model->extension.workstation.get_used_size(host,
name);
+ return surf_workstation_
get_used_size(host,
name);
}
xbt_dict_t SIMIX_pre_storage_get_properties(smx_simcall_t simcall, smx_storage_t storage){
}
xbt_dict_t SIMIX_pre_storage_get_properties(smx_simcall_t simcall, smx_storage_t storage){
@@
-337,7
+327,7
@@
xbt_dict_t SIMIX_pre_storage_get_properties(smx_simcall_t simcall, smx_storage_t
}
xbt_dict_t SIMIX_storage_get_properties(smx_storage_t storage){
xbt_assert((storage != NULL), "Invalid parameters (simix storage is NULL)");
}
xbt_dict_t SIMIX_storage_get_properties(smx_storage_t storage){
xbt_assert((storage != NULL), "Invalid parameters (simix storage is NULL)");
- return surf_
storage_model->extension.storage.get_properties(storage
);
+ return surf_
resource_get_properties(surf_workstation_resource_priv(storage)
);
}
const char* SIMIX_pre_storage_get_name(smx_simcall_t simcall, smx_storage_t storage){
}
const char* SIMIX_pre_storage_get_name(smx_simcall_t simcall, smx_storage_t storage){
@@
-375,12
+365,12
@@
xbt_dict_t SIMIX_pre_storage_get_content(smx_simcall_t simcall, smx_storage_t st
xbt_dict_t SIMIX_storage_get_content(smx_storage_t storage){
xbt_assert((storage != NULL), "Invalid parameters (simix storage is NULL)");
xbt_dict_t SIMIX_storage_get_content(smx_storage_t storage){
xbt_assert((storage != NULL), "Invalid parameters (simix storage is NULL)");
- return surf_storage_
model->extension.storage.
get_content(storage);
+ return surf_storage_get_content(storage);
}
}
-sg_s
torage_s
ize_t SIMIX_storage_get_size(smx_storage_t storage){
+sg_size_t SIMIX_storage_get_size(smx_storage_t storage){
xbt_assert((storage != NULL), "Invalid parameters (simix storage is NULL)");
xbt_assert((storage != NULL), "Invalid parameters (simix storage is NULL)");
- return surf_storage_
model->extension.storage.
get_size(storage);
+ return surf_storage_get_size(storage);
}
void SIMIX_post_io(smx_action_t action)
}
void SIMIX_post_io(smx_action_t action)
@@
-396,7
+386,7
@@
void SIMIX_post_io(smx_action_t action)
switch (simcall->call) {
case SIMCALL_FILE_OPEN:;
smx_file_t tmp = xbt_new(s_smx_file_t,1);
switch (simcall->call) {
case SIMCALL_FILE_OPEN:;
smx_file_t tmp = xbt_new(s_smx_file_t,1);
- tmp->surf_file =
(action->io.surf_io)->file
;
+ tmp->surf_file =
surf_storage_action_get_file(action->io.surf_io)
;
simcall_file_open__set__result(simcall, tmp);
break;
simcall_file_open__set__result(simcall, tmp);
break;
@@
-404,13
+394,12
@@
void SIMIX_post_io(smx_action_t action)
xbt_free(simcall_file_close__get__fd(simcall));
simcall_file_close__set__result(simcall, 0);
break;
xbt_free(simcall_file_close__get__fd(simcall));
simcall_file_close__set__result(simcall, 0);
break;
-
case SIMCALL_FILE_WRITE:
case SIMCALL_FILE_WRITE:
- simcall_file_write__set__result(simcall,
(action->io.surf_io)->cost
);
+ simcall_file_write__set__result(simcall,
surf_action_get_cost(action->io.surf_io)
);
break;
case SIMCALL_FILE_READ:
break;
case SIMCALL_FILE_READ:
- simcall_file_read__set__result(simcall,
(action->io.surf_io)->cost
);
+ simcall_file_read__set__result(simcall,
surf_action_get_cost(action->io.surf_io)
);
break;
case SIMCALL_FILE_LS:
break;
case SIMCALL_FILE_LS:
@@
-422,14
+411,14
@@
void SIMIX_post_io(smx_action_t action)
// xbt_dict_set((action->io.surf_io)->ls_dict,key,dst,xbt_free);
// }
// }
// xbt_dict_set((action->io.surf_io)->ls_dict,key,dst,xbt_free);
// }
// }
- simcall_file_ls__set__result(simcall,
(action->io.surf_io)->ls_dict
);
+ simcall_file_ls__set__result(simcall,
surf_storage_action_get_ls_dict(action->io.surf_io)
);
break;
default:
break;
}
}
break;
default:
break;
}
}
- switch (surf_
workstation_model->action_state_get
(action->io.surf_io)) {
+ switch (surf_
action_get_state
(action->io.surf_io)) {
case SURF_ACTION_FAILED:
action->state = SIMIX_FAILED;
case SURF_ACTION_FAILED:
action->state = SIMIX_FAILED;
@@
-451,7
+440,7
@@
void SIMIX_io_destroy(smx_action_t action)
{
XBT_DEBUG("Destroy action %p", action);
if (action->io.surf_io)
{
XBT_DEBUG("Destroy action %p", action);
if (action->io.surf_io)
-
action->io.surf_io->model_type->
action_unref(action->io.surf_io);
+
surf_
action_unref(action->io.surf_io);
xbt_mallocator_release(simix_global->action_mallocator, action);
}
xbt_mallocator_release(simix_global->action_mallocator, action);
}
@@
-481,8
+470,7
@@
void SIMIX_io_finish(smx_action_t action)
(int)action->state);
}
(int)action->state);
}
- if (surf_workstation_model->extension.
- workstation.get_state(simcall->issuer->smx_host) != SURF_RESOURCE_ON) {
+ if (surf_resource_get_state(surf_workstation_resource_priv(simcall->issuer->smx_host)) != SURF_RESOURCE_ON) {
simcall->issuer->context->iwannadie = 1;
}
simcall->issuer->context->iwannadie = 1;
}