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
model-checker : merge conflict resolved
[simgrid.git]
/
src
/
mc
/
mc_private.h
diff --git
a/src/mc/mc_private.h
b/src/mc/mc_private.h
index
6309724
..
179f7bb
100644
(file)
--- a/
src/mc/mc_private.h
+++ b/
src/mc/mc_private.h
@@
-1,4
+1,4
@@
-/* Copyright (c) 2007-201
1
Da SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-201
2
Da 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. */
/* 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. */
@@
-39,7
+39,6
@@
extern char *prog_name;
void MC_take_snapshot(mc_snapshot_t);
void MC_take_snapshot_liveness(mc_snapshot_t s);
void MC_take_snapshot(mc_snapshot_t);
void MC_take_snapshot_liveness(mc_snapshot_t s);
-void MC_take_snapshot_to_restore_liveness(mc_snapshot_t s);
void MC_restore_snapshot(mc_snapshot_t);
void MC_free_snapshot(mc_snapshot_t);
void MC_restore_snapshot(mc_snapshot_t);
void MC_free_snapshot(mc_snapshot_t);
@@
-139,7
+138,6
@@
void MC_print_statistics_pairs(mc_stats_pair_t);
extern void *std_heap;
extern void *raw_heap;
extern void *std_heap;
extern void *raw_heap;
-/* extern int raw_heap_fd; */ /* unused */
#define STD_HEAP_SIZE 20480000 /* Maximum size of the system's heap */
/* FIXME: Horrible hack! because the mmalloc library doesn't provide yet of */
#define STD_HEAP_SIZE 20480000 /* Maximum size of the system's heap */
/* FIXME: Horrible hack! because the mmalloc library doesn't provide yet of */
@@
-174,11
+172,11
@@
typedef struct s_map_region {
unsigned long inode; /* Inode in the device */
char *pathname; /* Path name of the mapped file */
unsigned long inode; /* Inode in the device */
char *pathname; /* Path name of the mapped file */
-} s_map_region;
+} s_map_region
_t
;
typedef struct s_memory_map {
typedef struct s_memory_map {
- s_map_region
*regions;
/* Pointer to an array of regions */
+ s_map_region
_t *regions;
/* Pointer to an array of regions */
int mapsize; /* Number of regions in the memory */
} s_memory_map_t, *memory_map_t;
int mapsize; /* Number of regions in the memory */
} s_memory_map_t, *memory_map_t;