A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
API cleanup: s/dict_insert/dict_set/ and s/dict_retrieve/dict_get/ for consistency...
[simgrid.git]
/
testsuite
/
xbt
/
dict_crash.c
diff --git
a/testsuite/xbt/dict_crash.c
b/testsuite/xbt/dict_crash.c
index
75fdb10
..
7a9fec7
100644
(file)
--- a/
testsuite/xbt/dict_crash.c
+++ b/
testsuite/xbt/dict_crash.c
@@
-48,14
+48,14
@@
static gras_error_t countelems(gras_dict_t *head,int*count) {
return no_error;
}
return no_error;
}
-int main() {
+int main(
int argc,char **argv
) {
gras_error_t errcode;
gras_dict_t *head=NULL;
int i,j,k, nb;
char *key;
void *data;
gras_error_t errcode;
gras_dict_t *head=NULL;
int i,j,k, nb;
char *key;
void *data;
-
TRY(gras_log_control_set("root.thresh=info")
);
+
gras_init_defaultlog(&argc,argv,"dict.thresh=verbose"
);
srand((unsigned int)time(NULL));
printf("Dictionnary: CRASH test:\n");
srand((unsigned int)time(NULL));
printf("Dictionnary: CRASH test:\n");
@@
-77,7
+77,7
@@
int main() {
key[k]=rand() % ('z' - 'a') + 'a';
key[k]='\0';
// printf("[%d %s]\n",j,key);
key[k]=rand() % ('z' - 'a') + 'a';
key[k]='\0';
// printf("[%d %s]\n",j,key);
- TRYFAIL(gras_dict_
insert(head,strdup(key)
,key,&free));
+ TRYFAIL(gras_dict_
set(head,key
,key,&free));
}
nb=0;
// gras_dict_dump(head,(void (*)(void*))&printf);
}
nb=0;
// gras_dict_dump(head,(void (*)(void*))&printf);
@@
-95,14
+95,17
@@
int main() {
printf("\n Fill 200 000 elements, with keys being the number of element\n");
printf(" (a point is 10 000 elements)\n");
for (j=0;j<NB_ELM;j++) {
printf("\n Fill 200 000 elements, with keys being the number of element\n");
printf(" (a point is 10 000 elements)\n");
for (j=0;j<NB_ELM;j++) {
- if (!(j%10000)) printf("."); fflush(stdout);
+ if (!(j%10000)) {
+ printf(".");
+ fflush(stdout);
+ }
if (!(key=malloc(10))) {
fprintf(stderr,"Out of memory\n");
abort();
}
sprintf(key,"%d",j);
if (!(key=malloc(10))) {
fprintf(stderr,"Out of memory\n");
abort();
}
sprintf(key,"%d",j);
- TRYFAIL(gras_dict_
inser
t(head,key,key,&free));
+ TRYFAIL(gras_dict_
se
t(head,key,key,&free));
}
printf("\n Count the elements (retrieving the key and data for each): \n");
}
printf("\n Count the elements (retrieving the key and data for each): \n");
@@
-119,18
+122,19
@@
int main() {
for (j=0;j<NB_ELM;j++) {
sprintf(key,"%d",j);
for (j=0;j<NB_ELM;j++) {
sprintf(key,"%d",j);
- TRYFAIL(gras_dict_
retrieve
(head,key,&data));
+ TRYFAIL(gras_dict_
get
(head,key,&data));
if (strcmp(key,(char*)data)) {
printf("key=%s != data=%s\n",key,(char*)data);
abort();
}
}
}
if (strcmp(key,(char*)data)) {
printf("key=%s != data=%s\n",key,(char*)data);
abort();
}
}
}
+ free(key);
printf("\n Remove my 200 000 elements. (a point is 10 000 elements)\n");
if (!(key=malloc(10))) {
fprintf(stderr,"Out of memory\n");
printf("\n Remove my 200 000 elements. (a point is 10 000 elements)\n");
if (!(key=malloc(10))) {
fprintf(stderr,"Out of memory\n");
-
return 3
;
+
abort()
;
}
for (j=0;j<NB_ELM;j++) {
if (!(j%10000)) printf("."); fflush(stdout);
}
for (j=0;j<NB_ELM;j++) {
if (!(j%10000)) printf("."); fflush(stdout);
@@
-138,9
+142,14
@@
int main() {
sprintf(key,"%d",j);
TRYFAIL(gras_dict_remove(head,key));
}
sprintf(key,"%d",j);
TRYFAIL(gras_dict_remove(head,key));
}
+ printf("\n");
+ free(key);
+
+ printf("\n Free the structure (twice)\n");
gras_dict_free(&head);
gras_dict_free(&head);
gras_dict_free(&head);
gras_dict_free(&head);
- printf("\n");
+
+ gras_exit();
return 0;
}
return 0;
}