X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/67c91d5b8652b0e76801e9cfc7d965a360237152..680d3333804979cca617afe9bef76ab1b1eb9f0e:/src/simix/smx_io.c

diff --git a/src/simix/smx_io.c b/src/simix/smx_io.c
index 519ce6de3d..be6a6539a8 100644
--- a/src/simix/smx_io.c
+++ b/src/simix/smx_io.c
@@ -1,11 +1,11 @@
-/* Copyright (c) 2007-2010, 2012-2013. The SimGrid Team.
+/* Copyright (c) 2007-2010, 2012-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * 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"
@@ -29,250 +29,201 @@ smx_storage_t SIMIX_storage_create(const char *name, void *storage, void *data)
 
   /* Update global variables */
   xbt_lib_set(storage_lib,name,SIMIX_STORAGE_LEVEL,smx_storage);
-
-  return xbt_lib_get_or_null(storage_lib, name, SIMIX_STORAGE_LEVEL);
-}
-
-
-void* SIMIX_pre_file_get_data(smx_simcall_t simcall,smx_file_t fd){
-  return SIMIX_file_get_data(fd);
-}
-
-void* SIMIX_file_get_data(smx_file_t fd){
-  xbt_assert((fd != NULL), "Invalid parameters (simix file is NULL)");
-
-  return fd->data;
+  return xbt_lib_get_elm_or_null(storage_lib, name);
 }
 
-void SIMIX_pre_file_set_data(smx_simcall_t simcall, smx_file_t fd, void *data) {
-  SIMIX_file_set_data(fd, data);
-}
+/**
+ * \brief Internal function to destroy a SIMIX storage.
+ *
+ * \param s the host to destroy (a smx_storage_t)
+ */
+void SIMIX_storage_destroy(void *s)
+{
+  smx_storage_priv_t storage = (smx_storage_priv_t) s;
 
-void SIMIX_file_set_data(smx_file_t fd, void *data){
-  xbt_assert((fd != NULL), "Invalid parameter");
+  xbt_assert((storage != NULL), "Invalid parameters");
+  if (storage->data)
+    free(storage->data);
 
-  fd->data = data;
+  /* Clean storage structure */
+  free(storage);
 }
 
 //SIMIX FILE READ
-void SIMIX_pre_file_read(smx_simcall_t simcall, smx_file_t fd, sg_storage_size_t size)
+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);
-  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_storage_size_t size)
+smx_synchro_t SIMIX_file_read(smx_file_t fd, sg_size_t size, smx_host_t host)
 {
-  smx_action_t action;
-  smx_host_t host = process->smx_host;
+  smx_synchro_t synchro;
 
   /* 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));
   }
 
-  action = xbt_mallocator_get(simix_global->action_mallocator);
-  action->type = SIMIX_ACTION_IO;
-  action->name = NULL;
+  synchro = xbt_mallocator_get(simix_global->synchro_mallocator);
+  synchro->type = SIMIX_SYNC_IO;
+  synchro->name = NULL;
 #ifdef HAVE_TRACING
-  action->category = NULL;
+  synchro->category = NULL;
 #endif
 
-  action->io.host = host;
-  action->io.surf_io =
-      surf_workstation_model->extension.workstation.read(host, fd->surf_file, size);
+  synchro->io.host = host;
+  synchro->io.surf_io = surf_workstation_read(host, fd->surf_file, size);
 
-  surf_workstation_model->action_data_set(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
-void SIMIX_pre_file_write(smx_simcall_t simcall, smx_file_t fd, sg_storage_size_t size)
+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);
-  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_storage_size_t size)
+smx_synchro_t SIMIX_file_write(smx_file_t fd, sg_size_t size, smx_host_t host)
 {
-  smx_action_t action;
-  smx_host_t host = process->smx_host;
+  smx_synchro_t synchro;
 
   /* 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));
   }
 
-  action = xbt_mallocator_get(simix_global->action_mallocator);
-  action->type = SIMIX_ACTION_IO;
-  action->name = NULL;
+  synchro = xbt_mallocator_get(simix_global->synchro_mallocator);
+  synchro->type = SIMIX_SYNC_IO;
+  synchro->name = NULL;
 #ifdef HAVE_TRACING
-  action->category = NULL;
+  synchro->category = NULL;
 #endif
 
-  action->io.host = host;
-  action->io.surf_io =
-      surf_workstation_model->extension.workstation.write(host, fd->surf_file, size);
+  synchro->io.host = host;
+  synchro->io.surf_io = surf_workstation_write(host, fd->surf_file, size);
 
-  surf_workstation_model->action_data_set(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
-void SIMIX_pre_file_open(smx_simcall_t simcall, const char* mount,
-                         const char* path)
+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, mount, path);
-  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* mount,
-                             const char* path)
+smx_synchro_t SIMIX_file_open(const char* fullpath, smx_host_t host)
 {
-  smx_action_t action;
-  smx_host_t host = process->smx_host;
+  smx_synchro_t synchro;
 
   /* 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));
   }
 
-  action = xbt_mallocator_get(simix_global->action_mallocator);
-  action->type = SIMIX_ACTION_IO;
-  action->name = NULL;
+  synchro = xbt_mallocator_get(simix_global->synchro_mallocator);
+  synchro->type = SIMIX_SYNC_IO;
+  synchro->name = NULL;
 #ifdef HAVE_TRACING
-  action->category = NULL;
+  synchro->category = NULL;
 #endif
 
-  action->io.host = host;
-  action->io.surf_io =
-      surf_workstation_model->extension.workstation.open(host, mount, path);
+  synchro->io.host = host;
+  synchro->io.surf_io = surf_workstation_open(host, fullpath);
 
-  surf_workstation_model->action_data_set(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
-void SIMIX_pre_file_close(smx_simcall_t simcall, smx_file_t fd)
+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);
-  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_synchro_t SIMIX_file_close(smx_file_t fd, smx_host_t host)
 {
-  smx_action_t action;
-  smx_host_t host = process->smx_host;
+  smx_synchro_t synchro;
 
   /* 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));
   }
 
-  action = xbt_mallocator_get(simix_global->action_mallocator);
-  action->type = SIMIX_ACTION_IO;
-  action->name = NULL;
+  synchro = xbt_mallocator_get(simix_global->synchro_mallocator);
+  synchro->type = SIMIX_SYNC_IO;
+  synchro->name = NULL;
 #ifdef HAVE_TRACING
-  action->category = NULL;
+  synchro->category = NULL;
 #endif
 
-  action->io.host = host;
-  action->io.surf_io = surf_workstation_model->extension.workstation.close(host, fd->surf_file);
+  synchro->io.host = host;
+  synchro->io.surf_io = surf_workstation_close(host, fd->surf_file);
 
-  surf_workstation_model->action_data_set(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
-int SIMIX_pre_file_unlink(smx_simcall_t simcall, smx_file_t fd)
+int SIMIX_file_unlink(smx_file_t fd, smx_host_t host)
 {
-  return SIMIX_file_unlink(simcall->issuer, fd);
-}
-
-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 */
-  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));
   }
 
