moving functions for testing and evaluation and experiments to the test library, minimizing the internal library, renaming files according to which library they belong to

11 files changed, 99 insertions, 90 deletions

diff --git a/src/regex/Makefile.am b/src/regex/Makefile.am
index 6e6fd443a..34ef90ca0 100644
--- a/src/regex/Makefile.am
+++ b/src/regex/Makefile.am
@@ -55,9 +55,9 @@ libgnunetregexblock_la_LDFLAGS = \
 
 
 libgnunetregex_internal_a_SOURCES = \
-  regex_internal.h regex.c \
-  regex_graph.c regex_random.c \
-  regex_dht.c
+  regex_internal_lib.h \
+  regex_internal.h regex_internal.c \
+  regex_internal_dht.c
 libgnunetregex_internal_a_DEPENDENCIES = \
   libgnunetregexblock.la
 
@@ -100,7 +100,9 @@ gnunet_regex_simulation_profiler_DEPENDENCIES = \
 endif
 
 libgnunetregextest_a_SOURCES = \
-  regex_test_lib.c regex_test_lib.h
+  regex_test_lib.c regex_test_lib.h \
+  regex_test_graph.c \
+  regex_test_random.c 
 libgnunetregextest_a_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/regex/libgnunetregex_internal.a
@@ -172,6 +174,7 @@ test_regex_eval_api_SOURCES = \
   test_regex_eval_api.c
 test_regex_eval_api_LDADD = -lm \
   $(top_builddir)/src/regex/libgnunetregex_internal.a \
+  $(top_builddir)/src/regex/libgnunetregextest.a \
   $(top_builddir)/src/regex/libgnunetregexblock.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
@@ -186,6 +189,7 @@ test_regex_proofs_SOURCES = \
   test_regex_proofs.c
 test_regex_proofs_LDADD = -lm \
   $(top_builddir)/src/regex/libgnunetregex_internal.a \
+  $(top_builddir)/src/regex/libgnunetregextest.a \
   $(top_builddir)/src/regex/libgnunetregexblock.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
@@ -193,6 +197,7 @@ test_regex_graph_api_SOURCES = \
   test_regex_graph_api.c
 test_regex_graph_api_LDADD = -lm \
   $(top_builddir)/src/regex/libgnunetregex_internal.a \
+  $(top_builddir)/src/regex/libgnunetregextest.a \
   $(top_builddir)/src/regex/libgnunetregexblock.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
