comparison libinterp/octave.cc @ 16485:8b783661e03f

improve exit sequence for GUI * octave-link.h, octave-link.cc (octave_link::accepting_events): Delete variable and all uses. (octave_link::link_enabled): New data member. (octave_link::octave_link): Don't set octave_exit. Initialize link_enabled. (octave_link::do_exit): Delete definition. Now pure virtual. Return bool. (octave_link::exit): Call instance->do_exit. (octave_link::enabled): New function. (ocave_link::process_events): New arg, disable. Optionally disable event processing. Use octave_link::enabled instead of instance_ok everywhere except for octave_link::exit. (octave_link::cleanup_instance): Delete. * octave-qt-link.h, octave-qt-link.cc (octave_qt_link::octave_qt_link): Accept thread as argument. Don't connect main_thread::finished signal. (octave_qt_link::~octave_qt_link): Don't delete main_thread. (octave_qt_link::do_exit): Emit exit_signal and return true. (octave_qt_link::exit_signal: New signal. (octave_qt_link::void octave_thread_finished_signal): Delete. * main-window.h, main-window.cc (main_window::_octave_main_thread): New member variable. (main_window::main_window): Initialize _octave_main_thread and _octave_qt_link to 0. (main_window::~main_window): Don't call octave_link::connect_link. Delete _octave_main_thread. (main_window::exit): Accept exit status as argument and call QApplication::exit instead of quit. (main_window::construct): Don't connect qApp::aboutToQuit to main_window::prepare_to_exit. (main_window::construct_octave_qt_link): Create _octave_main_thread and pass to _octave_qt_link. Don't connect _octave_qt_link::octave_thread_finished to main_window::exit. Connect _octave_qt_link::exit_signal to main_window::exit. * toplev.h, toplev.cc (main_loop): If quitting_gracefully, just return exit status instead of calling clean_up_and_exit. (do_octave_atexit): Now static. Call octave_link::process_events with disable arg set to true. (octave_atexit_functions): Now static. (clean_up_and_exit): New argument, safe_to_return. Call octave_link::exit and possibly return or wait for octave_link::exit to terminate the process. * octave.cc (octave_execute_interpreter): Don't alter return value from main_loop. Pass safe_to_return = true to clean_up_and_exit. Return retval instead of 0. (octave_initialize_interpreter): Don't call atexit.
author John W. Eaton <jwe@octave.org>
date Tue, 09 Apr 2013 23:08:24 -0400
parents 302157614308
children 9bc1f8278966
comparison
equal deleted inserted replaced
16484:fa842e78f491 16485:8b783661e03f
889 set_image_path (image_path); 889 set_image_path (image_path);
890 890
891 if (no_window_system) 891 if (no_window_system)
892 display_info::no_window_system (); 892 display_info::no_window_system ();
893 893
894 // Make sure we clean up when we exit. Also allow users to register
895 // functions. If we don't have atexit or on_exit, we're going to
896 // leave some junk files around if we exit abnormally.
897
898 atexit (do_octave_atexit);
899
900 // Is input coming from a terminal? If so, we are probably 894 // Is input coming from a terminal? If so, we are probably
901 // interactive. 895 // interactive.
902 896
903 // If stdin is not a tty, then we are reading commands from a pipe or 897 // If stdin is not a tty, then we are reading commands from a pipe or
904 // a redirected file. 898 // a redirected file.
1006 return 1; 1000 return 1;
1007 } 1001 }
1008 1002
1009 int retval = main_loop (); 1003 int retval = main_loop ();
1010 1004
1011 if (retval == 1 && ! error_state)
1012 retval = 0;
1013
1014 quitting_gracefully = true; 1005 quitting_gracefully = true;
1015 1006
1016 clean_up_and_exit (retval); 1007 clean_up_and_exit (retval, true);
1017 1008
1018 return 0; 1009 return retval;
1019 } 1010 }
1020 1011
1021 static bool 1012 static bool
1022 check_starting_gui (void) 1013 check_starting_gui (void)
1023 { 1014 {