/*
This file is part of GNUnet.
- Copyright (C) 2011 - 2013 GNUnet e.V.
+ Copyright (C) 2011 - 2017 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
+ */
/**
* @file regex/gnunet-regex-profiler.c
#include "gnunet_testbed_service.h"
#define FIND_TIMEOUT \
- GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 90)
+ GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 90)
/**
* DLL of operations
/**
* Handle to a running regex search.
*/
- struct REGEX_INTERNAL_Search *search_handle;
+ struct REGEX_INTERNAL_Search *search_handle;
/**
* Testbed operation handle for DHT.
/**
* Operation timeout
*/
- struct GNUNET_SCHEDULER_Task * timeout;
+ struct GNUNET_SCHEDULER_Task *timeout;
/**
* Deamon start
/**
* Abort task identifier
*/
-static struct GNUNET_SCHEDULER_Task * abort_task;
+static struct GNUNET_SCHEDULER_Task *abort_task;
/**
* Host registration task identifier
*/
-static struct GNUNET_SCHEDULER_Task * register_hosts_task;
+static struct GNUNET_SCHEDULER_Task *register_hosts_task;
/**
* Global event mask for all testbed events
/**
* Folder where policy files are stored.
*/
-static char * policy_dir;
+static char *policy_dir;
/**
* File with hostnames where to execute the test.
/**
* Search timeout task identifier.
*/
-static struct GNUNET_SCHEDULER_Task * search_timeout_task;
+static struct GNUNET_SCHEDULER_Task *search_timeout_task;
/**
* Search timeout in seconds.
* Prefix used for regex announcing. We need to prefix the search
* strings with it, in order to find something.
*/
-static char * regex_prefix;
+static char *regex_prefix;
/**
* What's the maximum regex reannounce period.
{
peer = &peers[peer_cnt];
- if (GNUNET_YES != peer->search_str_matched && NULL != data_file)
+ if ((GNUNET_YES != peer->search_str_matched) &&(NULL != data_file) )
{
prof_time = GNUNET_TIME_absolute_get_duration (peer->prof_start_time);
size =
GNUNET_snprintf (output_buffer,
- sizeof (output_buffer),
+ sizeof(output_buffer),
"%p Search string not found: %s (%d)\n"
"%p On peer: %u (%p)\n"
"%p After: %s\n",
unsigned long i = (unsigned long) cls;
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "Aborting from line %lu...\n", i);
+ "Aborting from line %lu...\n", i);
abort_task = NULL;
result = GNUNET_SYSERR;
GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
*/
static void *
stats_ca (void *cls,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
{
return GNUNET_STATISTICS_create ("<driver>", cfg);
}
*/
static int
stats_iterator (void *cls,
- const char *subsystem,
- const char *name,
+ const char *subsystem,
+ const char *name,
uint64_t value, int is_persistent)
{
struct RegexPeer *peer = cls;
}
size =
GNUNET_snprintf (output_buffer,
- sizeof (output_buffer),
+ sizeof(output_buffer),
"%p [%s] %llu %s\n",
peer,
subsystem, value, name);
if (peer_cnt == num_peers)
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "\nCollecting stats finished. Shutting down.\n");
+ "\nCollecting stats finished. Shutting down.\n");
GNUNET_SCHEDULER_shutdown ();
result = GNUNET_OK;
}
{
struct RegexPeer *peer = cls;
- if (NULL == ca_result || NULL != emsg)
+ if ((NULL == ca_result)||(NULL != emsg))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Failed to connect to statistics service on peer %u: %s\n",
{
size =
GNUNET_snprintf (output_buffer,
- sizeof (output_buffer),
+ sizeof(output_buffer),
"%p Peer: %u\n"
"%p Search string: %s\n"
"%p Search duration: %s\n\n",
{
unsigned int search_peer = (unsigned int) (long) cls;
- if ( (search_peer >= num_peers) ||
- (GNUNET_YES == in_shutdown) )
+ if ((search_peer >= num_peers) ||
+ (GNUNET_YES == in_shutdown))
return;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
GNUNET_assert (NULL != peers[search_peer].op_handle);
peers[search_peer].timeout
= GNUNET_SCHEDULER_add_delayed (FIND_TIMEOUT,
- &find_timed_out,
- &peers[search_peer]);
+ &find_timed_out,
+ &peers[search_peer]);
}
*/
static void
daemon_started (void *cls,
- struct GNUNET_TESTBED_Operation *op,
+ struct GNUNET_TESTBED_Operation *op,
const char *emsg)
{
struct RegexPeer *peer = (struct RegexPeer *) cls;
{
search_peer = (search_peer + 1) % num_peers;
if (i > num_peers)
- GNUNET_assert (0); /* we ran out of peers, must be a bug */
+ GNUNET_assert (0); /* we ran out of peers, must be a bug */
}
peers[search_peer].search_str = search_strings[peer->id];
peers[search_peer].search_str_matched = GNUNET_NO;
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_saturating_multiply(
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_saturating_multiply (
reannounce_period_max,
2),
&find_string,
if (GNUNET_YES == in_shutdown)
return;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Starting announce.\n");
+ "Starting announce.\n");
for (i = 0; i < init_parallel_searches; i++)
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Starting daemon %u\n", next_search);
peer = &peers[next_search];
peer->daemon_op =
- GNUNET_TESTBED_peer_manage_service (NULL,
- peer->peer_handle,
- "regexprofiler",
- &daemon_started,
- peer,
- 1);
+ GNUNET_TESTBED_peer_manage_service (NULL,
+ peer->peer_handle,
+ "regexprofiler",
+ &daemon_started,
+ peer,
+ 1);
next_search++;
parallel_searches++;
}
*/
static void
dht_connect_cb (void *cls,
- struct GNUNET_TESTBED_Operation *op,
+ struct GNUNET_TESTBED_Operation *op,
void *ca_result,
- const char *emsg)
+ const char *emsg)
{
struct RegexPeer *peer = (struct RegexPeer *) cls;
- if (NULL != emsg || NULL == op || NULL == ca_result)
+ if ((NULL != emsg)||(NULL == op)||(NULL == ca_result))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "DHT connect failed: %s\n", emsg);
GNUNET_assert (0);
peer->search_str_matched = GNUNET_NO;
peer->search_handle = REGEX_INTERNAL_search (peer->dht_handle,
- peer->search_str,
- ®ex_found_handler, peer,
- NULL);
+ peer->search_str,
+ ®ex_found_handler, peer,
+ NULL);
peer->prof_start_time = GNUNET_TIME_absolute_get ();
}
10 * num_peers);
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Waiting for DHT for %s to settle new connections.\n\n",
- GNUNET_STRINGS_relative_time_to_string(settle_time, GNUNET_NO));
+ GNUNET_STRINGS_relative_time_to_string (settle_time,
+ GNUNET_NO));
GNUNET_SCHEDULER_add_delayed (settle_time, &do_announce, NULL);
}
else
GNUNET_SCHEDULER_add_now (&do_announce, NULL);
}
search_timeout_task =
- GNUNET_SCHEDULER_add_delayed (search_timeout_time, &search_timed_out, NULL);
+ GNUNET_SCHEDULER_add_delayed (search_timeout_time, &search_timed_out, NULL);
}
/**
switch (event->type)
{
case GNUNET_TESTBED_ET_CONNECT:
- printf(".");
+ printf (".");
break;
+
case GNUNET_TESTBED_ET_PEER_START:
- printf("#");
+ printf ("#");
break;
+
default:
break;
}
- fflush(stdout);
+ fflush (stdout);
}
/*************************** TESTBED PEER SETUP *****************************/
/******************************************************************************/
+/**
+ * Process the text buffer counting the non-empty lines and separating them
+ * with NULL characters, for later ease of copy using (as)printf.
+ *
+ * @param data Memory buffer with strings.
+ * @param data_size Size of the @a data buffer in bytes.
+ * @param str_max Maximum number of strings to return.
+ * @return Positive number of lines found in the buffer,
+ * #GNUNET_SYSERR otherwise.
+ */
+static int
+count_and_separate_strings (char *data,
+ uint64_t data_size,
+ unsigned int str_max)
+{
+ char *buf; // Keep track of last string to skip blank lines
+ unsigned int offset;
+ unsigned int str_cnt;
+
+ buf = data;
+ offset = 0;
+ str_cnt = 0;
+ while ((offset < (data_size - 1)) && (str_cnt < str_max))
+ {
+ offset++;
+ if (((data[offset] == '\n')) &&
+ (buf != &data[offset]))
+ {
+ data[offset] = '\0';
+ str_cnt++;
+ buf = &data[offset + 1];
+ }
+ else if ((data[offset] == '\n') ||
+ (data[offset] == '\0'))
+ buf = &data[offset + 1];
+ }
+ return str_cnt;
+}
+
+
+/**
+ * Allocate a string array and fill it with the prefixed strings
+ * from a pre-processed, NULL-separated memory region.
+ *
+ * @param data Preprocessed memory with strings
+ * @param data_size Size of the @a data buffer in bytes.
+ * @param strings Address of the string array to be created.
+ * Must be freed by caller if function end in success.
+ * @param str_cnt String count. The @a data buffer should contain
+ * at least this many NULL-separated strings.
+ * @return #GNUNET_OK in ase of success, #GNUNET_SYSERR otherwise.
+ * In case of error @a strings must not be freed.
+ */
+static int
+create_string_array (char *data, uint64_t data_size,
+ char ***strings, unsigned int str_cnt)
+{
+ uint64_t offset;
+ uint64_t len;
+ unsigned int i;
+
+ *strings = GNUNET_malloc (sizeof(char *) * str_cnt);
+ offset = 0;
+ for (i = 0; i < str_cnt; i++)
+ {
+ len = strlen (&data[offset]);
+ if (offset + len >= data_size)
+ {
+ GNUNET_free (*strings);
+ *strings = NULL;
+ return GNUNET_SYSERR;
+ }
+ if (0 == len) // empty line
+ {
+ offset++;
+ i--;
+ continue;
+ }
+
+ GNUNET_asprintf (&(*strings)[i],
+ "%s%s",
+ regex_prefix,
+ &data[offset]);
+ offset += len + 1;
+ }
+ return GNUNET_OK;
+}
+
/**
* Load search strings from given filename. One search string per line.
*/
static int
load_search_strings (const char *filename,
- char ***strings,
- unsigned int limit)
+ char ***strings,
+ unsigned int limit)
{
char *data;
- char *buf;
uint64_t filesize;
- unsigned int offset;
int str_cnt;
- unsigned int i;
+ /* Sanity checks */
if (NULL == filename)
{
return GNUNET_SYSERR;
}
-
if (GNUNET_YES != GNUNET_DISK_file_test (filename))
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
&filesize,
GNUNET_YES,
GNUNET_YES))
- filesize = 0;
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Search strings file %s cannot be read.\n",
+ filename);
+ return GNUNET_SYSERR;
+ }
if (0 == filesize)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
filename);
return GNUNET_SYSERR;
}
+
+ /* Read data into memory */
data = GNUNET_malloc (filesize + 1);
if (filesize != GNUNET_DISK_fn_read (filename,
data,
GNUNET_free (data);
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Could not read search strings file %s.\n",
- filename);
+ filename);
return GNUNET_SYSERR;
}
- buf = data;
- offset = 0;
- str_cnt = 0;
- while ( (offset < (filesize - 1)) && (str_cnt < limit) )
- {
- offset++;
- if ( ((data[offset] == '\n')) &&
- (buf != &data[offset]) )
- {
- data[offset] = '\0';
- str_cnt++;
- buf = &data[offset + 1];
- }
- else if ( (data[offset] == '\n') ||
- (data[offset] == '\0') )
- buf = &data[offset + 1];
- }
- *strings = GNUNET_malloc (sizeof (char *) * str_cnt);
- offset = 0;
- for (i = 0; i < str_cnt; i++)
+
+ /* Process buffer and build array */
+ str_cnt = count_and_separate_strings (data, filesize, limit);
+ if (GNUNET_OK != create_string_array (data, filesize, strings, str_cnt))
{
- GNUNET_asprintf (&(*strings)[i],
- "%s%s",
- regex_prefix,
- &data[offset]);
- offset += strlen (&data[offset]) + 1;
+ str_cnt = GNUNET_SYSERR;
}
GNUNET_free (data);
return str_cnt;
if (NULL == config)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("No configuration file given. Exiting\n"));
+ _ ("No configuration file given. Exiting\n"));
GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
return;
}
®ex_prefix))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
- "regexprofiler",
- "regex_prefix");
+ "regexprofiler",
+ "regex_prefix");
GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
return;
}
if (NULL == policy_dir)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("No policy directory specified on command line. Exiting.\n"));
+ _ (
+ "No policy directory specified on command line. Exiting.\n"));
return;
}
if (GNUNET_YES != GNUNET_DISK_directory_test (policy_dir, GNUNET_YES))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Specified policies directory does not exist. Exiting.\n"));
+ _ ("Specified policies directory does not exist. Exiting.\n"));
GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
return;
}
- if (0 >= (int) (num_peers = GNUNET_DISK_directory_scan (policy_dir, NULL, NULL)))
+ if (0 >= (int) (num_peers = GNUNET_DISK_directory_scan (policy_dir, NULL,
+ NULL)))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("No files found in `%s'\n"),
+ _ ("No files found in `%s'\n"),
policy_dir);
return;
}
if (GNUNET_YES != GNUNET_DISK_file_test (strings_file))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("No search strings file given. Exiting.\n"));
+ _ ("No search strings file given. Exiting.\n"));
GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
return;
}
GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
return;
}
- if ( (0 == num_peers) || (NULL == search_strings))
+ if ((0 == num_peers) || (NULL == search_strings))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Error loading search strings. Exiting.\n"));
+ _ ("Error loading search strings. Exiting.\n"));
GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
return;
}
search_strings[i]);
/* Check logfile */
- if ( (NULL != data_filename) &&
- (NULL == (data_file =
- GNUNET_DISK_file_open (data_filename,
- GNUNET_DISK_OPEN_READWRITE |
- GNUNET_DISK_OPEN_TRUNCATE |
- GNUNET_DISK_OPEN_CREATE,
- GNUNET_DISK_PERM_USER_READ |
- GNUNET_DISK_PERM_USER_WRITE))) )
+ if ((NULL != data_filename) &&
+ (NULL == (data_file =
+ GNUNET_DISK_file_open (data_filename,
+ GNUNET_DISK_OPEN_READWRITE
+ | GNUNET_DISK_OPEN_TRUNCATE
+ | GNUNET_DISK_OPEN_CREATE,
+ GNUNET_DISK_PERM_USER_READ
+ | GNUNET_DISK_PERM_USER_WRITE))))
{
GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR,
"open",
}
/* Initialize peers */
- peers = GNUNET_malloc (sizeof (struct RegexPeer) * num_peers);
+ peers = GNUNET_malloc (sizeof(struct RegexPeer) * num_peers);
for (i = 0; i < num_peers; i++)
peers[i].id = i;
}
abort_time = GNUNET_TIME_relative_add (abort_time, GNUNET_TIME_UNIT_MINUTES);
abort_task =
- GNUNET_SCHEDULER_add_delayed (abort_time,
- &do_abort,
- (void*) __LINE__);
+ GNUNET_SCHEDULER_add_delayed (abort_time,
+ &do_abort,
+ (void*) __LINE__);
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"setup_timeout: %s\n",
GNUNET_STRINGS_relative_time_to_string (abort_time, GNUNET_YES));
main (int argc, char *const *argv)
{
struct GNUNET_GETOPT_CommandLineOption options[] = {
-
GNUNET_GETOPT_option_filename ('o',
"output-file",
"FILENAME",
- gettext_noop ("name of the file for writing statistics"),
+ gettext_noop (
+ "name of the file for writing statistics"),
&data_filename),
GNUNET_GETOPT_option_relative_time ('t',
- "matching-timeout",
- "TIMEOUT",
- gettext_noop ("wait TIMEOUT before ending the experiment"),
- &search_timeout_time),
+ "matching-timeout",
+ "TIMEOUT",
+ gettext_noop (
+ "wait TIMEOUT before ending the experiment"),
+ &search_timeout_time),
GNUNET_GETOPT_option_filename ('p',
"policy-dir",
GNUNET_GETOPT_option_filename ('s',
"strings-file",
"FILENAME",
- gettext_noop ("name of file with input strings"),
+ gettext_noop (
+ "name of file with input strings"),
&strings_file),
GNUNET_GETOPT_option_filename ('H',
"hosts-file",
"FILENAME",
- gettext_noop ("name of file with hosts' names"),
+ gettext_noop (
+ "name of file with hosts' names"),
&hosts_file),
GNUNET_GETOPT_OPTION_END
return 2;
result = GNUNET_SYSERR;
ret =
- GNUNET_PROGRAM_run (argc, argv,
- "gnunet-regex-profiler",
- _("Profiler for regex"),
- options, &run, NULL);
+ GNUNET_PROGRAM_run (argc, argv,
+ "gnunet-regex-profiler",
+ _ ("Profiler for regex"),
+ options, &run, NULL);
if (GNUNET_OK != ret)
return ret;
if (GNUNET_OK != result)
projects / oweals / gnunet.git / blobdiff