[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r15309 - gnunet/src/transport
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r15309 - gnunet/src/transport |
|
Date: |
Wed, 25 May 2011 17:56:53 +0200 |
Author: wachs
Date: 2011-05-25 17:56:53 +0200 (Wed, 25 May 2011)
New Revision: 15309
Added:
gnunet/src/transport/perf_transport_ats.c
Removed:
gnunet/src/transport/test_transport_ats_perf.c
Modified:
gnunet/src/transport/Makefile.am
Log:
renaming
Modified: gnunet/src/transport/Makefile.am
===================================================================
--- gnunet/src/transport/Makefile.am 2011-05-25 15:51:14 UTC (rev 15308)
+++ gnunet/src/transport/Makefile.am 2011-05-25 15:56:53 UTC (rev 15309)
@@ -34,12 +34,10 @@
if HAVE_PCAP
if LINUX
- WLAN_BIN = gnunet-transport-wlan-helper
- WLAN_BIN_DUMMY = gnunet-transport-wlan-helper-dummy
+ WANBIN = gnunet-transport-wlan-helper
WLAN_PLUGIN_LA = libgnunet_plugin_transport_wlan.la
WLAN_API_TEST = test_transport_api_wlan
WLAN_REL_TEST = test_transport_api_reliability_wlan
- WLAN_UREL_TEST = test_transport_api_unreliability_wlan
endif
endif
@@ -80,9 +78,8 @@
bin_PROGRAMS = \
gnunet-transport \
- $(WLAN_BIN) \
- gnunet-service-transport $(NATBIN) \
- $(WLAN_BIN_DUMMY)
+ $(WANBIN) \
+ gnunet-service-transport $(NATBIN)
bin_SCRIPTS = \
gnunet-transport-certificate-creation
@@ -94,21 +91,13 @@
gnunet_transport_wlan_helper_SOURCES = \
wlan/radiotap-parser.c \
wlan/helper_common.c \
+ wlan/loopback_helper.c \
gnunet-transport-wlan-helper.c
-gnunet_transport_wlan_helper_dummy_SOURCES = \
- wlan/radiotap-parser.c \
- wlan/helper_common.c \
- test_plugin_transport_wlan_dummy.c
-
gnunet_transport_wlan_helper_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
-lpcap
-gnunet_transport_wlan_helper_dummy_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- -lpcap
-
gnunet_nat_client_SOURCES = \
$(NATCLIENT)
@@ -224,7 +213,7 @@
check_PROGRAMS = \
test_transport_ats \
- test_transport_ats_perf \
+ perf_transport_ats \
test_transport_api_tcp \
test_transport_api_tcp_nat \
test_transport_api_udp \
@@ -249,14 +238,13 @@
$(HTTP_QUOTA_TEST) \
$(HTTPS_QUOTA_TEST) \
$(WLAN_API_TEST) \
- $(WLAN_REL_TEST) \
- $(WLAN_UREL_TEST)
+ $(WLAN_REL_TEST)
# TODO: add tests for nat, etc.
if !DISABLE_TEST_RUN
TESTS = \
test_transport_ats \
- test_transport_ats_perf \
+ perf_transport_ats \
test_transport_api_tcp \
test_transport_api_tcp_nat \
test_transport_api_udp \
@@ -280,12 +268,9 @@
$(UNIX_QUOTA_TEST) \
$(HTTP_QUOTA_TEST) \
$(HTTPS_QUOTA_TEST) \
- $(WLAN_UREL_TEST)
+ $(WLAN_REL_TEST)
endif
-# $(WLAN_API_TEST)
-# $(WLAN_REL_TEST)
-
test_transport_ats_SOURCES = \
test_transport_ats.c
test_transport_ats_LDADD = -lm \
@@ -294,9 +279,9 @@
$(top_builddir)/src/testing/libgnunettesting.la \
$(top_builddir)/src/util/libgnunetutil.la
-test_transport_ats_perf_SOURCES = \
- test_transport_ats_perf.c
-test_transport_ats_perf_LDADD = \
+perf_transport_ats_SOURCES = \
+ perf_transport_ats.c
+perf_transport_ats_LDADD = \
$(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/testing/libgnunettesting.la \
@@ -337,14 +322,8 @@
$(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/util/libgnunetutil.la
-
-test_transport_api_unreliability_wlan_SOURCES = \
- test_transport_api_unreliability.c
-test_transport_api_unreliability_wlan_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la
+
test_transport_api_udp_SOURCES = \
test_transport_api.c
test_transport_api_udp_LDADD = \
Added: gnunet/src/transport/perf_transport_ats.c
===================================================================
--- gnunet/src/transport/perf_transport_ats.c (rev 0)
+++ gnunet/src/transport/perf_transport_ats.c 2011-05-25 15:56:53 UTC (rev
15309)
@@ -0,0 +1,266 @@
+/*
+ This file is part of GNUnet.
+ (C) 2009 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 testing/per_transport_ats.c
+ * @brief testcase for ats functionality
+ */
+#include "platform.h"
+#include "gnunet_time_lib.h"
+#include "gauger.h"
+#if HAVE_LIBGLPK
+#include <glpk.h>
+#endif
+
+#define VERBOSE GNUNET_NO
+
+#define EXECS 5
+
+
+#if HAVE_LIBGLPK
+static int executions = EXECS;
+static uint64_t exec_time[EXECS];
+
+static uint64_t sim_no_opt_avg;
+static uint64_t sim_with_opt_avg;
+static uint64_t mlp_no_opt_avg;
+static uint64_t mlp_with_opt_avg;
+
+static glp_prob * prob;
+
+static struct GNUNET_TIME_Absolute start;
+static struct GNUNET_TIME_Absolute end;
+
+
+void solve_mlp(int presolve)
+{
+ int result, solution;
+
+ glp_iocp opt_mlp;
+ glp_init_iocp(&opt_mlp);
+ opt_mlp.msg_lev = GLP_MSG_OFF;
+ opt_mlp.presolve = GLP_OFF;
+
+ result = glp_intopt (prob, &opt_mlp);
+ solution = glp_mip_status (prob);
+ GNUNET_assert ((solution == 5) && (result==0));
+}
+
+void solve_lp(int presolve)
+{
+ int result, solution;
+
+ glp_smcp opt_lp;
+ glp_init_smcp(&opt_lp);
+
+ opt_lp.msg_lev = GLP_MSG_OFF;
+ if (presolve==GNUNET_YES) opt_lp.presolve = GLP_ON;
+ else opt_lp.presolve = GLP_OFF;
+
+ result = glp_simplex(prob, &opt_lp);
+ solution = glp_get_status (prob);
+ GNUNET_assert ((solution == 5) && (result==0));
+}
+
+/* Modify quality constraint */
+void modify_qm(int start, int length, int values_to_change)
+{
+ //int * ind = GNUNET_malloc (length * sizeof (int));
+ //double *val = GNUNET_malloc (length * sizeof (double));
+ int ind[1000];
+ double val[1000];
+
+ int res = 0;
+ int c = start, c2=1;
+ while (c<=(start+values_to_change))
+ {
+ res = glp_get_mat_row(prob, c, ind, val);
+
+ printf("%i %i \n", c, res);
+ for (c2=0; c2<res; c2++)
+ {
+ printf("%i = %f \n", ind[c2], val[c2]);
+ }
+
+ c++;
+ }
+ //glp_set_mat_row(prob, start, length, ind, val);
+}
+
+
+
+void bench_simplex_optimization(char * file, int executions)
+{
+
+ int c;
+ prob = glp_create_prob();
+ glp_read_lp(prob, NULL, file);
+
+ solve_lp(GNUNET_YES);
+
+ for (c=0; c<executions;c++)
+ {
+ start = GNUNET_TIME_absolute_get();
+ solve_lp(GNUNET_NO);
+ end = GNUNET_TIME_absolute_get();
+
+ exec_time[c] = GNUNET_TIME_absolute_get_difference(start,
end).rel_value;
+
+ sim_with_opt_avg += exec_time[c];
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Simplex /w optimization
iterations %i: %llu \n", c, exec_time[c]);
+ }
+
+ glp_delete_prob(prob);
+}
+
+
+void bench_simplex_no_optimization(char * file, int executions)
+{
+
+ int c;
+ prob = glp_create_prob();
+ glp_read_lp(prob, NULL, file);
+
+ for (c=0; c<executions;c++)
+ {
+ start = GNUNET_TIME_absolute_get();
+ solve_lp(GNUNET_YES);
+ end = GNUNET_TIME_absolute_get();
+
+ exec_time[c] = GNUNET_TIME_absolute_get_difference(start,
end).rel_value;
+
+ sim_no_opt_avg += exec_time[c];
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Simplex iterations %i:
%llu \n", c, exec_time[c]);
+ }
+
+ glp_delete_prob(prob);
+}
+
+void bench_mlp_no_optimization(char * file, int executions)
+{
+
+ int c;
+ prob = glp_create_prob();
+ glp_read_lp(prob, NULL, file);
+
+ for (c=0; c<executions;c++)
+ {
+ start = GNUNET_TIME_absolute_get();
+ solve_lp(GNUNET_YES);
+ solve_mlp (GNUNET_NO);
+ end = GNUNET_TIME_absolute_get();
+
+ exec_time[c] = GNUNET_TIME_absolute_get_difference(start,
end).rel_value;
+
+ mlp_no_opt_avg += exec_time[c];
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MLP iterations no
optimization %i: %llu \n", c, exec_time[c]);
+ }
+
+ glp_delete_prob(prob);
+}
+
+
+void bench_mlp_with_optimization(char * file, int executions, int changes)
+{
+ int c;
+ prob = glp_create_prob();
+ glp_read_lp(prob, NULL, file);
+
+ solve_lp(GNUNET_YES);
+
+ for (c=0; c<executions;c++)
+ {
+ start = GNUNET_TIME_absolute_get();
+ //modify_qm(906, 0, 0);
+ solve_lp(GNUNET_NO);
+ solve_mlp (GNUNET_NO);
+ end = GNUNET_TIME_absolute_get();
+
+ exec_time[c] = GNUNET_TIME_absolute_get_difference(start,
end).rel_value;
+
+ mlp_with_opt_avg += exec_time[c];
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MLP /w optimization
iterations %i: %llu \n", c, exec_time[c]);
+ }
+
+ glp_delete_prob(prob);
+}
+
+#if 0
+void modify_cr (int start, int length, int count)
+{
+ //int * ind = GNUNET_malloc (length * sizeof (int));
+ //double *val = GNUNET_malloc (length * sizeof (double));
+ int ind[500];
+ double val[500];
+ int res = 0;
+ int c = start, c2=1;
+ while (c<=(start+count))
+ {
+ res = glp_get_mat_row(prob, c, ind, val);
+
+ printf("row index: %i non-zero elements: %i \n", c, res);
+ for (c2=1; c2<=res; c2++)
+ {
+ printf("%i = %f ", ind[c2], val[c2]);
+ }
+ c++;
+ printf ("\n----\n");
+ }
+ //glp_set_mat_row(prob, start, length, ind, val);
+}
+#endif
+#endif
+
+int main (int argc, char *argv[])
+{
+ int ret = 0;
+ GNUNET_log_setup ("perf-transport-ats",
+#if VERBOSE
+ "DEBUG",
+#else
+ "INFO",
+#endif
+ NULL);
+
+#if !HAVE_LIBGLPK
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "GLPK not installed, exiting
testcase\n");
+ return 0;
+#else
+
+ char * file = "ats_mlp_p100_m400.problem";
+ // char * file = "mlps/ats_mlp_p500_m2000.problem";
+ bench_simplex_no_optimization (file, executions);
+ bench_simplex_optimization (file, executions);
+ bench_mlp_no_optimization (file, executions);
+ bench_mlp_with_optimization (file, executions, 0);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Simplex no optimization average:
%llu\n", sim_no_opt_avg / EXECS);
+ GAUGER ("TRANSPORT","GLPK simplex 100 peers 400 addresses no optimization",
sim_no_opt_avg / EXECS, "ms");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Simplex optimization average: %llu\n",
sim_with_opt_avg / EXECS);
+ GAUGER ("TRANSPORT","GLPK simplex 100 peers 400 addresses with
optimization", sim_with_opt_avg / EXECS, "ms");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MLP no optimization average: %llu\n",
mlp_no_opt_avg / EXECS);
+ GAUGER ("TRANSPORT","GLPK MLP 100 peers 400 addresses no optimization",
mlp_no_opt_avg / EXECS, "ms");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MLP optimization average: %llu\n",
mlp_with_opt_avg / EXECS);
+ GAUGER ("TRANSPORT","GLPK MLP 100 peers 400 addresses with optimization",
mlp_with_opt_avg / EXECS, "ms");
+
+#endif
+ return ret;
+}
+
+/* end of per_transport_ats.c*/
Deleted: gnunet/src/transport/test_transport_ats_perf.c
===================================================================
--- gnunet/src/transport/test_transport_ats_perf.c 2011-05-25 15:51:14 UTC
(rev 15308)
+++ gnunet/src/transport/test_transport_ats_perf.c 2011-05-25 15:56:53 UTC
(rev 15309)
@@ -1,266 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2009 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 testing/test_transport_ats_perf.c
- * @brief testcase for ats functionality
- */
-#include "platform.h"
-#include "gnunet_time_lib.h"
-#include "gauger.h"
-#if HAVE_LIBGLPK
-#include <glpk.h>
-#endif
-
-#define VERBOSE GNUNET_NO
-
-#define EXECS 5
-
-
-#if HAVE_LIBGLPK
-static int executions = EXECS;
-static uint64_t exec_time[EXECS];
-
-static uint64_t sim_no_opt_avg;
-static uint64_t sim_with_opt_avg;
-static uint64_t mlp_no_opt_avg;
-static uint64_t mlp_with_opt_avg;
-
-static glp_prob * prob;
-
-static struct GNUNET_TIME_Absolute start;
-static struct GNUNET_TIME_Absolute end;
-
-
-void solve_mlp(int presolve)
-{
- int result, solution;
-
- glp_iocp opt_mlp;
- glp_init_iocp(&opt_mlp);
- opt_mlp.msg_lev = GLP_MSG_OFF;
- opt_mlp.presolve = GLP_OFF;
-
- result = glp_intopt (prob, &opt_mlp);
- solution = glp_mip_status (prob);
- GNUNET_assert ((solution == 5) && (result==0));
-}
-
-void solve_lp(int presolve)
-{
- int result, solution;
-
- glp_smcp opt_lp;
- glp_init_smcp(&opt_lp);
-
- opt_lp.msg_lev = GLP_MSG_OFF;
- if (presolve==GNUNET_YES) opt_lp.presolve = GLP_ON;
- else opt_lp.presolve = GLP_OFF;
-
- result = glp_simplex(prob, &opt_lp);
- solution = glp_get_status (prob);
- GNUNET_assert ((solution == 5) && (result==0));
-}
-
-/* Modify quality constraint */
-void modify_qm(int start, int length, int values_to_change)
-{
- //int * ind = GNUNET_malloc (length * sizeof (int));
- //double *val = GNUNET_malloc (length * sizeof (double));
- int ind[1000];
- double val[1000];
-
- int res = 0;
- int c = start, c2=1;
- while (c<=(start+values_to_change))
- {
- res = glp_get_mat_row(prob, c, ind, val);
-
- printf("%i %i \n", c, res);
- for (c2=0; c2<res; c2++)
- {
- printf("%i = %f \n", ind[c2], val[c2]);
- }
-
- c++;
- }
- //glp_set_mat_row(prob, start, length, ind, val);
-}
-
-
-
-void bench_simplex_optimization(char * file, int executions)
-{
-
- int c;
- prob = glp_create_prob();
- glp_read_lp(prob, NULL, file);
-
- solve_lp(GNUNET_YES);
-
- for (c=0; c<executions;c++)
- {
- start = GNUNET_TIME_absolute_get();
- solve_lp(GNUNET_NO);
- end = GNUNET_TIME_absolute_get();
-
- exec_time[c] = GNUNET_TIME_absolute_get_difference(start,
end).rel_value;
-
- sim_with_opt_avg += exec_time[c];
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Simplex /w optimization
iterations %i: %llu \n", c, exec_time[c]);
- }
-
- glp_delete_prob(prob);
-}
-
-
-void bench_simplex_no_optimization(char * file, int executions)
-{
-
- int c;
- prob = glp_create_prob();
- glp_read_lp(prob, NULL, file);
-
- for (c=0; c<executions;c++)
- {
- start = GNUNET_TIME_absolute_get();
- solve_lp(GNUNET_YES);
- end = GNUNET_TIME_absolute_get();
-
- exec_time[c] = GNUNET_TIME_absolute_get_difference(start,
end).rel_value;
-
- sim_no_opt_avg += exec_time[c];
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Simplex iterations %i:
%llu \n", c, exec_time[c]);
- }
-
- glp_delete_prob(prob);
-}
-
-void bench_mlp_no_optimization(char * file, int executions)
-{
-
- int c;
- prob = glp_create_prob();
- glp_read_lp(prob, NULL, file);
-
- for (c=0; c<executions;c++)
- {
- start = GNUNET_TIME_absolute_get();
- solve_lp(GNUNET_YES);
- solve_mlp (GNUNET_NO);
- end = GNUNET_TIME_absolute_get();
-
- exec_time[c] = GNUNET_TIME_absolute_get_difference(start,
end).rel_value;
-
- mlp_no_opt_avg += exec_time[c];
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MLP iterations no
optimization %i: %llu \n", c, exec_time[c]);
- }
-
- glp_delete_prob(prob);
-}
-
-
-void bench_mlp_with_optimization(char * file, int executions, int changes)
-{
- int c;
- prob = glp_create_prob();
- glp_read_lp(prob, NULL, file);
-
- solve_lp(GNUNET_YES);
-
- for (c=0; c<executions;c++)
- {
- start = GNUNET_TIME_absolute_get();
- //modify_qm(906, 0, 0);
- solve_lp(GNUNET_NO);
- solve_mlp (GNUNET_NO);
- end = GNUNET_TIME_absolute_get();
-
- exec_time[c] = GNUNET_TIME_absolute_get_difference(start,
end).rel_value;
-
- mlp_with_opt_avg += exec_time[c];
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MLP /w optimization
iterations %i: %llu \n", c, exec_time[c]);
- }
-
- glp_delete_prob(prob);
-}
-
-#if 0
-void modify_cr (int start, int length, int count)
-{
- //int * ind = GNUNET_malloc (length * sizeof (int));
- //double *val = GNUNET_malloc (length * sizeof (double));
- int ind[500];
- double val[500];
- int res = 0;
- int c = start, c2=1;
- while (c<=(start+count))
- {
- res = glp_get_mat_row(prob, c, ind, val);
-
- printf("row index: %i non-zero elements: %i \n", c, res);
- for (c2=1; c2<=res; c2++)
- {
- printf("%i = %f ", ind[c2], val[c2]);
- }
- c++;
- printf ("\n----\n");
- }
- //glp_set_mat_row(prob, start, length, ind, val);
-}
-#endif
-#endif
-
-int main (int argc, char *argv[])
-{
- int ret = 0;
- GNUNET_log_setup ("test-transport-ats",
-#if VERBOSE
- "DEBUG",
-#else
- "INFO",
-#endif
- NULL);
-
-#if !HAVE_LIBGLPK
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "GLPK not installed, exiting
testcase\n");
- return 0;
-#else
-
- char * file = "ats_mlp_p100_m400.problem";
- // char * file = "mlps/ats_mlp_p500_m2000.problem";
- bench_simplex_no_optimization (file, executions);
- bench_simplex_optimization (file, executions);
- bench_mlp_no_optimization (file, executions);
- bench_mlp_with_optimization (file, executions, 0);
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Simplex no optimization average:
%llu\n", sim_no_opt_avg / EXECS);
- GAUGER ("TRANSPORT","GLPK simplex 100 peers 400 addresses no optimization",
sim_no_opt_avg / EXECS, "ms");
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Simplex optimization average: %llu\n",
sim_with_opt_avg / EXECS);
- GAUGER ("TRANSPORT","GLPK simplex 100 peers 400 addresses with
optimization", sim_with_opt_avg / EXECS, "ms");
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MLP no optimization average: %llu\n",
mlp_no_opt_avg / EXECS);
- GAUGER ("TRANSPORT","GLPK MLP 100 peers 400 addresses no optimization",
mlp_no_opt_avg / EXECS, "ms");
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MLP optimization average: %llu\n",
mlp_with_opt_avg / EXECS);
- GAUGER ("TRANSPORT","GLPK MLP 100 peers 400 addresses with optimization",
mlp_with_opt_avg / EXECS, "ms");
-
-#endif
- return ret;
-}
-
-/* end of test_transport_ats_perf.c*/
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r15309 - gnunet/src/transport,
gnunet <=