X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6785b0ccf56c1e02cc20b213db4708effcc96e0e..4993faf725da410b064124c820a86a7736b861ac:/src/xbt/dict.c

diff --git a/src/xbt/dict.c b/src/xbt/dict.c
index 81fb5e6b69..b66c85abe8 100644
--- a/src/xbt/dict.c
+++ b/src/xbt/dict.c
@@ -1144,7 +1144,6 @@ XBT_TEST_UNIT("crash", test_dict_crash, "Crash test")
   xbt_dict_t head = NULL;
   int i, j, k;
   char *key;
-  void *data;
 
   srand((unsigned int) time(NULL));
 
@@ -1205,6 +1204,7 @@ XBT_TEST_UNIT("crash", test_dict_crash, "Crash test")
   xbt_test_add("Search my %d elements 20 times", NB_ELM);
   key = xbt_malloc(10);
   for (i = 0; i < 20; i++) {
+    void *data;
     /* if (i%10) printf("."); else printf("%d",i/10); fflush(stdout); */
     for (j = 0; j < NB_ELM; j++) {
 
@@ -1236,83 +1236,4 @@ XBT_TEST_UNIT("crash", test_dict_crash, "Crash test")
   xbt_dict_free(&head);
 }
 
-static void str_free(void *s)
-{
-  char *c = *(char **) s;
-  free(c);
-}
-
-XBT_TEST_UNIT("multicrash", test_dict_multicrash, "Multi-dict crash test")
-{
-
-#undef NB_ELM
-#define NB_ELM 100              /*00 */
-#define DEPTH 5
-#define KEY_SIZE 512
-#define NB_TEST 20              /*20 */
-  int verbose = 0;
-
-  xbt_dict_t mdict = NULL;
-  int i, j, k, l;
-  xbt_dynar_t keys = xbt_dynar_new(sizeof(char *), str_free);
-  void *data;
-  char *key;
-
-
-  xbt_test_add("Generic multicache CRASH test");
-  xbt_test_log
-      (" Fill the struct and frees it %d times, using %d elements, "
-       "depth of multicache=%d, key size=%d", NB_TEST, NB_ELM, DEPTH,
-       KEY_SIZE);
-
-  for (l = 0; l < DEPTH; l++) {
-    key = xbt_malloc(KEY_SIZE);
-    xbt_dynar_push(keys, &key);
-  }
-
-  for (i = 0; i < NB_TEST; i++) {
-    mdict = xbt_dict_new();
-    XBT_VERB("mdict=%p", mdict);
-    if (verbose > 0)
-      printf("Test %d\n", i);
-    /* else if (i%10) printf("."); else printf("%d",i/10); */
-
-    for (j = 0; j < NB_ELM; j++) {
-      if (verbose > 0)
-        printf("  Add {");
-
-      for (l = 0; l < DEPTH; l++) {
-        key = *(char **) xbt_dynar_get_ptr(keys, l);
-
-        for (k = 0; k < KEY_SIZE - 1; k++)
-          key[k] = rand() % ('z' - 'a') + 'a';
-
-        key[k] = '\0';
-
-        if (verbose > 0)
-          printf("%p=%s %s ", key, key, (l < DEPTH - 1 ? ";" : "}"));
-      }
-      if (verbose > 0)
-        printf("in multitree %p.\n", mdict);
-
-      xbt_multidict_set(mdict, keys, xbt_strdup(key), free);
-
-      data = xbt_multidict_get(mdict, keys);
-
-      xbt_test_assert(data && !strcmp((char *) data, key),
-                       "Retrieved value (%s) does not match the given one (%s)\n",
-                       (char *) data, key);
-    }
-    xbt_dict_free(&mdict);
-  }
-
-  xbt_dynar_free(&keys);
-
-  /*  if (verbose>0)
-     xbt_dict_dump(mdict,&xbt_dict_print); */
-
-  xbt_dict_free(&mdict);
-  xbt_dynar_free(&keys);
-
-}
 #endif                          /* SIMGRID_TEST */