-  if (surf_workstation_model->extension.workstation.unlink(host, fd->surf_file)){
-    fd->surf_file = NULL;
-    return 1;
-  } else
-    return 0;
+  int res = surf_workstation_unlink(host, fd->surf_file);
+  xbt_free(fd);
+  return !!res;
 }
 
-//SIMIX FILE LS
-void SIMIX_pre_file_ls(smx_simcall_t simcall,
-                       const char* mount, const char* path)
+sg_size_t simcall_HANDLER_file_get_size(smx_simcall_t simcall, smx_file_t fd)
 {
-  smx_action_t action = SIMIX_file_ls(simcall->issuer, mount, path);
-  xbt_fifo_push(action->simcalls, simcall);
-  simcall->issuer->waiting_action = action;
+  return SIMIX_file_get_size(simcall->issuer, fd);
 }
-smx_action_t SIMIX_file_ls(smx_process_t process, const char* mount, const char *path)
+
+sg_size_t SIMIX_file_get_size(smx_process_t process, smx_file_t fd)
 {
-  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) {
-    THROWF(host_error, 0, "Host %s failed, you cannot call this function",
-           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
-
-  action->io.host = host;
-  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);
-  return action;
+  return  surf_workstation_get_size(host, fd->surf_file);
 }
 
-sg_storage_size_t SIMIX_pre_file_get_size(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_get_size(simcall->issuer, fd);
+  return SIMIX_file_tell(simcall->issuer, fd);
 }
 
-sg_storage_size_t SIMIX_file_get_size(smx_process_t process, smx_file_t fd)
+sg_size_t SIMIX_file_tell(smx_process_t process, smx_file_t fd)
 {
   smx_host_t host = process->smx_host;
-  return  surf_workstation_model->extension.workstation.get_size(host,
-      fd->surf_file);
+  return  surf_workstation_file_tell(host, fd->surf_file);
 }
 
-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);
 }
@@ -280,137 +231,114 @@ 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;
-  return  surf_workstation_model->extension.workstation.get_info(host,
-      fd->surf_file);
+  return  surf_workstation_get_info(host, fd->surf_file);
 }
 
-sg_storage_size_t SIMIX_pre_storage_get_free_size(smx_simcall_t simcall, const char* name)
+int simcall_HANDLER_file_seek(smx_simcall_t simcall, smx_file_t fd, sg_offset_t offset, int origin)
 {
-  return SIMIX_storage_get_free_size(simcall->issuer, name);
+  return SIMIX_file_seek(simcall->issuer, fd, offset, origin);
 }
 
