X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ca56c046667fe56766ea8d522fd87cf2c23df4a4..41626f8a47c96f54fa3b1ee61a90fb0af699dcbc:/src/mc/mc_pair.c

diff --git a/src/mc/mc_pair.c b/src/mc/mc_pair.c
index f25394abbf..ee3ad5d3e5 100644
--- a/src/mc/mc_pair.c
+++ b/src/mc/mc_pair.c
@@ -1,27 +1,35 @@
-/* Copyright (c) 2013 Da SimGrid Team. All rights reserved.            */
+/* Copyright (c) 2013-2014. 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. */
 
+#include <xbt.h>
+#include "mc_liveness.h"
 #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->nb_processes = xbt_swag_size(simix_global->process_list);
   p->num = ++mc_stats->expanded_pairs;
+  p->exploration_started = 0;
   p->search_cycle = 0;
-  p->other_num = -1;
+  p->visited_pair_removed = _sg_mc_visited > 0 ? 0 : 1;
   return p;
 }
 
-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);
-  p->stack_removed = 0;
-  p->visited_removed = 0;
-  p->acceptance_removed = 0;
+  if(p->visited_pair_removed)
+    MC_state_delete(p->graph_state, 1);
   xbt_dynar_free(&(p->atomic_propositions));
   xbt_free(p);
   p = NULL;
 }
+
+void mc_pair_free_voidp(void *p)
+{
+  MC_pair_delete((mc_pair_t) * (void **) p);
+}