diff options
author | Christian Grothoff <christian@grothoff.org> | 2014-12-17 17:48:17 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2014-12-17 17:48:17 +0000 |
commit | 7e6d8e5462a3456895d8f9712f015bbf4ef7e9c7 (patch) | |
tree | 09163d58c107af91f893b3942533ccfa59b4d77d | |
parent | b3b15995780e281a6fbfd1fd342d10f9029a5ec6 (diff) | |
download | gnunet-7e6d8e5462a3456895d8f9712f015bbf4ef7e9c7.tar.gz gnunet-7e6d8e5462a3456895d8f9712f015bbf4ef7e9c7.zip |
-more benchmarking results
-rw-r--r-- | src/scalarproduct/gnunet-service-scalarproduct_alice.c | 2 | ||||
-rw-r--r-- | src/scalarproduct/gnunet-service-scalarproduct_bob.c | 2 | ||||
-rwxr-xr-x | src/scalarproduct/perf_scalarproduct.sh | 20 | ||||
-rw-r--r-- | src/scalarproduct/test_scalarproduct.conf | 4 |
4 files changed, 14 insertions, 14 deletions
diff --git a/src/scalarproduct/gnunet-service-scalarproduct_alice.c b/src/scalarproduct/gnunet-service-scalarproduct_alice.c index 69e2db9bb..03770144d 100644 --- a/src/scalarproduct/gnunet-service-scalarproduct_alice.c +++ b/src/scalarproduct/gnunet-service-scalarproduct_alice.c | |||
@@ -1170,8 +1170,6 @@ GSS_handle_alice_client_message_multipart (void *cls, | |||
1170 | elements = (const struct GNUNET_SCALARPRODUCT_Element *) &msg[1]; | 1170 | elements = (const struct GNUNET_SCALARPRODUCT_Element *) &msg[1]; |
1171 | for (i = 0; i < contained_count; i++) | 1171 | for (i = 0; i < contained_count; i++) |
1172 | { | 1172 | { |
1173 | if (0 == GNUNET_ntohll (elements[i].value)) | ||
1174 | continue; | ||
1175 | elem = GNUNET_new (struct GNUNET_SCALARPRODUCT_Element); | 1173 | elem = GNUNET_new (struct GNUNET_SCALARPRODUCT_Element); |
1176 | memcpy (elem, | 1174 | memcpy (elem, |
1177 | &elements[i], | 1175 | &elements[i], |
diff --git a/src/scalarproduct/gnunet-service-scalarproduct_bob.c b/src/scalarproduct/gnunet-service-scalarproduct_bob.c index 6d41668e3..cc218287d 100644 --- a/src/scalarproduct/gnunet-service-scalarproduct_bob.c +++ b/src/scalarproduct/gnunet-service-scalarproduct_bob.c | |||
@@ -1274,8 +1274,6 @@ GSS_handle_bob_client_message_multipart (void *cls, | |||
1274 | elements = (const struct GNUNET_SCALARPRODUCT_Element *) &msg[1]; | 1274 | elements = (const struct GNUNET_SCALARPRODUCT_Element *) &msg[1]; |
1275 | for (i = 0; i < contained_count; i++) | 1275 | for (i = 0; i < contained_count; i++) |
1276 | { | 1276 | { |
1277 | if (0 == GNUNET_ntohll (elements[i].value)) | ||
1278 | continue; | ||
1279 | elem = GNUNET_new (struct GNUNET_SCALARPRODUCT_Element); | 1277 | elem = GNUNET_new (struct GNUNET_SCALARPRODUCT_Element); |
1280 | memcpy (elem, | 1278 | memcpy (elem, |
1281 | &elements[i], | 1279 | &elements[i], |
diff --git a/src/scalarproduct/perf_scalarproduct.sh b/src/scalarproduct/perf_scalarproduct.sh index 5424134df..aac184d91 100755 --- a/src/scalarproduct/perf_scalarproduct.sh +++ b/src/scalarproduct/perf_scalarproduct.sh | |||
@@ -1,16 +1,16 @@ | |||
1 | #!/bin/bash | 1 | #!/bin/bash |
2 | # Computes a simple scalar product, with configurable vector size. | 2 | # Computes a simple scalar product, with configurable vector size. |
3 | # | 3 | # |
4 | # Some results: | 4 | # Some results (wall-clock for Alice+Bob, single-core, i7): |
5 | # SIZE TIME-H(s) TIME-O(s) | 5 | # SIZE 2048-H(s) 2048-O(s) 1024-O(s) |
6 | # 25 10 | 6 | # 25 10 14 3 |
7 | # 50 17 | 7 | # 50 17 21 5 |
8 | # 100 32 39 | 8 | # 100 32 39 7 |
9 | # 200 77 | 9 | # 200 77 13 |
10 | # | 10 | # 400 149 23 |
11 | # | 11 | # 800 304 32 |
12 | # Configure benchmark size: | 12 | # Configure benchmark size: |
13 | SIZE=400 | 13 | SIZE=25 |
14 | # | 14 | # |
15 | # Construct input vectors: | 15 | # Construct input vectors: |
16 | INPUTALICE="-k CCC -e '" | 16 | INPUTALICE="-k CCC -e '" |
@@ -36,7 +36,7 @@ CFGBOB="-c $PREFIX/1/config" | |||
36 | # because the rest of the script is already in stdin, | 36 | # because the rest of the script is already in stdin, |
37 | # thus redirecting stdin does not suffice) | 37 | # thus redirecting stdin does not suffice) |
38 | #GNUNET_FORCE_LOG=';;;;ERROR' | 38 | #GNUNET_FORCE_LOG=';;;;ERROR' |
39 | GNUNET_FORCE_LOG='scalarproduct*;;;;DEBUG/cadet-api*;;;;DEBUG' | 39 | #GNUNET_FORCE_LOG='scalarproduct*;;;;DEBUG/cadet-api*;;;;DEBUG' |
40 | GNUNET_TESTING_PREFIX=$PREFIX ../testbed/gnunet-testbed-profiler -n -c test_scalarproduct.conf -p 2 & | 40 | GNUNET_TESTING_PREFIX=$PREFIX ../testbed/gnunet-testbed-profiler -n -c test_scalarproduct.conf -p 2 & |
41 | PID=$! | 41 | PID=$! |
42 | # sleep 1 is too short on most systems, 2 works on most, 5 seems to be safe | 42 | # sleep 1 is too short on most systems, 2 works on most, 5 seems to be safe |
diff --git a/src/scalarproduct/test_scalarproduct.conf b/src/scalarproduct/test_scalarproduct.conf index 1df495bba..d283b6440 100644 --- a/src/scalarproduct/test_scalarproduct.conf +++ b/src/scalarproduct/test_scalarproduct.conf | |||
@@ -14,3 +14,7 @@ WORKBITS=0 | |||
14 | 14 | ||
15 | [scalarproduct-alice] | 15 | [scalarproduct-alice] |
16 | #PREFIX = valgrind --leak-check=yes | 16 | #PREFIX = valgrind --leak-check=yes |
17 | |||
18 | [ats] | ||
19 | WAN_QUOTA_IN = unlimited | ||
20 | WAN_QUOTA_OUT = unlimited | ||