-/* 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
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;
}
void smpi_bench_destroy(void)
{
xbt_dict_free(&allocs);
+ xbt_dict_free(&allocs_metadata);
xbt_dict_free(&samples);
xbt_dict_free(&calls);
}
}
#ifndef WIN32
+static void smpi_shared_alloc_free(void *p)
+{
+ shared_data_t *data = p;
+ xbt_free(data->loc);
+ xbt_free(data);
+}
+
void *smpi_shared_malloc(size_t size, const char *file, int line)
{
char *loc = bprintf("%zu_%s_%d", (size_t)getpid(), file, line);
}
}
if (!allocs) {
- allocs = xbt_dict_new_homogeneous(free);
+ allocs = xbt_dict_new_homogeneous(smpi_shared_alloc_free);
}
data = xbt_dict_get_or_null(allocs, loc);
if(!data) {
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++;
}
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{