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

[gnunet]

Author: wachs
Date: 2012-12-06 16:21:32 +0100 (Thu, 06 Dec 2012)
New Revision: 25300

Removed:
   gnunet/src/ats/test_ats_api_scheduling.c
Modified:
   gnunet/src/ats/Makefile.am
Log:
remove old code

Modified: gnunet/src/ats/Makefile.am
===================================================================
--- gnunet/src/ats/Makefile.am  2012-12-06 15:18:54 UTC (rev 25299)
+++ gnunet/src/ats/Makefile.am  2012-12-06 15:21:32 UTC (rev 25300)
@@ -65,8 +65,6 @@
  test_ats_api_scheduling_destroy_session \
  test_ats_api_scheduling_block_and_reset \
  test_ats_api_performance 
-# test_ats_api_scheduling \
-# 
 # $(GN_MLP_TEST) \
 # $(GN_MLP_TEST_AVG) \
 # $(GN_MLP_PERF)
@@ -153,28 +151,6 @@
 #  $(top_builddir)/src/statistics/libgnunetstatistics.la
 endif
 
-
-#test_ats_api_scheduling_SOURCES = \
-# test_ats_api_scheduling.c
-#test_ats_api_scheduling_LDADD = \
-#  $(top_builddir)/src/util/libgnunetutil.la \
-#  $(top_builddir)/src/testing/libgnunettesting.la \
-#  $(top_builddir)/src/ats/libgnunetats.la  
-
-#test_ats_api_scheduling_destroy_address_SOURCES = \
-# test_ats_api_scheduling_destroy_address.c
-#test_ats_api_scheduling_destroy_address_LDADD = \
-#  $(top_builddir)/src/util/libgnunetutil.la \
-#  $(top_builddir)/src/testing/libgnunettesting.la \
-#  $(top_builddir)/src/ats/libgnunetats.la
-
-
-#test_ats_api_scheduling_get_type_SOURCES = \
-# test_ats_api_scheduling_get_type.c
-#test_ats_api_scheduling_get_type_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 = \
@@ -183,9 +159,6 @@
 #  $(top_builddir)/src/ats/libgnunetats.la  
 
 
-
-
-
 EXTRA_DIST = \
   ats.h \
   test_ats_api.conf

