machinery for checking that our OUTER parallel iteration works - before we delete it

[moebius2.git] / minimise.c

diff --git a/minimise.c b/minimise.c
index bf5b096c89339acdee0428147f503c2f94bfcc41..d52a685385b11c81e39e03eaa97819591f41823d 100644 (file)
--- a/minimise.c
+++ b/minimise.c
@@ -62,6 +62,14 @@ static void badusage(void) {
   exit(8);
 }
 
+static sig_atomic_t quit_requested;
+sig_atomic_t quitting_reported_threads;
+int quitting_last_iteration;
+
+static void sigint_handler(int ignored) {
+  quit_requested= 1;
+}
+
 int main(int argc, const char *const *argv) {
   gsl_multimin_function multimin_function;
   double size;
@@ -70,6 +78,7 @@ int main(int argc, const char *const *argv) {
   FILE *initial_f;
   gsl_vector initial_gsl, step_size_gsl;
   int r, i, size_check_counter= 0;
+  struct sigaction sa;
 
   if (argc==3) {
     input_file= argv[1];
@@ -88,6 +97,12 @@ int main(int argc, const char *const *argv) {
   if (final_file)
     if (asprintf(&final_file_tmp,"%s.new",final_file) <= 0) diee("asprintf");
 
+  memset(&sa,0,sizeof(sa));
+  sa.sa_handler= sigint_handler;
+  sa.sa_flags= SA_RESETHAND;
+  r= sigaction(SIGINT,&sa,0);
+  if (r) diee("sigaction SIGINT");
+
   graph_layout_prepare();
   printing_init();
   energy_init();
@@ -124,6 +139,11 @@ int main(int argc, const char *const *argv) {
                                  &initial_gsl, &step_size_gsl) );
 
   for (;;) {
+    if (quit_requested) {
+      fprintf(stderr,"SIGINT caught, quitting soon.\n");
+      quitting_last_iteration= 1;
+    }
+
     GA( gsl_multimin_fminimizer_iterate(minimiser) );
 
     if (!(size_check_counter++ % DIM)) {
@@ -137,6 +157,9 @@ int main(int argc, const char *const *argv) {
       if (r==GSL_SUCCESS) break;
       assert(r==GSL_CONTINUE);
     }
+
+    if (quitting_reported_threads)
+      exit(1);
   }
 
   if (final_file) {