#include <sys/types.h>
#include "simgrid_config.h"
-
#include <sys/types.h>
#include <xbt/mmalloc.h>
+
+#ifdef HAVE_MC
#include "xbt/mmalloc/mmprivate.h"
+#endif
+#include <simgrid/simix.h>
#include "simix/popping_private.h"
+#include "simix/smx_private.h"
#include "mc_forward.h"
#include "mc_mmalloc.h" // std_heap
#include "mc_memory_map.h"
#include "mc_address_space.h"
+#include "mc_protocol.h"
SG_BEGIN_DECL()
int MC_process_vm_open(pid_t pid, int flags);
-typedef enum {
- MC_PROCESS_NO_FLAG = 0,
- MC_PROCESS_SELF_FLAG = 1,
-} e_mc_process_flags_t;
+typedef int mc_process_flags_t;
+#define MC_PROCESS_NO_FLAG 0
+#define MC_PROCESS_SELF_FLAG 1
// Those flags are used to track down which cached information
// is still up to date and which information needs to be updated.
-typedef enum {
- MC_PROCESS_CACHE_FLAG_HEAP = 1,
- MC_PROCESS_CACHE_FLAG_MALLOC_INFO = 2,
-} e_mc_process_cache_flags_t ;
+typedef int mc_process_cache_flags_t;
+#define MC_PROCESS_CACHE_FLAG_NONE 0
+#define MC_PROCESS_CACHE_FLAG_HEAP 1
+#define MC_PROCESS_CACHE_FLAG_MALLOC_INFO 2
+#define MC_PROCESS_CACHE_FLAG_SIMIX_PROCESSES 4
+
+typedef struct s_mc_smx_process_info s_mc_smx_process_info_t, *mc_smx_process_info_t;
/** Representation of a process
*/
struct s_mc_process {
s_mc_address_space_t address_space;
- e_mc_process_flags_t process_flags;
+ mc_process_flags_t process_flags;
pid_t pid;
int socket;
int status;
size_t object_infos_size;
int memory_file;
- // Cache: don't use those fields directly but with the getters
- // which ensure that proper synchronisation has been done.
-
- e_mc_process_cache_flags_t cache_flags;
+ /** Copy of `simix_global->process_list`
+ *
+ * See mc_smx.c.
+ */
+ xbt_dynar_t smx_process_infos;
- /** Address of the heap structure in the target process.
+ /** Copy of `simix_global->process_to_destroy`
+ *
+ * See mc_smx.c.
*/
+ xbt_dynar_t smx_old_process_infos;
+
+ /** State of the cache (which variables are up to date) */
+ mc_process_cache_flags_t cache_flags;
+
+ /** Address of the heap structure in the MCed process. */
void* heap_address;
/** Copy of the heap structure of the process
/** The corresponding context
*/
void* unw_underlying_context;
+
+ xbt_dynar_t checkpoint_ignore;
};
bool MC_is_process(mc_address_space_t p);
* @param len data size
*/
const void* MC_process_read(mc_process_t process,
- e_adress_space_read_flags_t flags,
+ adress_space_read_flags_t flags,
void* local, const void* remote, size_t len,
int process_index);
+// Simplified versions/wrappers (whould be moved in mc_address_space):
+const void* MC_process_read_simple(mc_process_t process,
+ void* local, const void* remote, size_t len);
+const void* MC_process_read_dynar_element(mc_process_t process,
+ void* local, const void* remote_dynar, size_t i, size_t len);
+unsigned long MC_process_read_dynar_length(mc_process_t process, const void* remote_dynar);
+
/** Write data to a process memory
*
* @param process the process
dw_frame_t MC_process_find_function(mc_process_t process, const void* ip);
+void MC_process_read_variable(mc_process_t process, const char* name, void* target, size_t size);
+char* MC_process_read_string(mc_process_t, void* address);
+
static inline xbt_mheap_t MC_process_get_heap(mc_process_t process)
{
- if (MC_process_is_self(process))
- return std_heap;
if (!(process->cache_flags & MC_PROCESS_CACHE_FLAG_HEAP))
MC_process_refresh_heap(process);
return process->heap;
static inline malloc_info* MC_process_get_malloc_info(mc_process_t process)
{
- if (MC_process_is_self(process))
- return std_heap->heapinfo;
if (!(process->cache_flags & MC_PROCESS_CACHE_FLAG_MALLOC_INFO))
MC_process_refresh_malloc_info(process);
return process->heap_info;
*/
dw_variable_t MC_process_find_variable_by_name(mc_process_t process, const char* name);
+void MC_invalidate_cache(void);
+
SG_END_DECL()
#endif