Deleted: gnunet/src/ats/test_ats_api_scheduling.c
===================================================================
--- gnunet/src/ats/test_ats_api_scheduling.c    2012-12-06 15:18:54 UTC (rev 
25299)
+++ gnunet/src/ats/test_ats_api_scheduling.c    2012-12-06 15:21:32 UTC (rev 
25300)
@@ -1,201 +0,0 @@
-/*
-     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_scheduling.c
- * @brief test automatic transport selection scheduling API
- * @author Christian Grothoff
- * @author Matthias Wachs
- *
- * TODO:
- * - write test case
- * - extend API to get performance data
- * - implement simplistic strategy based on say 'lowest latency' or strict 
ordering
- * - extend API to get peer preferences, implement proportional bandwidth 
assignment
- * - re-implement API against a real ATS service (!)
- */
-#include "platform.h"
-#include "gnunet_ats_service.h"
-#include "gnunet_testing_lib-new.h"
-#include "ats.h"
-
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
-
-static GNUNET_SCHEDULER_TaskIdentifier die_task;
-
-static struct GNUNET_ATS_SchedulingHandle *ats;
-
-static int ret;
-
-struct Address
-{
-  char *plugin;
-  size_t plugin_len;
-
-  void *addr;
-  size_t addr_len;
-
-  struct GNUNET_ATS_Information *ats;
-  int ats_count;
-
-  void *session;
-};
-
-struct PeerContext
-{
-  struct GNUNET_PeerIdentity id;
-
-  struct Address *addr;
-};
-
-static struct Address test_addr[2];
-
-static struct PeerContext p[2];
-
-static struct GNUNET_ATS_Information atsi[2];
-
-
-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);
-  ret = GNUNET_SYSERR;
-}
-
-
-static void
-end ()
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutting down\n");
-  if (die_task != GNUNET_SCHEDULER_NO_TASK)
-  {
-    GNUNET_SCHEDULER_cancel (die_task);
-    die_task = GNUNET_SCHEDULER_NO_TASK;
-  }
-
-  GNUNET_ATS_scheduling_done (ats);
-  ret = 0;
-}
-
-
-static void
-address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
-                    struct Session *session,
-                    struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
-                    struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
-                    const struct GNUNET_ATS_Information *ats,
-                    uint32_t ats_count)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ATS suggests address `%s'\n",
-              GNUNET_i2s (&address->peer));
-
-  GNUNET_assert (0 ==
-                 memcmp (&address->peer, &p[0].id,
-                         sizeof (struct GNUNET_PeerIdentity)));
-  GNUNET_assert (0 == strcmp (address->transport_name, test_addr[0].plugin));
-  GNUNET_assert (address->address_length == test_addr[0].addr_len);
-  GNUNET_assert (0 ==
-                 memcmp (address->address, test_addr[0].plugin,
-                         address->address_length));
-  GNUNET_assert (test_addr[0].session == session);
-
-  ret = 0;
-
-  GNUNET_SCHEDULER_add_now (&end, NULL);
-}
-
-
-static void
-run (void *cls, 
-     const struct GNUNET_CONFIGURATION_Handle *cfg,
-     struct GNUNET_TESTING_Peer *peer)
-{
-  struct GNUNET_HELLO_Address address0;
-
-  ret = GNUNET_SYSERR;
-
-  die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
-  ats = GNUNET_ATS_scheduling_init (cfg, &address_suggest_cb, NULL);
-  if (ats == NULL)
-  {
-    ret = GNUNET_SYSERR;
-    end ();
-    return;
-  }
-  /* set up peer */
-  GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_WEAK,
-                                    &p[0].id.hashPubKey);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created peer `%s'\n",
-              GNUNET_i2s (&p[0].id));
-
-  GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_WEAK,
-                                    &p[1].id.hashPubKey);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created peer `%s'\n",
-              GNUNET_i2s (&p[1].id));
-
-  test_addr[0].plugin = "test";
-  test_addr[0].session = NULL;
-  test_addr[0].addr = GNUNET_strdup ("test");
-  test_addr[0].addr_len = 4;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing address creation\n");
-
-  address0.peer = p[0].id;
-  address0.transport_name = test_addr[0].plugin;
-  address0.address = test_addr[0].addr;
-  address0.address_length = test_addr[0].addr_len;
-  GNUNET_ATS_address_add (ats, &address0, test_addr[0].session, NULL, 0);
-  GNUNET_ATS_address_update (ats, &address0, test_addr[0].session, NULL, 0);
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing ATS info creation\n");
-
-  atsi[0].type = htonl (GNUNET_ATS_UTILIZATION_UP);
-  atsi[0].value = htonl (1024);
-
-  GNUNET_ATS_address_update (ats, &address0, test_addr[0].session, atsi, 1);
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing ATS info update\n");
-
-  atsi[0].type = htonl (GNUNET_ATS_UTILIZATION_UP);
-  atsi[0].value = htonl (2048);
-
-  atsi[1].type = htonl (GNUNET_ATS_UTILIZATION_DOWN);
-  atsi[1].value = htonl (1024);
-
-  GNUNET_ATS_address_update (ats, &address0, test_addr[0].session, atsi, 2);
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Requesting peer `%s'\n",
-              GNUNET_i2s (&p[0].id));
-  GNUNET_ATS_suggest_address (ats, &p[0].id);
-}
-
-
-int
-main (int argc, char *argv[])
-{
-  if (0 != GNUNET_TESTING_peer_run ("test_ats_api_scheduling",
-                                   "test_ats_api.conf",
-                                   &run, NULL))
-    return 1;
-  return ret;
-}
-
-/* end of file test_ats_api_scheduling.c */