X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e4abd3f271729beeff499da36267bfb274dd1f6d..f7d3e337e64b54125c8a990a99583383a6bf9780:/src/smpi/smpi_bench.c diff --git a/src/smpi/smpi_bench.c b/src/smpi/smpi_bench.c index 2732ec9be7..915a5a543e 100644 --- a/src/smpi/smpi_bench.c +++ b/src/smpi/smpi_bench.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2007, 2009, 2010. The SimGrid Team. +/* Copyright (c) 2007, 2009-2013. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -8,7 +8,9 @@ #include "xbt/dict.h" #include "xbt/sysdep.h" #include "xbt/ex.h" +#include "xbt/hash.h" #include "surf/surf.h" +#include "simgrid/sg_config.h" #ifndef WIN32 #include @@ -101,13 +103,13 @@ static void* shm_map(int fd, size_t size, shared_data_t* data) { xbt_die("Could not map fd %d: %s", fd, strerror(errno)); } if(!allocs_metadata) { - allocs_metadata = xbt_dict_new(); + allocs_metadata = xbt_dict_new_homogeneous(xbt_free); } snprintf(loc, PTR_STRLEN, "%p", mem); meta = xbt_new(shared_metadata_t, 1); meta->size = size; meta->data = data; - xbt_dict_set(allocs_metadata, loc, meta, &free); + xbt_dict_set(allocs_metadata, loc, meta, NULL); XBT_DEBUG("MMAP %zu to %p", size, mem); return mem; } @@ -116,6 +118,7 @@ static void* shm_map(int fd, size_t size, shared_data_t* data) { void smpi_bench_destroy(void) { xbt_dict_free(&allocs); + xbt_dict_free(&allocs_metadata); xbt_dict_free(&samples); xbt_dict_free(&calls); } @@ -136,19 +139,19 @@ void smpi_execute_flops(double flops) { static void smpi_execute(double duration) { /* FIXME: a global variable would be less expensive to consult than a call to xbt_cfg_get_double() right on the critical path */ - if (duration >= surf_cfg_get_double("smpi/cpu_threshold")) { + if (duration >= sg_cfg_get_double("smpi/cpu_threshold")) { XBT_DEBUG("Sleep for %f to handle real computation time", duration); smpi_execute_flops(duration * - surf_cfg_get_double("smpi/running_power")); + sg_cfg_get_double("smpi/running_power")); } else { XBT_DEBUG("Real computation took %f while option smpi/cpu_threshold is set to %f => ignore it", - duration, surf_cfg_get_double("smpi/cpu_threshold")); + duration, sg_cfg_get_double("smpi/cpu_threshold")); } } void smpi_bench_begin(void) { - xbt_os_timer_start(smpi_process_timer()); + xbt_os_threadtimer_start(smpi_process_timer()); smpi_current_rank = smpi_process_index(); } @@ -156,14 +159,14 @@ void smpi_bench_end(void) { xbt_os_timer_t timer = smpi_process_timer(); - xbt_os_timer_stop(timer); + xbt_os_threadtimer_stop(timer); smpi_execute(xbt_os_timer_elapsed(timer)); } unsigned int smpi_sleep(unsigned int secs) { smpi_bench_end(); - smpi_execute((double) secs); + smpi_execute_flops((double) secs*simcall_host_get_speed(SIMIX_host_self())); smpi_bench_begin(); return secs; } @@ -217,6 +220,8 @@ typedef struct { int benching; /* 1: we are benchmarking; 0: we have enough data, no bench anymore */ } local_data_t; +int smpi_sample_is_running = 0; + static char *sample_location(int global, const char *file, int line) { if (global) { return bprintf("%s:%d", file, line); @@ -244,6 +249,8 @@ void smpi_sample_1(int global, const char *file, int line, int iters, double thr local_data_t *data; smpi_bench_end(); /* Take time from previous, unrelated computation into account */ + smpi_sample_is_running++; + if (!samples) samples = xbt_dict_new_homogeneous(free); @@ -272,7 +279,7 @@ void smpi_sample_1(int global, const char *file, int line, int iters, double thr data->benching = !sample_enough_benchs(data); XBT_DEBUG("XXXX Re-entering the benched nest %s. %s",loc, (data->benching?"more benching needed":"we have enough data, skip computes")); } - free(loc); + xbt_free(loc); } int smpi_sample_2(int global, const char *file, int line) @@ -283,7 +290,7 @@ int smpi_sample_2(int global, const char *file, int line) xbt_assert(samples, "Y U NO use SMPI_SAMPLE_* macros? Stop messing directly with smpi_sample_* functions!"); data = xbt_dict_get(samples, loc); XBT_DEBUG("sample2 %s",loc); - free(loc); + xbt_free(loc); if (data->benching==1) { // we need to run a new bench @@ -298,6 +305,7 @@ int smpi_sample_2(int global, const char *file, int line) data->count, data->iters, data->relstderr, data->threshold, data->mean); smpi_execute(data->mean); + smpi_sample_is_running--; smpi_bench_begin(); // prepare to capture future, unrelated computations return 0; } @@ -312,13 +320,14 @@ void smpi_sample_3(int global, const char *file, int line) xbt_assert(samples, "Y U NO use SMPI_SAMPLE_* macros? Stop messing directly with smpi_sample_* functions!"); data = xbt_dict_get(samples, loc); XBT_DEBUG("sample3 %s",loc); + xbt_free(loc); if (data->benching==0) { THROW_IMPOSSIBLE; } // ok, benchmarking this loop is over - xbt_os_timer_stop(smpi_process_timer()); + xbt_os_threadtimer_stop(smpi_process_timer()); // update the stats double sample, n; @@ -340,50 +349,83 @@ void smpi_sample_3(int global, const char *file, int line) } #ifndef WIN32 -void *smpi_shared_malloc(size_t size, const char *file, int line) +static void smpi_shared_alloc_free(void *p) { - char *loc = bprintf("%zu_%s_%d", (size_t)getpid(), file, line); - size_t len = strlen(loc); - size_t i; - int fd; - void* mem; - shared_data_t *data; + shared_data_t *data = p; + xbt_free(data->loc); + xbt_free(data); +} - for(i = 0; i < len; i++) { - /* Make the 'loc' ID be a flat filename */ - if(loc[i] == '/') { - loc[i] = '_'; +static char *smpi_shared_alloc_hash(char *loc) +{ + char hash[42]; + char s[7]; + unsigned val; + int i, j; + + xbt_sha(loc, hash); + hash[41] = '\0'; + s[6] = '\0'; + loc = xbt_realloc(loc, 30); + loc[0] = '/'; + for (i = 0; i < 40; i += 6) { /* base64 encode */ + memcpy(s, hash + i, 6); + val = strtoul(s, NULL, 16); + for (j = 0; j < 4; j++) { + unsigned char x = (val >> (18 - 3 * j)) & 0x3f; + loc[1 + 4 * i / 6 + j] = + "ABCDEFGHIJKLMNOPQRSTUVZXYZabcdefghijklmnopqrstuvzxyz0123456789-_"[x]; } } - if (!allocs) { - allocs = xbt_dict_new_homogeneous(free); - } - data = xbt_dict_get_or_null(allocs, loc); - if(!data) { - fd = shm_open(loc, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); - if(fd < 0) { - switch(errno) { - case EEXIST: - xbt_die("Please cleanup /dev/shm/%s", loc); - default: - xbt_die("An unhandled error occured while opening %s: %s", loc, strerror(errno)); - } + loc[29] = '\0'; + return loc; +} + +void *smpi_shared_malloc(size_t size, const char *file, int line) +{ + void* mem; + if (sg_cfg_get_boolean("smpi/use_shared_malloc")){ + char *loc = bprintf("%zu_%s_%d", (size_t)getpid(), file, line); + int fd; + shared_data_t *data; + loc = smpi_shared_alloc_hash(loc); /* hash loc, in order to have something + * not too long */ + if (!allocs) { + allocs = xbt_dict_new_homogeneous(smpi_shared_alloc_free); } - data = xbt_new(shared_data_t, 1); - data->fd = fd; - data->count = 1; - data->loc = loc; - mem = shm_map(fd, size, data); - if(shm_unlink(loc) < 0) { - XBT_WARN("Could not early unlink %s: %s", loc, strerror(errno)); + data = xbt_dict_get_or_null(allocs, loc); + if (!data) { + fd = shm_open(loc, O_RDWR | O_CREAT | O_EXCL, + S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); + if (fd < 0) { + switch(errno) { + case EEXIST: + xbt_die("Please cleanup /dev/shm/%s", loc); + default: + xbt_die("An unhandled error occured while opening %s. shm_open: %s", loc, strerror(errno)); + } + } + data = xbt_new(shared_data_t, 1); + data->fd = fd; + data->count = 1; + data->loc = loc; + mem = shm_map(fd, size, data); + if (shm_unlink(loc) < 0) { + XBT_WARN("Could not early unlink %s. shm_unlink: %s", loc, strerror(errno)); + } + xbt_dict_set(allocs, loc, data, NULL); + XBT_DEBUG("Mapping %s at %p through %d", loc, mem, fd); + } else { + xbt_free(loc); + mem = shm_map(data->fd, size, data); + data->count++; } - xbt_dict_set(allocs, loc, data, NULL); - XBT_DEBUG("Mapping %s at %p through %d", loc, mem, fd); + XBT_DEBUG("Shared malloc %zu in %p (metadata at %p)", size, mem, data); } else { - mem = shm_map(data->fd, size, data); - data->count++; + mem = xbt_malloc(size); + XBT_DEBUG("Classic malloc %zu in %p", size, mem); } - XBT_DEBUG("Malloc %zu in %p (metadata at %p)", size, mem, data); + return mem; } void smpi_shared_free(void *ptr) @@ -391,33 +433,39 @@ void smpi_shared_free(void *ptr) char loc[PTR_STRLEN]; shared_metadata_t* meta; shared_data_t* data; - - if (!allocs) { - XBT_WARN("Cannot free: nothing was allocated"); - return; - } - if(!allocs_metadata) { - XBT_WARN("Cannot free: no metadata was allocated"); - } - snprintf(loc, PTR_STRLEN, "%p", ptr); - meta = (shared_metadata_t*)xbt_dict_get_or_null(allocs_metadata, loc); - if (!meta) { - XBT_WARN("Cannot free: %p was not shared-allocated by SMPI", ptr); - return; - } - data = meta->data; - if(!data) { - XBT_WARN("Cannot free: something is broken in the metadata link"); - return; - } - if(munmap(ptr, meta->size) < 0) { - XBT_WARN("Unmapping of fd %d failed: %s", data->fd, strerror(errno)); - } - data->count--; - if (data->count <= 0) { - close(data->fd); - xbt_dict_remove(allocs, data->loc); - free(data->loc); + if (sg_cfg_get_boolean("smpi/use_shared_malloc")){ + + if (!allocs) { + XBT_WARN("Cannot free: nothing was allocated"); + return; + } + if(!allocs_metadata) { + XBT_WARN("Cannot free: no metadata was allocated"); + } + snprintf(loc, PTR_STRLEN, "%p", ptr); + meta = (shared_metadata_t*)xbt_dict_get_or_null(allocs_metadata, loc); + if (!meta) { + XBT_WARN("Cannot free: %p was not shared-allocated by SMPI", ptr); + return; + } + data = meta->data; + if(!data) { + XBT_WARN("Cannot free: something is broken in the metadata link"); + return; + } + if(munmap(ptr, meta->size) < 0) { + XBT_WARN("Unmapping of fd %d failed: %s", data->fd, strerror(errno)); + } + data->count--; + XBT_DEBUG("Shared free - no removal - of %p, count = %d", ptr, data->count); + if (data->count <= 0) { + close(data->fd); + xbt_dict_remove(allocs, data->loc); + XBT_DEBUG("Shared free - with removal - of %p", ptr); + } + }else{ + XBT_DEBUG("Classic free of %p", ptr); + xbt_free(ptr); } } #endif