remove MSG_file_ls()

[simgrid.git] / src / surf / workstation_interface.cpp

diff --git a/src/surf/workstation_interface.cpp b/src/surf/workstation_interface.cpp
index 7149daf..cc7fb44 100644 (file)
--- a/src/surf/workstation_interface.cpp
+++ b/src/surf/workstation_interface.cpp
@@ -22,8 +22,8 @@ WorkstationModelPtr surf_workstation_model = NULL;
 
 surf_callback(void, WorkstationPtr) workstationCreatedCallbacks;
 surf_callback(void, WorkstationPtr) workstationDestructedCallbacks;
-surf_callback(void, WorkstationPtr) workstationStateChangedCallbacks;
-surf_callback(void, WorkstationActionPtr) workstationActionStateChangedCallbacks;
+surf_callback(void, WorkstationPtr, e_surf_resource_state_t, e_surf_resource_state_t) workstationStateChangedCallbacks;
+surf_callback(void, WorkstationActionPtr, e_surf_action_state_t, e_surf_action_state_t) workstationActionStateChangedCallbacks;
 
 /*********
  * Model *
@@ -112,8 +112,9 @@ Workstation::~Workstation(){
 }
 
 void Workstation::setState(e_surf_resource_state_t state){
+  e_surf_resource_state_t old = Resource::getState();
   Resource::setState(state);
-  surf_callback_emit(workstationStateChangedCallbacks, this);
+  surf_callback_emit(workstationStateChangedCallbacks, this, old, state);
 }
 
 int Workstation::getCore(){
@@ -291,12 +292,6 @@ int Workstation::unlink(surf_file_t fd) {
   }
 }
 
-ActionPtr Workstation::ls(const char* mount, const char *path){
-  XBT_DEBUG("LS on mount '%s' and file '%s'", mount, path);
-  StoragePtr st = findStorageOnMountList(mount);
-  return st->ls(path);
-}
-
 sg_size_t Workstation::getSize(surf_file_t fd){
   return fd->size;
 }
@@ -429,56 +424,37 @@ int Workstation::fileRcopy(surf_file_t fd, surf_resource_t host_dest, const char
        src_ws->read(fd, fd->size);
 
        /* Send a message from src to dest to simulate data transfer */
-       surf_network_model->communicate(src_ws->p_netElm, dest_ws->p_netElm, fd->size, -1.0);
+       surf_network_model->communicate(src_ws->p_netElm, dest_ws->p_netElm, fd->size, .0);
 
        /* Create the file on the dest side and write data into it*/
        char *mount_name, *path;
        path = (char *) xbt_malloc ((strlen(fullpath)-longest_prefix_length+1));
        mount_name = (char *) xbt_malloc ((longest_prefix_length+1));
+
        /* deduce mount_name and path from fullpath */
        strncpy(mount_name, fullpath, longest_prefix_length+1);
        strncpy(path, fullpath+longest_prefix_length, strlen(fullpath)-longest_prefix_length+1);
        path[strlen(fullpath)-longest_prefix_length] = '\0';
        mount_name[longest_prefix_length] = '\0';
+
     /* create the file */
-       ActionPtr open_action = storage_dest->open((const char*)mount_name, (const char*)path);
-    /* write data */
-       dest_ws->write(static_cast<StorageActionPtr>(open_action)->p_file, fd->size);
-    dest_ws->close(static_cast<StorageActionPtr>(open_action)->p_file);
-    free(path);
+       StorageActionPtr open_action = storage_dest->open((const char*)mount_name, (const char*)path);
+
+       surf_file_t surf_file = xbt_new(s_surf_file_t, 1);
+       surf_file->current_position = 0;
+       surf_file->mount = mount_name;
+       surf_file->name = strdup(path);
+       surf_file->size = 0;
+
+       /* write data and close file*/
+       storage_dest->write(surf_file, fd->size);
+       storage_dest->close(open_action->p_file);
+
+       free(path);
     free(mount_name);
     XBT_DEBUG("File %s has been copied on %s to %s",fd->name, host_dest->key, fullpath);
     return MSG_OK;
   }
-
-
-  XBT_INFO("SRC %s DEST %s", host_name_src, host_name_dest);
-
-
-
-//  /* Check that file to copy is local to the src workstation (storage is attached to src workstation) */
-//  StoragePtr storage = findStorageOnMountList(fd->mount);
-//  if(!strcmp((const char*)storage->p_attach, this->getName()))
-//  {
-//    /* Check that there is a route between src and dest workstations */
-//    xbt_dynar_t route = NULL;
-//    routing_get_route_and_latency(this->p_netElm, ((WorkstationPtr)host_dest)->p_netElm, &route, NULL);
-//    if(route){
-//
-//      ATTENTION DISCUSSION AVEC FRED !
-//      return MSG_OK;
-//    }
-//    else
-//    {
-//      XBT_WARN("There is no route between %s and %s. Action has been canceled", this->getName(), host_dest->key);
-//      return MSG_TASK_CANCELED;
-//    }
-//  }
-//  else
-//  {
-//    XBT_WARN("File %s is not local to %s but to %s. Action has been canceled", fd->name,this->getName(), storage->p_attach);
-//    return MSG_TASK_CANCELED;
-//  }
 }
 
 sg_size_t Workstation::getFreeSize(const char* name)
@@ -526,6 +502,7 @@ void Workstation::setParams(ws_params_t params)
  **********/
 
 void WorkstationAction::setState(e_surf_action_state_t state){
+  e_surf_action_state_t old = getState();
   Action::setState(state);
-  surf_callback_emit(workstationActionStateChangedCallbacks, this);
+  surf_callback_emit(workstationActionStateChangedCallbacks, this, old, state);
 }