Mercurial > hg > octave-lyh
view libinterp/interpfcn/toplev.h @ 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 | fb27f1e08297 |
children |
line wrap: on
line source
/* Copyright (C) 1993-2012 John W. Eaton This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #if !defined (octave_toplev_h) #define octave_toplev_h 1 #include <cstdio> #include <deque> #include <string> class octave_value; class octave_value_list; class octave_function; class octave_user_script; class tree_statement; class tree_statement_list; class charMatrix; #include "quit.h" #include "input.h" #include "oct-map.h" typedef void (*octave_exit_func) (int); extern OCTINTERP_API octave_exit_func octave_exit; extern OCTINTERP_API bool quit_allowed; extern OCTINTERP_API bool quitting_gracefully; extern OCTINTERP_API int exit_status; extern OCTINTERP_API void clean_up_and_exit (int status, bool safe_to_return = false); extern OCTINTERP_API void recover_from_exception (void); extern OCTINTERP_API int main_loop (void); extern OCTINTERP_API void octave_add_atexit_function (const std::string& fname); extern OCTINTERP_API bool octave_remove_atexit_function (const std::string& fname); // TRUE means we are ready to interpret commands, but not everything // is ready for interactive use. extern OCTINTERP_API bool octave_interpreter_ready; // TRUE means we've processed all the init code and we are good to go. extern OCTINTERP_API bool octave_initialized; class OCTINTERP_API octave_call_stack { private: struct call_stack_elt { call_stack_elt (octave_function *f, symbol_table::scope_id s, symbol_table::context_id c, size_t p = 0) : fcn (f), line (-1), column (-1), scope (s), context (c), prev (p) { } call_stack_elt (const call_stack_elt& elt) : fcn (elt.fcn), line (elt.line), column (elt.column), scope (elt.scope), context (elt.context), prev (elt.prev) { } octave_function *fcn; int line; int column; symbol_table::scope_id scope; symbol_table::context_id context; size_t prev; }; protected: octave_call_stack (void) : cs (), curr_frame (0) { } public: typedef std::deque<call_stack_elt>::iterator iterator; typedef std::deque<call_stack_elt>::const_iterator const_iterator; typedef std::deque<call_stack_elt>::reverse_iterator reverse_iterator; typedef std::deque<call_stack_elt>::const_reverse_iterator const_reverse_iterator; static void create_instance (void); static bool instance_ok (void) { bool retval = true; if (! instance) create_instance (); if (! instance) { ::error ("unable to create call stack object!"); retval = false; } return retval; } // Current function (top of stack). static octave_function *current (void) { return instance_ok () ? instance->do_current () : 0; } // Current line in current function. static int current_line (void) { return instance_ok () ? instance->do_current_line () : -1; } // Current column in current function. static int current_column (void) { return instance_ok () ? instance->do_current_column () : -1; } // Line in user code caller. static int caller_user_code_line (void) { return instance_ok () ? instance->do_caller_user_code_line () : -1; } // Column in user code caller. static int caller_user_code_column (void) { return instance_ok () ? instance->do_caller_user_code_column () : -1; } // Caller function, may be built-in. static octave_function *caller (void) { return instance_ok () ? instance->do_caller () : 0; } static size_t current_frame (void) { return instance_ok () ? instance->do_current_frame () : 0; } static size_t size (void) { return instance_ok () ? instance->do_size () : 0; } static size_t num_user_code_frames (octave_idx_type& curr_user_frame) { return instance_ok () ? instance->do_num_user_code_frames (curr_user_frame) : 0; } static symbol_table::scope_id current_scope (void) { return instance_ok () ? instance->do_current_scope () : 0; } static symbol_table::context_id current_context (void) { return instance_ok () ? instance->do_current_context () : 0; } // Function at location N on the call stack (N == 0 is current), may // be built-in. static octave_function *element (size_t n) { return instance_ok () ? instance->do_element (n) : 0; } // First user-defined function on the stack. static octave_user_code *caller_user_code (size_t nskip = 0) { return instance_ok () ? instance->do_caller_user_code (nskip) : 0; } static void push (octave_function *f, symbol_table::scope_id scope = symbol_table::current_scope (), symbol_table::context_id context = symbol_table::current_context ()) { if (instance_ok ()) instance->do_push (f, scope, context); } static void push (symbol_table::scope_id scope = symbol_table::current_scope (), symbol_table::context_id context = symbol_table::current_context ()) { if (instance_ok ()) instance->do_push (0, scope, context); } static void set_location (int l, int c) { if (instance_ok ()) instance->do_set_location (l, c); } static void set_line (int l) { if (instance_ok ()) instance->do_set_line (l); } static void set_column (int c) { if (instance_ok ()) instance->do_set_column (c); } static bool goto_frame (size_t n = 0, bool verbose = false) { return instance_ok () ? instance->do_goto_frame (n, verbose) : false; } static void restore_frame (size_t n) { goto_frame (n); } static bool goto_frame_relative (int n, bool verbose = false) { return instance_ok () ? instance->do_goto_frame_relative (n, verbose) : false; } static void goto_caller_frame (void) { if (instance_ok ()) instance->do_goto_caller_frame (); } static void goto_base_frame (void) { if (instance_ok ()) instance->do_goto_base_frame (); } static octave_map backtrace (size_t nskip, octave_idx_type& curr_user_frame) { return instance_ok () ? instance->do_backtrace (nskip, curr_user_frame) : octave_map (); } static octave_map empty_backtrace (void); static void pop (void) { if (instance_ok ()) instance->do_pop (); } static void clear (void) { if (instance_ok ()) instance->do_clear (); } static void backtrace_error_message (void) { if (instance_ok ()) instance->do_backtrace_error_message (); } private: // The current call stack. std::deque<call_stack_elt> cs; size_t curr_frame; static octave_call_stack *instance; static void cleanup_instance (void) { delete instance; instance = 0; } int do_current_line (void) const; int do_current_column (void) const; int do_caller_user_code_line (void) const; int do_caller_user_code_column (void) const; octave_function *do_caller (void) const { return curr_frame > 1 ? cs[curr_frame-1].fcn : cs[0].fcn; } size_t do_current_frame (void) { return curr_frame; } size_t do_size (void) { return cs.size (); } size_t do_num_user_code_frames (octave_idx_type& curr_user_frame) const; symbol_table::scope_id do_current_scope (void) const { return curr_frame > 0 && curr_frame < cs.size () ? cs[curr_frame].scope : 0; } symbol_table::context_id do_current_context (void) const { return curr_frame > 0 && curr_frame < cs.size () ? cs[curr_frame].context : 0; } octave_function *do_element (size_t n) { octave_function *retval = 0; if (cs.size () > n) { call_stack_elt& elt = cs[n]; retval = elt.fcn; } return retval; } octave_user_code *do_caller_user_code (size_t nskip) const; void do_push (octave_function *f, symbol_table::scope_id scope, symbol_table::context_id context) { size_t prev_frame = curr_frame; curr_frame = cs.size (); cs.push_back (call_stack_elt (f, scope, context, prev_frame)); symbol_table::set_scope_and_context (scope, context); } octave_function *do_current (void) const { octave_function *retval = 0; if (! cs.empty ()) { const call_stack_elt& elt = cs[curr_frame]; retval = elt.fcn; } return retval; } void do_set_location (int l, int c) { if (! cs.empty ()) { call_stack_elt& elt = cs.back (); elt.line = l; elt.column = c; } } void do_set_line (int l) { if (! cs.empty ()) { call_stack_elt& elt = cs.back (); elt.line = l; } } void do_set_column (int c) { if (! cs.empty ()) { call_stack_elt& elt = cs.back (); elt.column = c; } } octave_map do_backtrace (size_t nskip, octave_idx_type& curr_user_frame) const; bool do_goto_frame (size_t n, bool verbose); bool do_goto_frame_relative (int n, bool verbose); void do_goto_caller_frame (void); void do_goto_base_frame (void); void do_pop (void) { if (cs.size () > 1) { const call_stack_elt& elt = cs.back (); curr_frame = elt.prev; cs.pop_back (); const call_stack_elt& new_elt = cs[curr_frame]; symbol_table::set_scope_and_context (new_elt.scope, new_elt.context); } } void do_clear (void) { cs.clear (); } void do_backtrace_error_message (void) const; }; // Call a function with exceptions handled to avoid problems with // errors while shutting down. #define OCTAVE_IGNORE_EXCEPTION(E) \ catch (E) \ { \ std::cerr << "error: ignoring " #E " while preparing to exit" << std::endl; \ recover_from_exception (); \ } #define OCTAVE_SAFE_CALL(F, ARGS) \ do \ { \ try \ { \ unwind_protect frame; \ \ frame.protect_var (Vdebug_on_error); \ frame.protect_var (Vdebug_on_warning); \ \ Vdebug_on_error = false; \ Vdebug_on_warning = false; \ \ F ARGS; \ } \ OCTAVE_IGNORE_EXCEPTION (octave_interrupt_exception) \ OCTAVE_IGNORE_EXCEPTION (octave_execution_exception) \ OCTAVE_IGNORE_EXCEPTION (std::bad_alloc) \ \ if (error_state) \ error_state = 0; \ } \ while (0) #endif