Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

[simgrid.git] / src / include / mc / datatypes.h

diff --git a/src/include/mc/datatypes.h b/src/include/mc/datatypes.h
index d13ce8c..c33ed9b 100644 (file)
--- a/src/include/mc/datatypes.h
+++ b/src/include/mc/datatypes.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2013. The SimGrid Team.
+/* Copyright (c) 2008-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -6,12 +6,15 @@
 
 #ifndef MC_DATATYPE_H
 #define MC_DATATYPE_H
+
 #include "xbt/misc.h"
 #include "xbt/swag.h"
 #include "xbt/fifo.h"
 
+#if HAVE_MC
 #include <libunwind.h>
 #include <dwarf.h>
+#endif 
 
 SG_BEGIN_DECL()
 
@@ -19,7 +22,6 @@ SG_BEGIN_DECL()
 
 typedef struct s_mc_transition *mc_transition_t;
 
-
 /*********** Structures for snapshot comparison **************************/
 
 typedef struct s_mc_heap_ignore_region{
@@ -31,32 +33,13 @@ typedef struct s_mc_heap_ignore_region{
 
 typedef struct s_stack_region{
   void *address;
-  char *process_name;
   void *context;
   size_t size;
   int block;
+  int process_index;
 }s_stack_region_t, *stack_region_t;
 
-void heap_ignore_region_free(mc_heap_ignore_region_t r);
-void heap_ignore_region_free_voidp(void *r);
-
 /************ DWARF structures *************/
 
-typedef int e_dw_type_type;
-
-typedef struct s_dw_type{
-  e_dw_type_type type;
-  void *id; /* Offset in the section (in hexadecimal form) */
-  char *name; /* Name of the type */
-  int byte_size; /* Size in bytes */
-  int element_count; /* Number of elements for array type */
-  char *dw_type_id; /* DW_AT_type */
-  xbt_dynar_t members; /* if DW_TAG_structure_type, DW_TAG_union_type*/
-  int is_pointer_type;
-  int offset;
-}s_dw_type_t, *dw_type_t;
-
-char* get_type_description(xbt_dict_t types, char *type_name);
-
 SG_END_DECL()
 #endif                          /* _MC_MC_H */