From: Frederic Suter Date: Wed, 1 Mar 2017 09:45:37 +0000 (+0100) Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid X-Git-Tag: v3_15~263 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/8a2f0e341903330158b58400086dde589e2178e9?hp=031bbf5779cee53b0a5a58d5d5494dca2ae96bb8 Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid --- diff --git a/ChangeLog b/ChangeLog index 60ce7d100c..b7af4deefe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -56,7 +56,10 @@ SimGrid (3.15) UNRELEASED; urgency=low XBT - Kill the fifo data container: we don't use it anymore. - + + XML + - A can now be created with different speed values to represent pstates. + see examples/platforms/energy_cluster.xml for an example. -- target_date=March 20 2017 -- Da SimGrid team SimGrid (3.14.159) stable; urgency=low diff --git a/examples/msg/energy-pstate/energy-pstate.tesh b/examples/msg/energy-pstate/energy-pstate.tesh index 08a5aded9d..66282649d0 100644 --- a/examples/msg/energy-pstate/energy-pstate.tesh +++ b/examples/msg/energy-pstate/energy-pstate.tesh @@ -20,3 +20,22 @@ $ ${bindir:=.}/energy-pstate/energy-pstate$EXEEXT ${srcdir:=.}/../platforms/ener > [ 6.000000] (1:dvfs_test@MyHost1) Current power peak=20000000.000000 > [ 6.000000] (2:dvfs_test@MyHost2) Current power peak=20000000.000000 > [ 6.000000] (0:maestro@) Total simulation time: 6.000000e+00 + +$ ${bindir:=.}/energy-pstate/energy-pstate$EXEEXT ${srcdir:=.}/../platforms/energy_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +> [ 0.000000] (1:dvfs_test@MyHost1) Count of Processor states=3 +> [ 0.000000] (2:dvfs_test@MyHost2) Count of Processor states=3 +> [ 0.000000] (1:dvfs_test@MyHost1) Current power peak=100000000.000000 +> [ 0.000000] (2:dvfs_test@MyHost2) Current power peak=100000000.000000 +> [ 1.000000] (1:dvfs_test@MyHost1) Task1 simulation time: 1.000000e+00 +> [ 1.000000] (2:dvfs_test@MyHost2) Task1 simulation time: 1.000000e+00 +> [ 1.000000] (1:dvfs_test@MyHost1) Changing power peak value to 20000000.000000 (at index 2) +> [ 1.000000] (2:dvfs_test@MyHost2) Changing power peak value to 20000000.000000 (at index 2) +> [ 1.000000] (1:dvfs_test@MyHost1) Current power peak=20000000.000000 +> [ 1.000000] (2:dvfs_test@MyHost2) Current power peak=20000000.000000 +> [ 6.000000] (1:dvfs_test@MyHost1) Task2 simulation time: 5.000000e+00 +> [ 6.000000] (1:dvfs_test@MyHost1) Count of Processor states=3 +> [ 6.000000] (2:dvfs_test@MyHost2) Task2 simulation time: 5.000000e+00 +> [ 6.000000] (2:dvfs_test@MyHost2) Count of Processor states=3 +> [ 6.000000] (1:dvfs_test@MyHost1) Current power peak=20000000.000000 +> [ 6.000000] (2:dvfs_test@MyHost2) Current power peak=20000000.000000 +> [ 6.000000] (0:maestro@) Total simulation time: 6.000000e+00 diff --git a/examples/platforms/energy_cluster.xml b/examples/platforms/energy_cluster.xml new file mode 100644 index 0000000000..a23707579b --- /dev/null +++ b/examples/platforms/energy_cluster.xml @@ -0,0 +1,12 @@ + + + + + + + + + + diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp index 3eca546226..810757f8d6 100644 --- a/src/surf/HostImpl.cpp +++ b/src/surf/HostImpl.cpp @@ -60,7 +60,7 @@ static inline double has_cost(double* array, int pos) return -1.0; } Action* HostModel::executeParallelTask(int host_nb, simgrid::s4u::Host** host_list, double* flops_amount, - double* bytes_amount, double rate) + double* bytes_amount, double rate) { Action* action = nullptr; if ((host_nb == 1) && (has_cost(bytes_amount, 0) <= 0)) { @@ -81,10 +81,10 @@ Action* HostModel::executeParallelTask(int host_nb, simgrid::s4u::Host** host_li 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"); + "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"); + "using the ptask model"); } } else xbt_die( @@ -159,166 +159,166 @@ xbt_dynar_t HostImpl::getAttachedStorageList() } } 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; - 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_->cname()); - 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 + XBT_DEBUG("Search for storage name for '%s' on '%s'", fullpath, piface_->cname()); + 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_->cname()); - - XBT_DEBUG("OPEN %s on disk '%s'", path, st->cname()); - Action* action = st->open((const char*)mount_name, (const char*)path); - free((char*)path); - free((char*)mount_name); - return action; + 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_->cname()); - Action* HostImpl::close(surf_file_t fd) - { - simgrid::surf::Storage* st = findStorageOnMountList(fd->mount); - XBT_DEBUG("CLOSE %s on disk '%s'", fd->name, st->cname()); - return st->close(fd); - } + XBT_DEBUG("OPEN %s on disk '%s'", path, st->cname()); + Action* action = st->open((const char*)mount_name, (const char*)path); + free((char*)path); + free((char*)mount_name); + return action; +} - 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->cname()); - return st->read(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->cname()); + return st->close(fd); +} - 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->cname()); - return st->write(fd, size); - } +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->cname()); + return st->read(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->cname()); - return -1; - } else { - XBT_DEBUG("UNLINK %s on disk '%s'", fd->name, st->cname()); - 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; - } - } - } +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->cname()); + 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->cname()); + return -1; + } else { + XBT_DEBUG("UNLINK %s on disk '%s'", fd->name, st->cname()); + st->usedSize_ -= fd->size; - 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->cname()); - xbt_dynar_push_as(info, void*, st->typeId_); - xbt_dynar_push_as(info, void*, st->contentType_); - - return info; - } + // Remove the file from storage + xbt_dict_remove(st->content_, fd->name); - sg_size_t HostImpl::fileTell(surf_file_t fd) - { - return fd->current_position; + xbt_free(fd->name); + xbt_free(fd->mount); + xbt_free(fd); + return 0; } + } +} - 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::getSize(surf_file_t fd) +{ + return fd->size; +} - 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 = (sg_size_t*)xbt_dict_get_or_null(findStorageOnMountList(fd->mount)->content_, fd->name); - if (psize) { // src file exists - sg_size_t* new_psize = xbt_new(sg_size_t, 1); - *new_psize = *psize; - 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; - } - } +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->cname()); + xbt_dynar_push_as(info, void*, st->typeId_); + xbt_dynar_push_as(info, void*, st->contentType_); + + return info; +} +sg_size_t HostImpl::fileTell(surf_file_t fd) +{ + return fd->current_position; +} + +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; + } +} + +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 = (sg_size_t*)xbt_dict_get_or_null(findStorageOnMountList(fd->mount)->content_, fd->name); + if (psize) { // src file exists + sg_size_t* new_psize = xbt_new(sg_size_t, 1); + *new_psize = *psize; + 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; + } +} + +} +} diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index bb4d2e8483..3ce4e724f5 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -191,7 +191,7 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) char * host_id = bprintf("%s%d%s", cluster->prefix, i, cluster->suffix); char * link_id = bprintf("%s_link_%d", cluster->id, i); - XBT_DEBUG("", host_id, cluster->speed); + XBT_DEBUG("", host_id, cluster->speeds.front()); s_sg_platf_host_cbarg_t host; memset(&host, 0, sizeof(host)); @@ -206,7 +206,7 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) } } - host.speed_per_pstate.push_back(cluster->speed); + host.speed_per_pstate = cluster->speeds; host.pstate = 0; host.core_amount = cluster->core_amount; host.coord = ""; diff --git a/src/surf/xml/platf_private.hpp b/src/surf/xml/platf_private.hpp index 092e81c5f3..3e0cfe68ed 100644 --- a/src/surf/xml/platf_private.hpp +++ b/src/surf/xml/platf_private.hpp @@ -96,7 +96,7 @@ typedef struct s_sg_platf_cluster_cbarg { const char* prefix; const char* suffix; std::vector* radicals; - double speed; + std::vector speeds; int core_amount; double bw; double lat; diff --git a/src/surf/xml/surfxml_sax_cb.cpp b/src/surf/xml/surfxml_sax_cb.cpp index 63708b1962..cbca3d7461 100644 --- a/src/surf/xml/surfxml_sax_cb.cpp +++ b/src/surf/xml/surfxml_sax_cb.cpp @@ -270,6 +270,28 @@ double surf_parse_get_speed(const char *string, const char *entity_kind, const c "Append 'f' or 'flops' to your speed to get flop per second", "f"); } +static std::vector surf_parse_get_all_speeds(char* speeds, const char* entity_kind, const char* id){ + + std::vector speed_per_pstate; + + if (strchr(speeds, ',') == nullptr){ + double speed = surf_parse_get_speed(speeds, entity_kind, id); + speed_per_pstate.push_back(speed); + } else { + xbt_dynar_t pstate_list = xbt_str_split(speeds, ","); + unsigned int i; + char* speed_str; + xbt_dynar_foreach(pstate_list, i, speed_str) { + xbt_str_trim(speed_str, nullptr); + double speed = surf_parse_get_speed(speed_str,entity_kind, id); + speed_per_pstate.push_back(speed); + XBT_DEBUG("Speed value: %f", speed); + } + xbt_dynar_free(&pstate_list); + } + return speed_per_pstate; +} + /* * All the callback lists that can be overridden anywhere. * (this list should probably be reduced to the bare minimum to allow the models to work) @@ -487,24 +509,7 @@ void ETag_surfxml_host() { host.id = A_surfxml_host_id; - char* buf = A_surfxml_host_speed; - XBT_DEBUG("Buffer: %s", buf); - if (strchr(buf, ',') == nullptr){ - double speed = surf_parse_get_speed(A_surfxml_host_speed,"speed of host", host.id); - host.speed_per_pstate.push_back(speed); - } - else { - xbt_dynar_t pstate_list = xbt_str_split(buf, ","); - unsigned int i; - char* speed_str; - xbt_dynar_foreach(pstate_list, i, speed_str) { - xbt_str_trim(speed_str, nullptr); - double speed = surf_parse_get_speed(speed_str,"speed of host", host.id); - host.speed_per_pstate.push_back(speed); - XBT_DEBUG("Speed value: %f", speed); - } - xbt_dynar_free(&pstate_list); - } + host.speed_per_pstate = surf_parse_get_all_speeds(A_surfxml_host_speed, "speed of host", host.id); XBT_DEBUG("pstate: %s", A_surfxml_host_pstate); host.core_amount = surf_parse_get_int(A_surfxml_host_core); @@ -541,7 +546,7 @@ void ETag_surfxml_cluster(){ cluster.prefix = A_surfxml_cluster_prefix; cluster.suffix = A_surfxml_cluster_suffix; cluster.radicals = explodesRadical(A_surfxml_cluster_radical); - cluster.speed = surf_parse_get_speed(A_surfxml_cluster_speed, "speed of cluster", cluster.id); + cluster.speeds = surf_parse_get_all_speeds(A_surfxml_cluster_speed, "speed of cluster", cluster.id); cluster.core_amount = surf_parse_get_int(A_surfxml_cluster_core); cluster.bw = surf_parse_get_bandwidth(A_surfxml_cluster_bw, "bw of cluster", cluster.id); cluster.lat = surf_parse_get_time(A_surfxml_cluster_lat, "lat of cluster", cluster.id); @@ -588,8 +593,7 @@ void ETag_surfxml_cluster(){ cluster.sharing_policy = SURF_LINK_FATPIPE; break; default: - surf_parse_error("Invalid cluster sharing policy for cluster %s", - cluster.id); + surf_parse_error("Invalid cluster sharing policy for cluster %s", cluster.id); break; } switch (AX_surfxml_cluster_bb___sharing___policy) { @@ -600,8 +604,7 @@ void ETag_surfxml_cluster(){ cluster.bb_sharing_policy = SURF_LINK_SHARED; break; default: - surf_parse_error("Invalid bb sharing policy in cluster %s", - cluster.id); + surf_parse_error("Invalid bb sharing policy in cluster %s", cluster.id); break; } diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 81feb43200..4be1c2fabc 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -1077,6 +1077,7 @@ set(PLATFORMS_EXAMPLES examples/platforms/data_center.xml examples/platforms/dogbone.xml examples/platforms/energy_platform.xml + examples/platforms/energy_cluster.xml examples/platforms/faulty_host.xml examples/platforms/g5k.xml examples/platforms/griffon.xml