-follow naming and coding style conventions

[oweals/gnunet.git] / src / regex / perf-regex.c

diff --git a/src/regex/perf-regex.c b/src/regex/perf-regex.c
index 2fa7ca35687e75f5319a1542a208260ebd46e1e6..bf19a2bff7953cdc527eefb9c9788a315d7b8282 100644 (file)
--- a/src/regex/perf-regex.c
+++ b/src/regex/perf-regex.c
@@ -19,14 +19,14 @@
 */
 
 /**
- * @file src/regex/prof-regex.c
+ * @file src/regex/perf-regex.c
  * @brief Test how long it takes to create a automaton from a string regex.
  * @author Bartlomiej Polot
  */
 #include <regex.h>
 #include <time.h>
 #include "platform.h"
-#include "gnunet_regex_lib.h"
+#include "regex_internal_lib.h"
 #include "regex_test_lib.h"
 
 static const char *exe;
@@ -37,6 +37,40 @@ usage(void)
   fprintf (stderr, "Usage: %s REGEX_FILE COMPRESSION\n", exe);
 }
 
+/**
+ * Iterator callback function.
+ *
+ * @param cls closure.
+ * @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_BLOCK_Edge *edges)
+{
+  unsigned int i;
+
+  printf ("%s: %s\n", GNUNET_h2s (key), accepting ? "ACCEPTING" : "");
+  printf ("  proof: %s\n", proof);
+  for (i = 0; i < num_edges; i++)
+  {
+    printf ("    %s: %s\n", edges[i].label, GNUNET_h2s (&edges[i].destination));
+  }
+}
+
+static void
+print_dfa (struct REGEX_INTERNAL_Automaton* dfa)
+{
+  REGEX_INTERNAL_iterate_all_edges (dfa, iter, NULL);
+}
+
 /**
  * The main function of the regex performace test.
  * 
@@ -50,7 +84,7 @@ usage(void)
 int
 main (int argc, char *const *argv)
 {
-  struct GNUNET_REGEX_Automaton* dfa;
+  struct REGEX_INTERNAL_Automaton* dfa;
   char **regexes;
   char *buffer;
   char *regex;
@@ -64,14 +98,14 @@ main (int argc, char *const *argv)
     usage();
     return 1;
   }
-  regexes = GNUNET_REGEX_read_from_file (argv[1]);
+  regexes = REGEX_TEST_read_from_file (argv[1]);
 
   if (NULL == regexes)
   {
     usage();
     return 2;
   }
-  buffer = GNUNET_REGEX_combine (regexes);
+  buffer = REGEX_TEST_combine (regexes);
 
   GNUNET_asprintf (&regex, "GNVPN-0001-PAD(%s)(0|1)*", buffer);
   size = strlen (regex);
@@ -80,10 +114,12 @@ main (int argc, char *const *argv)
   //   return 0;
 
   compression = atoi (argv[2]);
-  dfa = GNUNET_REGEX_construct_dfa (regex, size, compression);
-  GNUNET_REGEX_automaton_destroy (dfa);
+  dfa = REGEX_INTERNAL_construct_dfa (regex, size, compression);
+  print_dfa (dfa);
+  REGEX_INTERNAL_automaton_destroy (dfa);
   GNUNET_free (buffer);
-  GNUNET_REGEX_free_from_file (regexes);
+  REGEX_TEST_free_from_file (regexes);
+  GNUNET_free (regex);
   return 0;
 }