X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aa1c2a3c58f59790b6bf2d45908d0e731d68a6c9..b18c943247318ff666cf7811fe5358e985b38cc1:/src/smpi/smpi_bench.c diff --git a/src/smpi/smpi_bench.c b/src/smpi/smpi_bench.c index 6e0b4099a8..480c391f52 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,6 +8,7 @@ #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" @@ -102,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; } @@ -117,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); } @@ -125,7 +127,6 @@ void smpi_execute_flops(double flops) { smx_action_t action; smx_host_t host; host = SIMIX_host_self(); - XBT_DEBUG("Handle real computation time: %f flops", flops); action = simcall_host_execute("computation", host, flops, 1); #ifdef HAVE_TRACING @@ -139,8 +140,21 @@ 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 >= sg_cfg_get_double("smpi/cpu_threshold")) { XBT_DEBUG("Sleep for %f to handle real computation time", duration); - smpi_execute_flops(duration * - sg_cfg_get_double("smpi/running_power")); + double flops = duration * + sg_cfg_get_double("smpi/running_power"); +#ifdef HAVE_TRACING + int rank = smpi_process_index(); + instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); + extra->type=TRACING_COMPUTING; + extra->comp_size=flops; + TRACE_smpi_computing_in(rank, extra); +#endif + smpi_execute_flops(flops); + +#ifdef HAVE_TRACING + TRACE_smpi_computing_out(rank); +#endif + } else { XBT_DEBUG("Real computation took %f while option smpi/cpu_threshold is set to %f => ignore it", duration, sg_cfg_get_double("smpi/cpu_threshold")); @@ -163,8 +177,18 @@ void smpi_bench_end(void) unsigned int smpi_sleep(unsigned int secs) { + smx_action_t action; + smpi_bench_end(); - smpi_execute_flops((double) secs*simcall_host_get_speed(SIMIX_host_self())); + + double flops = (double) secs*simcall_host_get_speed(SIMIX_host_self()); + XBT_DEBUG("Sleep for: %f flops", flops); + action = simcall_host_execute("computation", SIMIX_host_self(), flops, 1); + #ifdef HAVE_TRACING + simcall_set_category (action, TRACE_internal_smpi_get_category()); + #endif + simcall_host_execution_wait(action); + smpi_bench_begin(); return secs; } @@ -218,6 +242,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); @@ -245,6 +271,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); @@ -299,6 +327,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; } @@ -349,33 +378,53 @@ static void smpi_shared_alloc_free(void *p) xbt_free(data); } +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]; + } + } + loc[29] = '\0'; + return loc; +} + void *smpi_shared_malloc(size_t size, const char *file, int line) { - 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; if (sg_cfg_get_boolean("smpi/use_shared_malloc")){ - for(i = 0; i < len; i++) { - /* Make the 'loc' ID be a flat filename */ - if(loc[i] == '/') { - loc[i] = '_'; - } - } + 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_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) { + 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)); + xbt_die("An unhandled error occured while opening %s. shm_open: %s", loc, strerror(errno)); } } data = xbt_new(shared_data_t, 1); @@ -383,17 +432,18 @@ void *smpi_shared_malloc(size_t size, const char *file, int line) 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)); + 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_DEBUG("Shared malloc %zu in %p (metadata at %p)", size, mem, data); - }else{ + } else { mem = xbt_malloc(size); XBT_DEBUG("Classic malloc %zu in %p", size, mem); }