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
[mc] Fix spurious call fo remote()
[simgrid.git]
/
src
/
simix
/
smx_io.c
diff --git
a/src/simix/smx_io.c
b/src/simix/smx_io.c
index 3200ad135269c1dceebd32476e7f4c1b081fa6de..118b800db702b28c3397b1b0401d56a73734ef94 100644
(file)
--- a/
src/simix/smx_io.c
+++ b/
src/simix/smx_io.c
@@
-50,16
+50,16
@@
void SIMIX_storage_destroy(void *s)
}
//SIMIX FILE READ
}
//SIMIX FILE READ
-void
SIMIX_pre
_file_read(smx_simcall_t simcall, smx_file_t fd, sg_size_t size, smx_host_t host)
+void
simcall_HANDLER
_file_read(smx_simcall_t simcall, smx_file_t fd, sg_size_t size, smx_host_t host)
{
{
- smx_
action_t action = SIMIX_file_read(simcall->issuer,
fd, size, host);
- xbt_fifo_push(
action
->simcalls, simcall);
- simcall->issuer->waiting_
action = action
;
+ smx_
synchro_t synchro = SIMIX_file_read(
fd, size, host);
+ xbt_fifo_push(
synchro
->simcalls, simcall);
+ simcall->issuer->waiting_
synchro = synchro
;
}
}
-smx_
action_t SIMIX_file_read(smx_process_t process,
smx_file_t fd, sg_size_t size, smx_host_t host)
+smx_
synchro_t SIMIX_file_read(
smx_file_t fd, sg_size_t size, smx_host_t host)
{
{
- smx_
action_t action
;
+ smx_
synchro_t synchro
;
/* check if the host is active */
if (surf_resource_get_state(surf_workstation_resource_priv(host)) != SURF_RESOURCE_ON) {
/* check if the host is active */
if (surf_resource_get_state(surf_workstation_resource_priv(host)) != SURF_RESOURCE_ON) {
@@
-67,33
+67,31
@@
smx_action_t SIMIX_file_read(smx_process_t process, smx_file_t fd, sg_size_t siz
sg_host_name(host));
}
sg_host_name(host));
}
- action = xbt_mallocator_get(simix_global->action_mallocator);
- action->type = SIMIX_ACTION_IO;
- action->name = NULL;
-#ifdef HAVE_TRACING
- action->category = NULL;
-#endif
+ synchro = xbt_mallocator_get(simix_global->synchro_mallocator);
+ synchro->type = SIMIX_SYNC_IO;
+ synchro->name = NULL;
+ synchro->category = NULL;
-
action
->io.host = host;
-
action
->io.surf_io = surf_workstation_read(host, fd->surf_file, size);
+
synchro
->io.host = host;
+
synchro
->io.surf_io = surf_workstation_read(host, fd->surf_file, size);
- surf_action_set_data(
action->io.surf_io, action
);
- XBT_DEBUG("Create io
action %p", action
);
+ surf_action_set_data(
synchro->io.surf_io, synchro
);
+ XBT_DEBUG("Create io
synchro %p", synchro
);
- return
action
;
+ return
synchro
;
}
//SIMIX FILE WRITE
}
//SIMIX FILE WRITE
-void
SIMIX_pre
_file_write(smx_simcall_t simcall, smx_file_t fd, sg_size_t size, smx_host_t host)
+void
simcall_HANDLER
_file_write(smx_simcall_t simcall, smx_file_t fd, sg_size_t size, smx_host_t host)
{
{
- smx_
action_t action = SIMIX_file_write(simcall->issuer,
fd, size, host);
- xbt_fifo_push(
action
->simcalls, simcall);
- simcall->issuer->waiting_
action = action
;
+ smx_
synchro_t synchro = SIMIX_file_write(
fd, size, host);
+ xbt_fifo_push(
synchro
->simcalls, simcall);
+ simcall->issuer->waiting_
synchro = synchro
;
}
}
-smx_
action_t SIMIX_file_write(smx_process_t process,
smx_file_t fd, sg_size_t size, smx_host_t host)
+smx_
synchro_t SIMIX_file_write(
smx_file_t fd, sg_size_t size, smx_host_t host)
{
{
- smx_
action_t action
;
+ smx_
synchro_t synchro
;
/* check if the host is active */
if (surf_resource_get_state(surf_workstation_resource_priv(host)) != SURF_RESOURCE_ON) {
/* check if the host is active */
if (surf_resource_get_state(surf_workstation_resource_priv(host)) != SURF_RESOURCE_ON) {
@@
-101,33
+99,31
@@
smx_action_t SIMIX_file_write(smx_process_t process, smx_file_t fd, sg_size_t si
sg_host_name(host));
}
sg_host_name(host));
}
- action = xbt_mallocator_get(simix_global->action_mallocator);
- action->type = SIMIX_ACTION_IO;
- action->name = NULL;
-#ifdef HAVE_TRACING
- action->category = NULL;
-#endif
+ synchro = xbt_mallocator_get(simix_global->synchro_mallocator);
+ synchro->type = SIMIX_SYNC_IO;
+ synchro->name = NULL;
+ synchro->category = NULL;
-
action
->io.host = host;
-
action
->io.surf_io = surf_workstation_write(host, fd->surf_file, size);
+
synchro
->io.host = host;
+
synchro
->io.surf_io = surf_workstation_write(host, fd->surf_file, size);
- surf_action_set_data(
action->io.surf_io, action
);
- XBT_DEBUG("Create io
action %p", action
);
+ surf_action_set_data(
synchro->io.surf_io, synchro
);
+ XBT_DEBUG("Create io
synchro %p", synchro
);
- return
action
;
+ return
synchro
;
}
//SIMIX FILE OPEN
}
//SIMIX FILE OPEN
-void
SIMIX_pre
_file_open(smx_simcall_t simcall, const char* fullpath, smx_host_t host)
+void
simcall_HANDLER
_file_open(smx_simcall_t simcall, const char* fullpath, smx_host_t host)
{
{
- smx_
action_t action = SIMIX_file_open(simcall->issuer,
fullpath, host);
- xbt_fifo_push(
action
->simcalls, simcall);
- simcall->issuer->waiting_
action = action
;
+ smx_
synchro_t synchro = SIMIX_file_open(
fullpath, host);
+ xbt_fifo_push(
synchro
->simcalls, simcall);
+ simcall->issuer->waiting_
synchro = synchro
;
}
}
-smx_
action_t SIMIX_file_open(smx_process_t process,
const char* fullpath, smx_host_t host)
+smx_
synchro_t SIMIX_file_open(
const char* fullpath, smx_host_t host)
{
{
- smx_
action_t action
;
+ smx_
synchro_t synchro
;
/* check if the host is active */
if (surf_resource_get_state(surf_workstation_resource_priv(host)) != SURF_RESOURCE_ON) {
/* check if the host is active */
if (surf_resource_get_state(surf_workstation_resource_priv(host)) != SURF_RESOURCE_ON) {
@@
-135,33
+131,31
@@
smx_action_t SIMIX_file_open(smx_process_t process, const char* fullpath, smx_ho
sg_host_name(host));
}
sg_host_name(host));
}
- action = xbt_mallocator_get(simix_global->action_mallocator);
- action->type = SIMIX_ACTION_IO;
- action->name = NULL;
-#ifdef HAVE_TRACING
- action->category = NULL;
-#endif
+ synchro = xbt_mallocator_get(simix_global->synchro_mallocator);
+ synchro->type = SIMIX_SYNC_IO;
+ synchro->name = NULL;
+ synchro->category = NULL;
-
action
->io.host = host;
-
action
->io.surf_io = surf_workstation_open(host, fullpath);
+
synchro
->io.host = host;
+
synchro
->io.surf_io = surf_workstation_open(host, fullpath);
- surf_action_set_data(
action->io.surf_io, action
);
- XBT_DEBUG("Create io
action %p", action
);
+ surf_action_set_data(
synchro->io.surf_io, synchro
);
+ XBT_DEBUG("Create io
synchro %p", synchro
);
- return
action
;
+ return
synchro
;
}
//SIMIX FILE CLOSE
}
//SIMIX FILE CLOSE
-void
SIMIX_pre
_file_close(smx_simcall_t simcall, smx_file_t fd, smx_host_t host)
+void
simcall_HANDLER
_file_close(smx_simcall_t simcall, smx_file_t fd, smx_host_t host)
{
{
- smx_
action_t action = SIMIX_file_close(simcall->issuer,
fd, host);
- xbt_fifo_push(
action
->simcalls, simcall);
- simcall->issuer->waiting_
action = action
;
+ smx_
synchro_t synchro = SIMIX_file_close(
fd, host);
+ xbt_fifo_push(
synchro
->simcalls, simcall);
+ simcall->issuer->waiting_
synchro = synchro
;
}
}
-smx_
action_t SIMIX_file_close(smx_process_t process,
smx_file_t fd, smx_host_t host)
+smx_
synchro_t SIMIX_file_close(
smx_file_t fd, smx_host_t host)
{
{
- smx_
action_t action
;
+ smx_
synchro_t synchro
;
/* check if the host is active */
if (surf_resource_get_state(surf_workstation_resource_priv(host)) != SURF_RESOURCE_ON) {
/* check if the host is active */
if (surf_resource_get_state(surf_workstation_resource_priv(host)) != SURF_RESOURCE_ON) {
@@
-169,30
+163,23
@@
smx_action_t SIMIX_file_close(smx_process_t process, smx_file_t fd, smx_host_t h
sg_host_name(host));
}
sg_host_name(host));
}
- action = xbt_mallocator_get(simix_global->action_mallocator);
- action->type = SIMIX_ACTION_IO;
- action->name = NULL;
-#ifdef HAVE_TRACING
- action->category = NULL;
-#endif
+ synchro = xbt_mallocator_get(simix_global->synchro_mallocator);
+ synchro->type = SIMIX_SYNC_IO;
+ synchro->name = NULL;
+ synchro->category = NULL;
-
action
->io.host = host;
-
action
->io.surf_io = surf_workstation_close(host, fd->surf_file);
+
synchro
->io.host = host;
+
synchro
->io.surf_io = surf_workstation_close(host, fd->surf_file);
- surf_action_set_data(
action->io.surf_io, action
);
- XBT_DEBUG("Create io
action %p", action
);
+ surf_action_set_data(
synchro->io.surf_io, synchro
);
+ XBT_DEBUG("Create io
synchro %p", synchro
);
- return
action
;
+ return
synchro
;
}
//SIMIX FILE UNLINK
}
//SIMIX FILE UNLINK
-int SIMIX_pre_file_unlink(smx_simcall_t simcall, smx_file_t fd, smx_host_t host)
-{
- return SIMIX_file_unlink(simcall->issuer, fd, host);
-}
-
-int SIMIX_file_unlink(smx_process_t process, smx_file_t fd, smx_host_t host)
+int SIMIX_file_unlink(smx_file_t fd, smx_host_t host)
{
/* check if the host is active */
if (surf_resource_get_state(surf_workstation_resource_priv(host)) != SURF_RESOURCE_ON) {
{
/* check if the host is active */
if (surf_resource_get_state(surf_workstation_resource_priv(host)) != SURF_RESOURCE_ON) {
@@
-205,7
+192,7
@@
int SIMIX_file_unlink(smx_process_t process, smx_file_t fd, smx_host_t host)
return !!res;
}
return !!res;
}
-sg_size_t
SIMIX_pre
_file_get_size(smx_simcall_t simcall, smx_file_t fd)
+sg_size_t
simcall_HANDLER
_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);
}
@@
-216,7
+203,7
@@
sg_size_t SIMIX_file_get_size(smx_process_t process, smx_file_t fd)
return surf_workstation_get_size(host, fd->surf_file);
}
return surf_workstation_get_size(host, fd->surf_file);
}
-sg_size_t
SIMIX_pre
_file_tell(smx_simcall_t simcall, smx_file_t fd)
+sg_size_t
simcall_HANDLER
_file_tell(smx_simcall_t simcall, smx_file_t fd)
{
return SIMIX_file_tell(simcall->issuer, fd);
}
{
return SIMIX_file_tell(simcall->issuer, fd);
}
@@
-228,7
+215,7
@@
sg_size_t SIMIX_file_tell(smx_process_t process, smx_file_t fd)
}
}
-xbt_dynar_t
SIMIX_pre
_file_get_info(smx_simcall_t simcall, smx_file_t fd)
+xbt_dynar_t
simcall_HANDLER
_file_get_info(smx_simcall_t simcall, smx_file_t fd)
{
return SIMIX_file_get_info(simcall->issuer, fd);
}
{
return SIMIX_file_get_info(simcall->issuer, fd);
}
@@
-239,7
+226,7
@@
xbt_dynar_t SIMIX_file_get_info(smx_process_t process, smx_file_t fd)
return surf_workstation_get_info(host, fd->surf_file);
}
return surf_workstation_get_info(host, fd->surf_file);
}
-int
SIMIX_pre
_file_seek(smx_simcall_t simcall, smx_file_t fd, sg_offset_t offset, int origin)
+int
simcall_HANDLER
_file_seek(smx_simcall_t simcall, smx_file_t fd, sg_offset_t offset, int origin)
{
return SIMIX_file_seek(simcall->issuer, fd, offset, origin);
}
{
return SIMIX_file_seek(simcall->issuer, fd, offset, origin);
}
@@
-250,7
+237,7
@@
int SIMIX_file_seek(smx_process_t process, smx_file_t fd, sg_offset_t offset, in
return surf_workstation_file_seek(host, fd->surf_file, offset, origin);
}
return surf_workstation_file_seek(host, fd->surf_file, offset, origin);
}
-int
SIMIX_pre
_file_move(smx_simcall_t simcall, smx_file_t file, const char* fullpath)
+int
simcall_HANDLER
_file_move(smx_simcall_t simcall, smx_file_t file, const char* fullpath)
{
return SIMIX_file_move(simcall->issuer, file, fullpath);
}
{
return SIMIX_file_move(simcall->issuer, file, fullpath);
}
@@
-266,7
+253,7
@@
sg_size_t SIMIX_storage_get_size(smx_storage_t storage){
return surf_storage_get_size(storage);
}
return surf_storage_get_size(storage);
}
-sg_size_t
SIMIX_pre
_storage_get_free_size(smx_simcall_t simcall, smx_storage_t storage)
+sg_size_t
simcall_HANDLER
_storage_get_free_size(smx_simcall_t simcall, smx_storage_t storage)
{
return SIMIX_storage_get_free_size(simcall->issuer, storage);
}
{
return SIMIX_storage_get_free_size(simcall->issuer, storage);
}
@@
-276,7
+263,7
@@
sg_size_t SIMIX_storage_get_free_size(smx_process_t process, smx_storage_t stora
return surf_storage_get_free_size(storage);
}
return surf_storage_get_free_size(storage);
}
-sg_size_t
SIMIX_pre
_storage_get_used_size(smx_simcall_t simcall, smx_storage_t storage)
+sg_size_t
simcall_HANDLER
_storage_get_used_size(smx_simcall_t simcall, smx_storage_t storage)
{
return SIMIX_storage_get_used_size(simcall->issuer, storage);
}
{
return SIMIX_storage_get_used_size(simcall->issuer, storage);
}
@@
-286,55
+273,36
@@
sg_size_t SIMIX_storage_get_used_size(smx_process_t process, smx_storage_t stora
return surf_storage_get_used_size(storage);
}
return surf_storage_get_used_size(storage);
}
-xbt_dict_t SIMIX_pre_storage_get_properties(smx_simcall_t simcall, smx_storage_t storage){
- return SIMIX_storage_get_properties(storage);
-}
xbt_dict_t SIMIX_storage_get_properties(smx_storage_t storage){
xbt_assert((storage != NULL), "Invalid parameters (simix storage is NULL)");
return surf_resource_get_properties(surf_storage_resource_priv(storage));
}
xbt_dict_t SIMIX_storage_get_properties(smx_storage_t storage){
xbt_assert((storage != NULL), "Invalid parameters (simix storage is NULL)");
return surf_resource_get_properties(surf_storage_resource_priv(storage));
}
-const char* SIMIX_pre_storage_get_name(smx_simcall_t simcall, smx_storage_t storage){
- return SIMIX_storage_get_name(storage);
-}
-
const char* SIMIX_storage_get_name(smx_storage_t storage){
xbt_assert((storage != NULL), "Invalid parameters");
return sg_storage_name(storage);
}
const char* SIMIX_storage_get_name(smx_storage_t storage){
xbt_assert((storage != NULL), "Invalid parameters");
return sg_storage_name(storage);
}
-xbt_dict_t SIMIX_pre_storage_get_content(smx_simcall_t simcall, smx_storage_t storage){
- return SIMIX_storage_get_content(storage);
-}
-
xbt_dict_t SIMIX_storage_get_content(smx_storage_t storage){
xbt_assert((storage != NULL), "Invalid parameters (simix storage is NULL)");
return surf_storage_get_content(storage);
}
xbt_dict_t SIMIX_storage_get_content(smx_storage_t storage){
xbt_assert((storage != NULL), "Invalid parameters (simix storage is NULL)");
return surf_storage_get_content(storage);
}
-const char* SIMIX_pre_storage_get_host(smx_simcall_t simcall, smx_storage_t storage){
- return SIMIX_storage_get_host(storage);
-}
-
const char* SIMIX_storage_get_host(smx_storage_t storage){
xbt_assert((storage != NULL), "Invalid parameters");
return surf_storage_get_host(storage);
}
const char* SIMIX_storage_get_host(smx_storage_t storage){
xbt_assert((storage != NULL), "Invalid parameters");
return surf_storage_get_host(storage);
}
-void SIMIX_post_io(smx_
action_t action
)
+void SIMIX_post_io(smx_
synchro_t synchro
)
{
xbt_fifo_item_t i;
smx_simcall_t simcall;
{
xbt_fifo_item_t i;
smx_simcall_t simcall;
-// char* key;
-// xbt_dict_cursor_t cursor = NULL;
-// s_file_stat_t *dst = NULL;
-// s_file_stat_t *src = NULL;
- xbt_fifo_foreach(
action
->simcalls,i,simcall,smx_simcall_t) {
+ xbt_fifo_foreach(
synchro
->simcalls,i,simcall,smx_simcall_t) {
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 = surf_storage_action_get_file(
action
->io.surf_io);
+ tmp->surf_file = surf_storage_action_get_file(
synchro
->io.surf_io);
simcall_file_open__set__result(simcall, tmp);
break;
}
simcall_file_open__set__result(simcall, tmp);
break;
}
@@
-343,11
+311,11
@@
void SIMIX_post_io(smx_action_t action)
simcall_file_close__set__result(simcall, 0);
break;
case SIMCALL_FILE_WRITE:
simcall_file_close__set__result(simcall, 0);
break;
case SIMCALL_FILE_WRITE:
- simcall_file_write__set__result(simcall, surf_action_get_cost(
action
->io.surf_io));
+ simcall_file_write__set__result(simcall, surf_action_get_cost(
synchro
->io.surf_io));
break;
case SIMCALL_FILE_READ:
break;
case SIMCALL_FILE_READ:
- simcall_file_read__set__result(simcall, surf_action_get_cost(
action
->io.surf_io));
+ simcall_file_read__set__result(simcall, surf_action_get_cost(
synchro
->io.surf_io));
break;
default:
break;
default:
@@
-355,14
+323,14
@@
void SIMIX_post_io(smx_action_t action)
}
}
}
}
- switch (surf_action_get_state(
action
->io.surf_io)) {
+ switch (surf_action_get_state(
synchro
->io.surf_io)) {
case SURF_ACTION_FAILED:
case SURF_ACTION_FAILED:
-
action
->state = SIMIX_FAILED;
+
synchro
->state = SIMIX_FAILED;
break;
case SURF_ACTION_DONE:
break;
case SURF_ACTION_DONE:
-
action
->state = SIMIX_DONE;
+
synchro
->state = SIMIX_DONE;
break;
default:
break;
default:
@@
-370,28
+338,28
@@
void SIMIX_post_io(smx_action_t action)
break;
}
break;
}
- SIMIX_io_finish(
action
);
+ SIMIX_io_finish(
synchro
);
}
}
-void SIMIX_io_destroy(smx_
action_t action
)
+void SIMIX_io_destroy(smx_
synchro_t synchro
)
{
{
- XBT_DEBUG("Destroy
action %p", action
);
- if (
action
->io.surf_io)
- surf_action_unref(
action
->io.surf_io);
- xbt_mallocator_release(simix_global->
action_mallocator, action
);
+ XBT_DEBUG("Destroy
synchro %p", synchro
);
+ if (
synchro
->io.surf_io)
+ surf_action_unref(
synchro
->io.surf_io);
+ xbt_mallocator_release(simix_global->
synchro_mallocator, synchro
);
}
}
-void SIMIX_io_finish(smx_
action_t action
)
+void SIMIX_io_finish(smx_
synchro_t synchro
)
{
xbt_fifo_item_t item;
smx_simcall_t simcall;
{
xbt_fifo_item_t item;
smx_simcall_t simcall;
- xbt_fifo_foreach(
action
->simcalls, item, simcall, smx_simcall_t) {
+ xbt_fifo_foreach(
synchro
->simcalls, item, simcall, smx_simcall_t) {
- switch (
action
->state) {
+ switch (
synchro
->state) {
case SIMIX_DONE:
case SIMIX_DONE:
- /* do nothing,
action
done */
+ /* do nothing,
synchro
done */
break;
case SIMIX_FAILED:
break;
case SIMIX_FAILED:
@@
-403,18
+371,18
@@
void SIMIX_io_finish(smx_action_t action)
break;
default:
break;
default:
- xbt_die("Internal error in SIMIX_io_finish: unexpected
action
state %d",
- (int)
action
->state);
+ xbt_die("Internal error in SIMIX_io_finish: unexpected
synchro
state %d",
+ (int)
synchro
->state);
}
if (surf_resource_get_state(surf_workstation_resource_priv(simcall->issuer->smx_host)) != SURF_RESOURCE_ON) {
simcall->issuer->context->iwannadie = 1;
}
}
if (surf_resource_get_state(surf_workstation_resource_priv(simcall->issuer->smx_host)) != SURF_RESOURCE_ON) {
simcall->issuer->context->iwannadie = 1;
}
- simcall->issuer->waiting_
action
= NULL;
+ simcall->issuer->waiting_
synchro
= NULL;
SIMIX_simcall_answer(simcall);
}
/* We no longer need it */
SIMIX_simcall_answer(simcall);
}
/* We no longer need it */
- SIMIX_io_destroy(
action
);
+ SIMIX_io_destroy(
synchro
);
}
}