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 9d93ab5..00ecfdf 100644 (file)
@@ -4,11 +4,14 @@
 /* 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"
 #include "simgrid/sg_config.h"
 
+#include "network_interface.hpp"
+
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_workstation, surf,
                                 "Logging specific to the SURF workstation module");
 
@@ -20,8 +23,17 @@ 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;
+
+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 *
@@ -110,8 +122,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(){
@@ -184,28 +197,64 @@ xbt_dict_t Workstation::getMountedStorageList()
   return storage_list;
 }
 
-xbt_dict_t Workstation::getAttachedStorageList()
+xbt_dynar_t Workstation::getAttachedStorageList()
 {
   xbt_lib_cursor_t cursor;
   char *key;
   void **data;
-  xbt_dict_t res = xbt_dict_new_homogeneous(NULL);
+  xbt_dynar_t result = xbt_dynar_new(sizeof(void*), NULL);
   xbt_lib_foreach(storage_lib, cursor, key, data) {
-    if(routing_get_network_element_type(key) == SURF_STORAGE_LEVEL) {
-      xbt_dictelm_t elm = xbt_dict_cursor_get_elm(cursor);
-      if ( (static_cast<StoragePtr>(surf_storage_resource_priv(surf_storage_resource_by_name((const char*)elm))))->p_attach == this->getName())
-         xbt_dict_set(res,(const char*)elm,xbt_lib_get_level(elm,MSG_STORAGE_LEVEL),NULL);
-    }
+    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*)storage->getName());
+         }
+       }
   }
-  return res;
-
+  return result;
 }
 
+ActionPtr Workstation::open(const char* fullpath) {
+
+  StoragePtr st = NULL;
+  s_mount_t mnt;
+  unsigned int cursor;
+  size_t longest_prefix_length = 0;
+  char *path = NULL;
+  char *file_mount_name = NULL;
+  char *mount_name = NULL;
+
+  XBT_DEBUG("Search for storage name for '%s' on '%s'", fullpath, getName());
+  xbt_dynar_foreach(p_storage,cursor,mnt)
+  {
+    XBT_DEBUG("See '%s'",mnt.name);
+    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';
 
-ActionPtr Workstation::open(const char* mount, const char* path) {
-  StoragePtr st = findStorageOnMountList(mount);
-  XBT_DEBUG("OPEN on disk '%s'", st->getName());
-  return st->open(mount, path);
+    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);
+      st = static_cast<StoragePtr>(mnt.storage);
+    }
+    free(file_mount_name);
+  }
+  if(longest_prefix_length>0)
+  { /* Mount point found, split fullpath into mount_name and path+filename*/
+       path = (char *) xbt_malloc ((strlen(fullpath)-longest_prefix_length+1));
+       mount_name = (char *) xbt_malloc ((longest_prefix_length+1));
+       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';
+  }
+  else
+    xbt_die("Can't find mount point for '%s' on '%s'", fullpath, getName());
+
+  ActionPtr action = st->open((const char*)mount_name, (const char*)path);
+  free((char*)path);
+  free((char*)mount_name);
+  return action;
 }
 
 ActionPtr Workstation::close(surf_file_t fd) {
@@ -229,15 +278,15 @@ 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 {
-//    XBT_INFO("%s %zu", fd->storage, fd->size);
+
     StoragePtr st = findStorageOnMountList(fd->mount);
     /* Check if the file is on this storage */
     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;
@@ -245,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;
 }
@@ -286,31 +329,47 @@ 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;
   }
 }
 
-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;
+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))) {
+    sg_size_t *psize, *new_psize;
+    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 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 -1;
+  }
 }
 
 xbt_dynar_t Workstation::getVms()
@@ -346,6 +405,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);
 }