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
Try to support older versions of cmake.
[simgrid.git]
/
src
/
simix
/
smx_io.c
diff --git
a/src/simix/smx_io.c
b/src/simix/smx_io.c
index
9251bd3
..
f261620
100644
(file)
--- a/
src/simix/smx_io.c
+++ b/
src/simix/smx_io.c
@@
-30,9
+30,9
@@
smx_action_t SIMIX_file_read(smx_process_t process, void* ptr, size_t size, size
/* check if the host is active */
if (surf_workstation_model->extension.
/* check if the host is active */
if (surf_workstation_model->extension.
- workstation.get_state(host
->host
) != SURF_RESOURCE_ON) {
+ workstation.get_state(host) != SURF_RESOURCE_ON) {
THROWF(host_error, 0, "Host %s failed, you cannot call this function",
THROWF(host_error, 0, "Host %s failed, you cannot call this function",
-
host->name
);
+
sg_host_name(host)
);
}
action = xbt_mallocator_get(simix_global->action_mallocator);
}
action = xbt_mallocator_get(simix_global->action_mallocator);
@@
-43,7
+43,7
@@
smx_action_t SIMIX_file_read(smx_process_t process, void* ptr, size_t size, size
#endif
action->io.host = host;
#endif
action->io.host = host;
- action->io.surf_io = surf_workstation_model->extension.workstation.read(host
->host
, ptr, size, nmemb, stream->surf_file);
+ action->io.surf_io = surf_workstation_model->extension.workstation.read(host, ptr, size, nmemb, stream->surf_file);
surf_workstation_model->action_data_set(action->io.surf_io, action);
XBT_DEBUG("Create io action %p", action);
surf_workstation_model->action_data_set(action->io.surf_io, action);
XBT_DEBUG("Create io action %p", action);
@@
-67,9
+67,9
@@
smx_action_t SIMIX_file_write(smx_process_t process, const void* ptr, size_t siz
/* check if the host is active */
if (surf_workstation_model->extension.
/* check if the host is active */
if (surf_workstation_model->extension.
- workstation.get_state(host
->host
) != SURF_RESOURCE_ON) {
+ workstation.get_state(host) != SURF_RESOURCE_ON) {
THROWF(host_error, 0, "Host %s failed, you cannot call this function",
THROWF(host_error, 0, "Host %s failed, you cannot call this function",
-
host->name
);
+
sg_host_name(host)
);
}
action = xbt_mallocator_get(simix_global->action_mallocator);
}
action = xbt_mallocator_get(simix_global->action_mallocator);
@@
-80,7
+80,7
@@
smx_action_t SIMIX_file_write(smx_process_t process, const void* ptr, size_t siz
#endif
action->io.host = host;
#endif
action->io.host = host;
- action->io.surf_io = surf_workstation_model->extension.workstation.write(host
->host
, ptr, size, nmemb, stream->surf_file);
+ action->io.surf_io = surf_workstation_model->extension.workstation.write(host, ptr, size, nmemb, stream->surf_file);
surf_workstation_model->action_data_set(action->io.surf_io, action);
XBT_DEBUG("Create io action %p", action);
surf_workstation_model->action_data_set(action->io.surf_io, action);
XBT_DEBUG("Create io action %p", action);
@@
-104,9
+104,9
@@
smx_action_t SIMIX_file_open(smx_process_t process ,const char* mount, const cha
/* check if the host is active */
if (surf_workstation_model->extension.
/* check if the host is active */
if (surf_workstation_model->extension.
- workstation.get_state(host
->host
) != SURF_RESOURCE_ON) {
+ workstation.get_state(host) != SURF_RESOURCE_ON) {
THROWF(host_error, 0, "Host %s failed, you cannot call this function",
THROWF(host_error, 0, "Host %s failed, you cannot call this function",
-
host->name
);
+
sg_host_name(host)
);
}
action = xbt_mallocator_get(simix_global->action_mallocator);
}
action = xbt_mallocator_get(simix_global->action_mallocator);
@@
-117,7
+117,7
@@
smx_action_t SIMIX_file_open(smx_process_t process ,const char* mount, const cha
#endif
action->io.host = host;
#endif
action->io.host = host;
- action->io.surf_io = surf_workstation_model->extension.workstation.open(host
->host
, mount, path, mode);
+ action->io.surf_io = surf_workstation_model->extension.workstation.open(host, mount, path, mode);
surf_workstation_model->action_data_set(action->io.surf_io, action);
XBT_DEBUG("Create io action %p", action);
surf_workstation_model->action_data_set(action->io.surf_io, action);
XBT_DEBUG("Create io action %p", action);
@@
-140,9
+140,9
@@
smx_action_t SIMIX_file_close(smx_process_t process, smx_file_t fp)
/* check if the host is active */
if (surf_workstation_model->extension.
/* check if the host is active */
if (surf_workstation_model->extension.
- workstation.get_state(host
->host
) != SURF_RESOURCE_ON) {
+ workstation.get_state(host) != SURF_RESOURCE_ON) {
THROWF(host_error, 0, "Host %s failed, you cannot call this function",
THROWF(host_error, 0, "Host %s failed, you cannot call this function",
-
host->name
);
+
sg_host_name(host)
);
}
action = xbt_mallocator_get(simix_global->action_mallocator);
}
action = xbt_mallocator_get(simix_global->action_mallocator);
@@
-153,7
+153,7
@@
smx_action_t SIMIX_file_close(smx_process_t process, smx_file_t fp)
#endif
action->io.host = host;
#endif
action->io.host = host;
- action->io.surf_io = surf_workstation_model->extension.workstation.close(host
->host
, fp->surf_file);
+ action->io.surf_io = surf_workstation_model->extension.workstation.close(host, fp->surf_file);
surf_workstation_model->action_data_set(action->io.surf_io, action);
XBT_DEBUG("Create io action %p", action);
surf_workstation_model->action_data_set(action->io.surf_io, action);
XBT_DEBUG("Create io action %p", action);
@@
-162,9
+162,9
@@
smx_action_t SIMIX_file_close(smx_process_t process, smx_file_t fp)
}
//SIMIX FILE STAT
}
//SIMIX FILE STAT
-void SIMIX_pre_file_stat(smx_simcall_t simcall, smx_file_t fd, s_file_stat_t buf)
+void SIMIX_pre_file_stat(smx_simcall_t simcall, smx_file_t fd, s_file_stat_t
*
buf)
{
{
- smx_action_t action = SIMIX_file_stat(simcall->issuer, fd, buf);
+ smx_action_t action = SIMIX_file_stat(simcall->issuer, fd,
*
buf);
xbt_fifo_push(action->simcalls, simcall);
simcall->issuer->waiting_action = action;
}
xbt_fifo_push(action->simcalls, simcall);
simcall->issuer->waiting_action = action;
}
@@
-175,9
+175,9
@@
smx_action_t SIMIX_file_stat(smx_process_t process, smx_file_t fd, s_file_stat_t
smx_host_t host = process->smx_host;
/* check if the host is active */
if (surf_workstation_model->extension.
smx_host_t host = process->smx_host;
/* check if the host is active */
if (surf_workstation_model->extension.
- workstation.get_state(host
->host
) != SURF_RESOURCE_ON) {
+ workstation.get_state(host) != SURF_RESOURCE_ON) {
THROWF(host_error, 0, "Host %s failed, you cannot call this function",
THROWF(host_error, 0, "Host %s failed, you cannot call this function",
-
host->name
);
+
sg_host_name(host)
);
}
action = xbt_mallocator_get(simix_global->action_mallocator);
}
action = xbt_mallocator_get(simix_global->action_mallocator);
@@
-188,7
+188,7
@@
smx_action_t SIMIX_file_stat(smx_process_t process, smx_file_t fd, s_file_stat_t
#endif
action->io.host = host;
#endif
action->io.host = host;
- action->io.surf_io = surf_workstation_model->extension.workstation.stat(host
->host
, fd->surf_file);
+ action->io.surf_io = surf_workstation_model->extension.workstation.stat(host, fd->surf_file);
surf_workstation_model->action_data_set(action->io.surf_io, action);
XBT_DEBUG("Create io action %p", action);
surf_workstation_model->action_data_set(action->io.surf_io, action);
XBT_DEBUG("Create io action %p", action);
@@
-210,9
+210,9
@@
smx_action_t SIMIX_file_unlink(smx_process_t process, smx_file_t fd)
smx_host_t host = process->smx_host;
/* check if the host is active */
if (surf_workstation_model->extension.
smx_host_t host = process->smx_host;
/* check if the host is active */
if (surf_workstation_model->extension.
- workstation.get_state(host
->host
) != SURF_RESOURCE_ON) {
+ workstation.get_state(host) != SURF_RESOURCE_ON) {
THROWF(host_error, 0, "Host %s failed, you cannot call this function",
THROWF(host_error, 0, "Host %s failed, you cannot call this function",
-
host->name
);
+
sg_host_name(host)
);
}
action = xbt_mallocator_get(simix_global->action_mallocator);
}
action = xbt_mallocator_get(simix_global->action_mallocator);
@@
-223,7
+223,7
@@
smx_action_t SIMIX_file_unlink(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.unlink(host
->host
, fd->surf_file);
+ action->io.surf_io = surf_workstation_model->extension.workstation.unlink(host, fd->surf_file);
surf_workstation_model->action_data_set(action->io.surf_io, action);
XBT_DEBUG("Create io action %p", action);
surf_workstation_model->action_data_set(action->io.surf_io, action);
XBT_DEBUG("Create io action %p", action);
@@
-235,8
+235,7
@@
smx_action_t SIMIX_file_unlink(smx_process_t process, smx_file_t fd)
void SIMIX_pre_file_ls(smx_simcall_t simcall,
const char* mount, const char* path)
{
void SIMIX_pre_file_ls(smx_simcall_t simcall,
const char* mount, const char* path)
{
- smx_action_t action = SIMIX_file_ls(simcall->issuer,
- simcall->file_ls.mount, simcall->file_ls.path);
+ smx_action_t action = SIMIX_file_ls(simcall->issuer, mount, path);
xbt_fifo_push(action->simcalls, simcall);
simcall->issuer->waiting_action = action;
}
xbt_fifo_push(action->simcalls, simcall);
simcall->issuer->waiting_action = action;
}
@@
-245,9
+244,9
@@
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
->host
) != SURF_RESOURCE_ON) {
+ if (surf_workstation_model->extension.workstation.get_state(host) != SURF_RESOURCE_ON) {
THROWF(host_error, 0, "Host %s failed, you cannot call this function",
THROWF(host_error, 0, "Host %s failed, you cannot call this function",
-
host->name
);
+
sg_host_name(host)
);
}
action = xbt_mallocator_get(simix_global->action_mallocator);
}
action = xbt_mallocator_get(simix_global->action_mallocator);
@@
-258,7
+257,7
@@
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
->host
,mount,path);
+ action->io.surf_io = surf_workstation_model->extension.workstation.ls(host,mount,path);
surf_workstation_model->action_data_set(action->io.surf_io, action);
XBT_DEBUG("Create io action %p", action);
surf_workstation_model->action_data_set(action->io.surf_io, action);
XBT_DEBUG("Create io action %p", action);
@@
-290,32
+289,32
@@
void SIMIX_post_io(smx_action_t action)
case SIMCALL_FILE_OPEN:;
smx_file_t tmp = xbt_new(s_smx_file_t,1);
tmp->surf_file = (action->io.surf_io)->file;
case SIMCALL_FILE_OPEN:;
smx_file_t tmp = xbt_new(s_smx_file_t,1);
tmp->surf_file = (action->io.surf_io)->file;
- simcall
->result.p = tmp
;
+ simcall
_file_open__set__result(simcall, tmp)
;
break;
case SIMCALL_FILE_CLOSE:
break;
case SIMCALL_FILE_CLOSE:
- xbt_free(simcall
->file_close.fp
);
- simcall
->result.i = 0
;
+ xbt_free(simcall
_file_close__get__fp(simcall)
);
+ simcall
_file_close__set__result(simcall, 0)
;
break;
case SIMCALL_FILE_WRITE:
break;
case SIMCALL_FILE_WRITE:
- simcall
->result.si = (action->io.surf_io)->cost
;
+ simcall
_file_write__set__result(simcall, (action->io.surf_io)->cost)
;
break;
case SIMCALL_FILE_READ:
break;
case SIMCALL_FILE_READ:
- simcall
->result.d = (action->io.surf_io)->cost
;
+ simcall
_file_read__set__result(simcall, (action->io.surf_io)->cost)
;
break;
case SIMCALL_FILE_STAT:
break;
case SIMCALL_FILE_STAT:
- simcall
->result.i = 0
;
- dst =
&(simcall->file_stat.buf
);
+ simcall
_file_stat__set__result(simcall, 0)
;
+ dst =
simcall_file_stat__get__buf(simcall
);
src = &((action->io.surf_io)->stat);
file_stat_copy(src,dst);
break;
case SIMCALL_FILE_UNLINK:
src = &((action->io.surf_io)->stat);
file_stat_copy(src,dst);
break;
case SIMCALL_FILE_UNLINK:
- xbt_free(simcall
->file_unlink.fd
);
- simcall
->result.i = 0
;
+ xbt_free(simcall
_file_unlink__get__fd(simcall)
);
+ simcall
_file_unlink__set__result(simcall, 0)
;
break;
case SIMCALL_FILE_LS:
break;
case SIMCALL_FILE_LS:
@@
-327,7
+326,7
@@
void SIMIX_post_io(smx_action_t action)
xbt_dict_set((action->io.surf_io)->ls_dict,key,dst,free_file_stat);
}
}
xbt_dict_set((action->io.surf_io)->ls_dict,key,dst,free_file_stat);
}
}
- simcall
->file_ls.result = (action->io.surf_io)->ls_dict
;
+ simcall
_file_ls__set__result(simcall, (action->io.surf_io)->ls_dict)
;
break;
default:
break;
default:
@@
-388,7
+387,7
@@
void SIMIX_io_finish(smx_action_t action)
}
if (surf_workstation_model->extension.
}
if (surf_workstation_model->extension.
- workstation.get_state(simcall->issuer->smx_host
->host
) != SURF_RESOURCE_ON) {
+ workstation.get_state(simcall->issuer->smx_host) != SURF_RESOURCE_ON) {
simcall->issuer->context->iwannadie = 1;
}
simcall->issuer->context->iwannadie = 1;
}