X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dc3c3416c4cca30fef7c29422d45094687f59893..564a883b3d816d2c5d227f5311d248ef799b5190:/src/include/mc/datatypes.h diff --git a/src/include/mc/datatypes.h b/src/include/mc/datatypes.h index 307e3ea064..401969f990 100644 --- a/src/include/mc/datatypes.h +++ b/src/include/mc/datatypes.h @@ -1,58 +1,37 @@ -/* Copyright (c) 2008-2012. Da SimGrid Team. All rights reserved. */ +/* Copyright (c) 2008-2015. The 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. */ #ifndef MC_DATATYPE_H #define MC_DATATYPE_H -#include "xbt/misc.h" -#include "xbt/swag.h" -#include "xbt/fifo.h" -SG_BEGIN_DECL() - -/******************************* Transitions **********************************/ - -typedef struct s_mc_transition *mc_transition_t; +#include +#include +#ifdef _XBT_WIN32 +# include /* context relative declarations */ +#else +# include /* context relative declarations */ +#endif -/*********** Structures for snapshot comparison **************************/ - -typedef struct s_mc_heap_ignore_region{ - int block; - int fragment; - void *address; - size_t size; -}s_mc_heap_ignore_region_t, *mc_heap_ignore_region_t; +#if HAVE_MC +#include +#endif -typedef struct s_mc_stack_ignore_variable{ - char *var_name; - char *frame; -}s_mc_stack_ignore_variable_t, *mc_stack_ignore_variable_t; +SG_BEGIN_DECL() -typedef struct s_mc_data_bss_ignore_variable{ - void *address; - size_t size; -}s_mc_data_bss_ignore_variable_t, *mc_data_bss_ignore_variable_t; +typedef struct s_mc_transition *mc_transition_t; typedef struct s_stack_region{ void *address; - char *process_name; - void *context; + ucontext_t* context; size_t size; int block; + int process_index; }s_stack_region_t, *stack_region_t; -typedef struct s_heap_equality{ - void *address1; - void *address2; -}s_heap_equality_t, *heap_equality_t; - -void heap_equality_free_voidp(void *e); -void stack_region_free_voidp(void *s); - -void heap_ignore_region_free(mc_heap_ignore_region_t r); -void heap_ignore_region_free_voidp(void *r); - SG_END_DECL() + #endif /* _MC_MC_H */