-sg_storage_size_t SIMIX_storage_get_free_size(smx_process_t process, const char* name)
+int SIMIX_file_seek(smx_process_t process, smx_file_t fd, sg_offset_t offset, int origin)
 {
   smx_host_t host = process->smx_host;
-  return  surf_workstation_model->extension.workstation.get_free_size(host,name);
+  return  surf_workstation_file_seek(host, fd->surf_file, offset, origin);
 }
 
-sg_storage_size_t SIMIX_pre_storage_get_used_size(smx_simcall_t simcall, const char* name)
+int simcall_HANDLER_file_move(smx_simcall_t simcall, smx_file_t file, const char* fullpath)
 {
-  return SIMIX_storage_get_used_size(simcall->issuer, name);
+  return SIMIX_file_move(simcall->issuer, file, fullpath);
 }
 
-sg_storage_size_t SIMIX_storage_get_used_size(smx_process_t process, const char* name)
+int SIMIX_file_move(smx_process_t process, smx_file_t file, const char* fullpath)
 {
   smx_host_t host = process->smx_host;
-  return  surf_workstation_model->extension.workstation.get_used_size(host,name);
+  return  surf_workstation_file_move(host, file->surf_file, fullpath);
 }
 
-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){
+sg_size_t SIMIX_storage_get_size(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_storage_get_size(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);
+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);
 }
 
-void SIMIX_pre_storage_set_data(smx_simcall_t simcall, smx_storage_t storage, void *data) {
-  SIMIX_storage_set_data(storage, data);
+sg_size_t SIMIX_storage_get_free_size(smx_process_t process, smx_storage_t storage)
+{
+  return  surf_storage_get_free_size(storage);
 }
-void SIMIX_storage_set_data(smx_storage_t storage, void *data){
-  xbt_assert((storage != NULL), "Invalid parameters");
-  xbt_assert((SIMIX_storage_priv(storage)->data == NULL), "Data already set");
 
-  SIMIX_storage_priv(storage)->data = data;
+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);
 }
 
-void* SIMIX_pre_storage_get_data(smx_simcall_t simcall,smx_storage_t storage){
-  return SIMIX_storage_get_data(storage);
+sg_size_t SIMIX_storage_get_used_size(smx_process_t process, smx_storage_t storage)
+{
+  return  surf_storage_get_used_size(storage);
 }
 
-void* SIMIX_storage_get_data(smx_storage_t storage){
+xbt_dict_t SIMIX_storage_get_properties(smx_storage_t storage){
   xbt_assert((storage != NULL), "Invalid parameters (simix storage is NULL)");
-
-  return SIMIX_storage_priv(storage)->data;
+  return surf_resource_get_properties(surf_storage_resource_priv(storage));
 }
 
-xbt_dict_t SIMIX_pre_storage_get_content(smx_simcall_t simcall, smx_storage_t storage){
-  return SIMIX_storage_get_content(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_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_storage_size_t SIMIX_storage_get_size(smx_storage_t storage){
-  xbt_assert((storage != NULL), "Invalid parameters (simix storage is NULL)");
-  return surf_storage_model->extension.storage.get_size(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;
-//  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:;
+    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(synchro->io.surf_io);
       simcall_file_open__set__result(simcall, tmp);
       break;
-
+    }
     case SIMCALL_FILE_CLOSE:
       xbt_free(simcall_file_close__get__fd(simcall));
       simcall_file_close__set__result(simcall, 0);
       break;
-
     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(synchro->io.surf_io));
       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(synchro->io.surf_io));
       break;
 
-    case SIMCALL_FILE_LS:
-//      xbt_dict_foreach((action->io.surf_io)->ls_dict,cursor,key, src){
-//        // if there is a stat we have to duplicate it
-//        if(src){
-//          dst = xbt_new0(s_file_stat_t,1);
-//          file_stat_copy(src, dst);
-//          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);
-      break;
     default:
       break;
     }
   }
 
-  switch (surf_workstation_model->action_state_get(action->io.surf_io)) {
+  switch (surf_action_get_state(synchro->io.surf_io)) {
 
     case SURF_ACTION_FAILED:
-      action->state = SIMIX_FAILED;
+      synchro->state = SIMIX_FAILED;
       break;
 
     case SURF_ACTION_DONE:
-      action->state = SIMIX_DONE;
+      synchro->state = SIMIX_DONE;
       break;
 
     default:
@@ -418,28 +346,28 @@ void SIMIX_post_io(smx_action_t action)
       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)
-    action->io.surf_io->model_type->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_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:
-        /* do nothing, action done */
+        /* do nothing, synchro done */
         break;
 
       case SIMIX_FAILED:
@@ -451,19 +379,18 @@ void SIMIX_io_finish(smx_action_t action)
         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_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->waiting_action = NULL;
+    simcall->issuer->waiting_synchro = NULL;
     SIMIX_simcall_answer(simcall);
   }
 
   /* We no longer need it */
-  SIMIX_io_destroy(action);
+  SIMIX_io_destroy(synchro);
 }