A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make my previous commit also compile under MC (sorry)
[simgrid.git]
/
src
/
mc
/
mc_private.h
diff --git
a/src/mc/mc_private.h
b/src/mc/mc_private.h
index
c06613e
..
1147044
100644
(file)
--- a/
src/mc/mc_private.h
+++ b/
src/mc/mc_private.h
@@
-31,6
+31,7
@@
#include "xbt/parmap.h"
#include "mc_mmu.h"
#include "mc_page_store.h"
#include "xbt/parmap.h"
#include "mc_mmu.h"
#include "mc_page_store.h"
+#include "mc_interface.h"
SG_BEGIN_DECL()
SG_BEGIN_DECL()
@@
-39,7
+40,7
@@
typedef struct s_mc_function_index_item s_mc_function_index_item_t, *mc_function
/****************************** Snapshots ***********************************/
/****************************** Snapshots ***********************************/
-#define NB_REGIONS 3 /* binary data (data + BSS) (type = 2), libsimgrid data (data + BSS) (type = 1), std_heap (type = 0)*/
+#define NB_REGIONS 3 /* binary data (data + BSS) (type = 2), libsimgrid data (data + BSS) (type = 1), std_heap (type = 0)*/
/** @brief Copy/snapshot of a given memory region
*
/** @brief Copy/snapshot of a given memory region
*
@@
-105,7
+106,7
@@
typedef struct s_mc_snapshot{
xbt_dynar_t to_ignore;
uint64_t hash;
xbt_dynar_t ignored_data;
xbt_dynar_t to_ignore;
uint64_t hash;
xbt_dynar_t ignored_data;
-} s_mc_snapshot_t
, *mc_snapshot_t
;
+} s_mc_snapshot_t;
/** @brief Process index used when no process is available
*
/** @brief Process index used when no process is available
*
@@
-167,7
+168,6
@@
typedef struct s_mc_checkpoint_ignore_region{
static void* mc_snapshot_get_heap_end(mc_snapshot_t snapshot);
static void* mc_snapshot_get_heap_end(mc_snapshot_t snapshot);
-mc_snapshot_t SIMIX_pre_mc_snapshot(smx_simcall_t simcall);
mc_snapshot_t MC_take_snapshot(int num_state);
void MC_restore_snapshot(mc_snapshot_t);
void MC_free_snapshot(mc_snapshot_t);
mc_snapshot_t MC_take_snapshot(int num_state);
void MC_restore_snapshot(mc_snapshot_t);
void MC_free_snapshot(mc_snapshot_t);
@@
-235,7
+235,6
@@
void MC_wait_for_requests(void);
void MC_show_deadlock(smx_simcall_t req);
void MC_show_stack_safety(xbt_fifo_t stack);
void MC_dump_stack_safety(xbt_fifo_t stack);
void MC_show_deadlock(smx_simcall_t req);
void MC_show_stack_safety(xbt_fifo_t stack);
void MC_dump_stack_safety(xbt_fifo_t stack);
-int SIMIX_pre_mc_random(smx_simcall_t simcall, int min, int max);
extern xbt_fifo_t mc_stack;
int get_search_interval(xbt_dynar_t list, void *ref, int *min, int *max);
extern xbt_fifo_t mc_stack;
int get_search_interval(xbt_dynar_t list, void *ref, int *min, int *max);
@@
-319,8
+318,8
@@
void MC_print_statistics(mc_stats_t);
/* Normally the system should operate in std, for switching to raw mode */
/* you must wrap the code between MC_SET_RAW_MODE and MC_UNSET_RAW_MODE */
/* Normally the system should operate in std, for switching to raw mode */
/* you must wrap the code between MC_SET_RAW_MODE and MC_UNSET_RAW_MODE */
-extern
void *
std_heap;
-extern
void *
mc_heap;
+extern
xbt_mheap_t
std_heap;
+extern
xbt_mheap_t
mc_heap;
/* FIXME: Horrible hack! because the mmalloc library doesn't provide yet of */
/* FIXME: Horrible hack! because the mmalloc library doesn't provide yet of */
@@
-388,7
+387,6
@@
extern __thread mc_comparison_times_t mc_comp_times;
extern __thread double mc_snapshot_comparison_time;
int snapshot_compare(void *state1, void *state2);
extern __thread double mc_snapshot_comparison_time;
int snapshot_compare(void *state1, void *state2);
-int SIMIX_pre_mc_compare_snapshots(smx_simcall_t simcall, mc_snapshot_t s1, mc_snapshot_t s2);
void print_comparison_times(void);
//#define MC_DEBUG 1
void print_comparison_times(void);
//#define MC_DEBUG 1
@@
-755,7
+753,7
@@
static inline __attribute__ ((always_inline))
void* mc_snapshot_get_heap_end(mc_snapshot_t snapshot) {
if(snapshot==NULL)
xbt_die("snapshot is NULL");
void* mc_snapshot_get_heap_end(mc_snapshot_t snapshot) {
if(snapshot==NULL)
xbt_die("snapshot is NULL");
- void** addr = &(
(xbt_mheap_t)std_heap)->breakval
;
+ void** addr = &(
std_heap->breakval)
;
return mc_snapshot_read_pointer(addr, snapshot, MC_ANY_PROCESS_INDEX);
}
return mc_snapshot_read_pointer(addr, snapshot, MC_ANY_PROCESS_INDEX);
}
@@
-818,4
+816,3
@@
void* mc_snapshot_read_pointer_region(void* addr, mc_mem_region_t region)
SG_END_DECL()
#endif
SG_END_DECL()
#endif
-