/*
This file is part of GNUnet.
- (C) 2010, 2011, 2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2010, 2011, 2012 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., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, 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
+ */
/**
* @file fs/perf_gnunet_service_fs_p2p_respect.c
static struct GNUNET_FS_Uri *uri2;
+static char *fn1;
+
+static char *fn2;
/**
* Master context for 'stat_run'.
* Statistics we print out.
*/
static struct StatValues stats[] = {
- {"fs", "# artificial delays introduced (ms)"},
- {"fs", "# queries forwarded"},
- {"fs", "# replies received and matched"},
- {"fs", "# results found locally"},
- {"fs", "# requests forwarded due to high load"},
- {"fs", "# requests done for free (low load)"},
- {"fs", "# requests dropped, priority insufficient"},
- {"fs", "# requests done for a price (normal load)"},
- {"fs", "# requests dropped by datastore (queue length limit)"},
- {"fs", "# P2P searches received"},
- {"fs", "# P2P searches discarded (queue length bound)"},
- {"fs", "# replies received for local clients"},
- {"fs", "# queries retransmitted to same target"},
- {"core", "# bytes decrypted"},
- {"core", "# bytes encrypted"},
- {"core", "# discarded CORE_SEND requests"},
- {"core", "# discarded lower priority CORE_SEND requests"},
- {"transport", "# bytes received via TCP"},
- {"transport", "# bytes transmitted via TCP"},
- {"datacache", "# bytes stored"},
- {NULL, NULL}
+ { "fs", "# artificial delays introduced (ms)" },
+ { "fs", "# queries forwarded" },
+ { "fs", "# replies received and matched" },
+ { "fs", "# results found locally" },
+ { "fs", "# requests forwarded due to high load" },
+ { "fs", "# requests done for free (low load)" },
+ { "fs", "# requests dropped, priority insufficient" },
+ { "fs", "# requests done for a price (normal load)" },
+ { "fs", "# requests dropped by datastore (queue length limit)" },
+ { "fs", "# P2P searches received" },
+ { "fs", "# P2P searches discarded (queue length bound)" },
+ { "fs", "# replies received for local clients" },
+ { "fs", "# queries retransmitted to same target" },
+ { "core", "# bytes decrypted" },
+ { "core", "# bytes encrypted" },
+ { "core", "# discarded CORE_SEND requests" },
+ { "core", "# discarded lower priority CORE_SEND requests" },
+ { "transport", "# bytes received via TCP" },
+ { "transport", "# bytes transmitted via TCP" },
+ { "datacache", "# bytes stored" },
+ { NULL, NULL }
};
+static void
+cleanup ()
+{
+ GNUNET_SCHEDULER_shutdown ();
+ if (NULL != fn1)
+ {
+ GNUNET_DISK_directory_remove (fn1);
+ GNUNET_free (fn1);
+ }
+ if (NULL != fn2)
+ {
+ GNUNET_DISK_directory_remove (fn2);
+ GNUNET_free (fn2);
+ }
+}
+
+
/**
* Callback function to process statistic values.
*
{
struct StatMaster *sm = cls;
- FPRINTF (stderr, "Peer %2u: %12s/%50s = %12llu\n", sm->daemon, subsystem,
+ fprintf (stderr, "Peer %2u: %12s/%50s = %12llu\n", sm->daemon, subsystem,
name, (unsigned long long) value);
return GNUNET_OK;
}
* Function that gathers stats from all daemons.
*/
static void
-stat_run (void *cls,
- struct GNUNET_TESTBED_Operation *op,
- void *ca_result,
- const char *emsg);
+stat_run (void *cls,
+ struct GNUNET_TESTBED_Operation *op,
+ void *ca_result,
+ const char *emsg);
/**
}
-
/**
* Adapter function called to establish a connection to
* statistics service.
- *
+ *
* @param cls closure
* @param cfg configuration of the peer to connect to; will be available until
* GNUNET_TESTBED_operation_done() is called on the operation returned
*/
static void *
statistics_connect_adapter (void *cls,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
{
return GNUNET_STATISTICS_create ("<driver>",
- cfg);
+ cfg);
}
/**
* Adapter function called to destroy a connection to
* statistics service.
- *
+ *
* @param cls closure
* @param op_result service handle returned from the connect adapter
*/
-static void
+static void
statistics_disconnect_adapter (void *cls,
- void *op_result)
+ void *op_result)
{
GNUNET_STATISTICS_destroy (op_result, GNUNET_NO);
}
* Function that gathers stats from all daemons.
*/
static void
-stat_run (void *cls,
- struct GNUNET_TESTBED_Operation *op,
- void *ca_result,
- const char *emsg)
+stat_run (void *cls,
+ struct GNUNET_TESTBED_Operation *op,
+ void *ca_result,
+ const char *emsg)
{
struct StatMaster *sm = cls;
- if (stats[sm->value].name != NULL)
+ sm->stat = ca_result;
+ GNUNET_assert (NULL != sm->stat);
+ if (NULL != stats[sm->value].name)
{
GNUNET_STATISTICS_get (sm->stat,
#if 0
#else
stats[sm->value].subsystem, stats[sm->value].name,
#endif
- GNUNET_TIME_UNIT_FOREVER_REL, &get_done, &print_stat,
+ &get_done, &print_stat,
sm);
return;
}
if (NUM_DAEMONS == sm->daemon)
{
GNUNET_free (sm);
- GNUNET_SCHEDULER_shutdown ();
+ cleanup ();
return;
}
sm->op =
GNUNET_TESTBED_service_connect (NULL,
- daemons[sm->daemon],
- "statistics",
- &stat_run, sm,
- &statistics_connect_adapter,
- &statistics_disconnect_adapter,
- NULL);
+ daemons[sm->daemon],
+ "statistics",
+ &stat_run, sm,
+ &statistics_connect_adapter,
+ &statistics_disconnect_adapter,
+ NULL);
}
static void
-do_report (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_report (void *cls)
{
static int download_counter;
const char *type = cls;
char *fancy;
struct StatMaster *sm;
- if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE))
+ if (0 ==
+ GNUNET_TIME_absolute_get_remaining (GNUNET_TIME_absolute_add (start_time,
+ TIMEOUT)).
+ rel_value_us)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Timeout during download for type `%s', shutting down with error\n",
type);
ok = 1;
- GNUNET_SCHEDULER_shutdown ();
+ cleanup ();
return;
}
del = GNUNET_TIME_absolute_get_duration (start_time);
- if (del.rel_value == 0)
- del.rel_value = 1;
+ if (del.rel_value_us == 0)
+ del.rel_value_us = 1;
fancy =
- GNUNET_STRINGS_byte_size_fancy (((unsigned long long) FILESIZE) *
- 1000LL / del.rel_value);
- FPRINTF (stderr, "Download speed of type `%s' was %s/s\n", type, fancy);
+ GNUNET_STRINGS_byte_size_fancy (((unsigned long long) FILESIZE)
+ * 1000000LL / del.rel_value_us);
+ fprintf (stderr, "Download speed of type `%s' was %s/s\n", type, fancy);
GNUNET_free (fancy);
if (NUM_DAEMONS != ++download_counter)
return; /* more downloads to come */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Finished all downloads, shutting down\n",
- (unsigned long long) FILESIZE);
- sm = GNUNET_malloc (sizeof (struct StatMaster));
+ "Finished all downloads, getting statistics\n");
+ sm = GNUNET_new (struct StatMaster);
sm->op =
GNUNET_TESTBED_service_connect (NULL,
- daemons[sm->daemon],
- "statistics",
- &stat_run, sm,
- &statistics_connect_adapter,
- &statistics_disconnect_adapter,
- NULL);
+ daemons[sm->daemon],
+ "statistics",
+ &stat_run, sm,
+ &statistics_connect_adapter,
+ &statistics_disconnect_adapter,
+ NULL);
}
static void
-do_downloads (void *cls, const struct GNUNET_FS_Uri *u2)
+do_downloads (void *cls, const struct GNUNET_FS_Uri *u2,
+ const char *fn)
{
int anonymity;
unsigned int i;
if (NULL == u2)
{
- GNUNET_SCHEDULER_shutdown ();
+ cleanup ();
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Timeout during upload attempt, shutting down with error\n");
ok = 1;
return;
}
+ if (NULL != fn)
+ fn2 = GNUNET_strdup (fn);
uri2 = GNUNET_FS_uri_dup (u2);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Downloading %llu bytes\n",
(unsigned long long) FILESIZE);
static void
-do_publish2 (void *cls,
- const struct GNUNET_FS_Uri *u1)
+do_publish2 (void *cls,
+ const struct GNUNET_FS_Uri *u1,
+ const char *fn)
{
int do_index;
int anonymity;
if (NULL == u1)
- {
- GNUNET_SCHEDULER_shutdown ();
+ {
+ cleanup ();
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Timeout during upload attempt, shutting down with error\n");
ok = 1;
return;
}
+ if (NULL != fn)
+ fn1 = GNUNET_strdup (fn);
uri1 = GNUNET_FS_uri_dup (u1);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Publishing %llu bytes\n",
(unsigned long long) FILESIZE);
NULL);
}
+
static void
-do_publish1 (void *cls,
- struct GNUNET_TESTBED_Operation *op,
- const char *emsg)
+do_publish1 (void *cls,
+ struct GNUNET_TESTBED_Operation *op,
+ const char *emsg)
{
unsigned int *coco = cls;
int do_index;
int anonymity;
+ GNUNET_TESTBED_operation_done (op);
if (NULL != emsg)
{
- GNUNET_SCHEDULER_shutdown ();
+ cleanup ();
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Error trying to connect: %s\n", emsg);
ok = 1;
return;
static void
-do_connect (void *cls,
- unsigned int num_peers,
- struct GNUNET_TESTBED_Peer **peers)
+do_connect (void *cls,
+ struct GNUNET_TESTBED_RunHandle *h,
+ unsigned int num_peers,
+ struct GNUNET_TESTBED_Peer **peers,
+ unsigned int links_succeeded,
+ unsigned int links_failed)
{
static unsigned int coco;
unsigned int i;
unsigned int j;
-
+
GNUNET_assert (NUM_DAEMONS == num_peers);
- for (i=0;i<num_peers;i++)
+ for (i = 0; i < num_peers; i++)
daemons[i] = peers[i];
- for (i=0;i<NUM_DAEMONS;i++)
- for (j=i+1;j<NUM_DAEMONS;j++)
- {
- coco++;
- GNUNET_TESTBED_overlay_connect (NULL,
- &do_publish1,
- &coco,
- peers[i],
- peers[j]);
- }
+ for (i = 0; i < NUM_DAEMONS; i++)
+ for (j = i + 1; j < NUM_DAEMONS; j++)
+ {
+ coco++;
+ GNUNET_TESTBED_overlay_connect (NULL,
+ &do_publish1,
+ &coco,
+ peers[i],
+ peers[j]);
+ }
}
int
main (int argc, char *argv[])
{
- GNUNET_TESTBED_test_run ("perf-gnunet-service-fs-p2p-respect",
- "perf_gnunet_service_fs_p2p.conf",
- NUM_DAEMONS,
- 0, NULL, NULL,
- &do_connect, NULL);
+ progname = argv[0];
+ (void) GNUNET_TESTBED_test_run ("perf-gnunet-service-fs-p2p-respect",
+ "perf_gnunet_service_fs_p2p.conf",
+ NUM_DAEMONS,
+ 0, NULL, NULL,
+ &do_connect, NULL);
GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");
return ok;
}
+
/* end of perf_gnunet_service_fs_p2p_respect.c */
projects / oweals / gnunet.git / blobdiff