#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;
-
-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 GNUNET_REGEX_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 GNUNET_REGEX_Automaton* dfa)
-{
- GNUNET_REGEX_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.
*
int
main (int argc, char *const *argv)
{
- struct GNUNET_REGEX_Automaton* dfa;
+ struct REGEX_INTERNAL_Automaton* dfa;
char **regexes;
char *buffer;
char *regex;
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 = GNUNET_REGEX_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 = GNUNET_REGEX_combine (regexes);
+ compression = atoi (argv[2]);
- GNUNET_asprintf (®ex, "GNVPN-0001-PAD(%s)(0|1)*", buffer);
+ buffer = REGEX_TEST_combine (regexes);
+ GNUNET_asprintf (®ex, "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 = GNUNET_REGEX_construct_dfa (regex, size, compression);
- print_dfa (dfa);
- GNUNET_REGEX_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);
- GNUNET_REGEX_free_from_file (regexes);
+ REGEX_TEST_free_from_file (regexes);
+ GNUNET_free (regex);
return 0;
}