X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/01021da3b27c6a5704bfa08cd0ce07be6b925e8b..cb699a49faa9fa426f301dc1d21b6d5617b9c1a0:/testsuite/xbt/dynar_int.c

diff --git a/testsuite/xbt/dynar_int.c b/testsuite/xbt/dynar_int.c
index 68f0d48179..8e9ba8b6e5 100644
--- a/testsuite/xbt/dynar_int.c
+++ b/testsuite/xbt/dynar_int.c
@@ -2,150 +2,148 @@
 
 /* dynar_int: A test case for the dynar using integers as content           */
 
-/* Authors: Martin Quinson                                                  */
-/* Copyright (C) 2003 the OURAGAN project.                                  */
+/* Copyright (c) 2003, 2004 Martin Quinson. 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. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include <stdio.h>
-#include <gras.h>
+#include "gras.h"
 
 #define NB_ELEM 5000
-GRAS_LOG_NEW_DEFAULT_CATEGORY(test,"Logging specific to this test");
+XBT_LOG_NEW_DEFAULT_CATEGORY(test,"Logging specific to this test");
 
 int main(int argc,char *argv[]) {
-   gras_dynar_t d;
-   gras_error_t errcode;
+   xbt_dynar_t d;
+   xbt_error_t errcode;
    int i,cpt,cursor;
    int *iptr;
    
-   gras_init_defaultlog(&argc,argv,"dynar.thresh=debug");
+   xbt_init_defaultlog(&argc,argv,"dynar.thresh=debug");
 
    INFO0("==== Traverse the empty dynar");
-   d=gras_dynar_new(sizeof(int),NULL);
-   gras_dynar_foreach(d,cursor,i){
-     gras_assert0(0,"Damnit, there is something in the empty dynar");
+   d=xbt_dynar_new(sizeof(int),NULL);
+   xbt_dynar_foreach(d,cursor,i){
+     xbt_assert0(0,"Damnit, there is something in the empty dynar");
    }
-   gras_dynar_free(&d);
-   gras_dynar_free(&d);
+   xbt_dynar_free(&d);
+   xbt_dynar_free(&d);
 
    INFO1("==== Push %d int, set them again 3 times, traverse them, shift them",
 	NB_ELEM);
-   d=gras_dynar_new(sizeof(int),NULL);
+   d=xbt_dynar_new(sizeof(int),NULL);
    for (cpt=0; cpt< NB_ELEM; cpt++) {
-     gras_dynar_push_as(d,int,cpt);
-     DEBUG2("Push %d, length=%lu",cpt, gras_dynar_length(d));
+     xbt_dynar_push_as(d,int,cpt);
+     DEBUG2("Push %d, length=%lu",cpt, xbt_dynar_length(d));
    }
    for (cursor=0; cursor< NB_ELEM; cursor++) {
-     iptr=gras_dynar_get_ptr(d,cursor);
-     gras_assert2(cursor == *iptr,
+     iptr=xbt_dynar_get_ptr(d,cursor);
+     xbt_assert2(cursor == *iptr,
 		  "The retrieved value is not the same than the injected one (%d!=%d)",
 		  cursor,cpt);
    }
-   gras_dynar_foreach(d,cursor,cpt){
-     gras_assert2(cursor == cpt,
+   xbt_dynar_foreach(d,cursor,cpt){
+     xbt_assert2(cursor == cpt,
      		  "The retrieved value is not the same than the injected one (%d!=%d)",
      		  cursor,cpt);
    }
    for (cpt=0; cpt< NB_ELEM; cpt++)
-     *(int*)gras_dynar_get_ptr(d,cpt) = cpt;
+     *(int*)xbt_dynar_get_ptr(d,cpt) = cpt;
 
    for (cpt=0; cpt< NB_ELEM; cpt++) 
-     *(int*)gras_dynar_get_ptr(d,cpt) = cpt;
-/*     gras_dynar_set(d,cpt,&cpt);*/
+     *(int*)xbt_dynar_get_ptr(d,cpt) = cpt;
+/*     xbt_dynar_set(d,cpt,&cpt);*/
    
    for (cpt=0; cpt< NB_ELEM; cpt++) 
-     *(int*)gras_dynar_get_ptr(d,cpt) = cpt;
+     *(int*)xbt_dynar_get_ptr(d,cpt) = cpt;
    
    cpt=0;
