-/* Copyright (c) 2007-2020. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2021. The SimGrid Team. All rights reserved. */
/* 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 <map>
+#include <array>
#include <cstring>
+#include <map>
#include "private.hpp"
#include "xbt/config.hpp"
+#include "xbt/file.hpp"
#include <cerrno>
#ifndef WIN32
#include <sys/mman.h>
#endif
-#include <cstdio>
-#include <fcntl.h>
-#include <sys/stat.h>
-
+#include <stdlib.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include "smpi_utils.hpp"
#ifndef MAP_ANONYMOUS
#define MAP_ANONYMOUS MAP_ANON
#endif
};
std::unordered_map<smpi_source_location, shared_data_t, std::hash<std::string>> allocs;
-typedef decltype(allocs)::value_type shared_data_key_type;
+using shared_data_key_type = decltype(allocs)::value_type;
struct shared_metadata_t {
size_t size;
};
std::map<const void*, shared_metadata_t> allocs_metadata;
-std::map<std::string, void*> calls;
+std::map<std::string, void*, std::less<>> calls;
#ifndef WIN32
-static int smpi_shared_malloc_bogusfile = -1;
-static int smpi_shared_malloc_bogusfile_huge_page = -1;
-static unsigned long smpi_shared_malloc_blocksize = 1UL << 20;
+int smpi_shared_malloc_bogusfile = -1;
+int smpi_shared_malloc_bogusfile_huge_page = -1;
+unsigned long smpi_shared_malloc_blocksize = 1UL << 20;
#endif
}
-
void smpi_shared_destroy()
{
allocs.clear();
* The others are not.
*/
-void* smpi_shared_malloc_partial(size_t size, size_t* shared_block_offsets, int nb_shared_blocks)
+void* smpi_shared_malloc_partial(size_t size, const size_t* shared_block_offsets, int nb_shared_blocks)
{
std::string huge_page_mount_point = simgrid::config::get_value<std::string>("smpi/shared-malloc-hugepage");
bool use_huge_page = not huge_page_mount_point.empty();
smpi_shared_malloc_bogusfile = mkstemp(name);
XBT_DEBUG("bogusfile : %s\n", name);
unlink(name);
- const char* dumb = new char[smpi_shared_malloc_blocksize](); // zero initialized
- ssize_t err = write(smpi_shared_malloc_bogusfile, dumb, smpi_shared_malloc_blocksize);
- if(err<0)
- xbt_die("Could not write bogus file for shared malloc");
- delete[] dumb;
+ xbt_assert(ftruncate(smpi_shared_malloc_bogusfile, smpi_shared_malloc_blocksize) == 0,
+ "Could not write bogus file for shared malloc");
}
int mmap_base_flag = MAP_FIXED | MAP_SHARED | MAP_POPULATE;
void* smpi_shared_malloc_intercept(size_t size, const char* file, int line)
{
- if( smpi_cfg_auto_shared_malloc_thresh() == 0 || size < smpi_cfg_auto_shared_malloc_thresh())
- return ::operator new(size);
- else
+ if( smpi_cfg_auto_shared_malloc_thresh() == 0 || size < smpi_cfg_auto_shared_malloc_thresh()){
+ void* ptr = ::operator new(size);
+ if(not smpi_cfg_trace_call_use_absolute_path())
+ simgrid::smpi::utils::account_malloc_size(size, simgrid::xbt::Path(file).get_base_name(), line, ptr);
+ else
+ simgrid::smpi::utils::account_malloc_size(size, file, line, ptr);
+ return ptr;
+ } else {
+ simgrid::smpi::utils::account_shared_size(size);
return smpi_shared_malloc(size, file, line);
+ }
}
void* smpi_shared_calloc_intercept(size_t num_elm, size_t elem_size, const char* file, int line)
{
- if( smpi_cfg_auto_shared_malloc_thresh() == 0 || elem_size*num_elm < smpi_cfg_auto_shared_malloc_thresh()){
- void* ptr = ::operator new(elem_size*num_elm);
- memset(ptr, 0, elem_size*num_elm);
+ size_t size = elem_size * num_elm;
+ if (smpi_cfg_auto_shared_malloc_thresh() == 0 || size < smpi_cfg_auto_shared_malloc_thresh()) {
+ void* ptr = ::operator new(size);
+ if(not smpi_cfg_trace_call_use_absolute_path())
+ simgrid::smpi::utils::account_malloc_size(size, simgrid::xbt::Path(file).get_base_name(), line, ptr);
+ else
+ simgrid::smpi::utils::account_malloc_size(size, file, line, ptr);
+ memset(ptr, 0, size);
return ptr;
- } else
- return smpi_shared_malloc(elem_size*num_elm, file, line);
+ } else {
+ simgrid::smpi::utils::account_shared_size(size);
+ return memset(smpi_shared_malloc(size, file, line), 0, size);
+ }
+}
+
+void* smpi_shared_realloc_intercept(void* data, size_t size, const char* file, int line)
+{
+ // FIXME
+ static bool already_warned = false;
+ if (not already_warned) {
+ XBT_WARN("%s:%d: using realloc() with SMPI malloc interception is currently not well supported. "
+ "You may want to recompile with -DSMPI_NO_OVERRIDE_MALLOC",
+ file, line);
+ already_warned = true;
+ }
+ return realloc(data, size);
}
void* smpi_shared_malloc(size_t size, const char* file, int line)
return smpi_shared_malloc_local(size, file, line);
} else if (smpi_cfg_shared_malloc() == SharedMallocType::GLOBAL) {
int nb_shared_blocks = 1;
- size_t shared_block_offsets[2] = {0, size};
- return smpi_shared_malloc_partial(size, shared_block_offsets, nb_shared_blocks);
+ const std::array<size_t, 2> shared_block_offsets = {{0, size}};
+ return smpi_shared_malloc_partial(size, shared_block_offsets.data(), nb_shared_blocks);
}
XBT_DEBUG("Classic allocation of %zu bytes", size);
return ::operator new(size);
void smpi_shared_free(void *ptr)
{
+ simgrid::smpi::utils::account_free(ptr);
if (smpi_cfg_shared_malloc() == SharedMallocType::LOCAL) {
auto meta = allocs_metadata.find(ptr);
if (meta == allocs_metadata.end()) {