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

[gnunet]

Author: wachs
Date: 2013-03-26 13:37:56 +0100 (Tue, 26 Mar 2013)
New Revision: 26608

Modified:
   gnunet/src/ats/Makefile.am
   gnunet/src/ats/gnunet-service-ats_addresses.c
   gnunet/src/ats/test_ats_api_performance_monitor.c
Log:
test


Modified: gnunet/src/ats/Makefile.am
===================================================================
--- gnunet/src/ats/Makefile.am  2013-03-26 10:59:44 UTC (rev 26607)
+++ gnunet/src/ats/Makefile.am  2013-03-26 12:37:56 UTC (rev 26608)
@@ -76,6 +76,7 @@
  test_ats_simplistic_pref_aging \
  test_ats_api_performance_list_addresses \
  test_ats_api_performance_monitor \
+ test_ats_api_performance_address_info \
  $(GN_MLP_TEST) $(GN_MLP_PERF) $(GN_MLP_TEST_UPDATE)
 # $(GN_MLP_TEST_AVG)
 # test_ats_api_scheduling_get_type
@@ -175,6 +176,15 @@
   $(top_builddir)/src/ats/libgnunetats.la     
 
 
+test_ats_api_performance_address_info_SOURCES = \
+ test_ats_api_performance_address_info.c
+test_ats_api_performance_address_info_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
+
+
 test_ats_simplistic_SOURCES = \
  test_ats_simplistic.c test_ats_api_common.c
 test_ats_simplistic_LDADD = \

Modified: gnunet/src/ats/gnunet-service-ats_addresses.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses.c       2013-03-26 10:59:44 UTC 
(rev 26607)
+++ gnunet/src/ats/gnunet-service-ats_addresses.c       2013-03-26 12:37:56 UTC 
(rev 26608)
@@ -1264,14 +1264,24 @@
 {
   struct GAS_Addresses_Handle *handle = cls;
   struct GAS_Addresses_Suggestion_Requests *cur;
+  struct GNUNET_ATS_Information *ats;
+  unsigned int ats_count;
 
   GNUNET_assert (handle != NULL);
   GNUNET_assert (address != NULL);
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Bandwidth assignment changed for peer 
%s \n", GNUNET_i2s(&address->peer));
-  struct GNUNET_ATS_Information *ats;
-  unsigned int ats_count;
 
+
+  ats_count = assemble_ats_information (address, &ats);
+  GAS_performance_notify_all_clients (&address->peer,
+      address->plugin,
+      address->addr, address->addr_len,
+      address->session_id,
+      ats, ats_count,
+      address->assigned_bw_out,
+      address->assigned_bw_in);
+
   cur = handle->r_head;
   while (NULL != cur)
   {
@@ -1283,13 +1293,14 @@
   {
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                   "Nobody is interested in peer `%s' :(\n",GNUNET_i2s 
(&address->peer));
+      GNUNET_free (ats);
       return;
   }
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Sending bandwidth update for peer `%s'\n",GNUNET_i2s 
(&address->peer));
 
-  ats_count = assemble_ats_information (address, &ats);
+
   GAS_scheduling_transmit_address_suggestion (&address->peer,
                                               address->plugin,
                                               address->addr, address->addr_len,

Modified: gnunet/src/ats/test_ats_api_performance_monitor.c
===================================================================
--- gnunet/src/ats/test_ats_api_performance_monitor.c   2013-03-26 10:59:44 UTC 
(rev 26607)
+++ gnunet/src/ats/test_ats_api_performance_monitor.c   2013-03-26 12:37:56 UTC 
(rev 26608)
@@ -142,30 +142,6 @@
   end_now (1);
 }
 
-static void
-next_stage (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-       static int stage_counter = 0;
-
-       stage_task = GNUNET_SCHEDULER_NO_TASK;
-       if (0 == stage_counter)
-       {
-               GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stop performance 
monitoring\n");
-
-               stage_task = GNUNET_SCHEDULER_add_delayed (SHUTDOWN_CORRECT, 
&next_stage, NULL);
-               stage_counter++;
-               return;
-       }
-       if (1 == stage_counter)
-       {
-
-       }
-       else
-       {
-                       end_now (1);
-       }
-}
-
 static void end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Success\n");