X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fd77edf75909515d711d8be2c27e61e23a72ba74..32b2173475cd6596fd437abe76bbebe5a0dbb3da:/src/surf/HostImpl.cpp

diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp
index df99dc0545..24411bcfba 100644
--- a/src/surf/HostImpl.cpp
+++ b/src/surf/HostImpl.cpp
@@ -17,7 +17,7 @@
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_host, surf,
                                 "Logging specific to the SURF host module");
 
-simgrid::surf::HostModel *surf_host_model = NULL;
+simgrid::surf::HostModel *surf_host_model = nullptr;
 
 /*************
  * Callbacks *
@@ -31,10 +31,10 @@ simgrid::xbt::Extension<simgrid::s4u::Host, HostImpl> HostImpl::EXTENSION_ID;
 /*********
  * Model *
  *********/
-HostImpl *HostModel::createHost(const char *name,NetCard *netElm, Cpu *cpu, xbt_dict_t props){
+HostImpl *HostModel::createHost(const char *name, routing::NetCard *netElm, Cpu *cpu){
   xbt_dynar_t storageList = (xbt_dynar_t)xbt_lib_get_or_null(storage_lib, name, ROUTING_STORAGE_HOST_LEVEL);
 
-  HostImpl *host = new simgrid::surf::HostImpl(surf_host_model, name, props, storageList, cpu);
+  HostImpl *host = new simgrid::surf::HostImpl(surf_host_model, name, storageList, cpu);
   XBT_DEBUG("Create host %s with %ld mounted disks", name, xbt_dynar_length(host->p_storage));
   return host;
 }
@@ -61,13 +61,13 @@ void HostModel::adjustWeightOfDummyCpuActions()
 
       /* FIXME: we should use lmm_update_variable_weight() ? */
       /* FIXME: If we assign 1.05 and 0.05, the system makes apparently wrong values. */
-      ws_vm->p_action->setPriority(1);
+      ws_vm->action_->setPriority(1);
 
     } else {
       /* no task exits on this VM */
       XBT_DEBUG("set the weight of the dummy CPU action on PM to 0");
 
-      ws_vm->p_action->setPriority(0);
+      ws_vm->action_->setPriority(0);
     }
   }
 }
@@ -78,7 +78,7 @@ Action *HostModel::executeParallelTask(int host_nb,
     double *bytes_amount,
     double rate){
 #define cost_or_zero(array,pos) ((array)?(array)[pos]:0.0)
-  Action *action =NULL;
+  Action *action =nullptr;
   if ((host_nb == 1)
       && (cost_or_zero(bytes_amount, 0) == 0.0)){
     action = host_list[0]->pimpl_cpu->execution_start(flops_amount[0]);
@@ -108,6 +108,8 @@ Action *HostModel::executeParallelTask(int host_nb,
     THROW_UNIMPLEMENTED;      /* This model does not implement parallel tasks for more than 2 hosts */
 #undef cost_or_zero
   xbt_free(host_list);
+  if(action==nullptr)
+    xbt_die("This model doesn't support tasks with 0 comm and 0 computation, please use ptak_L07 instead");
   return action;
 }
 
@@ -123,19 +125,18 @@ void HostImpl::classInit()
   }
 }
 
-HostImpl::HostImpl(simgrid::surf::HostModel *model, const char *name, xbt_dict_t props,
-                     xbt_dynar_t storage, Cpu *cpu)
+HostImpl::HostImpl(simgrid::surf::HostModel *model, const char *name, xbt_dynar_t storage, Cpu *cpu)
  : Resource(model, name)
- , PropertyHolder(props)
+ , PropertyHolder(nullptr)
  , p_storage(storage), p_cpu(cpu)
 {
   p_params.ramsize = 0;
 }
 
