X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6511b78ff810ead55a110d42b01a08255a55b56d..6a6b04b52ae82e68af569e9a226609be3a3cd324:/testsuite/xbt/set_usage.c diff --git a/testsuite/xbt/set_usage.c b/testsuite/xbt/set_usage.c index e9eecddd86..178b421547 100644 --- a/testsuite/xbt/set_usage.c +++ b/testsuite/xbt/set_usage.c @@ -2,19 +2,17 @@ /* set_usage - A test of normal usage of a set */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2004 the OURAGAN project. */ +/* Copyright (c) 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 -#include -#include +#include "gras.h" -GRAS_LOG_NEW_DEFAULT_CATEGORY(test); -GRAS_LOG_EXTERNAL_CATEGORY(set); +XBT_LOG_NEW_DEFAULT_CATEGORY(test,"Logging specific to this test"); +XBT_LOG_EXTERNAL_CATEGORY(set); typedef struct { /* headers */ @@ -24,21 +22,21 @@ typedef struct { /* payload */ char *data; -}my_elem_t; - -static gras_error_t fill(gras_set_t **set); -static gras_error_t debuged_add(gras_set_t *set,const char*key); -static gras_error_t debuged_add_with_data(gras_set_t *set, - const char *name, - const char *data); -static gras_error_t search_name(gras_set_t *set,const char*key); -static gras_error_t search_id(gras_set_t *head, +} s_my_elem_t,*my_elem_t; + +static void fill(xbt_set_t *set); +static void debuged_add(xbt_set_t set,const char*key); +static void debuged_add_with_data(xbt_set_t set, + const char *name, + const char *data); +static xbt_error_t search_name(xbt_set_t set,const char*key); +static xbt_error_t search_id(xbt_set_t head, int id, const char*expected_key); -static gras_error_t traverse(gras_set_t *set); +static xbt_error_t traverse(xbt_set_t set); static void my_elem_free(void *e) { - my_elem_t *elm=(my_elem_t*)e; + my_elem_t elm=(my_elem_t)e; if (elm) { free(elm->name); @@ -47,58 +45,52 @@ static void my_elem_free(void *e) { } } -static gras_error_t debuged_add_with_data(gras_set_t *set, - const char *name, - const char *data) { +static void debuged_add_with_data(xbt_set_t set, + const char *name, + const char *data) { - gras_error_t errcode; - my_elem_t *elm; + my_elem_t elm; - elm = (my_elem_t*)malloc(sizeof(my_elem_t)); - elm->name=strdup(name); + elm = xbt_new(s_my_elem_t,1); + elm->name=xbt_strdup(name); elm->name_len=0; - elm->data=strdup(data); + elm->data=xbt_strdup(data); printf(" - Add %s ",name); if (strcmp(name,data)) { printf("(->%s)",data); } printf("\n"); - errcode=gras_set_add(set, - (gras_set_elm_t*)elm, - &my_elem_free); - return errcode; + xbt_set_add(set, (xbt_set_elm_t)elm, + &my_elem_free); } -static gras_error_t debuged_add(gras_set_t *set, - const char *name) { - return debuged_add_with_data(set, name, name); +static void debuged_add(xbt_set_t set, + const char *name) { + debuged_add_with_data(set, name, name); } -static gras_error_t fill(gras_set_t **set) { - gras_error_t errcode; +static void fill(xbt_set_t *set) { printf("\n Fill in the data set\n"); - TRY(gras_set_new(set)); - TRY(debuged_add(*set,"12")); - TRY(debuged_add(*set,"12a")); - TRY(debuged_add(*set,"12b")); - TRY(debuged_add(*set,"123")); - TRY(debuged_add(*set,"123456")); - // Child becomes child of what to add - TRY(debuged_add(*set,"1234")); - // Need of common ancestor - TRY(debuged_add(*set,"123457")); - - return no_error; + *set=xbt_set_new(); + debuged_add(*set,"12"); + debuged_add(*set,"12a"); + debuged_add(*set,"12b"); + debuged_add(*set,"123"); + debuged_add(*set,"123456"); + /* Child becomes child of what to add */ + debuged_add(*set,"1234"); + /* Need of common ancestor */ + debuged_add(*set,"123457"); } -static gras_error_t search_name(gras_set_t *head,const char*key) { - gras_error_t errcode; - my_elem_t *elm; +static xbt_error_t search_name(xbt_set_t head,const char*key) { + xbt_error_t errcode; + my_elem_t elm; - errcode=gras_set_get_by_name(head,key,(gras_set_elm_t**)&elm); + errcode=xbt_set_get_by_name(head,key,(xbt_set_elm_t*)&elm); printf(" - Search by name %s. Found %s (under ID %d)\n", key, elm? elm->data:"(null)", @@ -117,11 +109,11 @@ static gras_error_t search_name(gras_set_t *head,const char*key) { return errcode; } -static gras_error_t search_id(gras_set_t *head,int id,const char*key) { - gras_error_t errcode; - my_elem_t *elm; +static xbt_error_t search_id(xbt_set_t head,int id,const char*key) { + xbt_error_t errcode; + my_elem_t elm; - errcode=gras_set_get_by_id(head,id,(gras_set_elm_t**)&elm); + errcode=xbt_set_get_by_id(head,id,(xbt_set_elm_t*)&elm); printf(" - Search by id %d. Found %s (data %s)\n", id, elm? elm->name:"(null)", @@ -146,65 +138,64 @@ static gras_error_t search_id(gras_set_t *head,int id,const char*key) { } -static gras_error_t traverse(gras_set_t *set) { - gras_set_cursor_t *cursor=NULL; - my_elem_t *elm=NULL; +static xbt_error_t traverse(xbt_set_t set) { + xbt_set_cursor_t cursor=NULL; + my_elem_t elm=NULL; - gras_set_foreach(set,cursor,elm) { - gras_assert0(elm,"Dude ! Got a null elm during traversal!"); + xbt_set_foreach(set,cursor,elm) { + xbt_assert0(elm,"Dude ! Got a null elm during traversal!"); printf(" - Id(%d): %s->%s\n",elm->ID,elm->name,elm->data); - if (strcmp(elm->name,elm->data)) { - printf("Key(%s) != value(%s). Abording\n",elm->name,elm->data); - abort(); - } + xbt_assert2(!strcmp(elm->name,elm->data), + "Key(%s) != value(%s). Abording", + elm->name,elm->data); } return no_error; } int main(int argc,char **argv) { - gras_error_t errcode; - gras_set_t *set=NULL; - my_elem_t *elm; + xbt_error_t errcode; + xbt_set_t set=NULL; + my_elem_t elm; - gras_init_defaultlog(argc,argv,"set.thresh=verbose"); + xbt_init_defaultlog(&argc,argv,"set.thresh=verbose"); printf("\nData set: USAGE test:\n"); printf(" Traverse the empty set\n"); TRYFAIL(traverse(set)); - TRYFAIL(fill(&set)); + fill(&set); printf(" Free the data set\n"); - gras_set_free(&set); + xbt_set_free(&set); printf(" Free the data set again\n"); - gras_set_free(&set); + xbt_set_free(&set); - TRYFAIL(fill(&set)); + fill(&set); printf(" - Change some values\n"); printf(" - Change 123 to 'Changed 123'\n"); - TRYFAIL(debuged_add_with_data(set,"123","Changed 123")); + debuged_add_with_data(set,"123","Changed 123"); printf(" - Change 123 back to '123'\n"); - TRYFAIL(debuged_add_with_data(set,"123","123")); + debuged_add_with_data(set,"123","123"); printf(" - Change 12a to 'Dummy 12a'\n"); - TRYFAIL(debuged_add_with_data(set,"12a","Dummy 12a")); + debuged_add_with_data(set,"12a","Dummy 12a"); printf(" - Change 12a to '12a'\n"); - TRYFAIL(debuged_add_with_data(set,"12a","12a")); + debuged_add_with_data(set,"12a","12a"); - // gras_dict_dump(head,(void (*)(void*))&printf); + /* xbt_dict_dump(head,(void (*)(void*))&printf); */ printf(" - Traverse the resulting data set\n"); TRYFAIL(traverse(set)); printf(" - Retrive values\n"); - TRYFAIL(gras_set_get_by_name(set,"123",(gras_set_elm_t**)&elm)); - assert(elm); + xbt_set_get_by_name(set,"123",(xbt_set_elm_t*)&elm); + xbt_assert(elm); TRYFAIL(strcmp("123",elm->data)); - TRYEXPECT(gras_set_get_by_name(set,"Can't be found",(gras_set_elm_t**)&elm), + TRYEXPECT(xbt_set_get_by_name(set,"Can't be found",(xbt_set_elm_t*)&elm), mismatch_error); - TRYEXPECT(gras_set_get_by_name(set,"123 Can't be found",(gras_set_elm_t**)&elm), + TRYEXPECT(xbt_set_get_by_name(set,"123 Can't be found",(xbt_set_elm_t*)&elm), mismatch_error); - TRYEXPECT(gras_set_get_by_name(set,"12345678 NOT",(gras_set_elm_t**)&elm), + TRYEXPECT(xbt_set_get_by_name(set,"12345678 NOT",(xbt_set_elm_t*)&elm), mismatch_error); TRYFAIL(search_name(set,"12")); @@ -226,14 +217,15 @@ int main(int argc,char **argv) { printf(" - Traverse the resulting data set\n"); TRYFAIL(traverse(set)); - // gras_dict_dump(head,(void (*)(void*))&printf); + /* xbt_dict_dump(head,(void (*)(void*))&printf); */ printf(" Free the data set (twice)\n"); - gras_set_free(&set); - gras_set_free(&set); + xbt_set_free(&set); + xbt_set_free(&set); printf(" - Traverse the resulting data set\n"); TRYFAIL(traverse(set)); + xbt_exit(); return 0; }