Mercurial > hg > octave-nkf
view libinterp/corefcn/oct-procbuf.cc @ 20744:b70cc4bd8109
begin removal of global error_state variable
* gripes.h, gripes.cc (gripe_library_execution_error): Delete.
* error.cc (warning_state): Delete unused variable.
(reset_error_handler): Don't set warning_state or error_state.
(debug_or_throw_exception): New static function.
(verror): Don't check error_state.
(vmessage): Call debug_or_throw_exception instead of setting
error_state.
(error_1, error_2): Combine into single function, error_1 that prints
error message and ultimately calls debug_or_throw_exception.
(verror, verror_with_cfn, verror_with_id_cfn): Call error_1. Don't
check or set warning_state.
(error): Don't check error_state.
(Flasterror, Flasterr): Adapt to not using error_state.
(interpreter_try): Don't unwind_protect error_state.
* NEWS: Update.
* doc/interpreter/external.txi: Explain octave_execution_exception
instead of error_state for matrix addition example.
* jit-typeinfo.cc (octave_jit_gripe_nan_to_logical_conversion,
octave_jit_ginvalid_index, octave_jit_gindex_range,
octave_jit_paren_scalar, octave_jit_paren_scalar_subsasgn):
Don't catch octave_execution_exception.
* cellfun.cc (Fcellfun): Use exceptions instead of error_state.
* ls-mat-ascii.cc (save_mat_ascii_data): Likewise.
* mex.cc (mexCallMATLAB, mexEvalString): Likewise.
* variables.cc (safe_symbol_lookup): Likewise.
* svd.cc (Fsvd): Eliminate use of error_state.
* __magick_read__.cc (read_file, write_file): Likewise.
* variables.cc (generate_struct_completions): Eliminate use of
obsolete warning_state variable.
* ov-builtin.cc (octave_builtin::do_multi_index_op): Don't catch
octave_execution_exception and call gripe_library_execution_error.
* ov-class.cc (octave_class::reconstruct_exemplar): Eliminate use of
error_state. Catch possible octave_execution_exception in
do_multi_index_op.
* ov-mex-fcn.cc (octave_mex_function::do_multi_index_op): Eliminate
use of error_state. Catch possible octave_execution_exception in
call_mex.
* ov-fcn-handle.cc (octave_fcn_binder::maybe_binder): Eliminate use of
error_state.
* ov-oncleanup.cc (octave_oncleanup::~octave_oncleanup): Eliminate use
of error_state. Propagate possible octave_execution_exception from
do_multi_index_op.
* ov.cc (octave_value::assign, do_binary_op, do_unary_op,
octave_value::do_non_const_unary_op): Don't catch
octave_execution_exception here.
* oct-parse.in.yy (octave_base_parser::finish_colon_expression,
octave_base_parser::finish_array_list): Eliminate use of warning_state
and error_state.
(Feval, Fevalin): Use exceptions instead of error_state.
* pt-eval.cc, pt-eval.h (tree_evaluator::unwind_protect_exception):
New static variable.
* (tree_evaluator::visit_statement): Don't catch
octave_execution_exception here.
(tree_evaluator::visit_try_catch_command,
tree_evaluator::do_unwind_protect_cleanup): Eliminate use of error_state.
(tree_evaluator::visit_unwind_protect_command): Use
unwind_protect_exception to track whether an exception has occurred in
the try block.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 01 Oct 2015 16:18:19 -0400 |
parents | 4197fc428c7d |
children |
line wrap: on
line source
/* Copyright (C) 1996-2015 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/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include <cerrno> #include <iostream> #include <sys/types.h> #include <unistd.h> #include "lo-mappers.h" #include "lo-utils.h" #include "oct-procbuf.h" #include "oct-syscalls.h" #include "sysdep.h" #include "variables.h" #include "defun.h" #include "gripes.h" #include "utils.h" #ifndef SHELL_PATH #define SHELL_PATH "/bin/sh" #endif // This class is based on the procbuf class from libg++, written by // Per Bothner, Copyright (C) 1993 Free Software Foundation. static octave_procbuf *octave_procbuf_list = 0; #ifndef BUFSIZ #define BUFSIZ 1024 #endif octave_procbuf * octave_procbuf::open (const char *command, int mode) { #if defined (__CYGWIN__) || defined (__MINGW32__) || defined (_MSC_VER) if (is_open ()) return 0; f = octave_popen (command, (mode & std::ios::in) ? "r" : "w"); if (! f) return 0; // Oops... popen doesn't return the associated pid, so fake it for now proc_pid = 1; open_p = true; if (mode & std::ios::out) ::setvbuf (f, 0, _IOLBF, BUFSIZ); return this; #elif defined (HAVE_SYS_WAIT_H) int pipe_fds[2]; volatile int child_std_end = (mode & std::ios::in) ? 1 : 0; volatile int parent_end, child_end; if (is_open ()) return 0; if (pipe (pipe_fds) < 0) return 0; if (mode & std::ios::in) { parent_end = pipe_fds[0]; child_end = pipe_fds[1]; } else { parent_end = pipe_fds[1]; child_end = pipe_fds[0]; } proc_pid = ::fork (); if (proc_pid == 0) { gnulib::close (parent_end); if (child_end != child_std_end) { gnulib::dup2 (child_end, child_std_end); gnulib::close (child_end); } while (octave_procbuf_list) { FILE *fp = octave_procbuf_list->f; if (fp) { gnulib::fclose (fp); fp = 0; } octave_procbuf_list = octave_procbuf_list->next; } execl (SHELL_PATH, "sh", "-c", command, static_cast<void *> (0)); exit (127); } gnulib::close (child_end); if (proc_pid < 0) { gnulib::close (parent_end); return 0; } f = ::fdopen (parent_end, (mode & std::ios::in) ? "r" : "w"); if (mode & std::ios::out) ::setvbuf (f, 0, _IOLBF, BUFSIZ); open_p = true; next = octave_procbuf_list; octave_procbuf_list = this; return this; #else return 0; #endif } octave_procbuf * octave_procbuf::close (void) { #if defined (__CYGWIN__) || defined (__MINGW32__) || defined (_MSC_VER) if (f) { wstatus = octave_pclose (f); f = 0; } open_p = false; return this; #elif defined (HAVE_SYS_WAIT_H) if (f) { pid_t wait_pid; int status = -1; for (octave_procbuf **ptr = &octave_procbuf_list; *ptr != 0; ptr = &(*ptr)->next) { if (*ptr == this) { *ptr = (*ptr)->next; status = 0; break; } } if (status == 0 && gnulib::fclose (f) == 0) { using namespace std; do { wait_pid = octave_syscalls::waitpid (proc_pid, &wstatus, 0); } while (wait_pid == -1 && errno == EINTR); } f = 0; } open_p = false; return this; #else return 0; #endif }