Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Fix compil without tracing, which was broken multiple times ...
[simgrid.git] / src / surf / workstation_interface.cpp
index dae99c9..00ecfdf 100644 (file)
@@ -4,6 +4,7 @@
 /* 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 "simix/smx_private.h"
 #include "workstation_interface.hpp"
 #include "vm_workstation_interface.hpp"
 #include "cpu_cas01.hpp"
@@ -25,6 +26,15 @@ surf_callback(void, WorkstationPtr) workstationDestructedCallbacks;
 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;
 
+void workstation_parse_init(sg_platf_host_cbarg_t host)
+{
+  surf_workstation_model->createWorkstation(host->id);
+}
+
+void workstation_add_traces(){
+  surf_workstation_model->addTraces();
+}
+
 /*********
  * Model *
  *********/
@@ -197,7 +207,7 @@ xbt_dynar_t Workstation::getAttachedStorageList()
     if(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL) != NULL) {
          StoragePtr storage = static_cast<StoragePtr>(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL));
          if(!strcmp((const char*)storage->p_attach,this->getName())){
-           xbt_dynar_push_as(result, void *,(void *)static_cast<ResourcePtr>(storage)->getName());
+           xbt_dynar_push_as(result, void *, (void*)storage->getName());
          }
        }
   }
@@ -268,7 +278,7 @@ ActionPtr Workstation::write(surf_file_t fd, sg_size_t size) {
 int Workstation::unlink(surf_file_t fd) {
   if (!fd){
     XBT_WARN("No such file descriptor. Impossible to unlink");
-    return 0;
+    return -1;
   } else {
 
     StoragePtr st = findStorageOnMountList(fd->mount);
@@ -276,7 +286,7 @@ int Workstation::unlink(surf_file_t fd) {
     if (!xbt_dict_get_or_null(st->p_content, fd->name)){
       XBT_WARN("File %s is not on disk %s. Impossible to unlink", fd->name,
           st->getName());
-      return 0;
+      return -1;
     } else {
       XBT_DEBUG("UNLINK on disk '%s'",st->getName());
       st->m_usedSize -= fd->size;
@@ -284,20 +294,14 @@ int Workstation::unlink(surf_file_t fd) {
       // Remove the file from storage
       xbt_dict_remove(st->p_content, fd->name);
 
-      free(fd->name);
-      free(fd->mount);
+      xbt_free(fd->name);
+      xbt_free(fd->mount);
       xbt_free(fd);
-      return 1;
+      return 0;
     }
   }
 }
 
-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;
 }
@@ -325,156 +329,49 @@ int Workstation::fileSeek(surf_file_t fd, sg_size_t offset, int origin){
 
   switch (origin) {
   case SEEK_SET:
-    fd->current_position = 0;
-       return MSG_OK;
+    fd->current_position = offset;
+    return 0;
   case SEEK_CUR:
-       if(offset > fd->size)
-         offset = fd->size;
-       fd->current_position = offset;
-       return MSG_OK;
+    fd->current_position += offset;
+    return 0;
   case SEEK_END:
-       fd->current_position = fd->size;
-       return MSG_OK;
+    fd->current_position = fd->size + offset;
+    return 0;
   default:
-       return MSG_TASK_CANCELED;
+    return -1;
   }
 }
 
 int Workstation::fileMove(surf_file_t fd, const char* fullpath){
-
   /* Check if the new full path is on the same mount point */
-  if(!strncmp((const char*)fd->mount, fullpath, strlen(fd->mount)))
-  {
+  if(!strncmp((const char*)fd->mount, fullpath, strlen(fd->mount))) {
     sg_size_t *psize, *new_psize;
-    psize = (sg_size_t*) xbt_dict_get_or_null(findStorageOnMountList(fd->mount)->p_content,fd->name);
+    psize = (sg_size_t*)
+        xbt_dict_get_or_null(findStorageOnMountList(fd->mount)->p_content,
+                             fd->name);
     new_psize = xbt_new(sg_size_t, 1);
     *new_psize = *psize;
     if (psize){// src file exists
-         xbt_dict_remove(findStorageOnMountList(fd->mount)->p_content, fd->name);
-
-         char *path = (char *) xbt_malloc ((strlen(fullpath)-strlen(fd->mount)+1));;
-         strncpy(path, fullpath+strlen(fd->mount), strlen(fullpath)-strlen(fd->mount)+1);
-         xbt_dict_set(findStorageOnMountList(fd->mount)->p_content, path, new_psize,NULL);
-         XBT_DEBUG("Move file from %s to %s, size '%llu'",fd->name, fullpath, *psize);
-         free(path);
-         return MSG_OK;
-    }
-    else
-         XBT_WARN("File %s doesn't exist", fd->name);
-      return MSG_TASK_CANCELED;
+      xbt_dict_remove(findStorageOnMountList(fd->mount)->p_content, fd->name);
+      char *path = (char *) xbt_malloc ((strlen(fullpath)-strlen(fd->mount)+1));;
+      strncpy(path, fullpath+strlen(fd->mount),
+              strlen(fullpath)-strlen(fd->mount)+1);
+      xbt_dict_set(findStorageOnMountList(fd->mount)->p_content, path,
+                   new_psize,NULL);
+      XBT_DEBUG("Move file from %s to %s, size '%llu'",fd->name, fullpath, *psize);
+      free(path);
+      return 0;
+    } else {
+      XBT_WARN("File %s doesn't exist", fd->name);
+      return -1;
     }
-  else
-  {
-       XBT_WARN("New full path %s is not on the same mount point: %s. Action has been canceled.", fullpath, fd->mount);
-       return MSG_TASK_CANCELED;
-  }
-}
-
-int Workstation::fileRcopy(surf_file_t fd, surf_resource_t host_dest, const char* fullpath){
-
-  XBT_DEBUG("Rcopy file %s on %s to %s",fd->name, host_dest->key, fullpath);
-
-  /* Find the host src where the file is located */
-  StoragePtr storage = findStorageOnMountList(fd->mount);
-  const char* host_name_src = (const char*)storage->p_attach;
-
-  /* Find the real host dest where the file will be stored */
-  s_mount_t mnt;
-  unsigned int cursor;
-  StoragePtr storage_dest = NULL;
-  const char* host_name_dest;
-  char *file_mount_name;
-  size_t longest_prefix_length = 0;
-  WorkstationPtr dest_ws, src_ws;
-
-  dest_ws = static_cast<WorkstationPtr>(surf_workstation_resource_priv(host_dest));
-
-  xbt_dynar_foreach(dest_ws->p_storage,cursor,mnt)
-  {
-       file_mount_name = (char *) xbt_malloc ((strlen(mnt.name)+1));
-    strncpy(file_mount_name,fullpath,strlen(mnt.name)+1);
-    file_mount_name[strlen(mnt.name)] = '\0';
-
-       if(!strcmp(file_mount_name,mnt.name) && strlen(mnt.name)>longest_prefix_length)
-       {/* The current mount name is found in the full path and is bigger than the previous*/
-      longest_prefix_length = strlen(mnt.name);
-      storage_dest = static_cast<StoragePtr>(mnt.storage);
-       }
-       free(file_mount_name);
-  }
-  if(longest_prefix_length>0)
-  { /* Mount point found, retrieve the host the storage is attached to */
-    host_name_dest = storage_dest->p_attach;
-  }
-  else
-  {
-    XBT_WARN("Can't find mount point for '%s' on destination host '%s'", fullpath, host_dest->key);
-    return MSG_TASK_CANCELED;
-  }
-
-  /* Check that there is a route between src and dest workstations */
-  xbt_dynar_t route = NULL;
-  dest_ws = static_cast<WorkstationPtr>(surf_workstation_resource_priv(xbt_lib_get_elm_or_null(host_lib, host_name_dest)));
-  src_ws = static_cast<WorkstationPtr>(surf_workstation_resource_priv(xbt_lib_get_elm_or_null(host_lib, host_name_src)));
-
-  routing_get_route_and_latency(src_ws->p_netElm, dest_ws->p_netElm, &route, NULL);
-  if(!xbt_dynar_length (route))
-  {
-       XBT_WARN("There is no route between %s and %s. Action has been canceled", src_ws->getName(), dest_ws->getName());
-       return MSG_TASK_CANCELED;
-  }
-  else
-  {/* There is a route between src and dest, let's copy the file */
-
-    /* Read the file on the src side */
-       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, .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 */
-       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;
+  } else {
+    XBT_WARN("New full path %s is not on the same mount point: %s. Action has been canceled.",
+             fullpath, fd->mount);
+    return -1;
   }
 }
 
-sg_size_t Workstation::getFreeSize(const char* name)
-{
-  StoragePtr st = findStorageOnMountList(name);
-  return st->m_size - st->m_usedSize;
-}
-
-sg_size_t Workstation::getUsedSize(const char* name)
-{
-  StoragePtr st = findStorageOnMountList(name);
-  return st->m_usedSize;
-}
-
 xbt_dynar_t Workstation::getVms()
 {
   xbt_dynar_t dyn = xbt_dynar_new(sizeof(smx_host_t), NULL);