4 files changed, 257 insertions, 21 deletions

diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am
index abec8e625..74f8abcb8 100644
--- a/src/ats/Makefile.am
+++ b/src/ats/Makefile.am
@@ -33,9 +33,9 @@ gnunet_service_ats_LDADD = \
 
 
 check_PROGRAMS = \
- test_ats_api_scheduling 
-# test_ats_api_update_address
-
+ test_ats_api_scheduling \
+ test_ats_api_bandwidth_consumption
+ 
 if ENABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)
 endif
@@ -46,6 +46,12 @@ test_ats_api_scheduling_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/ats/libgnunetats.la  
 
+test_ats_api_bandwidth_consumption_SOURCES = \
+ test_ats_api_bandwidth_consumption.c
+test_ats_api_bandwidth_consumption_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/ats/libgnunetats.la  
+
 #test_ats_api_update_address_SOURCES = \
 # test_ats_api_update_address.c
 #test_ats_api_update_address_LDADD = \
diff --git a/src/ats/test_ats_api.conf b/src/ats/test_ats_api.conf
index c9e2d70cb..8ee71a7e8 100644
--- a/src/ats/test_ats_api.conf
+++ b/src/ats/test_ats_api.conf
@@ -17,21 +17,4 @@ ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
 UNIXPATH = /tmp/test-ats-scheduling-ats.sock
 UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-
