[GNUnet-SVN] r29595 - gnunet/src/ats

[gnunet]

Author: wachs
Date: 2013-09-26 12:07:40 +0200 (Thu, 26 Sep 2013)
New Revision: 29595

Added:
   gnunet/src/ats/test_ats_solver_add_address.c
   gnunet/src/ats/test_ats_solver_mlp.conf
   gnunet/src/ats/test_ats_solver_proportional.conf
   gnunet/src/ats/test_ats_solver_ril.conf
Modified:
   gnunet/src/ats/Makefile.am
Log:
new solver test


Modified: gnunet/src/ats/Makefile.am
===================================================================
--- gnunet/src/ats/Makefile.am  2013-09-26 10:06:31 UTC (rev 29594)
+++ gnunet/src/ats/Makefile.am  2013-09-26 10:07:40 UTC (rev 29595)
@@ -75,7 +75,10 @@
  test_ats_api_performance_list_peer_addresses \
  test_ats_api_performance_list_all_addresses_active \
  test_ats_api_performance_monitor \
- test_ats_api_performance_monitor_initial_callback
+ test_ats_api_performance_monitor_initial_callback \
+ test_ats_solver_add_address_proportional \
+ test_ats_solver_add_address_mlp \
+ test_ats_solver_add_address_ril
 # test_ats_api_scheduling_min_bw
 # test_ats_api_scheduling_check_min_bw_alt
 # test_ats_api_scheduling_update_address
@@ -99,6 +102,8 @@
 TESTS = $(check_PROGRAMS)
 endif
 
+# scheduling API tests
+
 test_ats_api_scheduling_init_SOURCES = \
  test_ats_api_scheduling_init.c \
  test_ats_api_common.c test_ats_api_common.h
@@ -169,6 +174,8 @@
   $(top_builddir)/src/ats/libgnunetats.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la  
 
+# performance API tests
+
 test_ats_api_performance_list_all_addresses_SOURCES = \
  test_ats_api_performance_list_all_addresses.c
 test_ats_api_performance_list_all_addresses_LDADD = \
@@ -214,11 +221,35 @@
   $(top_builddir)/src/ats/libgnunetats.la \
        $(top_builddir)/src/statistics/libgnunetstatistics.la
        
+# solver tests
+test_ats_solver_add_address_proportional_SOURCES = \
+ test_ats_solver_add_address.c 
+test_ats_solver_add_address_proportional_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/hello/libgnunethello.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+       $(top_builddir)/src/statistics/libgnunetstatistics.la
        
+test_ats_solver_add_address_mlp_SOURCES = \
+ test_ats_solver_add_address.c 
+test_ats_solver_add_address_mlp_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/hello/libgnunethello.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+       $(top_builddir)/src/statistics/libgnunetstatistics.la
+               
+test_ats_solver_add_address_ril_SOURCES = \
+ test_ats_solver_add_address.c 
+test_ats_solver_add_address_ril_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/hello/libgnunethello.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+       $(top_builddir)/src/statistics/libgnunetstatistics.la
+                       
 
-
-       
-
 #test_ats_api_scheduling_min_bw_SOURCES = \
 # test_ats_api_scheduling_min_bw.c test_ats_api_common.c
 #test_ats_api_scheduling_min_bw_LDADD = \

Added: gnunet/src/ats/test_ats_solver_add_address.c
===================================================================
--- gnunet/src/ats/test_ats_solver_add_address.c                                
(rev 0)
+++ gnunet/src/ats/test_ats_solver_add_address.c        2013-09-26 10:07:40 UTC 
(rev 29595)
@@ -0,0 +1,105 @@
+/*
+  if (NULL == (perf_ats = GNUNET_ATS_performance_init (cfg, &ats_perf_cb, 
NULL)))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+        "Failed to connect to performance API\n");
+    GNUNET_SCHEDULER_add_now (end_badly, NULL);
+  }
+ This file is part of GNUnet.
+ (C) 2010-2013 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+/**
+ * @file ats/test_ats_solver_add_address.c
+ * @brief solver test: add address
+ * @author Christian Grothoff
+ * @author Matthias Wachs
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_testbed_service.h"
+#include "gnunet_ats_service.h"
+
+static int ret;
+
+
+static void
+run (void *cls, const struct GNUNET_CONFIGURATION_Handle *mycfg,
+    struct GNUNET_TESTING_Peer *peer)
+{
+  ret = 0;
+}
+
+int
+main (int argc, char *argv[])
+{
+  char *sep;
+  char *src_filename = GNUNET_strdup (__FILE__);
+  char *test_filename = GNUNET_strdup (argv[0]);
+  char *config_file;
+  char *solver;
+
+  ret = 0;
+
+  if (NULL == (sep  = (strstr (src_filename,".c"))))
+  {
+    GNUNET_break (0);
+    return -1;
+  }
+  sep[0] = '\0';
+
+  if (NULL != (sep = strstr (test_filename, ".exe")))
+    sep[0] = '\0';
+
+  if (NULL == (solver = strstr (test_filename, src_filename)))
+  {
+    GNUNET_break (0);
+    return -1;
+  }
+  solver += strlen (src_filename) +1;
+
+  if (0 == strcmp(solver, "proportional"))
+  {
+    config_file = "test_ats_solver_proportional.conf";
+  }
+  else if (0 == strcmp(solver, "mlp"))
+  {
+    config_file = "test_ats_solver_mlp.conf";
+  }
+  else if ((0 == strcmp(solver, "ril")))
+  {
+    config_file = "test_ats_solver_ril.conf";
+  }
+  else
+  {
+    GNUNET_break (0);
+    GNUNET_free (src_filename);
+    GNUNET_free (test_filename);
+    return 1;
+  }
+
+  GNUNET_free (src_filename);
+  GNUNET_free (test_filename);
+
+  if (0 != GNUNET_TESTING_peer_run ("test_ats_api_performance",
+      config_file, &run, NULL ))
+    return GNUNET_SYSERR;
+
+  return ret;
+}
+
+/* end of file test_ats_solver_add_address.c */

Added: gnunet/src/ats/test_ats_solver_mlp.conf
===================================================================
Added: gnunet/src/ats/test_ats_solver_proportional.conf
===================================================================
Added: gnunet/src/ats/test_ats_solver_ril.conf
===================================================================