X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/15badc71ce964f6dae6428c9a4c0198fad5d4936..314c3d6a9ae66376eb5c1bc5f63b29e45e061051:/src/include/mc/datatypes.h diff --git a/src/include/mc/datatypes.h b/src/include/mc/datatypes.h index 656541b87a..28e76d6055 100644 --- a/src/include/mc/datatypes.h +++ b/src/include/mc/datatypes.h @@ -1,62 +1,33 @@ -/* 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 -/*********** 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; +#ifdef HAVE_UCONTEXT_H +#include /* context relative declarations */ +#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; +#ifdef HAVE_UCONTEXT_H + ucontext_t* context; +#endif 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); -void data_bss_ignore_variable_free(mc_data_bss_ignore_variable_t v); -void data_bss_ignore_variable_free_voidp(void *v); -void stack_ignore_variable_free(mc_stack_ignore_variable_t v); -void stack_ignore_variable_free_voidp(void *v); - SG_END_DECL() + #endif /* _MC_MC_H */