-HostImpl::HostImpl(simgrid::surf::HostModel *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint,
+HostImpl::HostImpl(simgrid::surf::HostModel *model, const char *name, lmm_constraint_t constraint,
                  xbt_dynar_t storage, Cpu *cpu)
  : Resource(model, name, constraint)
- , PropertyHolder(props)
+ , PropertyHolder(nullptr)
  , p_storage(storage), p_cpu(cpu)
 {
   p_params.ramsize = 0;
@@ -154,10 +155,10 @@ void HostImpl::attach(simgrid::s4u::Host* host)
   p_host = host;
 }
 
-bool HostImpl::isOn() {
+bool HostImpl::isOn() const {
   return p_cpu->isOn();
 }
-bool HostImpl::isOff() {
+bool HostImpl::isOff() const {
   return p_cpu->isOff();
 }
 void HostImpl::turnOn(){
@@ -175,7 +176,7 @@ void HostImpl::turnOff(){
 
 simgrid::surf::Storage *HostImpl::findStorageOnMountList(const char* mount)
 {
-  simgrid::surf::Storage *st = NULL;
+  simgrid::surf::Storage *st = nullptr;
   s_mount_t mnt;
   unsigned int cursor;
 
@@ -196,12 +197,12 @@ xbt_dict_t HostImpl::getMountedStorageList()
 {
   s_mount_t mnt;
   unsigned int i;
-  xbt_dict_t storage_list = xbt_dict_new_homogeneous(NULL);
-  char *storage_name = NULL;
+  xbt_dict_t storage_list = xbt_dict_new_homogeneous(nullptr);
+  char *storage_name = nullptr;
 
   xbt_dynar_foreach(p_storage,i,mnt){
     storage_name = (char *)static_cast<simgrid::surf::Storage*>(mnt.storage)->getName();
-    xbt_dict_set(storage_list,mnt.name,storage_name,NULL);
+    xbt_dict_set(storage_list,mnt.name,storage_name,nullptr);
   }
   return storage_list;
 }
@@ -211,9 +212,9 @@ xbt_dynar_t HostImpl::getAttachedStorageList()
   xbt_lib_cursor_t cursor;
   char *key;
   void **data;
-  xbt_dynar_t result = xbt_dynar_new(sizeof(void*), NULL);
+  xbt_dynar_t result = xbt_dynar_new(sizeof(void*), nullptr);
   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) != NULL) {
+    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())){
       xbt_dynar_push_as(result, void *, (void*)storage->getName());
@@ -225,13 +226,13 @@ xbt_dynar_t HostImpl::getAttachedStorageList()
 
 Action *HostImpl::open(const char* fullpath) {
 
-  simgrid::surf::Storage *st = NULL;
+  simgrid::surf::Storage *st = nullptr;
   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;
+  char *path = nullptr;
+  char *file_mount_name = nullptr;
+  char *mount_name = nullptr;
 
   XBT_DEBUG("Search for storage name for '%s' on '%s'", fullpath, getName());
   xbt_dynar_foreach(p_storage,cursor,mnt)
@@ -321,7 +322,7 @@ xbt_dynar_t HostImpl::getInfo( surf_file_t fd)
   simgrid::surf::Storage *st = findStorageOnMountList(fd->mount);
   sg_size_t *psize = xbt_new(sg_size_t, 1);
   *psize = fd->size;
-  xbt_dynar_t info = xbt_dynar_new(sizeof(void*), NULL);
+  xbt_dynar_t info = xbt_dynar_new(sizeof(void*), nullptr);
   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());
@@ -367,7 +368,7 @@ int HostImpl::fileMove(surf_file_t fd, const char* fullpath){
       strncpy(path, fullpath+strlen(fd->mount),
               strlen(fullpath)-strlen(fd->mount)+1);
       xbt_dict_set(findStorageOnMountList(fd->mount)->p_content, path,
-                   new_psize,NULL);
+                   new_psize,nullptr);
       XBT_DEBUG("Move file from %s to %s, size '%llu'",fd->name, fullpath, *psize);
       free(path);
       return 0;
@@ -384,7 +385,7 @@ int HostImpl::fileMove(surf_file_t fd, const char* fullpath){
 
 xbt_dynar_t HostImpl::getVms()
 {
-  xbt_dynar_t dyn = xbt_dynar_new(sizeof(simgrid::surf::VirtualMachine*), NULL);
+  xbt_dynar_t dyn = xbt_dynar_new(sizeof(simgrid::surf::VirtualMachine*), nullptr);
 
   /* iterate for all virtual machines */
   for (simgrid::surf::VMModel::vm_list_t::iterator iter =
@@ -392,7 +393,7 @@ xbt_dynar_t HostImpl::getVms()
        iter !=  simgrid::surf::VMModel::ws_vms.end(); ++iter) {
 
     simgrid::surf::VirtualMachine *ws_vm = &*iter;
-    if (this == ws_vm->p_hostPM->extension(simgrid::surf::HostImpl::EXTENSION_ID))
+    if (this == ws_vm->getPm()->extension(simgrid::surf::HostImpl::EXTENSION_ID))
       xbt_dynar_push(dyn, &ws_vm);
   }