diff --git a/src/regex/regex.c b/src/regex/regex_internal.c
index ecb3044e3..e66835134 100644
--- a/src/regex/regex.c
+++ b/src/regex/regex_internal.c
@@ -18,7 +18,7 @@
      Boston, MA 02111-1307, USA.
 */
 /**
- * @file src/regex/regex.c
+ * @file src/regex/regex_internal.c
  * @brief library to create Deterministic Finite Automatons (DFAs) from regular
  * expressions (regexes).
  * @author Maximilian Szengel
diff --git a/src/regex/regex_internal.h b/src/regex/regex_internal.h
index 17f5f8419..cd76c1c73 100644
--- a/src/regex/regex_internal.h
+++ b/src/regex/regex_internal.h
@@ -444,35 +444,6 @@ REGEX_ITERNAL_dfa_add_multi_strides (struct REGEX_ITERNAL_Context *regex_ctx,
                                     const unsigned int stride_len);
 
 
-/**
- * Generate a (pseudo) random regular expression of length 'rx_length', as well
- * as a (optional) string that will be matched by the generated regex. The
- * returned regex needs to be freed.
- *
- * @param rx_length length of the random regex.
- * @param matching_str (optional) pointer to a string that will contain a string
- *                     that will be matched by the generated regex, if
- *                     'matching_str' pointer was not NULL.
- *
- * @return NULL if 'rx_length' is 0, a random regex of length 'rx_length', which
- *         needs to be freed, otherwise.
- */
-char *
-REGEX_ITERNAL_generate_random_regex (size_t rx_length, char *matching_str);
-
-
-/**
- * Generate a random string of maximum length 'max_len' that only contains literals allowed
- * in a regular expression. The string might be 0 chars long but is garantueed
- * to be shorter or equal to 'max_len'.
- *
- * @param max_len maximum length of the string that should be generated.
- *
- * @return random string that needs to be freed.
- */
-char *
-REGEX_ITERNAL_generate_random_string (size_t max_len);
-
 
 #if 0                           /* keep Emacsens' auto-indent happy */
 {
diff --git a/src/regex/regex_dht.c b/src/regex/regex_internal_dht.c
index 1cc4107e8..0b5d99928 100644
--- a/src/regex/regex_dht.c
+++ b/src/regex/regex_internal_dht.c
@@ -18,7 +18,7 @@
      Boston, MA 02111-1307, USA.
 */
 /**
- * @file src/regex/regex_dht.c
+ * @file src/regex/regex_internal_dht.c
  * @brief library to announce regexes in the network and match strings
  * against published regexes.
  * @author Bartlomiej Polot
@@ -204,6 +204,7 @@ REGEX_ITERNAL_announce (struct GNUNET_DHT_Handle *dht,
   return h;
 }
 
+
 void
 REGEX_ITERNAL_reannounce (struct REGEX_ITERNAL_Announcement *h)
 {
@@ -213,6 +214,7 @@ REGEX_ITERNAL_reannounce (struct REGEX_ITERNAL_Announcement *h)
   REGEX_ITERNAL_iterate_all_edges (h->dfa, &regex_iterator, h);
 }
 
+
 void
 REGEX_ITERNAL_announce_cancel (struct REGEX_ITERNAL_Announcement *h)
 {
@@ -365,10 +367,9 @@ dht_get_string_accept_handler (void *cls, struct GNUNET_TIME_Absolute exp,
                   &block->id,
                   get_path, get_path_length,
                   put_path, put_path_length);
-
-  return;
 }
 
+
 /**
  * Find a path to a peer that offers a regex servcie compatible
  * with a given string.
@@ -485,10 +486,7 @@ dht_get_string_handler (void *cls, struct GNUNET_TIME_Absolute exp,
     }
     return;
   }
-
   regex_next_edge (block, size, ctx);
-
-  return;
 }
 
 
diff --git a/src/regex/regex_internal_lib.h b/src/regex/regex_internal_lib.h
index f14665538..e138535d4 100644
--- a/src/regex/regex_internal_lib.h
+++ b/src/regex/regex_internal_lib.h
@@ -21,7 +21,6 @@
  * @file regex/regex_internal_lib.h
  * @brief library to parse regular expressions into dfa
  * @author Maximilian Szengel
- *
  */
 
 #ifndef REGEX_INTERNAL_LIB_H
@@ -40,11 +39,9 @@ extern "C"
 #endif
 
 
-
-
 /**
  * Automaton (NFA/DFA) representation.
-- */
+ */
 struct REGEX_ITERNAL_Automaton;
 
 
@@ -98,44 +95,6 @@ REGEX_ITERNAL_automaton_destroy (struct REGEX_ITERNAL_Automaton *a);
 
 
 /**
- * Options for graph creation function
- * REGEX_ITERNAL_automaton_save_graph.
- */
-enum REGEX_ITERNAL_GraphSavingOptions
-{
-  /**
-   * Default. Do nothing special.
-   */
-  REGEX_ITERNAL_GRAPH_DEFAULT = 0,
-
-  /**
-   * The generated graph will include extra information such as the NFA states
-   * that were used to generate the DFA state.
-   */
-  REGEX_ITERNAL_GRAPH_VERBOSE = 1,
-
-  /**
-   * Enable graph coloring. Will color each SCC in a different color.
-   */
-  REGEX_ITERNAL_GRAPH_COLORING = 2
-};
-
-
-/**
- * Save the given automaton as a GraphViz dot file.
- *
- * @param a the automaton to be saved.
- * @param filename where to save the file.
- * @param options options for graph generation that include coloring or verbose
- *                mode
- */
-void
-REGEX_ITERNAL_automaton_save_graph (struct REGEX_ITERNAL_Automaton *a,
-                                   const char *filename,
-                                   enum REGEX_ITERNAL_GraphSavingOptions options);
-
-
-/**
  * Evaluates the given 'string' against the given compiled regex.
  *
  * @param a automaton.
diff --git a/src/regex/regex_graph.c b/src/regex/regex_test_graph.c
index 4789fd635..369356aa1 100644
--- a/src/regex/regex_graph.c
+++ b/src/regex/regex_test_graph.c
@@ -18,12 +18,13 @@
      Boston, MA 02111-1307, USA.
 */
 /**
- * @file src/regex/regex_graph.c
+ * @file src/regex/regex_test_graph.c
  * @brief functions for creating .dot graphs from regexes
  * @author Maximilian Szengel
  */
 #include "platform.h"
 #include "regex_internal_lib.h"
+#include "regex_test_lib.h"
 #include "regex_internal.h"
 
 /**
diff --git a/src/regex/regex_test_lib.h b/src/regex/regex_test_lib.h
index 418f47dba..107c2ffce 100644
--- a/src/regex/regex_test_lib.h
+++ b/src/regex/regex_test_lib.h
@@ -20,15 +20,15 @@
 /**
  * @file src/regex/regex_test_lib.h
  * @brief library to read regexes representing IP networks from a file.
- *        and simplyfinying the into one big regex, in order to run
- *        tests (regex performance, mesh profiler).
+ *        and simplifying the into one big regex, in order to run
+ *        tests (regex performance, regex profiler).
  * @author Bertlomiej Polot
- *
  */
 
 #ifndef REGEX_ITERNAL_TEST_LIB_H
 #define REGEX_ITERNAL_TEST_LIB_H
 
+#include "regex_internal_lib.h"
 
 #ifdef __cplusplus
 extern "C"
@@ -48,6 +48,7 @@ extern "C"
 char *
 REGEX_ITERNAL_combine(char * const regexes[]);
 
+
 /**
  * Read a set of regexes from a file, one per line and return them in an array
  * suitable for REGEX_ITERNAL_combine.
@@ -69,6 +70,76 @@ REGEX_ITERNAL_read_from_file (const char *filename);
 void
 REGEX_ITERNAL_free_from_file (char **regexes);
 
+
+/**
+ * Generate a (pseudo) random regular expression of length 'rx_length', as well
+ * as a (optional) string that will be matched by the generated regex. The
+ * returned regex needs to be freed.
+ *
+ * @param rx_length length of the random regex.
+ * @param matching_str (optional) pointer to a string that will contain a string
+ *                     that will be matched by the generated regex, if
+ *                     'matching_str' pointer was not NULL.
+ *
+ * @return NULL if 'rx_length' is 0, a random regex of length 'rx_length', which
+ *         needs to be freed, otherwise.
+ */
+char *
+REGEX_ITERNAL_generate_random_regex (size_t rx_length, char *matching_str);
+
+
+/**
+ * Generate a random string of maximum length 'max_len' that only contains literals allowed
+ * in a regular expression. The string might be 0 chars long but is garantueed
+ * to be shorter or equal to 'max_len'.
+ *
+ * @param max_len maximum length of the string that should be generated.
+ *
+ * @return random string that needs to be freed.
+ */
+char *
+REGEX_ITERNAL_generate_random_string (size_t max_len);
+
+
+/**
+ * Options for graph creation function
+ * REGEX_ITERNAL_automaton_save_graph.
+ */
+enum REGEX_ITERNAL_GraphSavingOptions
+{
+  /**
+   * Default. Do nothing special.
+   */
+  REGEX_ITERNAL_GRAPH_DEFAULT = 0,
+
+  /**
+   * The generated graph will include extra information such as the NFA states
+   * that were used to generate the DFA state.
+   */
+  REGEX_ITERNAL_GRAPH_VERBOSE = 1,
+
+  /**
+   * Enable graph coloring. Will color each SCC in a different color.
+   */
+  REGEX_ITERNAL_GRAPH_COLORING = 2
+};
+
+
+/**
+ * Save the given automaton as a GraphViz dot file.
+ *
+ * @param a the automaton to be saved.
+ * @param filename where to save the file.
+ * @param options options for graph generation that include coloring or verbose
+ *                mode
+ */
+void
+REGEX_ITERNAL_automaton_save_graph (struct REGEX_ITERNAL_Automaton *a,
+                                   const char *filename,
+                                   enum REGEX_ITERNAL_GraphSavingOptions options);
+
+
+
 #if 0                           /* keep Emacsens' auto-indent happy */
 {
   #endif
@@ -77,4 +148,4 @@ REGEX_ITERNAL_free_from_file (char **regexes);
 #endif
 
 /* end of regex_internal_lib.h */
-#endif
\ No newline at end of file
+#endif
diff --git a/src/regex/regex_random.c b/src/regex/regex_test_random.c
index 6093ed2eb..00e4c21b3 100644
--- a/src/regex/regex_random.c
+++ b/src/regex/regex_test_random.c
@@ -18,12 +18,12 @@
      Boston, MA 02111-1307, USA.
 */
 /**
- * @file src/regex/regex_random.c
+ * @file src/regex/regex_test_random.c
  * @brief functions for creating random regular expressions and strings
  * @author Maximilian Szengel
  */
 #include "platform.h"
-#include "regex_internal_lib.h"
+#include "regex_test_lib.h"
 #include "gnunet_crypto_lib.h"
 #include "regex_internal.h"
 
@@ -33,7 +33,7 @@
  *
  * @return random valid literal
  */
-char
+static char
 get_random_literal ()
 {
   uint32_t ridx;
@@ -137,6 +137,7 @@ REGEX_ITERNAL_generate_random_regex (size_t rx_length, char *matching_str)
   return rx;
 }
 
+
 /**
  * Generate a random string of maximum length 'max_len' that only contains literals allowed
  * in a regular expression. The string might be 0 chars long but is garantueed
diff --git a/src/regex/test_regex_eval_api.c b/src/regex/test_regex_eval_api.c
index 8cdefb17d..3ab914dc1 100644
--- a/src/regex/test_regex_eval_api.c
+++ b/src/regex/test_regex_eval_api.c
@@ -26,6 +26,7 @@
 #include <time.h>
 #include "platform.h"
 #include "regex_internal_lib.h"
+#include "regex_test_lib.h"
 #include "regex_internal.h"
 
 enum Match_Result
diff --git a/src/regex/test_regex_graph_api.c b/src/regex/test_regex_graph_api.c
index 303a0ce07..a0d44fb2f 100644
--- a/src/regex/test_regex_graph_api.c
+++ b/src/regex/test_regex_graph_api.c
@@ -26,6 +26,7 @@
 #include <time.h>
 #include "platform.h"
 #include "regex_internal_lib.h"
+#include "regex_test_lib.h"
 #include "regex_internal.h"
 
 #define KEEP_FILES 1
diff --git a/src/regex/test_regex_proofs.c b/src/regex/test_regex_proofs.c
index f5bac0ad7..d7c743c77 100644
--- a/src/regex/test_regex_proofs.c
+++ b/src/regex/test_regex_proofs.c
@@ -24,6 +24,7 @@
  */
 #include "platform.h"
 #include "regex_internal_lib.h"
+#include "regex_test_lib.h"
 #include "regex_internal.h"