/*
This file is part of GNUnet.
- Copyright (C) 2011-2015 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011-2016 GNUnet e.V.
- 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 free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published
+ by the Free Software Foundation, either version 3 of the License,
+ 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.
+ Affero 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., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ SPDX-License-Identifier: AGPL3.0-or-later
*/
/**
#include "gnunet_ats_service.h"
#include "gnunet_transport_service.h"
+
struct Iteration
{
struct Iteration *next;
/**
* Timeout for a connections
*/
-#define CONNECT_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
+#define CONNECT_TIMEOUT \
+ GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
/**
* Benchmarking block size in bye
/**
* Handle to transport service.
*/
-static struct GNUNET_TRANSPORT_Handle *handle;
+static struct GNUNET_TRANSPORT_CoreHandle *handle;
/**
* Handle to ATS service.
* Global return value (0 success).
*/
static int ret;
+
/**
- * Handle for current transmission request.
+ * Handle for transmissions.
*/
-static struct GNUNET_TRANSPORT_TransmitHandle *th;
+static struct GNUNET_MQ_Handle *mq;
static struct GNUNET_TRANSPORT_Blacklist *bl_handle;
*/
static struct GNUNET_PeerIdentity pid;
-/**
- * Task scheduled for cleanup / termination of the process.
- */
-static struct GNUNET_SCHEDULER_Task * end;
-
/**
* Selected level of verbosity.
*/
-static int verbosity;
+static unsigned int verbosity;
/**
* Stops monitoring activity.
*
* @param cls NULL
- * @param tc scheduler context
*/
static void
-shutdown_task (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls)
{
struct Iteration *icur;
struct Iteration *inext;
GNUNET_ATS_connectivity_suggest_cancel (ats_sh);
ats_sh = NULL;
}
- if (NULL != th)
- {
- GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
- th = NULL;
- }
- if (NULL != bl_handle )
+ if (NULL != bl_handle)
{
GNUNET_TRANSPORT_blacklist_cancel (bl_handle);
bl_handle = NULL;
}
if (NULL != handle)
{
- GNUNET_TRANSPORT_disconnect (handle);
+ GNUNET_TRANSPORT_core_disconnect (handle);
handle = NULL;
}
{
inext = icur->next;
icur->rate = ((benchmark_count * benchmark_size) / 1024) /
- ((float) icur->dur.rel_value_us / (1000 * 1000));
+ ((float) icur->dur.rel_value_us / (1000 * 1000));
if (verbosity > 0)
- FPRINTF (stdout, _("%llu B in %llu ms == %.2f KB/s!\n"),
- ((long long unsigned int) benchmark_count * benchmark_size),
- ((long long unsigned int) icur->dur.rel_value_us / 1000),
- (float) icur->rate);
+ FPRINTF (stdout,
+ _ ("%llu B in %llu ms == %.2f KB/s!\n"),
+ ((long long unsigned int) benchmark_count * benchmark_size),
+ ((long long unsigned int) icur->dur.rel_value_us / 1000),
+ (float) icur->rate);
avg_duration += icur->dur.rel_value_us / (1000);
- avg_rate += icur->rate;
- iterations ++;
+ avg_rate += icur->rate;
+ iterations++;
}
-
+ if (0 == iterations)
+ iterations = 1; /* avoid division by zero */
/* Calculate average rate */
avg_rate /= iterations;
/* Calculate average duration */
while (NULL != (icur = inext))
{
inext = icur->next;
- stddev_rate += ((icur->rate-avg_rate) *
- (icur->rate-avg_rate));
+ stddev_rate += ((icur->rate - avg_rate) * (icur->rate - avg_rate));
stddev_duration += (((icur->dur.rel_value_us / 1000) - avg_duration) *
- ((icur->dur.rel_value_us / 1000) - avg_duration));
-
+ ((icur->dur.rel_value_us / 1000) - avg_duration));
}
/* Calculate standard deviation rate */
stddev_rate = stddev_rate / iterations;
- stddev_rate = sqrtf(stddev_rate);
+ stddev_rate = sqrtf (stddev_rate);
/* Calculate standard deviation duration */
stddev_duration = stddev_duration / iterations;
- stddev_duration = sqrtf(stddev_duration);
+ stddev_duration = sqrtf (stddev_duration);
/* Output */
- FPRINTF (stdout, _("%u;%u;%llu;%llu;%.2f;%.2f"),benchmark_count, benchmark_size,
- avg_duration, (unsigned long long) stddev_duration, avg_rate, stddev_rate);
+ FPRINTF (stdout,
+ "%u;%u;%llu;%llu;%.2f;%.2f",
+ benchmark_count,
+ benchmark_size,
+ avg_duration,
+ (unsigned long long) stddev_duration,
+ avg_rate,
+ stddev_rate);
inext = ihead;
while (NULL != (icur = inext))
inext = icur->next;
GNUNET_CONTAINER_DLL_remove (ihead, itail, icur);
- FPRINTF (stdout, _(";%llu;%.2f"),
- (long long unsigned int) (icur->dur.rel_value_us / 1000), icur->rate);
+ FPRINTF (stdout,
+ ";%llu;%.2f",
+ (long long unsigned int) (icur->dur.rel_value_us / 1000),
+ icur->rate);
GNUNET_free (icur);
}
{
duration = GNUNET_TIME_absolute_get_duration (start_time);
FPRINTF (stdout,
- _("Received %llu bytes/s (%llu bytes in %s)\n"),
+ "Received %llu bytes/s (%llu bytes in %s)\n",
1000LL * 1000LL * traffic_received / (1 + duration.rel_value_us),
traffic_received,
GNUNET_STRINGS_relative_time_to_string (duration, GNUNET_YES));
}
#endif
- FPRINTF (stdout, _("\n"));
+ FPRINTF (stdout, "\n");
}
+
static void
iteration_done ();
* @param buf where the callee should write the message
* @return number of bytes written to @a buf
*/
-static size_t
-transmit_data (void *cls,
- size_t size,
- void *buf)
+static void
+send_msg (void *cls)
{
- struct GNUNET_MessageHeader *m = buf;
-
- th = NULL;
- if ((NULL == buf) || (0 == size))
- {
- th = NULL;
- return 0;
- }
-
- itail->msgs_sent ++;
+ struct GNUNET_MQ_Envelope *env;
+ struct GNUNET_MessageHeader *m;
- GNUNET_assert(size >= sizeof(struct GNUNET_MessageHeader));
- GNUNET_assert(size < GNUNET_SERVER_MAX_MESSAGE_SIZE);
- m->size = ntohs (size);
- m->type = ntohs (GNUNET_MESSAGE_TYPE_DUMMY);
- memset (&m[1], 52, size - sizeof(struct GNUNET_MessageHeader));
+ if (NULL == mq)
+ return;
+ env = GNUNET_MQ_msg_extra (m, benchmark_size, GNUNET_MESSAGE_TYPE_DUMMY);
+ memset (&m[1], 52, benchmark_size - sizeof (struct GNUNET_MessageHeader));
if (itail->msgs_sent < benchmark_count)
{
- th = GNUNET_TRANSPORT_notify_transmit_ready (handle, &pid, benchmark_size,
- GNUNET_TIME_UNIT_FOREVER_REL, &transmit_data, NULL );
+ GNUNET_MQ_notify_sent (env, &send_msg, NULL);
}
else
{
-
- iteration_done();
- return size;
+ iteration_done ();
}
- if (verbosity > 0)
- if (itail->msgs_sent % 10 == 0 )
- FPRINTF (stdout, _("."));
- return size;
+ GNUNET_MQ_send (mq, env);
+ if ((verbosity > 0) && (0 == itail->msgs_sent % 10))
+ FPRINTF (stdout, ".");
}
iteration_start ()
{
struct Iteration *icur;
- ret = 0;
-
- if (benchmark_send)
- {
- benchmark_running = GNUNET_YES;
- icur = GNUNET_new (struct Iteration);
- GNUNET_CONTAINER_DLL_insert_tail (ihead, itail, icur);
- icur->start = GNUNET_TIME_absolute_get();
- if (verbosity > 0)
- FPRINTF (stdout,
- _("\nStarting benchmark to `%s', starting to send %u messages in %u byte blocks\n"),
- GNUNET_i2s (&pid), benchmark_count, benchmark_size);
- if (NULL == th)
- th = GNUNET_TRANSPORT_notify_transmit_ready (handle, &pid, benchmark_size,
- GNUNET_TIME_UNIT_FOREVER_REL, &transmit_data, NULL );
- else
- GNUNET_break(0);
+ ret = 0;
+ if (! benchmark_send)
return;
- }
+ benchmark_running = GNUNET_YES;
+ icur = GNUNET_new (struct Iteration);
+ GNUNET_CONTAINER_DLL_insert_tail (ihead, itail, icur);
+ icur->start = GNUNET_TIME_absolute_get ();
+ if (verbosity > 0)
+ FPRINTF (
+ stdout,
+ "\nStarting benchmark, starting to send %u messages in %u byte blocks\n",
+ benchmark_count,
+ benchmark_size);
+ send_msg (NULL);
}
iteration_done ()
{
static int it_count = 0;
- it_count ++;
+ it_count++;
itail->dur = GNUNET_TIME_absolute_get_duration (itail->start);
if (it_count == benchmark_iterations)
{
benchmark_running = GNUNET_NO;
- if (NULL != end)
- GNUNET_SCHEDULER_cancel (end);
- end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
+ GNUNET_SCHEDULER_shutdown ();
return;
}
- else
- {
- iteration_start ();
- }
+ iteration_start ();
}
*
* @param cls closure
* @param peer the peer that connected
+ * @param m message queue for transmissions
+ * @return NULL
*/
-static void
+static void *
notify_connect (void *cls,
- const struct GNUNET_PeerIdentity *peer)
+ const struct GNUNET_PeerIdentity *peer,
+ struct GNUNET_MQ_Handle *m)
{
- if (0 != memcmp (&pid,
- peer,
- sizeof(struct GNUNET_PeerIdentity)))
+ if (0 != memcmp (&pid, peer, sizeof (struct GNUNET_PeerIdentity)))
{
- FPRINTF (stdout,
- _("Connected to different peer `%s'\n"),
- GNUNET_i2s (&pid));
- return;
+ FPRINTF (stdout, "Connected to different peer `%s'\n", GNUNET_i2s (&pid));
+ return NULL;
}
if (verbosity > 0)
- FPRINTF (stdout,
- _("Successfully connected to `%s'\n"),
- GNUNET_i2s (&pid));
+ FPRINTF (stdout, "Successfully connected to `%s'\n", GNUNET_i2s (&pid));
+ mq = m;
iteration_start ();
+ return NULL;
}
*
* @param cls closure
* @param peer the peer that disconnected
+ * @param internal_cls NULL
*/
static void
notify_disconnect (void *cls,
- const struct GNUNET_PeerIdentity *peer)
+ const struct GNUNET_PeerIdentity *peer,
+ void *internal_cls)
{
- if (0 != memcmp (&pid, peer, sizeof(struct GNUNET_PeerIdentity)))
+ if (0 != memcmp (&pid, peer, sizeof (struct GNUNET_PeerIdentity)))
return;
+ mq = NULL;
if (GNUNET_YES == benchmark_running)
{
- FPRINTF (stdout, _("Disconnected from peer `%s' while benchmarking\n"),
- GNUNET_i2s (&pid));
+ FPRINTF (stdout,
+ "Disconnected from peer `%s' while benchmarking\n",
+ GNUNET_i2s (&pid));
return;
}
}
* Function called by the transport for each received message.
*
* @param cls closure
- * @param peer (claimed) identity of the other peer
+ * @param message the message
+ * @return #GNUNET_OK
+ */
+static int
+check_dummy (void *cls, const struct GNUNET_MessageHeader *message)
+{
+ return GNUNET_OK; /* all messages are fine */
+}
+
+
+/**
+ * Function called by the transport for each received message.
+ *
+ * @param cls closure
* @param message the message
*/
static void
-notify_receive (void *cls,
- const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_MessageHeader *message)
+handle_dummy (void *cls, const struct GNUNET_MessageHeader *message)
{
- if (benchmark_receive)
- {
- if (GNUNET_MESSAGE_TYPE_DUMMY != ntohs (message->type))
- return;
- if (verbosity > 0)
- FPRINTF (stdout,
- _("Received %u bytes from %s\n"),
- (unsigned int) ntohs (message->size),
- GNUNET_i2s (peer));
+ if (! benchmark_receive)
return;
- }
+ if (verbosity > 0)
+ FPRINTF (stdout,
+ "Received %u bytes\n",
+ (unsigned int) ntohs (message->size));
}
static int
-blacklist_cb (void *cls,
- const struct GNUNET_PeerIdentity *peer)
+blacklist_cb (void *cls, const struct GNUNET_PeerIdentity *peer)
{
- if (0 != memcmp (&pid, peer, sizeof(struct GNUNET_PeerIdentity)))
+ if (0 != memcmp (&pid, peer, sizeof (struct GNUNET_PeerIdentity)))
{
if (verbosity > 0)
- FPRINTF (stdout,
- _("Denying connection to `%s'\n"),
- GNUNET_i2s (peer));
+ FPRINTF (stdout, "Denying connection to `%s'\n", GNUNET_i2s (peer));
return GNUNET_SYSERR;
}
-
return GNUNET_OK;
}
-
/**
- * Function called with the result of the check if the 'transport'
- * service is running.
+ * Main function that will be run by the scheduler.
*
- * @param cls closure with our configuration
- * @param result #GNUNET_YES if transport is running
+ * @param cls closure
+ * @param args remaining command-line arguments
+ * @param cfgfile name of the configuration file used (for saving, can be NULL!)
+ * @param mycfg configuration
*/
static void
-testservice_task (void *cls, int result)
+run (void *cls,
+ char *const *args,
+ const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *mycfg)
{
- ret = 1;
+ struct GNUNET_MQ_MessageHandler handlers[] =
+ {GNUNET_MQ_hd_var_size (dummy,
+ GNUNET_MESSAGE_TYPE_DUMMY,
+ struct GNUNET_MessageHeader,
+ NULL),
+ GNUNET_MQ_handler_end ()};
- if (GNUNET_YES != result)
- {
- FPRINTF (stderr, _("Service `%s' is not running\n"), "transport");
- return;
- }
+ cfg = (struct GNUNET_CONFIGURATION_Handle *) mycfg;
- if (GNUNET_SERVER_MAX_MESSAGE_SIZE <= benchmark_size)
+ ret = 1;
+ if (GNUNET_MAX_MESSAGE_SIZE <= benchmark_size)
{
- FPRINTF (stderr, _("Message size too big!\n"));
+ FPRINTF (stderr, "Message size too big!\n");
return;
}
if (NULL == cpid)
{
- FPRINTF (stderr, _("No peer identity given\n"));
+ FPRINTF (stderr, "No peer identity given\n");
return;
}
- if ((GNUNET_OK !=
- GNUNET_CRYPTO_eddsa_public_key_from_string (cpid, strlen (cpid),
- &pid.public_key)))
+ if (GNUNET_OK != GNUNET_CRYPTO_eddsa_public_key_from_string (cpid,
+ strlen (cpid),
+ &pid.public_key))
{
- FPRINTF (stderr, _("Failed to parse peer identity `%s'\n"), cpid);
+ FPRINTF (stderr, "Failed to parse peer identity `%s'\n", cpid);
return;
}
-
if (1 == benchmark_send)
{
if (verbosity > 0)
FPRINTF (stderr,
- _("Trying to send %u messages with size %u to peer `%s'\n"),
- benchmark_count, benchmark_size, GNUNET_i2s (&pid));
+ "Trying to send %u messages with size %u to peer `%s'\n",
+ benchmark_count,
+ benchmark_size,
+ GNUNET_i2s (&pid));
}
else if (1 == benchmark_receive)
{
FPRINTF (stderr,
- _("Trying to receive messages from peer `%s'\n"),
- GNUNET_i2s (&pid));
+ "Trying to receive messages from peer `%s'\n",
+ GNUNET_i2s (&pid));
}
else
{
- FPRINTF (stderr, _("No operation given\n"));
+ FPRINTF (stderr, "No operation given\n");
return;
}
ats = GNUNET_ATS_connectivity_init (cfg);
if (NULL == ats)
{
- FPRINTF (stderr, "%s", _("Failed to connect to ATS service\n"));
+ FPRINTF (stderr, "Failed to connect to ATS service\n");
ret = 1;
return;
}
- handle = GNUNET_TRANSPORT_connect (cfg, NULL, NULL,
- ¬ify_receive,
- ¬ify_connect,
- ¬ify_disconnect);
+ handle = GNUNET_TRANSPORT_core_connect (cfg,
+ NULL,
+ handlers,
+ NULL,
+ ¬ify_connect,
+ ¬ify_disconnect,
+ NULL);
if (NULL == handle)
{
- FPRINTF (stderr, "%s", _("Failed to connect to transport service\n"));
+ FPRINTF (stderr, "Failed to connect to transport service\n");
GNUNET_ATS_connectivity_done (ats);
ats = NULL;
ret = 1;
return;
}
- bl_handle = GNUNET_TRANSPORT_blacklist (cfg,
- &blacklist_cb,
- NULL);
- ats_sh = GNUNET_ATS_connectivity_suggest (ats,
- &pid,
- 1);
- end = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
- &shutdown_task,
- NULL);
-}
-
-
-/**
- * Main function that will be run by the scheduler.
- *
- * @param cls closure
- * @param args remaining command-line arguments
- * @param cfgfile name of the configuration file used (for saving, can be NULL!)
- * @param mycfg configuration
- */
-static void
-run (void *cls,
- char * const *args,
- const char *cfgfile,
- const struct GNUNET_CONFIGURATION_Handle *mycfg)
-{
- cfg = (struct GNUNET_CONFIGURATION_Handle *) mycfg;
- GNUNET_CLIENT_service_test ("transport", cfg, GNUNET_TIME_UNIT_SECONDS,
- &testservice_task, (void *) cfg);
+ bl_handle = GNUNET_TRANSPORT_blacklist (cfg, &blacklist_cb, NULL);
+ ats_sh = GNUNET_ATS_connectivity_suggest (ats, &pid, 1);
+ GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL);
}
int
-main (int argc, char * const *argv)
+main (int argc, char *const *argv)
{
int res;
benchmark_count = DEFAULT_MESSAGE_COUNT;
benchmark_iterations = DEFAULT_ITERATION_COUNT;
benchmark_running = GNUNET_NO;
- static const struct GNUNET_GETOPT_CommandLineOption options[] = {
-
- { 's', "send", NULL,
- gettext_noop ("send data to peer"),
- 0, &GNUNET_GETOPT_set_one, &benchmark_send},
- { 'r', "receive", NULL, gettext_noop
- ("receive data from peer"), 0,
- &GNUNET_GETOPT_set_one, &benchmark_receive},
- { 'i', "iterations", NULL, gettext_noop
- ("iterations"), 1,
- &GNUNET_GETOPT_set_uint, &benchmark_iterations},
- { 'n', "number", NULL, gettext_noop
- ("number of messages to send"), 1,
- &GNUNET_GETOPT_set_uint, &benchmark_count},
- { 'm', "messagesize", NULL, gettext_noop
- ("message size to use"), 1,
- &GNUNET_GETOPT_set_uint, &benchmark_size},
- { 'p', "peer", "PEER",
- gettext_noop ("peer identity"), 1, &GNUNET_GETOPT_set_string,
- &cpid },
- GNUNET_GETOPT_OPTION_VERBOSE (&verbosity),
- GNUNET_GETOPT_OPTION_END
- };
+ struct GNUNET_GETOPT_CommandLineOption options[] = {
+
+ GNUNET_GETOPT_option_flag ('s',
+ "send",
+ gettext_noop ("send data to peer"),
+ &benchmark_send),
+ GNUNET_GETOPT_option_flag ('r',
+ "receive",
+ gettext_noop ("receive data from peer"),
+ &benchmark_receive),
+ GNUNET_GETOPT_option_uint ('i',
+ "iterations",
+ NULL,
+ gettext_noop ("iterations"),
+ &benchmark_iterations),
+ GNUNET_GETOPT_option_uint ('n',
+ "number",
+ NULL,
+ gettext_noop ("number of messages to send"),
+ &benchmark_count),
+ GNUNET_GETOPT_option_uint ('m',
+ "messagesize",
+ NULL,
+ gettext_noop ("message size to use"),
+ &benchmark_size),
+ GNUNET_GETOPT_option_string ('p',
+ "peer",
+ "PEER",
+ gettext_noop ("peer identity"),
+ &cpid),
+ GNUNET_GETOPT_option_verbose (&verbosity),
+ GNUNET_GETOPT_OPTION_END};
if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
return 2;
- res = GNUNET_PROGRAM_run (argc, argv,
- "gnunet-transport",
- gettext_noop ("Direct access to transport service."),
- options,
- &run, NULL);
- GNUNET_free((void *) argv);
+ res =
+ GNUNET_PROGRAM_run (argc,
+ argv,
+ "gnunet-transport",
+ gettext_noop ("Direct access to transport service."),
+ options,
+ &run,
+ NULL);
+ GNUNET_free ((void *) argv);
if (GNUNET_OK == res)
return ret;
return 1;
projects / oweals / gnunet.git / blobdiff