From: Florian Forster <octo@leeloo.octo.it>
Date: Mon, 24 Jan 2011 07:12:04 +0000 (+0100)
Subject: sn-count-markov: Print current network when receiving SIGHUP.
X-Git-Tag: v1.1.0~15
X-Git-Url: https://git.octo.it/?p=sort-networks.git;a=commitdiff_plain;h=8be763371ce43036e9e9f43bbecc954d1f90d8b8

sn-count-markov: Print current network when receiving SIGHUP.
---

diff --git a/src/sn-count-markov.c b/src/sn-count-markov.c
index 698ca4d..2535bd8 100644
--- a/src/sn-count-markov.c
+++ b/src/sn-count-markov.c
@@ -58,12 +58,35 @@ static GTree *all_networks = NULL;
 static uint64_t cycles_num = 0;
 
 static _Bool do_loop = 1;
+static _Bool do_output_network = 0;
 static uint64_t max_iterations = 0;
 
-static void sigint_handler (int signal __attribute__((unused)))
+static void sigint_handler (__attribute__((unused)) int signal) /* {{{ */
 {
   do_loop = 0;
-} /* void sigint_handler */
+} /* }}} void sigint_handler */
+
+static void sighup_handler (__attribute__((unused)) int signal) /* {{{ */
+{
+  do_output_network = 1;
+} /* }}} void sighup_handler */
+
+static int output_network (sn_network_t *n) /* {{{ */
+{
+  FILE *fh;
+
+  if (n == NULL)
+    return (EINVAL);
+
+  fh = fopen ("/dev/tty", "w");
+  if (fh == NULL)
+    return (errno);
+
+  sn_network_show_fh (n, fh);
+
+  fclose (fh);
+  return (0);
+} /* }}} int output_network */
 
 static gint compare_hashval (gconstpointer p0, gconstpointer p1) /* {{{ */
 {
@@ -233,6 +256,12 @@ static void random_walk (sn_network_t *n)
 
     account_network (next, iteration_counter);
 
+    if (do_output_network)
+    {
+      output_network (next);
+      do_output_network = 0;
+    }
+
     sn_network_destroy (n);
     n = next;
     iteration_counter++;
@@ -252,12 +281,13 @@ int main (int argc, char **argv)
 
   struct sigaction sigint_action;
   struct sigaction sigterm_action;
+  struct sigaction sighup_action;
 
   read_options (argc, argv);
   if (initial_input_file == NULL)
     exit_usage (argv[0], EXIT_FAILURE);
 
-  memset (&sigint_action, '\0', sizeof (sigint_action));
+  memset (&sigint_action, 0, sizeof (sigint_action));
   sigint_action.sa_handler = sigint_handler;
   sigaction (SIGINT, &sigint_action, NULL);
 
@@ -265,6 +295,10 @@ int main (int argc, char **argv)
   sigterm_action.sa_handler = sigint_handler;
   sigaction (SIGTERM, &sigterm_action, NULL);
 
+  memset (&sighup_action, 0, sizeof (sighup_action));
+  sighup_action.sa_handler = sighup_handler;
+  sigaction (SIGHUP, &sighup_action, NULL);
+
   all_networks = g_tree_new (compare_hashval);
   if (all_networks == NULL)
   {