diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-01-30 15:54:31 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-01-30 15:54:31 +0000 |
commit | fc7bafd3ef0dd1c89a17e758f2b451a053b8b51b (patch) | |
tree | f4000bafeab26b1607bfd44aa91b2349feffaea6 /src | |
parent | 59943eb54a55aa6ddd0921eb81bc325d55bcae72 (diff) | |
download | gnunet-fc7bafd3ef0dd1c89a17e758f2b451a053b8b51b.tar.gz gnunet-fc7bafd3ef0dd1c89a17e758f2b451a053b8b51b.zip |
API extension, make blocking socket API visible
Diffstat (limited to 'src')
-rw-r--r-- | src/fs/perf_gnunet_service_fs_p2p.c | 2 | ||||
-rw-r--r-- | src/fs/perf_gnunet_service_fs_p2p.conf | 3 | ||||
-rw-r--r-- | src/include/gnunet_network_lib.h | 12 | ||||
-rw-r--r-- | src/testbed/gnunet-service-testbed_hc.c | 1 |
4 files changed, 14 insertions, 4 deletions
diff --git a/src/fs/perf_gnunet_service_fs_p2p.c b/src/fs/perf_gnunet_service_fs_p2p.c index 6c84d1545..10492eb0d 100644 --- a/src/fs/perf_gnunet_service_fs_p2p.c +++ b/src/fs/perf_gnunet_service_fs_p2p.c | |||
@@ -32,7 +32,7 @@ | |||
32 | /** | 32 | /** |
33 | * File-size we use for testing. | 33 | * File-size we use for testing. |
34 | */ | 34 | */ |
35 | #define FILESIZE (1024 * 1024 * 10) | 35 | #define FILESIZE (1024 * 1024 * 100) |
36 | 36 | ||
37 | /** | 37 | /** |
38 | * How long until we give up on transmitting the message? | 38 | * How long until we give up on transmitting the message? |
diff --git a/src/fs/perf_gnunet_service_fs_p2p.conf b/src/fs/perf_gnunet_service_fs_p2p.conf index ac7d1b10b..7787a99c6 100644 --- a/src/fs/perf_gnunet_service_fs_p2p.conf +++ b/src/fs/perf_gnunet_service_fs_p2p.conf | |||
@@ -4,5 +4,4 @@ SERVICEHOME = /tmp/gnunet-fs-test-lib/ | |||
4 | 4 | ||
5 | [fs] | 5 | [fs] |
6 | GAUGER_HEAP = "2-peer 10 MB P2P download" | 6 | GAUGER_HEAP = "2-peer 10 MB P2P download" |
7 | 7 | PREFIX = valgrind \ No newline at end of file | |
8 | |||
diff --git a/src/include/gnunet_network_lib.h b/src/include/gnunet_network_lib.h index 4876478bb..1ff397e86 100644 --- a/src/include/gnunet_network_lib.h +++ b/src/include/gnunet_network_lib.h | |||
@@ -121,6 +121,18 @@ GNUNET_NETWORK_socket_box_native (SOCKTYPE fd); | |||
121 | 121 | ||
122 | 122 | ||
123 | /** | 123 | /** |
124 | * Set if a socket should use blocking or non-blocking IO. | ||
125 | * | ||
126 | * @param fd socket | ||
127 | * @param doBlock blocking mode | ||
128 | * @return GNUNET_OK on success, GNUNET_SYSERR on error | ||
129 | */ | ||
130 | int | ||
131 | GNUNET_NETWORK_socket_set_blocking (struct GNUNET_NETWORK_Handle *fd, | ||
132 | int doBlock); | ||
133 | |||
134 | |||
135 | /** | ||
124 | * Bind to a connected socket | 136 | * Bind to a connected socket |
125 | * | 137 | * |
126 | * @param desc socket to bind | 138 | * @param desc socket to bind |
diff --git a/src/testbed/gnunet-service-testbed_hc.c b/src/testbed/gnunet-service-testbed_hc.c index 7810d32ac..8bc95f78d 100644 --- a/src/testbed/gnunet-service-testbed_hc.c +++ b/src/testbed/gnunet-service-testbed_hc.c | |||
@@ -23,7 +23,6 @@ | |||
23 | * @brief testbed cache implementation | 23 | * @brief testbed cache implementation |
24 | * @author Sree Harsha Totakura | 24 | * @author Sree Harsha Totakura |
25 | */ | 25 | */ |
26 | |||
27 | #include "gnunet-service-testbed.h" | 26 | #include "gnunet-service-testbed.h" |
28 | 27 | ||
29 | /** | 28 | /** |