No more use of abort.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@621 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/surf/maxmin.c b/src/surf/maxmin.c
index ff99982..01e29f9 100644 (file)
--- a/src/surf/maxmin.c
+++ b/src/surf/maxmin.c
@@ -10,6 +10,8 @@
 #include "xbt/error.h"
 #include "maxmin_private.h"
 #include <stdlib.h>
 #include "xbt/error.h"
 #include "maxmin_private.h"
 #include <stdlib.h>

+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(maxmin, surf,
+                               "Logging specific to the SURF maxminmodule");

 
 lmm_system_t lmm_system_new(void)
 {
 
 lmm_system_t lmm_system_new(void)
 {


@@ -77,8 +79,8 @@ static void lmm_var_free(lmm_system_t sys, lmm_variable_t var)
 
 static void lmm_cnst_free(lmm_system_t sys, lmm_constraint_t cnst)
 {
 
 static void lmm_cnst_free(lmm_system_t sys, lmm_constraint_t cnst)
 {

-/*   xbt_assert0(xbt_fifo_size(&(cnst->row)), */
-/*              "This list should be empty!"); */
+  xbt_assert0(xbt_swag_size(&(cnst->element_set)),
+             "This list should be empty!");

   remove_active_constraint(sys, cnst);
   xbt_free(cnst);
 }
   remove_active_constraint(sys, cnst);
   xbt_free(cnst);
 }


@@ -146,8 +148,8 @@ void lmm_expand(lmm_system_t sys, lmm_constraint_t cnst,
 
   sys->modified = 1;
 
 
   sys->modified = 1;
 

-  if (var->cnsts_number >= var->cnsts_size)
-    abort();
+  xbt_assert0(var->cnsts_number >= var->cnsts_size,
+             "Too much constraints");

 
   elem = &(var->cnsts[var->cnsts_number++]);
 
 
   elem = &(var->cnsts[var->cnsts_number++]);
 

diff --git a/src/xbt/heap.c b/src/xbt/heap.c
index d9c31a1..e37675f 100644 (file)
--- a/src/xbt/heap.c
+++ b/src/xbt/heap.c
@@ -122,8 +122,7 @@ void *xbt_heap_pop(xbt_heap_t H)
  */
 double xbt_heap_maxkey(xbt_heap_t H)
 {
  */
 double xbt_heap_maxkey(xbt_heap_t H)
 {

-  if (H->count == 0)
-    abort();
+  xbt_assert0(H->count != 0,"Empty heap");

   return KEY(H, 0);
 }
 
   return KEY(H, 0);
 }
 


@@ -136,8 +135,7 @@ double xbt_heap_maxkey(xbt_heap_t H)
  */
 void *xbt_heap_maxcontent(xbt_heap_t H)
 {
  */
 void *xbt_heap_maxcontent(xbt_heap_t H)
 {

-  if (H->count == 0)
-    abort();
+  xbt_assert0(H->count != 0,"Empty heap");

   return CONTENT(H, 0);
 }
 
   return CONTENT(H, 0);
 }