X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fregex%2Fperf-regex.c;h=3f1e771154dcbc1defbcff28e7b7cca95cd44e7e;hb=d94c5185fcdf47c6a57d3233b946fa7e621f7ad9;hp=210b16b814663d12aaf60c16f13e54eaa73cc991;hpb=21a2b4f95b4488645ba5a6254fcb8919c4915f73;p=oweals%2Fgnunet.git

diff --git a/src/regex/perf-regex.c b/src/regex/perf-regex.c
index 210b16b81..3f1e77115 100644
--- a/src/regex/perf-regex.c
+++ b/src/regex/perf-regex.c
@@ -29,51 +29,42 @@
 #include "regex_internal_lib.h"
 #include "regex_test_lib.h"
 
-static const char *exe;
-
-static void
-usage(void)
-{
-  fprintf (stderr, "Usage: %s REGEX_FILE COMPRESSION\n", exe);
-}
 
 /**
- * Iterator callback function.
+ * Print information about the given node and its edges
+ * to stdout.
  *
- * @param cls closure.
+ * @param cls closure, unused.
  * @param key hash for current state.
  * @param proof proof for current state.
  * @param accepting GNUNET_YES if this is an accepting state, GNUNET_NO if not.
  * @param num_edges number of edges leaving current state.
  * @param edges edges leaving current state.
  */
-static void 
-iter (void *cls,
-      const struct GNUNET_HashCode *key,
-      const char *proof,
-      int accepting,
-      unsigned int num_edges,
-      const struct REGEX_ITERNAL_Edge *edges)
+static void
+print_edge (void *cls,
+	    const struct GNUNET_HashCode *key,
+	    const char *proof,
+	    int accepting,
+	    unsigned int num_edges,
+	    const struct REGEX_BLOCK_Edge *edges)
 {
   unsigned int i;
 
-  printf ("%s: %s\n", GNUNET_h2s (key), accepting ? "ACCEPTING" : "");
-  printf ("  proof: %s\n", proof);
+  printf ("%s: %s, proof: `%s'\n",
+	  GNUNET_h2s (key),
+	  accepting ? "ACCEPTING" : "",
+	  proof);
   for (i = 0; i < num_edges; i++)
-  {
-    printf ("    %s: %s\n", edges[i].label, GNUNET_h2s (&edges[i].destination));
-  }
+    printf ("    `%s': %s\n",
+	    edges[i].label,
+	    GNUNET_h2s (&edges[i].destination));
 }
 
-static void
-print_dfa (struct REGEX_ITERNAL_Automaton* dfa)
-{
-  REGEX_ITERNAL_iterate_all_edges (dfa, iter, NULL);
-}
 
 /**
  * The main function of the regex performace test.
- * 
+ *
  * Read a set of regex from a file, combine them and create a DFA from the
  * resulting combined regex.
  *
@@ -84,7 +75,7 @@ print_dfa (struct REGEX_ITERNAL_Automaton* dfa)
 int
 main (int argc, char *const *argv)
 {
-  struct REGEX_ITERNAL_Automaton* dfa;
+  struct REGEX_INTERNAL_Automaton* dfa;
   char **regexes;
   char *buffer;
   char *regex;
@@ -92,33 +83,39 @@ main (int argc, char *const *argv)
   long size;
 
   GNUNET_log_setup ("perf-regex", "DEBUG", NULL);
-  exe = argv[0];
   if (3 != argc)
   {
-    usage();
+    fprintf (stderr,
+	     "Usage: %s REGEX_FILE COMPRESSION\n",
+	     argv[0]);
     return 1;
   }
-  regexes = REGEX_ITERNAL_read_from_file (argv[1]);
-
+  regexes = REGEX_TEST_read_from_file (argv[1]);
   if (NULL == regexes)
   {
-    usage();
+    fprintf (stderr,
+	     "Failed to read regexes from `%s'\n",
+	     argv[1]);
     return 2;
   }
-  buffer = REGEX_ITERNAL_combine (regexes);
+  compression = atoi (argv[2]);
 
-  GNUNET_asprintf (&regex, "GNVPN-0001-PAD(%s)(0|1)*", buffer);
+  buffer = REGEX_TEST_combine (regexes);
+  GNUNET_asprintf (&regex, "GNUNET_REGEX_PROFILER_(%s)(0|1)*", buffer);
   size = strlen (regex);
 
-  fprintf (stderr, "Combined regex (%ld bytes):\n%s\n", size, regex);
-  //   return 0;
-
-  compression = atoi (argv[2]);
-  dfa = REGEX_ITERNAL_construct_dfa (regex, size, compression);
-  print_dfa (dfa);
-  REGEX_ITERNAL_automaton_destroy (dfa);
+  fprintf (stderr,
+	   "Combined regex (%ld bytes):\n%s\n",
+	   size,
+	   regex);
+  dfa = REGEX_INTERNAL_construct_dfa (regex, size, compression);
+  printf ("********* ALL EDGES *********'\n");
+  REGEX_INTERNAL_iterate_all_edges (dfa, &print_edge, NULL);
+  printf ("\n\n********* REACHABLE EDGES *********'\n");
+  REGEX_INTERNAL_iterate_reachable_edges (dfa, &print_edge, NULL);
+  REGEX_INTERNAL_automaton_destroy (dfa);
   GNUNET_free (buffer);
-  REGEX_ITERNAL_free_from_file (regexes);
+  REGEX_TEST_free_from_file (regexes);
   GNUNET_free (regex);
   return 0;
 }