X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d785a64b1830b6a5d05561316ef7161ee1c67671..6c619fe932602290423c6a789c2aa034ae9f1cad:/src/surf/HostImpl.cpp

diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp
index c7e5ec9a0d..010d3198b7 100644
--- a/src/surf/HostImpl.cpp
+++ b/src/surf/HostImpl.cpp
@@ -13,8 +13,7 @@
 #include "network_interface.hpp"
 #include "virtual_machine.hpp"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_host, surf,
-                                "Logging specific to the SURF host module");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_host, surf, "Logging specific to the SURF host module");
 
 simgrid::surf::HostModel *surf_host_model = nullptr;
 
@@ -100,9 +99,7 @@ Action *HostModel::executeParallelTask(int host_nb,
       }
     }
     if (nb == 1) {
-      action = surf_network_model->communicate(host_list[0]->pimpl_netcard,
-					       host_list[1]->pimpl_netcard,
-					       value, rate);
+      action = surf_network_model->communicate(host_list[0]->pimpl_netcard, host_list[1]->pimpl_netcard, value, rate);
     } else if (nb == 0) {
        xbt_die("Cannot have a communication with no flop to exchange in this model. You should consider using the ptask model");
     } else {       
@@ -118,20 +115,13 @@ Action *HostModel::executeParallelTask(int host_nb,
 /************
  * Resource *
  ************/
-
-
-void HostImpl::classInit()
-{
-  if (!EXTENSION_ID.valid()) {
-    EXTENSION_ID = simgrid::s4u::Host::extension_create<simgrid::surf::HostImpl>();
-  }
-}
-
 HostImpl::HostImpl(simgrid::surf::HostModel *model, const char *name, xbt_dynar_t storage, Cpu *cpu)
  : Resource(model, name)
  , PropertyHolder(nullptr)
  , p_storage(storage), p_cpu(cpu)
 {
+  if (!EXTENSION_ID.valid())
+    EXTENSION_ID = simgrid::s4u::Host::extension_create<simgrid::surf::HostImpl>();
   p_params.ramsize = 0;
 }
 
@@ -183,15 +173,15 @@ simgrid::surf::Storage *HostImpl::findStorageOnMountList(const char* mount)
   unsigned int cursor;
 
   XBT_DEBUG("Search for storage name '%s' on '%s'", mount, getName());
-  xbt_dynar_foreach(p_storage,cursor,mnt)
-  {
+  xbt_dynar_foreach(p_storage,cursor,mnt){
     XBT_DEBUG("See '%s'",mnt.name);
     if(!strcmp(mount,mnt.name)){
       st = static_cast<simgrid::surf::Storage*>(mnt.storage);
       break;
     }
   }
-  if(!st) xbt_die("Can't find mount '%s' for '%s'", mount, getName());
+  if(!st)
+    xbt_die("Can't find mount '%s' for '%s'", mount, getName());
   return st;
 }
 
@@ -218,7 +208,7 @@ xbt_dynar_t HostImpl::getAttachedStorageList()
   xbt_lib_foreach(storage_lib, cursor, key, data) {
     if(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL) != nullptr) {
     simgrid::surf::Storage *storage = static_cast<simgrid::surf::Storage*>(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())){
+    if(!strcmp((const char*)storage->attach_,this->getName())){
       xbt_dynar_push_as(result, void *, (void*)storage->getName());
     }
   }
@@ -296,16 +286,16 @@ int HostImpl::unlink(surf_file_t fd) {
 
     simgrid::surf::Storage *st = findStorageOnMountList(fd->mount);
     /* Check if the file is on this storage */
-    if (!xbt_dict_get_or_null(st->p_content, fd->name)){
+    if (!xbt_dict_get_or_null(st->content_, fd->name)){
       XBT_WARN("File %s is not on disk %s. Impossible to unlink", fd->name,
           st->getName());
       return -1;
     } else {
       XBT_DEBUG("UNLINK %s on disk '%s'",fd->name, st->getName());
-      st->m_usedSize -= fd->size;
+      st->usedSize_ -= fd->size;
 
       // Remove the file from storage
-      xbt_dict_remove(st->p_content, fd->name);
+      xbt_dict_remove(st->content_, fd->name);
 
       xbt_free(fd->name);
       xbt_free(fd->mount);
@@ -328,8 +318,8 @@ xbt_dynar_t HostImpl::getInfo( surf_file_t fd)
   xbt_dynar_push_as(info, sg_size_t *, psize);
   xbt_dynar_push_as(info, void *, fd->mount);
   xbt_dynar_push_as(info, void *, (void *)st->getName());
-  xbt_dynar_push_as(info, void *, st->p_typeId);
-  xbt_dynar_push_as(info, void *, st->p_contentType);
+  xbt_dynar_push_as(info, void *, st->typeId_);
+  xbt_dynar_push_as(info, void *, st->contentType_);
 
   return info;
 }
@@ -360,16 +350,16 @@ int HostImpl::fileMove(surf_file_t fd, const char* fullpath){
   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,
+        xbt_dict_get_or_null(findStorageOnMountList(fd->mount)->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);
+      xbt_dict_remove(findStorageOnMountList(fd->mount)->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,
+      xbt_dict_set(findStorageOnMountList(fd->mount)->content_, path,
                    new_psize,nullptr);
       XBT_DEBUG("Move file from %s to %s, size '%llu'",fd->name, fullpath, *psize);
       free(path);