[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r8995 - in GNUnet/src: applications/testing include
From: |
gnunet |
Subject: |
[GNUnet-SVN] r8995 - in GNUnet/src: applications/testing include |
Date: |
Mon, 14 Sep 2009 12:52:14 -0600 |
Author: nevans
Date: 2009-09-14 12:52:14 -0600 (Mon, 14 Sep 2009)
New Revision: 8995
Modified:
GNUnet/src/applications/testing/remote.c
GNUnet/src/include/gnunet_remote_lib.h
Log:
allow arbitrary strings to be prepended when executing gnunetd (for instance,
profiling with valgrind --callgrind)
Modified: GNUnet/src/applications/testing/remote.c
===================================================================
--- GNUnet/src/applications/testing/remote.c 2009-09-14 18:49:25 UTC (rev
8994)
+++ GNUnet/src/applications/testing/remote.c 2009-09-14 18:52:14 UTC (rev
8995)
@@ -62,12 +62,13 @@
* @param hostname hostname or ip address of remote machine
* @param username username to use for ssh (assumed to be used with ssh-agent)
* @param remote_friend_file_path path for friend file on remote machine
+ * @param prepend_exec prepend gnunetd command with prepend_exec (such as
valgrind)
*/
int
GNUNET_REMOTE_start_daemon (char *gnunetd_home,
char *localConfigPath, char *configFileName,
char *remote_config_path, char *hostname,
- char *username, char *remote_friend_file_path)
+ char *username, char *remote_friend_file_path,
char *prepend_exec)
{
char *cmd;
int length;
@@ -135,20 +136,20 @@
if (is_local)
{
length =
- snprintf (NULL, 0, "%sgnunetd -c %s%s &",
+ snprintf (NULL, 0, "%s %sgnunetd -c %s%s &", prepend_exec,
gnunetd_home, remote_config_path, configFileName);
cmd = GNUNET_malloc (length + 1);
- snprintf (cmd, length + 1, "%sgnunetd -c %s%s &", gnunetd_home,
+ snprintf (cmd, length + 1, "%s %sgnunetd -c %s%s &", prepend_exec,
gnunetd_home,
remote_config_path, configFileName);
}
else
{
length =
- snprintf (NULL, 0, "ssh address@hidden %sgnunetd -c %s%s &", username,
- hostname, gnunetd_home, remote_config_path, configFileName);
+ snprintf (NULL, 0, "ssh address@hidden %s %sgnunetd -c %s%s &",
username,
+ hostname, prepend_exec, gnunetd_home, remote_config_path,
configFileName);
cmd = GNUNET_malloc (length + 1);
- snprintf (cmd, length + 1, "ssh address@hidden %sgnunetd -c %s%s &",
- username, hostname, gnunetd_home, remote_config_path,
+ snprintf (cmd, length + 1, "ssh address@hidden %s %sgnunetd -c %s%s &",
+ username, hostname, prepend_exec, gnunetd_home,
remote_config_path,
configFileName);
}
@@ -333,6 +334,7 @@
char *temp_host_string;
char *temp_remote_config_path;
char *dotOutFileName;
+ char *prepend_exec;
unsigned long long starting_port;
unsigned long long port_increment;
@@ -366,9 +368,9 @@
double percentage;
double logNModifier;
- double malicious_getter_num;
- double malicious_putter_num;
- double malicious_dropper_num;
+ int malicious_getter_num;
+ int malicious_putter_num;
+ int malicious_dropper_num;
length = 0;
ipk_dir = GNUNET_get_installation_path (GNUNET_IPK_DATADIR);
@@ -382,6 +384,10 @@
"SSH_USERNAME", "",
&ssh_username);
+ GNUNET_GC_get_configuration_value_string (newcfg, "MULTIPLE_SERVER_TESTING",
+ "PREPEND_EXECUTABLE", "",
+ &prepend_exec);
+
GNUNET_GC_get_configuration_value_number (newcfg, "MULTIPLE_SERVER_TESTING",
"TOPOLOGY", 0, -1, 0, &topology);
@@ -391,7 +397,9 @@
&malicious_getters);
if (malicious_getters > 0)
- malicious_getter_num = number_of_daemons / malicious_getters;
+ malicious_getter_num = (int)(number_of_daemons / malicious_getters);
+ else
+ malicious_getter_num = 0;
GNUNET_GC_get_configuration_value_number (newcfg, "MULTIPLE_SERVER_TESTING",
"MALICIOUS_PUTTERS", 0,
@@ -399,7 +407,9 @@
&malicious_putters);
if (malicious_putters > 0)
- malicious_putter_num = number_of_daemons / malicious_putters;
+ malicious_putter_num = (int)(number_of_daemons / malicious_putters);
+ else
+ malicious_putter_num = 0;
GNUNET_GC_get_configuration_value_number (newcfg, "MULTIPLE_SERVER_TESTING",
"MALICIOUS_DROPPERS", 0,
@@ -407,7 +417,9 @@
&malicious_droppers);
if (malicious_droppers > 0)
- malicious_dropper_num = number_of_daemons / malicious_droppers;
+ malicious_dropper_num = (int)(number_of_daemons / malicious_droppers);
+ else
+ malicious_dropper_num = 0;
type_of_topology = (unsigned int) topology;
@@ -759,7 +771,7 @@
GNUNET_REMOTE_start_daemon (remote_gnunetd_path, "/tmp/",
temp, remote_config_path,
curr_host, ssh_username,
- temp_pos->remote_friend_file_path);
+ temp_pos->remote_friend_file_path,
prepend_exec);
next_peer =
GNUNET_malloc (sizeof
@@ -1044,7 +1056,7 @@
temp, remote_config_path,
curr_host, ssh_username,
temp_pos->
- remote_friend_file_path);
+ remote_friend_file_path,
prepend_exec);
next_peer =
GNUNET_malloc (sizeof
Modified: GNUnet/src/include/gnunet_remote_lib.h
===================================================================
--- GNUnet/src/include/gnunet_remote_lib.h 2009-09-14 18:49:25 UTC (rev
8994)
+++ GNUnet/src/include/gnunet_remote_lib.h 2009-09-14 18:52:14 UTC (rev
8995)
@@ -78,7 +78,7 @@
char *localConfigPath, char *configFileName,
char *remote_config_path, char *ip_address,
char *username,
- char *remote_friend_file_path);
+ char *remote_friend_file_path, char
*prepend_exec);
/**
* Main start function to be called. Needs a remote config specified, as well
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r8995 - in GNUnet/src: applications/testing include,
gnunet <=