aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2013-09-18 12:48:47 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2013-09-18 12:48:47 +0000
commitda43a590f1c47e9907a5b44b978999e043fd74ee (patch)
tree1dbcb126a62b2d8949eb273b0b18d79e8d3c3cf5
parentaa4697d8b58e66544daf359a1257e8ab1eb5fce8 (diff)
downloadgnunet-da43a590f1c47e9907a5b44b978999e043fd74ee.tar.gz
gnunet-da43a590f1c47e9907a5b44b978999e043fd74ee.zip
mixed up .c and .h
finished makefile
-rw-r--r--src/ats-tests/Makefile.am32
-rw-r--r--src/ats-tests/perf_ats_logging.c12
-rw-r--r--src/ats-tests/perf_ats_logging.h12
3 files changed, 28 insertions, 28 deletions
diff --git a/src/ats-tests/Makefile.am b/src/ats-tests/Makefile.am
index 1662220b7..58352b94f 100644
--- a/src/ats-tests/Makefile.am
+++ b/src/ats-tests/Makefile.am
@@ -66,7 +66,7 @@ perf_ats_proportional_transport_none_LDADD = \
66 $(top_builddir)/src/transport/libgnunettransport.la 66 $(top_builddir)/src/transport/libgnunettransport.la
67 67
68perf_ats_proportional_core_bandwidth_SOURCES = \ 68perf_ats_proportional_core_bandwidth_SOURCES = \
69 perf_ats.c 69 perf_ats.c perf_ats_logging.c
70perf_ats_proportional_core_bandwidth_LDADD = \ 70perf_ats_proportional_core_bandwidth_LDADD = \
71 $(top_builddir)/src/util/libgnunetutil.la \ 71 $(top_builddir)/src/util/libgnunetutil.la \
72 $(top_builddir)/src/testbed/libgnunettestbed.la \ 72 $(top_builddir)/src/testbed/libgnunettestbed.la \
@@ -75,7 +75,7 @@ perf_ats_proportional_core_bandwidth_LDADD = \
75 $(top_builddir)/src/transport/libgnunettransport.la 75 $(top_builddir)/src/transport/libgnunettransport.la
76 76
77perf_ats_proportional_transport_bandwidth_SOURCES = \ 77perf_ats_proportional_transport_bandwidth_SOURCES = \
78 perf_ats.c 78 perf_ats.c perf_ats_logging.c
79perf_ats_proportional_transport_bandwidth_LDADD = \ 79perf_ats_proportional_transport_bandwidth_LDADD = \
80 $(top_builddir)/src/util/libgnunetutil.la \ 80 $(top_builddir)/src/util/libgnunetutil.la \
81 $(top_builddir)/src/testbed/libgnunettestbed.la \ 81 $(top_builddir)/src/testbed/libgnunettestbed.la \
@@ -84,7 +84,7 @@ perf_ats_proportional_transport_bandwidth_LDADD = \
84 $(top_builddir)/src/transport/libgnunettransport.la 84 $(top_builddir)/src/transport/libgnunettransport.la
85 85
86perf_ats_proportional_core_latency_SOURCES = \ 86perf_ats_proportional_core_latency_SOURCES = \
87 perf_ats.c 87 perf_ats.c perf_ats_logging.c
88perf_ats_proportional_core_latency_LDADD = \ 88perf_ats_proportional_core_latency_LDADD = \
89 $(top_builddir)/src/util/libgnunetutil.la \ 89 $(top_builddir)/src/util/libgnunetutil.la \
90 $(top_builddir)/src/testbed/libgnunettestbed.la \ 90 $(top_builddir)/src/testbed/libgnunettestbed.la \
@@ -93,7 +93,7 @@ perf_ats_proportional_core_latency_LDADD = \
93 $(top_builddir)/src/transport/libgnunettransport.la 93 $(top_builddir)/src/transport/libgnunettransport.la
94 94
95perf_ats_proportional_transport_latency_SOURCES = \ 95perf_ats_proportional_transport_latency_SOURCES = \
96 perf_ats.c 96 perf_ats.c perf_ats_logging.c
97perf_ats_proportional_transport_latency_LDADD = \ 97perf_ats_proportional_transport_latency_LDADD = \
98 $(top_builddir)/src/util/libgnunetutil.la \ 98 $(top_builddir)/src/util/libgnunetutil.la \
99 $(top_builddir)/src/testbed/libgnunettestbed.la \ 99 $(top_builddir)/src/testbed/libgnunettestbed.la \
@@ -103,7 +103,7 @@ perf_ats_proportional_transport_latency_LDADD = \
103 103
104if HAVE_LIBGLPK 104if HAVE_LIBGLPK
105perf_ats_mlp_core_none_SOURCES = \ 105perf_ats_mlp_core_none_SOURCES = \
106 perf_ats.c 106 perf_ats.c perf_ats_logging.c
107perf_ats_mlp_core_none_LDADD = \ 107perf_ats_mlp_core_none_LDADD = \
108 $(top_builddir)/src/util/libgnunetutil.la \ 108 $(top_builddir)/src/util/libgnunetutil.la \
109 $(top_builddir)/src/testbed/libgnunettestbed.la \ 109 $(top_builddir)/src/testbed/libgnunettestbed.la \
@@ -112,7 +112,7 @@ perf_ats_mlp_core_none_LDADD = \
112 $(top_builddir)/src/transport/libgnunettransport.la 112 $(top_builddir)/src/transport/libgnunettransport.la
113 113
114perf_ats_mlp_transport_none_SOURCES = \ 114perf_ats_mlp_transport_none_SOURCES = \
115 perf_ats.c 115 perf_ats.c perf_ats_logging.c
116perf_ats_mlp_transport_none_LDADD = \ 116perf_ats_mlp_transport_none_LDADD = \
117 $(top_builddir)/src/util/libgnunetutil.la \ 117 $(top_builddir)/src/util/libgnunetutil.la \
118 $(top_builddir)/src/testbed/libgnunettestbed.la \ 118 $(top_builddir)/src/testbed/libgnunettestbed.la \
@@ -121,7 +121,7 @@ perf_ats_mlp_transport_none_LDADD = \
121 $(top_builddir)/src/transport/libgnunettransport.la 121 $(top_builddir)/src/transport/libgnunettransport.la
122 122
123perf_ats_mlp_core_bandwidth_SOURCES = \ 123perf_ats_mlp_core_bandwidth_SOURCES = \
124 perf_ats.c 124 perf_ats.c perf_ats_logging.c
125perf_ats_mlp_core_bandwidth_LDADD = \ 125perf_ats_mlp_core_bandwidth_LDADD = \
126 $(top_builddir)/src/util/libgnunetutil.la \ 126 $(top_builddir)/src/util/libgnunetutil.la \
127 $(top_builddir)/src/testbed/libgnunettestbed.la \ 127 $(top_builddir)/src/testbed/libgnunettestbed.la \
@@ -130,7 +130,7 @@ perf_ats_mlp_core_bandwidth_LDADD = \
130 $(top_builddir)/src/transport/libgnunettransport.la 130 $(top_builddir)/src/transport/libgnunettransport.la
131 131
132perf_ats_mlp_transport_bandwidth_SOURCES = \ 132perf_ats_mlp_transport_bandwidth_SOURCES = \
133 perf_ats.c 133 perf_ats.c perf_ats_logging.c
134perf_ats_mlp_transport_bandwidth_LDADD = \ 134perf_ats_mlp_transport_bandwidth_LDADD = \
135 $(top_builddir)/src/util/libgnunetutil.la \ 135 $(top_builddir)/src/util/libgnunetutil.la \
136 $(top_builddir)/src/testbed/libgnunettestbed.la \ 136 $(top_builddir)/src/testbed/libgnunettestbed.la \
@@ -139,7 +139,7 @@ perf_ats_mlp_transport_bandwidth_LDADD = \
139 $(top_builddir)/src/transport/libgnunettransport.la 139 $(top_builddir)/src/transport/libgnunettransport.la
140 140
141perf_ats_mlp_core_latency_SOURCES = \ 141perf_ats_mlp_core_latency_SOURCES = \
142 perf_ats.c 142 perf_ats.c perf_ats_logging.c
143perf_ats_mlp_core_latency_LDADD = \ 143perf_ats_mlp_core_latency_LDADD = \
144 $(top_builddir)/src/util/libgnunetutil.la \ 144 $(top_builddir)/src/util/libgnunetutil.la \
145 $(top_builddir)/src/testbed/libgnunettestbed.la \ 145 $(top_builddir)/src/testbed/libgnunettestbed.la \
@@ -148,7 +148,7 @@ perf_ats_mlp_core_latency_LDADD = \
148 $(top_builddir)/src/transport/libgnunettransport.la 148 $(top_builddir)/src/transport/libgnunettransport.la
149 149
150perf_ats_mlp_transport_latency_SOURCES = \ 150perf_ats_mlp_transport_latency_SOURCES = \
151 perf_ats.c 151 perf_ats.c perf_ats_logging.c
152perf_ats_mlp_transport_latency_LDADD = \ 152perf_ats_mlp_transport_latency_LDADD = \
153 $(top_builddir)/src/util/libgnunetutil.la \ 153 $(top_builddir)/src/util/libgnunetutil.la \
154 $(top_builddir)/src/testbed/libgnunettestbed.la \ 154 $(top_builddir)/src/testbed/libgnunettestbed.la \
@@ -158,7 +158,7 @@ perf_ats_mlp_transport_latency_LDADD = \
158endif 158endif
159 159
160perf_ats_ril_core_none_SOURCES = \ 160perf_ats_ril_core_none_SOURCES = \
161 perf_ats.c 161 perf_ats.c perf_ats_logging.c
162perf_ats_ril_core_none_LDADD = \ 162perf_ats_ril_core_none_LDADD = \
163 $(top_builddir)/src/util/libgnunetutil.la \ 163 $(top_builddir)/src/util/libgnunetutil.la \
164 $(top_builddir)/src/testbed/libgnunettestbed.la \ 164 $(top_builddir)/src/testbed/libgnunettestbed.la \
@@ -167,7 +167,7 @@ perf_ats_ril_core_none_LDADD = \
167 $(top_builddir)/src/transport/libgnunettransport.la 167 $(top_builddir)/src/transport/libgnunettransport.la
168 168
169perf_ats_ril_transport_none_SOURCES = \ 169perf_ats_ril_transport_none_SOURCES = \
170 perf_ats.c 170 perf_ats.c perf_ats_logging.c
171perf_ats_ril_transport_none_LDADD = \ 171perf_ats_ril_transport_none_LDADD = \
172 $(top_builddir)/src/util/libgnunetutil.la \ 172 $(top_builddir)/src/util/libgnunetutil.la \
173 $(top_builddir)/src/testbed/libgnunettestbed.la \ 173 $(top_builddir)/src/testbed/libgnunettestbed.la \
@@ -176,7 +176,7 @@ perf_ats_ril_transport_none_LDADD = \
176 $(top_builddir)/src/transport/libgnunettransport.la 176 $(top_builddir)/src/transport/libgnunettransport.la
177 177
178perf_ats_ril_core_bandwidth_SOURCES = \ 178perf_ats_ril_core_bandwidth_SOURCES = \
179 perf_ats.c 179 perf_ats.c perf_ats_logging.c
180perf_ats_ril_core_bandwidth_LDADD = \ 180perf_ats_ril_core_bandwidth_LDADD = \
181 $(top_builddir)/src/util/libgnunetutil.la \ 181 $(top_builddir)/src/util/libgnunetutil.la \
182 $(top_builddir)/src/testbed/libgnunettestbed.la \ 182 $(top_builddir)/src/testbed/libgnunettestbed.la \
@@ -185,7 +185,7 @@ perf_ats_ril_core_bandwidth_LDADD = \
185 $(top_builddir)/src/transport/libgnunettransport.la 185 $(top_builddir)/src/transport/libgnunettransport.la
186 186
187perf_ats_ril_transport_bandwidth_SOURCES = \ 187perf_ats_ril_transport_bandwidth_SOURCES = \
188 perf_ats.c 188 perf_ats.c perf_ats_logging.c
189perf_ats_ril_transport_bandwidth_LDADD = \ 189perf_ats_ril_transport_bandwidth_LDADD = \
190 $(top_builddir)/src/util/libgnunetutil.la \ 190 $(top_builddir)/src/util/libgnunetutil.la \
191 $(top_builddir)/src/testbed/libgnunettestbed.la \ 191 $(top_builddir)/src/testbed/libgnunettestbed.la \
@@ -194,7 +194,7 @@ perf_ats_ril_transport_bandwidth_LDADD = \
194 $(top_builddir)/src/transport/libgnunettransport.la 194 $(top_builddir)/src/transport/libgnunettransport.la
195 195
196perf_ats_ril_core_latency_SOURCES = \ 196perf_ats_ril_core_latency_SOURCES = \
197 perf_ats.c 197 perf_ats.c perf_ats_logging.c
198perf_ats_ril_core_latency_LDADD = \ 198perf_ats_ril_core_latency_LDADD = \
199 $(top_builddir)/src/util/libgnunetutil.la \ 199 $(top_builddir)/src/util/libgnunetutil.la \
200 $(top_builddir)/src/testbed/libgnunettestbed.la \ 200 $(top_builddir)/src/testbed/libgnunettestbed.la \
@@ -203,7 +203,7 @@ perf_ats_ril_core_latency_LDADD = \
203 $(top_builddir)/src/transport/libgnunettransport.la 203 $(top_builddir)/src/transport/libgnunettransport.la
204 204
205perf_ats_ril_transport_latency_SOURCES = \ 205perf_ats_ril_transport_latency_SOURCES = \
206 perf_ats.c 206 perf_ats.c perf_ats_logging.c
207perf_ats_ril_transport_latency_LDADD = \ 207perf_ats_ril_transport_latency_LDADD = \
208 $(top_builddir)/src/util/libgnunetutil.la \ 208 $(top_builddir)/src/util/libgnunetutil.la \
209 $(top_builddir)/src/testbed/libgnunettestbed.la \ 209 $(top_builddir)/src/testbed/libgnunettestbed.la \
diff --git a/src/ats-tests/perf_ats_logging.c b/src/ats-tests/perf_ats_logging.c
index 2342a270d..9cdccf54b 100644
--- a/src/ats-tests/perf_ats_logging.c
+++ b/src/ats-tests/perf_ats_logging.c
@@ -27,8 +27,16 @@
27#include "gnunet_util_lib.h" 27#include "gnunet_util_lib.h"
28 28
29void 29void
30perf_logging_stop (); 30perf_logging_stop ()
31{
32 GNUNET_log(GNUNET_ERROR_TYPE_INFO,
33 _("Start logging\n"));
34}
31 35
32void 36void
33perf_logging_start (); 37perf_logging_start ()
38{
39 GNUNET_log(GNUNET_ERROR_TYPE_INFO,
40 _("Start logging\n"));
41}
34/* end of file perf_ats_logging.c */ 42/* end of file perf_ats_logging.c */
diff --git a/src/ats-tests/perf_ats_logging.h b/src/ats-tests/perf_ats_logging.h
index 9b93076ec..94a9a6590 100644
--- a/src/ats-tests/perf_ats_logging.h
+++ b/src/ats-tests/perf_ats_logging.h
@@ -27,17 +27,9 @@
27#include "gnunet_util_lib.h" 27#include "gnunet_util_lib.h"
28 28
29void 29void
30perf_logging_stop () 30perf_logging_stop ();
31{
32 GNUNET_log(GNUNET_ERROR_TYPE_INFO,
33 _("Start logging\n"));
34}
35 31
36void 32void
37perf_logging_start () 33perf_logging_start ();
38{
39 GNUNET_log(GNUNET_ERROR_TYPE_INFO,
40 _("Start logging\n"));
41}
42 34
43/* end of file perf_ats_logging.c */ 35/* end of file perf_ats_logging.c */