#ifndef XBT_MODINTER_H
#define XBT_MODINTER_H
#include "xbt/misc.h"
+#include "xbt/mmalloc.h"
SG_BEGIN_DECL
void xbt_dict_preinit(void);
void xbt_dict_postexit(void);
-void* mmalloc_preinit(void);
+xbt_mheap_t mmalloc_preinit(void);
void mmalloc_postexit(void);
extern int xbt_initialized;
RemoteProcess::RemoteProcess(pid_t pid) : AddressSpace(this), pid_(pid), running_(true) {}
-void RemoteProcess::init(void* mmalloc_default_mdp, void* maxpid, void* actors, void* dead_actors)
+void RemoteProcess::init(xbt_mheap_t mmalloc_default_mdp, void* maxpid, void* actors, void* dead_actors)
{
this->heap_address = mmalloc_default_mdp;
this->maxpid_addr_ = maxpid;
public:
explicit RemoteProcess(pid_t pid);
~RemoteProcess() override;
- void init(void* mmalloc_default_mdp, void* maxpid, void* actors, void* dead_actors);
+ void init(xbt_mheap_t mmalloc_default_mdp, void* maxpid, void* actors, void* dead_actors);
RemoteProcess(RemoteProcess const&) = delete;
RemoteProcess(RemoteProcess&&) = delete;
public:
/** Address of the heap structure in the MCed process. */
- void* heap_address;
+ xbt_mheap_t heap_address;
/** Copy of the heap structure of the process
*
#include "simgrid/forward.h" // aid_t
#include <array>
#include <cstdint>
+#include <xbt/mmalloc.h>
#include <xbt/utility.hpp>
// ***** Messages
/* Client->Server */
struct s_mc_message_initial_addresses_t {
simgrid::mc::MessageType type;
- void* mmalloc_default_mdp;
+ xbt_mheap_t mmalloc_default_mdp;
void* maxpid;
void* actors;
void* dead_actors;
}
/* Initialize the default malloc descriptor. */
-void *mmalloc_preinit(void)
+xbt_mheap_t mmalloc_preinit(void)
{
if (__mmalloc_default_mdp == NULL) {
if(!xbt_pagesize)