//SIMIX FILE READ
-void SIMIX_pre_file_read(smx_simcall_t simcall)
+void SIMIX_pre_file_read(smx_simcall_t simcall, void *ptr, size_t size,
+ size_t nmemb, smx_file_t stream)
{
- smx_action_t action = SIMIX_file_read(simcall->issuer,
- simcall->file_read.ptr,
- simcall->file_read.size,
- simcall->file_read.nmemb,
- simcall->file_read.stream);
+ smx_action_t action = SIMIX_file_read(simcall->issuer, ptr, size, nmemb, stream);
xbt_fifo_push(action->simcalls, simcall);
simcall->issuer->waiting_action = action;
}
/* 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",
- host->name);
+ sg_host_name(host));
}
action = xbt_mallocator_get(simix_global->action_mallocator);
#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);
}
//SIMIX FILE WRITE
-void SIMIX_pre_file_write(smx_simcall_t simcall)
+void SIMIX_pre_file_write(smx_simcall_t simcall, const void *ptr, size_t size,
+ size_t nmemb, smx_file_t stream)
{
- smx_action_t action = SIMIX_file_write(simcall->issuer,
- simcall->file_write.ptr,
- simcall->file_write.size,
- simcall->file_write.nmemb,
- simcall->file_write.stream);
+ smx_action_t action = SIMIX_file_write(simcall->issuer, ptr, size, nmemb, stream);
xbt_fifo_push(action->simcalls, simcall);
simcall->issuer->waiting_action = action;
}
/* 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",
- host->name);
+ sg_host_name(host));
}
action = xbt_mallocator_get(simix_global->action_mallocator);
#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);
}
//SIMIX FILE OPEN
-void SIMIX_pre_file_open(smx_simcall_t simcall)
+void SIMIX_pre_file_open(smx_simcall_t simcall, const char* mount,
+ const char* path, const char* mode)
{
- smx_action_t action = SIMIX_file_open(simcall->issuer,
- simcall->file_open.mount,
- simcall->file_open.path,
- simcall->file_open.mode);
+ smx_action_t action = SIMIX_file_open(simcall->issuer, mount, path, mode);
xbt_fifo_push(action->simcalls, simcall);
simcall->issuer->waiting_action = action;
}
/* 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",
- host->name);
+ sg_host_name(host));
}
action = xbt_mallocator_get(simix_global->action_mallocator);
#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);
}
//SIMIX FILE CLOSE
-void SIMIX_pre_file_close(smx_simcall_t simcall)
+void SIMIX_pre_file_close(smx_simcall_t simcall, smx_file_t fp)
{
- smx_action_t action = SIMIX_file_close(simcall->issuer,
- simcall->file_close.fp);
+ smx_action_t action = SIMIX_file_close(simcall->issuer, fp);
xbt_fifo_push(action->simcalls, simcall);
simcall->issuer->waiting_action = action;
}
/* 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",
- host->name);
+ sg_host_name(host));
}
action = xbt_mallocator_get(simix_global->action_mallocator);
#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);
}
//SIMIX FILE STAT
-void SIMIX_pre_file_stat(smx_simcall_t simcall)
+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,
- simcall->file_stat.fd,
- simcall->file_stat.buf);
+ smx_action_t action = SIMIX_file_stat(simcall->issuer, fd, *buf);
xbt_fifo_push(action->simcalls, simcall);
simcall->issuer->waiting_action = 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) {
+ workstation.get_state(host) != SURF_RESOURCE_ON) {
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);
#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);
}
//SIMIX FILE UNLINK
-void SIMIX_pre_file_unlink(smx_simcall_t simcall)
+void SIMIX_pre_file_unlink(smx_simcall_t simcall, smx_file_t fd)
{
- smx_action_t action = SIMIX_file_unlink(simcall->issuer,
- simcall->file_unlink.fd);
+ smx_action_t action = SIMIX_file_unlink(simcall->issuer, fd);
xbt_fifo_push(action->simcalls, simcall);
simcall->issuer->waiting_action = 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) {
+ workstation.get_state(host) != SURF_RESOURCE_ON) {
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);
#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);
}
//SIMIX FILE LS
-void SIMIX_pre_file_ls(smx_simcall_t simcall)
+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;
}
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",
- host->name);
+ sg_host_name(host));
}
action = xbt_mallocator_get(simix_global->action_mallocator);
#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);
xbt_fifo_foreach(action->simcalls,i,simcall,smx_simcall_t) {
switch (simcall->call) {
- case SIMCALL_FILE_OPEN:
- simcall->file_open.result = xbt_new(s_smx_file_t,1);
- simcall->file_open.result->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_file_open__set__result(simcall, tmp);
break;
case SIMCALL_FILE_CLOSE:
- xbt_free(simcall->file_close.fp);
- simcall->file_close.result = 0;
+ xbt_free(simcall_file_close__get__fp(simcall));
+ simcall_file_close__set__result(simcall, 0);
break;
case SIMCALL_FILE_WRITE:
- simcall->file_write.result = (action->io.surf_io)->cost;
+ simcall_file_write__set__result(simcall, (action->io.surf_io)->cost);
break;
case SIMCALL_FILE_READ:
- simcall->file_read.result = (action->io.surf_io)->cost;
+ simcall_file_read__set__result(simcall, (action->io.surf_io)->cost);
break;
case SIMCALL_FILE_STAT:
- simcall->file_stat.result = 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:
- xbt_free(simcall->file_unlink.fd);
- simcall->file_unlink.result = 0;
+ xbt_free(simcall_file_unlink__get__fd(simcall));
+ simcall_file_unlink__set__result(simcall, 0);
break;
case SIMCALL_FILE_LS:
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:
}
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;
}