-   gras_dynar_foreach(d,cursor,i){
-     gras_assert2(i == cpt,
+   xbt_dynar_foreach(d,cursor,i){
+     xbt_assert2(i == cpt,
 	  "The retrieved value is not the same than the injected one (%d!=%d)",
 		  i,cpt);
      cpt++;
    }
-   gras_assert2(cpt == NB_ELEM,
+   xbt_assert2(cpt == NB_ELEM,
 		"Cannot retrieve my %d values. Last got one is %d",
 		NB_ELEM, cpt);
 
    for (cpt=0; cpt< NB_ELEM; cpt++) {
-     gras_dynar_shift(d,&i);
-     gras_assert2(i == cpt,
+     xbt_dynar_shift(d,&i);
+     xbt_assert2(i == cpt,
            "The retrieved value is not the same than the injected one (%d!=%d)",
 	       i,cpt);
-     DEBUG2("Pop %d, length=%lu",cpt, gras_dynar_length(d));
+     DEBUG2("Pop %d, length=%lu",cpt, xbt_dynar_length(d));
    }
-   gras_dynar_free(&d);
-   gras_dynar_free(&d);
+   xbt_dynar_free(&d);
+   xbt_dynar_free(&d);
 
    
    INFO1("==== Unshift/pop %d int",NB_ELEM);
-   d=gras_dynar_new(sizeof(int),NULL);
+   d=xbt_dynar_new(sizeof(int),NULL);
    for (cpt=0; cpt< NB_ELEM; cpt++) {
-     gras_dynar_unshift(d,&cpt);
-     DEBUG2("Push %d, length=%lu",cpt, gras_dynar_length(d));
+     xbt_dynar_unshift(d,&cpt);
+     DEBUG2("Push %d, length=%lu",cpt, xbt_dynar_length(d));
    }
    for (cpt=0; cpt< NB_ELEM; cpt++) {
-     i=gras_dynar_pop_as(d,int);
-     gras_assert2(i == cpt,
+     i=xbt_dynar_pop_as(d,int);
+     xbt_assert2(i == cpt,
            "The retrieved value is not the same than the injected one (%d!=%d)",
 		 i,cpt);
-     DEBUG2("Pop %d, length=%lu",cpt, gras_dynar_length(d));
+     DEBUG2("Pop %d, length=%lu",cpt, xbt_dynar_length(d));
    }
-   gras_dynar_free(&d);
-   gras_dynar_free(&d);
+   xbt_dynar_free(&d);
+   xbt_dynar_free(&d);
 
    
    INFO1("==== Push %d int, insert 1000 int in the middle, shift everything",NB_ELEM);
-   d=gras_dynar_new(sizeof(int),NULL);
+   d=xbt_dynar_new(sizeof(int),NULL);
    for (cpt=0; cpt< NB_ELEM; cpt++) {
-     gras_dynar_push_as(d,int,cpt);
-     DEBUG2("Push %d, length=%lu",cpt, gras_dynar_length(d));
+     xbt_dynar_push_as(d,int,cpt);
+     DEBUG2("Push %d, length=%lu",cpt, xbt_dynar_length(d));
    }
    for (cpt=0; cpt< 1000; cpt++) {
-     gras_dynar_insert_at_as(d,2500,int,cpt);
-     DEBUG2("Push %d, length=%lu",cpt, gras_dynar_length(d));
+     xbt_dynar_insert_at_as(d,2500,int,cpt);
+     DEBUG2("Push %d, length=%lu",cpt, xbt_dynar_length(d));
    }
 
    for (cpt=0; cpt< 2500; cpt++) {
-     gras_dynar_shift(d,&i);
-     gras_assert2(i == cpt,
+     xbt_dynar_shift(d,&i);
+     xbt_assert2(i == cpt,
            "The retrieved value is not the same than the injected one at the begining (%d!=%d)",
 	       i,cpt);
-     DEBUG2("Pop %d, length=%lu",cpt, gras_dynar_length(d));
+     DEBUG2("Pop %d, length=%lu",cpt, xbt_dynar_length(d));
    }
    for (cpt=999; cpt>=0; cpt--) {
-     gras_dynar_shift(d,&i);
-     gras_assert2(i == cpt,
+     xbt_dynar_shift(d,&i);
+     xbt_assert2(i == cpt,
            "The retrieved value is not the same than the injected one in the middle (%d!=%d)",
 	       i,cpt);
    }
    for (cpt=2500; cpt< NB_ELEM; cpt++) {
-     gras_dynar_shift(d,&i);
-      gras_assert2(i == cpt,
+     xbt_dynar_shift(d,&i);
+      xbt_assert2(i == cpt,
            "The retrieved value is not the same than the injected one at the end (%d!=%d)",
 	       i,cpt);
    }
-   gras_dynar_free(&d);
-   gras_dynar_free(&d);
+   xbt_dynar_free(&d);
+   xbt_dynar_free(&d);
 
 
    INFO1("==== Push %d int, remove 2000-4000. free the rest",NB_ELEM);
-   d=gras_dynar_new(sizeof(int),NULL);
+   d=xbt_dynar_new(sizeof(int),NULL);
    for (cpt=0; cpt< NB_ELEM; cpt++) 
-     gras_dynar_push_as(d,int,cpt);
+     xbt_dynar_push_as(d,int,cpt);
    
    for (cpt=2000; cpt< 4000; cpt++) {
-     gras_dynar_remove_at(d,2000,&i);
-     gras_assert2(i == cpt,
+     xbt_dynar_remove_at(d,2000,&i);
+     xbt_assert2(i == cpt,
 		  "Remove a bad value. Got %d, expected %d",
 		  i,cpt);
-     DEBUG2("remove %d, length=%lu",cpt, gras_dynar_length(d));
+     DEBUG2("remove %d, length=%lu",cpt, xbt_dynar_length(d));
    }
-   gras_dynar_free(&d);
-   gras_dynar_free(&d);
+   xbt_dynar_free(&d);
+   xbt_dynar_free(&d);
 
-   gras_exit();
+   xbt_exit();
    return 0;
 }