-[resolver]
-PORT = 12003
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
-
-[statistics]
-PORT = 12004
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
-
-[peerinfo]
-PORT = 12005
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
-
-[transport]
-PORT = 12006
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
\ No newline at end of file
+UNIX_MATCH_GID = YES
\ No newline at end of file
diff --git a/src/ats/test_ats_api_bandwidth_consumption.c b/src/ats/test_ats_api_bandwidth_consumption.c
new file mode 100644
index 000000000..5ff19fd83
--- /dev/null
+++ b/src/ats/test_ats_api_bandwidth_consumption.c
@@ -0,0 +1,246 @@
+/*
+     This file is part of GNUnet.
+     (C) 2010,2011 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_api_bandwidth_consumption.c
+ * @brief test automatic transport selection scheduling API
+ * @author Christian Grothoff
+ * @author Matthias Wachs
+
+ */
+#include "platform.h"
+#include "gnunet_ats_service.h"
+#include "ats.h"
+
+#define VERBOSE GNUNET_YES
+
+#define VERBOSE_ARM GNUNET_EXTRA_LOGGING
+
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
+
+static GNUNET_SCHEDULER_TaskIdentifier die_task;
+
+static struct GNUNET_ATS_SchedulingHandle *ats;
+
+static struct GNUNET_ATS_PerformanceHandle *atp;
+
+static struct GNUNET_OS_Process * arm_proc;
+
+static struct GNUNET_BANDWIDTH_Value32NBO bw_in;
+
+static struct GNUNET_BANDWIDTH_Value32NBO bw_out;
+
+static int ret;
+
+struct Address
+{
+  char * plugin;
+  size_t plugin_len;
+
+  void * addr;
+  size_t addr_len;
+
+  struct GNUNET_TRANSPORT_ATS_Information * ats;
+  int ats_count;
+
+  void  *session;
+};
+
+struct PeerContext
+{
+  struct GNUNET_PeerIdentity id;
+
+  struct Address * addr;
+};
+
+
+static void
+stop_arm ()
+{
+  if (0 != GNUNET_OS_process_kill (arm_proc, SIGTERM))
+    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+  GNUNET_OS_process_wait (arm_proc);
+  GNUNET_OS_process_close (arm_proc);
+  arm_proc = NULL;
+}
+
+
+static void
+end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  die_task = GNUNET_SCHEDULER_NO_TASK;
+  if (ats != NULL)
+    GNUNET_ATS_scheduling_done (ats);
+  if (atp != NULL)
+    GNUNET_ATS_performance_done (atp);
+
+  ret = GNUNET_SYSERR;
+
+  stop_arm ();
+}
+
+
+static void
+end ()
+{
+  if (die_task != GNUNET_SCHEDULER_NO_TASK)
+  {
+    GNUNET_SCHEDULER_cancel(die_task);
+    die_task = GNUNET_SCHEDULER_NO_TASK;
+  }
+
+  GNUNET_ATS_scheduling_done (ats);
+
+  GNUNET_ATS_performance_done (atp);
+
+  ret = 0;
+
+  stop_arm ();
+}
+
+void performance_cb (void *cls,
+                    const struct
+                    GNUNET_PeerIdentity *
+                    peer,
+                    const char *plugin_name,
+                    const void *plugin_addr,
+                    size_t plugin_addr_len,
+                    struct
+                    GNUNET_BANDWIDTH_Value32NBO
+                    bandwidth_out,
+                    struct
+                    GNUNET_BANDWIDTH_Value32NBO
+                    bandwidth_in,
+                    const struct
+                    GNUNET_TRANSPORT_ATS_Information
+                    * ats,
+                    uint32_t ats_count)
+{
+
+}
+
+static void
+address_suggest_cb (void *cls,
+                    const struct
+                    GNUNET_PeerIdentity *
+                    peer,
+                    const char *plugin_name,
+                    const void *plugin_addr,
+                    size_t plugin_addr_len,
+                    struct Session * session,
+                    struct
+                    GNUNET_BANDWIDTH_Value32NBO
+                    bandwidth_out,
+                    struct
+                    GNUNET_BANDWIDTH_Value32NBO
+                    bandwidth_in,
+                    const struct
+                    GNUNET_TRANSPORT_ATS_Information
+                    * ats,
+                    uint32_t ats_count)
+
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ATS suggested address for peer `%s'\n", GNUNET_i2s (peer));
+
+  bw_in = bandwidth_in;
+  bw_out = bandwidth_out;
+}
+
+void
+start_arm (const char *cfgname)
+{
+  arm_proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
+                           "gnunet-service-arm",
+#if VERBOSE_ARM
+                           "-L", "DEBUG",
+#endif
+                           "-c", cfgname, NULL);
+}
+
+static void
+check (void *cls, char *const *args, const char *cfgfile,
+       const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+  ret = GNUNET_SYSERR;
+  struct Address addr;
+  struct PeerContext p;
+
+  die_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT, &end_badly, NULL);
+  start_arm (cfgfile);
+
+  ats = GNUNET_ATS_scheduling_init (cfg, &address_suggest_cb, NULL);
+  if (ats == NULL)
+  {
+    ret = GNUNET_SYSERR;
+    end ();
+    return;
+  }
+
+  atp = GNUNET_ATS_performance_init (cfg, &performance_cb, NULL);
+  if (atp == NULL)
+  {
+    ret = GNUNET_SYSERR;
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to init ATS performance\n");
+    end_badly(NULL, NULL);
+    return;
+  }
+
+  /* set up peer */
+  GNUNET_CRYPTO_hash_create_random(GNUNET_CRYPTO_QUALITY_WEAK, &p.id.hashPubKey);
+
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created peer `%s'\n", GNUNET_i2s (&p.id));
+  p.addr = &addr;
+  addr.plugin = "test";
+  addr.session = NULL;
+  addr.addr = NULL;
+  addr.addr_len = 0;
+
+  GNUNET_ATS_address_update(ats, &p.id, addr.plugin, addr.addr, addr.addr_len, addr.session, NULL, 0);
+
+  GNUNET_ATS_suggest_address(ats, &p.id);
+}
+
+int
+main (int argc, char *argv[])
+{
+  static char *const argv2[] = { "test_ats_api_bandwidth_consumption",
+    "-c",
+    "test_ats_api.conf",
+#if VERBOSE
+    "-L", "DEBUG",
+#else
+    "-L", "WARNING",
+#endif
+    NULL
+  };
+
+  static struct GNUNET_GETOPT_CommandLineOption options[] = {
+    GNUNET_GETOPT_OPTION_END
+  };
+
+  GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2,
+                      "test_ats_api_bandwidth_consumption", "nohelp", options, &check,
+                      NULL);
+
+
+  return ret;
+}
+
+/* end of file test_ats_api_bandwidth_consumption.c */
diff --git a/src/ats/test_ats_api_scheduling.c b/src/ats/test_ats_api_scheduling.c
index 851b515ad..88bd8b7ba 100644
--- a/src/ats/test_ats_api_scheduling.c
+++ b/src/ats/test_ats_api_scheduling.c
@@ -164,6 +164,7 @@ check (void *cls, char *const *args, const char *cfgfile,
   if (ats == NULL)
   {
     ret = GNUNET_SYSERR;
+    end ();
     return;
   }