From 85a354a7bab3d074f209c31fbf7b5beb02df0e6c Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sun, 13 Nov 2016 15:27:50 +0100 Subject: [PATCH 1/1] reindent, no change --- src/surf/HostImpl.cpp | 374 +++++++++++++++++++++--------------------- src/surf/HostImpl.hpp | 17 +- 2 files changed, 195 insertions(+), 196 deletions(-) diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp index 576c6bd2b1..2943b4de73 100644 --- a/src/surf/HostImpl.cpp +++ b/src/surf/HostImpl.cpp @@ -62,17 +62,13 @@ Action* HostModel::executeParallelTask(int host_nb, simgrid::s4u::Host** host_li double* bytes_amount, double rate) { #define cost_or_zero(array,pos) ((array)?(array)[pos]:0.0) - Action *action =nullptr; - if ((host_nb == 1) - && (cost_or_zero(bytes_amount, 0) == 0.0)){ + 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]); - } else if ((host_nb == 1) - && (cost_or_zero(flops_amount, 0) == 0.0)) { + } else if ((host_nb == 1) && (cost_or_zero(flops_amount, 0) == 0.0)) { action = surf_network_model->communicate(host_list[0], host_list[0], bytes_amount[0], rate); - } else if ((host_nb == 2) - && (cost_or_zero(flops_amount, 0) == 0.0) - && (cost_or_zero(flops_amount, 1) == 0.0)) { - int i,nb = 0; + } else if ((host_nb == 2) && (cost_or_zero(flops_amount, 0) == 0.0) && (cost_or_zero(flops_amount, 1) == 0.0)) { + int i, nb = 0; double value = 0.0; for (i = 0; i < host_nb * host_nb; i++) { @@ -84,12 +80,16 @@ Action* HostModel::executeParallelTask(int host_nb, simgrid::s4u::Host** host_li if (nb == 1) { action = surf_network_model->communicate(host_list[0], host_list[1], 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 { - xbt_die("Cannot have a communication that is not a simple point-to-point in this model. You should consider using the ptask model"); + xbt_die("Cannot have a communication with no flop to exchange in this model. You should consider using the " + "ptask model"); + } else { + xbt_die("Cannot have a communication that is not a simple point-to-point in this model. You should consider " + "using the ptask model"); } - } else - xbt_die("This model only accepts one of the following. You should consider using the ptask model for the other cases.\n - execution with one host only and no communication\n - Self-comms with one host only\n - Communications with two hosts and no computation"); + } else + xbt_die("This model only accepts one of the following. You should consider using the ptask model for the other " + "cases.\n - execution with one host only and no communication\n - Self-comms with one host only\n - " + "Communications with two hosts and no computation"); #undef cost_or_zero xbt_free(host_list); return action; @@ -106,21 +106,21 @@ HostImpl::HostImpl(s4u::Host* host, xbt_dynar_t storage) : storage_(storage), pi /** @brief use destroy() instead of this destructor */ HostImpl::~HostImpl() = default; -simgrid::surf::Storage *HostImpl::findStorageOnMountList(const char* mount) +simgrid::surf::Storage* HostImpl::findStorageOnMountList(const char* mount) { - simgrid::surf::Storage *st = nullptr; + simgrid::surf::Storage* st = nullptr; s_mount_t mnt; unsigned int cursor; XBT_DEBUG("Search for storage name '%s' on '%s'", mount, piface_->name().c_str()); - xbt_dynar_foreach(storage_,cursor,mnt){ - XBT_DEBUG("See '%s'",mnt.name); - if(!strcmp(mount,mnt.name)){ + xbt_dynar_foreach (storage_, cursor, mnt) { + XBT_DEBUG("See '%s'", mnt.name); + if (!strcmp(mount, mnt.name)) { st = static_cast(mnt.storage); break; } } - if(!st) + if (!st) xbt_die("Can't find mount '%s' for '%s'", mount, piface_->name().c_str()); return st; } @@ -130,11 +130,11 @@ xbt_dict_t HostImpl::getMountedStorageList() s_mount_t mnt; unsigned int i; xbt_dict_t storage_list = xbt_dict_new_homogeneous(nullptr); - char *storage_name = nullptr; + char* storage_name = nullptr; - xbt_dynar_foreach(storage_,i,mnt){ - storage_name = (char *)static_cast(mnt.storage)->getName(); - xbt_dict_set(storage_list,mnt.name,storage_name,nullptr); + xbt_dynar_foreach (storage_, i, mnt) { + storage_name = (char*)static_cast(mnt.storage)->getName(); + xbt_dict_set(storage_list, mnt.name, storage_name, nullptr); } return storage_list; } @@ -142,190 +142,192 @@ xbt_dict_t HostImpl::getMountedStorageList() xbt_dynar_t HostImpl::getAttachedStorageList() { xbt_lib_cursor_t cursor; - char *key; - void **data; + char* key; + void** data; xbt_dynar_t result = xbt_dynar_new(sizeof(void*), nullptr); - xbt_lib_foreach(storage_lib, cursor, key, data) { + 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( xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL)); if (!strcmp((const char*)storage->attach_, piface_->name().c_str())) { xbt_dynar_push_as(result, void*, (void*)storage->getName()); } - } + } } return result; -} - -Action *HostImpl::open(const char* fullpath) { - - simgrid::surf::Storage *st = nullptr; - s_mount_t mnt; - unsigned int cursor; - size_t longest_prefix_length = 0; - char *path = nullptr; - char *file_mount_name = nullptr; - char *mount_name = nullptr; - - XBT_DEBUG("Search for storage name for '%s' on '%s'", fullpath, piface_->name().c_str()); - xbt_dynar_foreach(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'; - - 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(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, piface_->name().c_str()); - XBT_DEBUG("OPEN %s on disk '%s'",path, st->getName()); - Action *action = st->open((const char*)mount_name, (const char*)path); - free((char*)path); - free((char*)mount_name); - return action; -} - -Action *HostImpl::close(surf_file_t fd) { - simgrid::surf::Storage *st = findStorageOnMountList(fd->mount); - XBT_DEBUG("CLOSE %s on disk '%s'",fd->name, st->getName()); - return st->close(fd); -} - -Action *HostImpl::read(surf_file_t fd, sg_size_t size) { - simgrid::surf::Storage *st = findStorageOnMountList(fd->mount); - XBT_DEBUG("READ %s on disk '%s'",fd->name, st->getName()); - return st->read(fd, size); -} - -Action *HostImpl::write(surf_file_t fd, sg_size_t size) { - simgrid::surf::Storage *st = findStorageOnMountList(fd->mount); - XBT_DEBUG("WRITE %s on disk '%s'",fd->name, st->getName()); - return st->write(fd, size); -} + Action* HostImpl::open(const char* fullpath) + { + + simgrid::surf::Storage* st = nullptr; + s_mount_t mnt; + unsigned int cursor; + size_t longest_prefix_length = 0; + char* path = nullptr; + char* file_mount_name = nullptr; + char* mount_name = nullptr; + + XBT_DEBUG("Search for storage name for '%s' on '%s'", fullpath, piface_->name().c_str()); + xbt_dynar_foreach (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'; + + 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(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, piface_->name().c_str()); + + XBT_DEBUG("OPEN %s on disk '%s'", path, st->getName()); + Action* action = st->open((const char*)mount_name, (const char*)path); + free((char*)path); + free((char*)mount_name); + return action; + } -int HostImpl::unlink(surf_file_t fd) { - if (!fd){ - XBT_WARN("No such file descriptor. Impossible to unlink"); - return -1; - } else { - - simgrid::surf::Storage *st = findStorageOnMountList(fd->mount); - /* Check if the file is on this storage */ - 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->usedSize_ -= fd->size; + Action* HostImpl::close(surf_file_t fd) + { + simgrid::surf::Storage* st = findStorageOnMountList(fd->mount); + XBT_DEBUG("CLOSE %s on disk '%s'", fd->name, st->getName()); + return st->close(fd); + } - // Remove the file from storage - xbt_dict_remove(st->content_, fd->name); + Action* HostImpl::read(surf_file_t fd, sg_size_t size) + { + simgrid::surf::Storage* st = findStorageOnMountList(fd->mount); + XBT_DEBUG("READ %s on disk '%s'", fd->name, st->getName()); + return st->read(fd, size); + } - xbt_free(fd->name); - xbt_free(fd->mount); - xbt_free(fd); - return 0; + Action* HostImpl::write(surf_file_t fd, sg_size_t size) + { + simgrid::surf::Storage* st = findStorageOnMountList(fd->mount); + XBT_DEBUG("WRITE %s on disk '%s'", fd->name, st->getName()); + return st->write(fd, size); } - } -} -sg_size_t HostImpl::getSize(surf_file_t fd){ - return fd->size; -} + int HostImpl::unlink(surf_file_t fd) + { + if (!fd) { + XBT_WARN("No such file descriptor. Impossible to unlink"); + return -1; + } else { + + simgrid::surf::Storage* st = findStorageOnMountList(fd->mount); + /* Check if the file is on this storage */ + 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->usedSize_ -= fd->size; + + // Remove the file from storage + xbt_dict_remove(st->content_, fd->name); + + xbt_free(fd->name); + xbt_free(fd->mount); + xbt_free(fd); + return 0; + } + } + } -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*), 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()); - xbt_dynar_push_as(info, void *, st->typeId_); - xbt_dynar_push_as(info, void *, st->contentType_); - - return info; -} + sg_size_t HostImpl::getSize(surf_file_t fd) + { + return fd->size; + } -sg_size_t HostImpl::fileTell(surf_file_t fd){ - return fd->current_position; -} + 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*), 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()); + xbt_dynar_push_as(info, void*, st->typeId_); + xbt_dynar_push_as(info, void*, st->contentType_); + + return info; + } -int HostImpl::fileSeek(surf_file_t fd, sg_offset_t offset, int origin){ - - switch (origin) { - case SEEK_SET: - fd->current_position = offset; - return 0; - case SEEK_CUR: - fd->current_position += offset; - return 0; - case SEEK_END: - fd->current_position = fd->size + offset; - return 0; - default: - return -1; - } -} + sg_size_t HostImpl::fileTell(surf_file_t fd) + { + return fd->current_position; + } -int HostImpl::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)->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)->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)->content_, path, - new_psize,nullptr); - 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; + int HostImpl::fileSeek(surf_file_t fd, sg_offset_t offset, int origin) + { + + switch (origin) { + case SEEK_SET: + fd->current_position = offset; + return 0; + case SEEK_CUR: + fd->current_position += offset; + return 0; + case SEEK_END: + fd->current_position = fd->size + offset; + return 0; + default: + 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 HostImpl::getVms() -{ - xbt_dynar_t dyn = xbt_dynar_new(sizeof(simgrid::surf::VirtualMachineImpl*), nullptr); + int HostImpl::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)->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)->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)->content_, path, new_psize, nullptr); + 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; + } + } - for (VirtualMachineImpl* ws_vm : VirtualMachineImpl::allVms_) { - if (this == ws_vm->getPm()->pimpl_) - xbt_dynar_push(dyn, &ws_vm); - } + xbt_dynar_t HostImpl::getVms() + { + xbt_dynar_t dyn = xbt_dynar_new(sizeof(simgrid::surf::VirtualMachineImpl*), nullptr); - return dyn; -} + for (VirtualMachineImpl* ws_vm : VirtualMachineImpl::allVms_) { + if (this == ws_vm->getPm()->pimpl_) + xbt_dynar_push(dyn, &ws_vm); + } -}} + return dyn; + } + } + } diff --git a/src/surf/HostImpl.hpp b/src/surf/HostImpl.hpp index b727ce945c..76926014b3 100644 --- a/src/surf/HostImpl.hpp +++ b/src/surf/HostImpl.hpp @@ -25,8 +25,6 @@ namespace surf { class XBT_PRIVATE HostModel; class XBT_PRIVATE HostImpl; class XBT_PRIVATE HostAction; - - } } @@ -52,8 +50,8 @@ public: HostModel() : Model() {} virtual void adjustWeightOfDummyCpuActions(); - virtual Action *executeParallelTask(int host_nb, sg_host_t *host_list, - double *flops_amount, double *bytes_amount, double rate); + virtual Action* executeParallelTask(int host_nb, sg_host_t* host_list, double* flops_amount, double* bytes_amount, + double rate); }; /************ @@ -71,7 +69,7 @@ public: public: /** @brief Return the storage of corresponding mount point */ - virtual simgrid::surf::Storage *findStorageOnMountList(const char* storage); + virtual simgrid::surf::Storage* findStorageOnMountList(const char* storage); /** @brief Get the xbt_dict_t of mount_point: Storage */ virtual xbt_dict_t getMountedStorageList(); @@ -85,7 +83,7 @@ public: * @param fullpath The full path to the file * @return The StorageAction corresponding to the opening */ - virtual Action *open(const char* fullpath); + virtual Action* open(const char* fullpath); /** * @brief Close a file @@ -93,7 +91,7 @@ public: * @param fd The file descriptor to close * @return The StorageAction corresponding to the closing */ - virtual Action *close(surf_file_t fd); + virtual Action* close(surf_file_t fd); /** * @brief Unlink a file @@ -119,7 +117,7 @@ public: * @param size The size in bytes to read * @return The StorageAction corresponding to the reading */ - virtual Action *read(surf_file_t fd, sg_size_t size); + virtual Action* read(surf_file_t fd, sg_size_t size); /** * @brief Write a file @@ -128,7 +126,7 @@ public: * @param size The size in bytes to write * @return The StorageAction corresponding to the writing */ - virtual Action *write(surf_file_t fd, sg_size_t size); + virtual Action* write(surf_file_t fd, sg_size_t size); /** * @brief Get the information of a file descriptor @@ -186,7 +184,6 @@ public: simgrid::s4u::Host* getHost() { return piface_; } }; - } } -- 2.20.1