/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include <math.h> // sqrt
#include "private.h"
#include "xbt/dict.h"
#include "xbt/sysdep.h"
#include "xbt/ex.h"
#include "surf/surf.h"
+#include "simgrid/sg_config.h"
+#ifndef WIN32
#include <sys/mman.h>
+#endif
#include <sys/stat.h>
#include <sys/types.h>
#include <errno.h>
#include <fcntl.h>
+#include <math.h> // sqrt
#include <unistd.h>
#include <string.h>
#include <stdio.h>
return (size_t)st.st_size;
}
+#ifndef WIN32
static void* shm_map(int fd, size_t size, shared_data_t* data) {
void* mem;
char loc[PTR_STRLEN];
xbt_die("Could not truncate fd %d to %zu: %s", fd, size, strerror(errno));
}
}
+
mem = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
if(mem == MAP_FAILED) {
xbt_die("Could not map fd %d: %s", fd, strerror(errno));
XBT_DEBUG("MMAP %zu to %p", size, mem);
return mem;
}
+#endif
void smpi_bench_destroy(void)
{
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 >= xbt_cfg_get_double(_surf_cfg_set, "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 *
- xbt_cfg_get_double(_surf_cfg_set,
- "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, xbt_cfg_get_double(_surf_cfg_set, "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();
}
{
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;
}
-int smpi_gettimeofday(struct timeval *tv, struct timezone *tz)
+int smpi_gettimeofday(struct timeval *tv)
{
double now;
smpi_bench_end();
now = SIMIX_get_clock();
if (tv) {
tv->tv_sec = (time_t)now;
+#ifdef WIN32
+ tv->tv_usec = (useconds_t)((now - tv->tv_sec) * 1e6);
+#else
tv->tv_usec = (suseconds_t)((now - tv->tv_sec) * 1e6);
+#endif
}
smpi_bench_begin();
return 0;
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)
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
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;
data->benching = 0;
}
+#ifndef WIN32
void *smpi_shared_malloc(size_t size, const char *file, int line)
{
char *loc = bprintf("%zu_%s_%d", (size_t)getpid(), file, line);
int fd;
void* mem;
shared_data_t *data;
-
- for(i = 0; i < len; i++) {
- /* Make the 'loc' ID be a flat filename */
- if(loc[i] == '/') {
- loc[i] = '_';
- }
- }
- 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));
+ 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] = '_';
}
}
- 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));
+ if (!allocs) {
+ allocs = xbt_dict_new_homogeneous(free);
}
- xbt_dict_set(allocs, loc, data, NULL);
- XBT_DEBUG("Mapping %s at %p through %d", loc, mem, fd);
- } else {
- mem = shm_map(data->fd, size, data);
- data->count++;
+ 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));
+ }
+ }
+ 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));
+ }
+ xbt_dict_set(allocs, loc, data, NULL);
+ XBT_DEBUG("Mapping %s at %p through %d", loc, mem, fd);
+ } else {
+ mem = shm_map(data->fd, size, data);
+ data->count++;
+ }
+ XBT_DEBUG("Shared malloc %zu in %p (metadata at %p)", size, mem, data);
+ }else{
+ 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)
{
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);
+ free(data->loc);
+ XBT_DEBUG("Shared free - with removal - of %p", ptr);
+ }
+ }else{
+ XBT_DEBUG("Classic free of %p", ptr);
+ xbt_free(ptr);
}
}
+#endif
int smpi_shared_known_call(const char* func, const char* input) {
char* loc = bprintf("%s:%s", func, input);
