[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r29144 - gnunet/src/ats-tests
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r29144 - gnunet/src/ats-tests |
|
Date: |
Tue, 10 Sep 2013 10:54:30 +0200 |
Author: wachs
Date: 2013-09-10 10:54:30 +0200 (Tue, 10 Sep 2013)
New Revision: 29144
Added:
gnunet/src/ats-tests/perf_ats_mlp_bandwidth.conf
gnunet/src/ats-tests/perf_ats_mlp_delay.conf
gnunet/src/ats-tests/perf_ats_ril_bandwidth.conf
gnunet/src/ats-tests/perf_ats_ril_delay.conf
gnunet/src/ats-tests/template_perf_ats.conf
Modified:
gnunet/src/ats-tests/Makefile.am
gnunet/src/ats-tests/perf_ats.c
gnunet/src/ats-tests/perf_ats_proportional_bandwidth.conf
gnunet/src/ats-tests/perf_ats_proportional_delay.conf
Log:
updated configuration files
Modified: gnunet/src/ats-tests/Makefile.am
===================================================================
--- gnunet/src/ats-tests/Makefile.am 2013-09-10 08:44:03 UTC (rev 29143)
+++ gnunet/src/ats-tests/Makefile.am 2013-09-10 08:54:30 UTC (rev 29144)
@@ -13,13 +13,17 @@
endif
if HAVE_LIBGLPK
-
+ PERF_MLP_BANDWIDTH = perf_ats_mlp_bandwidth
+ PERF_MLP_DELAY = perf_ats_mlp_delay
endif
if HAVE_TESTING
TESTING_TESTS = \
perf_ats_proportional_bandwidth \
- perf_ats_proportional_delay
+ perf_ats_proportional_delay \
+ perf_ats_ril_bandwidth \
+ perf_ats_ril_delay \
+ $(PERF_MLP_BANDWIDTH) $(PERF_MLP_DELAY)
endif
check_PROGRAMS = \
@@ -44,7 +48,45 @@
$(top_builddir)/src/testbed/libgnunettestbed.la \
$(top_builddir)/src/ats/libgnunetats.la \
$(top_builddir)/src/core/libgnunetcore.la
+
+if HAVE_LIBGLPK
+perf_ats_mlp_bandwidth_SOURCES = \
+ perf_ats.c
+perf_ats_mlp_bandwidth_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testbed/libgnunettestbed.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
+ $(top_builddir)/src/core/libgnunetcore.la
+
+perf_ats_mlp_delay_SOURCES = \
+ perf_ats.c
+perf_ats_mlp_delay_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testbed/libgnunettestbed.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
+ $(top_builddir)/src/core/libgnunetcore.la
+endif
+perf_ats_ril_bandwidth_SOURCES = \
+ perf_ats.c
+perf_ats_ril_bandwidth_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testbed/libgnunettestbed.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
+ $(top_builddir)/src/core/libgnunetcore.la
+
+perf_ats_ril_delay_SOURCES = \
+ perf_ats.c
+perf_ats_ril_delay_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testbed/libgnunettestbed.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
+ $(top_builddir)/src/core/libgnunetcore.la
+
EXTRA_DIST = \
perf_ats_proportional_bandwidth.conf \
- perf_ats_proportional_delay.conf
+ perf_ats_proportional_delay.conf \
+ perf_ats_mlp_bandwidth.conf \
+ perf_ats_mlp_delay.conf \
+ perf_ats_ril_bandwidth.conf \
+ perf_ats_ril_delay.conf
Modified: gnunet/src/ats-tests/perf_ats.c
===================================================================
--- gnunet/src/ats-tests/perf_ats.c 2013-09-10 08:44:03 UTC (rev 29143)
+++ gnunet/src/ats-tests/perf_ats.c 2013-09-10 08:54:30 UTC (rev 29144)
@@ -693,8 +693,6 @@
int c;
int cs;
- id = GNUNET_strdup (GNUNET_i2s (&p->id));
-
t = find_peer (peer);
if (NULL == t)
{
@@ -702,6 +700,7 @@
return;
}
+ id = GNUNET_strdup (GNUNET_i2s (&p->id));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"%s %s connected to %s %s\n",
(p->master == GNUNET_YES) ? "Master": "Slave",
Added: gnunet/src/ats-tests/perf_ats_mlp_bandwidth.conf
===================================================================
--- gnunet/src/ats-tests/perf_ats_mlp_bandwidth.conf
(rev 0)
+++ gnunet/src/ats-tests/perf_ats_mlp_bandwidth.conf 2013-09-10 08:54:30 UTC
(rev 29144)
@@ -0,0 +1,4 @@
address@hidden@ template_perf_ats.conf
+
+[ats]
+MODE = MLP
\ No newline at end of file
Added: gnunet/src/ats-tests/perf_ats_mlp_delay.conf
===================================================================
--- gnunet/src/ats-tests/perf_ats_mlp_delay.conf
(rev 0)
+++ gnunet/src/ats-tests/perf_ats_mlp_delay.conf 2013-09-10 08:54:30 UTC
(rev 29144)
@@ -0,0 +1,4 @@
address@hidden@ template_perf_ats.conf
+
+[ats]
+MODE = MLP
Modified: gnunet/src/ats-tests/perf_ats_proportional_bandwidth.conf
===================================================================
--- gnunet/src/ats-tests/perf_ats_proportional_bandwidth.conf 2013-09-10
08:44:03 UTC (rev 29143)
+++ gnunet/src/ats-tests/perf_ats_proportional_bandwidth.conf 2013-09-10
08:54:30 UTC (rev 29144)
@@ -1,28 +1,4 @@
-[hostlist]
-SERVERS =
address@hidden@ template_perf_ats.conf
-[transport-udp]
-BROADCAST = NO
-
-[peerinfo]
-USE_INCLUDED_HELLOS = NO
-
[ats]
-# Network specific inbound/outbound quotas
-UNSPECIFIED_QUOTA_IN = 128 KiB
-UNSPECIFIED_QUOTA_OUT = 128 KiB
-# LOOPBACK
-LOOPBACK_QUOTA_IN = 128 KiB
-LOOPBACK_QUOTA_OUT = 128 KiB
-# LAN
-LAN_QUOTA_IN = 128 KiB
-LAN_QUOTA_OUT = 128 KiB
-# WAN
-WAN_QUOTA_IN = 128 KiB
-WAN_QUOTA_OUT = 128 KiB
-# WLAN
-WLAN_QUOTA_IN = 128 KiB
-WLAN_QUOTA_OUT = 128 KiB
-# BLUETOOTH
-BLUETOOTH_QUOTA_IN = 128 KiB
-BLUETOOTH_QUOTA_OUT = 128 KiB
\ No newline at end of file
+MODE = PROPORTIONAL
Modified: gnunet/src/ats-tests/perf_ats_proportional_delay.conf
===================================================================
--- gnunet/src/ats-tests/perf_ats_proportional_delay.conf 2013-09-10
08:44:03 UTC (rev 29143)
+++ gnunet/src/ats-tests/perf_ats_proportional_delay.conf 2013-09-10
08:54:30 UTC (rev 29144)
@@ -1,8 +1,4 @@
-[hostlist]
-SERVERS =
address@hidden@ template_perf_ats.conf
-[transport-udp]
-BROADCAST = NO
-
-[peerinfo]
-USE_INCLUDED_HELLOS = NO
+[ats]
+MODE = PROPORTIONAL
Added: gnunet/src/ats-tests/perf_ats_ril_bandwidth.conf
===================================================================
--- gnunet/src/ats-tests/perf_ats_ril_bandwidth.conf
(rev 0)
+++ gnunet/src/ats-tests/perf_ats_ril_bandwidth.conf 2013-09-10 08:54:30 UTC
(rev 29144)
@@ -0,0 +1,4 @@
address@hidden@ template_perf_ats.conf
+
+[ats]
+MODE = RIL
\ No newline at end of file
Added: gnunet/src/ats-tests/perf_ats_ril_delay.conf
===================================================================
--- gnunet/src/ats-tests/perf_ats_ril_delay.conf
(rev 0)
+++ gnunet/src/ats-tests/perf_ats_ril_delay.conf 2013-09-10 08:54:30 UTC
(rev 29144)
@@ -0,0 +1,4 @@
address@hidden@ template_perf_ats.conf
+
+[ats]
+MODE = RIL
Added: gnunet/src/ats-tests/template_perf_ats.conf
===================================================================
--- gnunet/src/ats-tests/template_perf_ats.conf (rev 0)
+++ gnunet/src/ats-tests/template_perf_ats.conf 2013-09-10 08:54:30 UTC (rev
29144)
@@ -0,0 +1,28 @@
+[hostlist]
+SERVERS =
+
+[transport-udp]
+BROADCAST = NO
+
+[peerinfo]
+USE_INCLUDED_HELLOS = NO
+
+[ats]
+# Network specific inbound/outbound quotas
+UNSPECIFIED_QUOTA_IN = 128 KiB
+UNSPECIFIED_QUOTA_OUT = 128 KiB
+# LOOPBACK
+LOOPBACK_QUOTA_IN = 128 KiB
+LOOPBACK_QUOTA_OUT = 128 KiB
+# LAN
+LAN_QUOTA_IN = 128 KiB
+LAN_QUOTA_OUT = 128 KiB
+# WAN
+WAN_QUOTA_IN = 128 KiB
+WAN_QUOTA_OUT = 128 KiB
+# WLAN
+WLAN_QUOTA_IN = 128 KiB
+WLAN_QUOTA_OUT = 128 KiB
+# BLUETOOTH
+BLUETOOTH_QUOTA_IN = 128 KiB
+BLUETOOTH_QUOTA_OUT = 128 KiB
\ No newline at end of file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r29144 - gnunet/src/ats-tests,
gnunet <=