chiark
/
gitweb
/
~ian
/
moebius2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed XBITS==4
[moebius2.git]
/
minimise.c
diff --git
a/minimise.c
b/minimise.c
index d52a685385b11c81e39e03eaa97819591f41823d..60f2d646e08d5495f72829ee8513dfaba3011ffd 100644
(file)
--- a/
minimise.c
+++ b/
minimise.c
@@
-63,8
+63,6
@@
static void badusage(void) {
}
static sig_atomic_t quit_requested;
}
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;
static void sigint_handler(int ignored) {
quit_requested= 1;
@@
-103,6
+101,7
@@
int main(int argc, const char *const *argv) {
r= sigaction(SIGINT,&sa,0);
if (r) diee("sigaction SIGINT");
r= sigaction(SIGINT,&sa,0);
if (r) diee("sigaction SIGINT");
+ mgraph_prepare();
graph_layout_prepare();
printing_init();
energy_init();
graph_layout_prepare();
printing_init();
energy_init();
@@
-140,8
+139,8
@@
int main(int argc, const char *const *argv) {
for (;;) {
if (quit_requested) {
for (;;) {
if (quit_requested) {
- fprintf(stderr,"SIGINT caught
, quitting soon
.\n");
-
quitting_last_iteration= 1
;
+ fprintf(stderr,"SIGINT caught.\n");
+
exit(1)
;
}
GA( gsl_multimin_fminimizer_iterate(minimiser) );
}
GA( gsl_multimin_fminimizer_iterate(minimiser) );
@@
-157,9
+156,6
@@
int main(int argc, const char *const *argv) {
if (r==GSL_SUCCESS) break;
assert(r==GSL_CONTINUE);
}
if (r==GSL_SUCCESS) break;
assert(r==GSL_CONTINUE);
}
-
- if (quitting_reported_threads)
- exit(1);
}
if (final_file) {
}
if (final_file) {