#endif
action->io.host = host;
- // TODO in surf model disk???
- // action->io.surf_io = surf_workstation_model->extension.storage.read(host->host, name),
- action->io.surf_io = surf_workstation_model->extension.workstation.sleep(host->host, 1.0);
+ action->io.surf_io = surf_workstation_model->extension.workstation.read(host->host, ptr, size, nmemb, (surf_file_t)stream),
surf_workstation_model->action_data_set(action->io.surf_io, action);
XBT_DEBUG("Create io action %p", action);
#endif
action->io.host = host;
- // TODO in surf model disk???
- // action->io.surf_io = surf_workstation_model->extension.storage.write(host->host, name),
- action->io.surf_io = surf_workstation_model->extension.workstation.sleep(host->host, 2.0);
+ action->io.surf_io = surf_workstation_model->extension.workstation.write(host->host, ptr, size, nmemb, (surf_file_t)stream);
surf_workstation_model->action_data_set(action->io.surf_io, action);
XBT_DEBUG("Create io action %p", action);
#endif
action->io.host = host;
- // TODO in surf model disk???
- // action->io.surf_io = surf_workstation_model->extension.storage.open(host->host, name),
- action->io.surf_io = surf_workstation_model->extension.workstation.sleep(host->host, 3.0);
+ action->io.surf_io = surf_workstation_model->extension.workstation.open(host->host, path, mode);
surf_workstation_model->action_data_set(action->io.surf_io, action);
XBT_DEBUG("Create io action %p", action);
#endif
action->io.host = host;
- // TODO in surf model disk???
- // action->io.surf_io = surf_workstation_model->extension.storage.close(host->host, name),
- action->io.surf_io = surf_workstation_model->extension.workstation.sleep(host->host, 4.0);
+ action->io.surf_io = surf_workstation_model->extension.workstation.close(host->host, (surf_file_t)fp);
surf_workstation_model->action_data_set(action->io.surf_io, action);
XBT_DEBUG("Create io action %p", action);
#endif
action->io.host = host;
- // TODO in surf model disk???
- // action->io.surf_io = surf_workstation_model->extension.storage.stat(host->host, name),
- action->io.surf_io = surf_workstation_model->extension.workstation.sleep(host->host, 5.0);
+ action->io.surf_io = surf_workstation_model->extension.workstation.stat(host->host, fd, buf);
surf_workstation_model->action_data_set(action->io.surf_io, action);
XBT_DEBUG("Create io action %p", action);
void SIMIX_io_finish(smx_action_t action)
{
- volatile xbt_fifo_item_t item;
+ xbt_fifo_item_t item;
smx_simcall_t simcall;
xbt_fifo_foreach(action->simcalls, item, simcall, smx_simcall_t) {
break;
case SIMIX_FAILED:
- TRY {
- THROWF(io_error, 0, "IO failed");
- }
- CATCH(simcall->issuer->running_ctx->exception) {
- simcall->issuer->doexception = 1;
- }
- break;
+ SMX_EXCEPTION(simcall->issuer, io_error, 0, "IO failed");
+ break;
case SIMIX_CANCELED:
- TRY {
- THROWF(cancel_error, 0, "Canceled");
- }
- CATCH(simcall->issuer->running_ctx->exception) {
- simcall->issuer->doexception = 1;
- }
- break;
+ SMX_EXCEPTION(simcall->issuer, cancel_error, 0, "Canceled");
+ break;
default:
xbt_die("Internal error in SIMIX_io_finish: unexpected action state %d",
- action->state);
+ (int)action->state);
}
simcall->issuer->waiting_action = NULL;
SIMIX_simcall_answer(simcall);