X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d0ffc37686edcc803601f76ab51fdfed5fc2f241..29b2bf945239b1950c277f4afff78e8ea327000a:/src/mc/mc_pair.c diff --git a/src/mc/mc_pair.c b/src/mc/mc_pair.c index 1056f444c1..29910e6cff 100644 --- a/src/mc/mc_pair.c +++ b/src/mc/mc_pair.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2013. The SimGrid Team. +/* Copyright (c) 2013-2014. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -6,7 +6,8 @@ #include "mc_private.h" -mc_pair_t MC_pair_new(){ +mc_pair_t MC_pair_new() +{ mc_pair_t p = NULL; p = xbt_new0(s_mc_pair_t, 1); p->num = ++mc_stats->expanded_pairs; @@ -14,36 +15,8 @@ mc_pair_t MC_pair_new(){ return p; } -mc_visited_pair_t MC_visited_pair_new(int pair_num, xbt_automaton_state_t automaton_state, xbt_dynar_t atomic_propositions){ - mc_visited_pair_t pair = NULL; - pair = xbt_new0(s_mc_visited_pair_t, 1); - pair->graph_state = MC_state_new(); - pair->graph_state->system_state = MC_take_snapshot(pair_num); - pair->heap_bytes_used = mmalloc_get_bytes_used(std_heap); - pair->nb_processes = xbt_swag_size(simix_global->process_list); - pair->automaton_state = automaton_state; - pair->num = pair_num; - pair->other_num = -1; - pair->acceptance_removed = 0; - pair->visited_removed = 0; - pair->acceptance_pair = 0; - pair->atomic_propositions = xbt_dynar_new(sizeof(int), NULL); - unsigned int cursor = 0; - int value; - xbt_dynar_foreach(atomic_propositions, cursor, value) - xbt_dynar_push_as(pair->atomic_propositions, int, value); - return pair; -} - -void MC_visited_pair_delete(mc_visited_pair_t p){ - p->automaton_state = NULL; - MC_state_delete(p->graph_state); - xbt_dynar_free(&(p->atomic_propositions)); - xbt_free(p); - p = NULL; -} - -void MC_pair_delete(mc_pair_t p){ +void MC_pair_delete(mc_pair_t p) +{ p->automaton_state = NULL; MC_state_delete(p->graph_state); xbt_dynar_free(&(p->atomic_propositions)); @@ -51,6 +24,7 @@ void MC_pair_delete(mc_pair_t p){ p = NULL; } -void mc_pair_free_voidp(void *p){ - MC_pair_delete((mc_pair_t) * (void **)p); +void mc_pair_free_voidp(void *p) +{ + MC_pair_delete((mc_pair_t) * (void **) p); }