+/* Copyright (c) 2018-2020. 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 <simgrid/plugins/load_balancer.h>
#include <simgrid/s4u/Actor.hpp>
-#include <smpi/sampi.h>
-#include <src/smpi/include/smpi_comm.hpp>
+#include <src/instr/instr_smpi.hpp>
#include <src/smpi/include/smpi_actor.hpp>
+#include <src/smpi/include/smpi_comm.hpp>
#include <src/smpi/plugins/ampi/instr_ampi.hpp>
-#include <src/instr/instr_smpi.hpp>
#include <xbt/replay.hpp>
+#include <xbt/sysdep.h>
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(plugin_pampi, smpi, "Logging specific to the AMPI functions");
+#include "ampi.hpp"
+#include <smpi/sampi.h>
-extern "C" void* __libc_malloc(size_t size);
-extern "C" void* __libc_free(void* ptr);
static std::vector<size_t> memory_size(500, 0); // FIXME cheinrich This needs to be dynamic
static std::map</*address*/ void*, size_t> alloc_table; // Keep track of all allocations
extern "C" void* _sampi_malloc(size_t size)
{
- void* result = __libc_malloc (size); // We need the space here to prevent recursive substitution
+ void* result = xbt_malloc(size);
alloc_table.insert({result, size});
if (not simgrid::s4u::this_actor::is_maestro()) {
memory_size[simgrid::s4u::this_actor::get_pid()] += size;
size_t alloc_size = alloc_table.at(ptr);
int my_proc_id = simgrid::s4u::this_actor::get_pid();
memory_size[my_proc_id] -= alloc_size;
- __libc_free(ptr);
+ xbt_free(ptr);
+}
+
+extern "C" void* _sampi_calloc(size_t num_elm, size_t elem_size)
+{
+ void* result = xbt_malloc0(num_elm * elem_size);
+ alloc_table.insert({result, num_elm * elem_size});
+ if (not simgrid::s4u::this_actor::is_maestro()) {
+ memory_size[simgrid::s4u::this_actor::get_pid()] += num_elm * elem_size;
+ }
+ return result;
+}
+extern "C" void* _sampi_realloc(void* ptr, size_t size)
+{
+ void* result = xbt_realloc(ptr, size);
+ int old_size = alloc_table.at(ptr);
+ alloc_table.erase(ptr);
+ alloc_table.insert({result, size});
+ if (not simgrid::s4u::this_actor::is_maestro()) {
+ memory_size[simgrid::s4u::this_actor::get_pid()] += size - old_size;
+ }
+ return result;
}
namespace simgrid {
namespace smpi {
namespace plugin {
namespace ampi {
- simgrid::xbt::signal<void(simgrid::s4u::ActorPtr)> on_iteration_in;
- simgrid::xbt::signal<void(simgrid::s4u::ActorPtr)> on_iteration_out;
+simgrid::xbt::signal<void(simgrid::s4u::Actor const&)> on_iteration_in;
+simgrid::xbt::signal<void(simgrid::s4u::Actor const&)> on_iteration_out;
}
}
}