- change --enable-ll to --enable-supermuc

- define a system wide termination signal GNUNET_TERM_SIG. Set this to SIGUSR1 only when building for SuperMUC
author: Sree Harsha Totakura <totakura@in.tum.de> 2013-10-12 00:07:33 +0000
committer: Sree Harsha Totakura <totakura@in.tum.de> 2013-10-12 00:07:33 +0000
commit: 27728a48d661e9ee546cc95aae8fa52050eefb29 (patch)
tree: 89450fc22b530dc592134ac18405180eeafe13b3 /src/hostlist
parent: 6d38e5b12b460d1d7f0a6eafe1410f7121e04002 (diff)
download: gnunet-27728a48d661e9ee546cc95aae8fa52050eefb29.tar.gz
gnunet-27728a48d661e9ee546cc95aae8fa52050eefb29.zip
3 files changed, 4 insertions, 4 deletions
diff --git a/src/hostlist/test_gnunet_daemon_hostlist.c b/src/hostlist/test_gnunet_daemon_hostlist.c
index 670c2ec28..2e1e5acb5 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist.c
@@ -153,7 +153,7 @@ waitpid_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  struct PeerContext *p = cls;
  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Killing ARM process.\n");
-  if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
+  if (0 != GNUNET_OS_process_kill (p->arm_proc, GNUNET_TERM_SIG))
    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
  if (GNUNET_OS_process_wait (p->arm_proc) != GNUNET_OK)
    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_learning.c b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
index 647b5983e..f581b532a 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_learning.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
@@ -145,7 +145,7 @@ shutdown_testcase ()
  }
  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Killing hostlist server ARM process.\n");
-  if (0 != GNUNET_OS_process_kill (adv_peer.arm_proc, SIGTERM))
+  if (0 != GNUNET_OS_process_kill (adv_peer.arm_proc, GNUNET_TERM_SIG))
    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
  if (GNUNET_OS_process_wait (adv_peer.arm_proc) != GNUNET_OK)
    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
@@ -153,7 +153,7 @@ shutdown_testcase ()
  adv_peer.arm_proc = NULL;
  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Killing hostlist client ARM process.\n");
-  if (0 != GNUNET_OS_process_kill (learn_peer.arm_proc, SIGTERM))
+  if (0 != GNUNET_OS_process_kill (learn_peer.arm_proc, GNUNET_TERM_SIG))
    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
  if (GNUNET_OS_process_wait (learn_peer.arm_proc) != GNUNET_OK)
    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c b/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c
index 21b2973de..6b38ffe19 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c
@@ -153,7 +153,7 @@ waitpid_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  struct PeerContext *p = cls;
  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Killing ARM process.\n");
-  if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
+  if (0 != GNUNET_OS_process_kill (p->arm_proc, GNUNET_TERM_SIG))
    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
  if (GNUNET_OS_process_wait (p->arm_proc) != GNUNET_OK)
    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
author	Sree Harsha Totakura <totakura@in.tum.de>	2013-10-12 00:07:33 +0000
committer	Sree Harsha Totakura <totakura@in.tum.de>	2013-10-12 00:07:33 +0000
commit	27728a48d661e9ee546cc95aae8fa52050eefb29 (patch)
tree	89450fc22b530dc592134ac18405180eeafe13b3 /src/hostlist
parent	6d38e5b12b460d1d7f0a6eafe1410f7121e04002 (diff)
download	gnunet-27728a48d661e9ee546cc95aae8fa52050eefb29.tar.gz gnunet-27728a48d661e9ee546cc95aae8fa52050eefb29.zip

diff --git a/src/hostlist/test_gnunet_daemon_hostlist.c b/src/hostlist/test_gnunet_daemon_hostlist.c index 670c2ec28..2e1e5acb5 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist.c +++ b/src/hostlist/test_gnunet_daemon_hostlist.c
@@ -153,7 +153,7 @@ waitpid_task (void cls, const struct GNUNET_SCHEDULER_TaskContext tc)
153	struct PeerContext *p = cls;	153	struct PeerContext *p = cls;
154		154
155	GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Killing ARM process.\n");	155	GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Killing ARM process.\n");
156	if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))	156	if (0 != GNUNET_OS_process_kill (p->arm_proc, GNUNET_TERM_SIG))
157	GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");	157	GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
158	if (GNUNET_OS_process_wait (p->arm_proc) != GNUNET_OK)	158	if (GNUNET_OS_process_wait (p->arm_proc) != GNUNET_OK)
159	GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");	159	GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");


diff --git a/src/hostlist/test_gnunet_daemon_hostlist_learning.c b/src/hostlist/test_gnunet_daemon_hostlist_learning.c index 647b5983e..f581b532a 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist_learning.c +++ b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
@@ -145,7 +145,7 @@ shutdown_testcase ()
145	}	145	}
146	GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,	146	GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
147	"Killing hostlist server ARM process.\n");	147	"Killing hostlist server ARM process.\n");
148	if (0 != GNUNET_OS_process_kill (adv_peer.arm_proc, SIGTERM))	148	if (0 != GNUNET_OS_process_kill (adv_peer.arm_proc, GNUNET_TERM_SIG))
149	GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");	149	GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
150	if (GNUNET_OS_process_wait (adv_peer.arm_proc) != GNUNET_OK)	150	if (GNUNET_OS_process_wait (adv_peer.arm_proc) != GNUNET_OK)
151	GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");	151	GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
@@ -153,7 +153,7 @@ shutdown_testcase ()
153	adv_peer.arm_proc = NULL;	153	adv_peer.arm_proc = NULL;
154	GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,	154	GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
155	"Killing hostlist client ARM process.\n");	155	"Killing hostlist client ARM process.\n");
156	if (0 != GNUNET_OS_process_kill (learn_peer.arm_proc, SIGTERM))	156	if (0 != GNUNET_OS_process_kill (learn_peer.arm_proc, GNUNET_TERM_SIG))
157	GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");	157	GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
158	if (GNUNET_OS_process_wait (learn_peer.arm_proc) != GNUNET_OK)	158	if (GNUNET_OS_process_wait (learn_peer.arm_proc) != GNUNET_OK)
159	GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");	159	GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");


diff --git a/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c b/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c index 21b2973de..6b38ffe19 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c +++ b/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c
@@ -153,7 +153,7 @@ waitpid_task (void cls, const struct GNUNET_SCHEDULER_TaskContext tc)
153	struct PeerContext *p = cls;	153	struct PeerContext *p = cls;
154		154
155	GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Killing ARM process.\n");	155	GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Killing ARM process.\n");
156	if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))	156	if (0 != GNUNET_OS_process_kill (p->arm_proc, GNUNET_TERM_SIG))
157	GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");	157	GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
158	if (GNUNET_OS_process_wait (p->arm_proc) != GNUNET_OK)	158	if (GNUNET_OS_process_wait (p->arm_proc) != GNUNET_OK)
159	GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");	159	GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");