Mercurial > hg > octave-nkf
annotate 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 |
| rev | line source |
|---|---|
| 2094 | 1 /* |
| 2 | |
|
19898
4197fc428c7d
maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents:
17744
diff
changeset
|
3 Copyright (C) 1996-2015 John W. Eaton |
| 2094 | 4 |
| 5 This file is part of Octave. | |
| 6 | |
| 7 Octave is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 7016 | 9 Free Software Foundation; either version 3 of the License, or (at your |
| 10 option) any later version. | |
| 2094 | 11 |
| 12 Octave is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 7016 | 18 along with Octave; see the file COPYING. If not, see |
| 19 <http://www.gnu.org/licenses/>. | |
| 2094 | 20 |
| 21 */ | |
| 22 | |
| 23 #ifdef HAVE_CONFIG_H | |
| 24 #include <config.h> | |
| 25 #endif | |
| 26 | |
| 27 #include <cerrno> | |
| 28 | |
| 3503 | 29 #include <iostream> |
| 2094 | 30 |
| 31 #include <sys/types.h> | |
| 32 #include <unistd.h> | |
| 33 | |
| 3174 | 34 #include "lo-mappers.h" |
| 35 #include "lo-utils.h" | |
| 2094 | 36 #include "oct-procbuf.h" |
| 5453 | 37 #include "oct-syscalls.h" |
| 6726 | 38 #include "sysdep.h" |
| 3176 | 39 #include "variables.h" |
| 2094 | 40 |
| 3174 | 41 #include "defun.h" |
| 42 #include "gripes.h" | |
| 3308 | 43 #include "utils.h" |
| 3174 | 44 |
|
15756
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15195
diff
changeset
|
45 #ifndef SHELL_PATH |
|
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15195
diff
changeset
|
46 #define SHELL_PATH "/bin/sh" |
|
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15195
diff
changeset
|
47 #endif |
|
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15195
diff
changeset
|
48 |
| 2094 | 49 // This class is based on the procbuf class from libg++, written by |
| 50 // Per Bothner, Copyright (C) 1993 Free Software Foundation. | |
| 51 | |
| 52 static octave_procbuf *octave_procbuf_list = 0; | |
| 53 | |
| 6094 | 54 #ifndef BUFSIZ |
| 55 #define BUFSIZ 1024 | |
| 56 #endif | |
| 57 | |
| 2094 | 58 octave_procbuf * |
| 59 octave_procbuf::open (const char *command, int mode) | |
| 60 { | |
| 6096 | 61 #if defined (__CYGWIN__) || defined (__MINGW32__) || defined (_MSC_VER) |
| 4472 | 62 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
63 if (is_open ()) |
| 4472 | 64 return 0; |
| 65 | |
| 6726 | 66 f = octave_popen (command, (mode & std::ios::in) ? "r" : "w"); |
| 4472 | 67 |
| 68 if (! f) | |
| 69 return 0; | |
| 70 | |
| 71 // Oops... popen doesn't return the associated pid, so fake it for now | |
| 72 | |
| 73 proc_pid = 1; | |
| 74 | |
| 75 open_p = true; | |
| 76 | |
| 77 if (mode & std::ios::out) | |
| 6094 | 78 ::setvbuf (f, 0, _IOLBF, BUFSIZ); |
| 4472 | 79 |
| 80 return this; | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
81 |
| 4472 | 82 #elif defined (HAVE_SYS_WAIT_H) |
| 2094 | 83 |
| 84 int pipe_fds[2]; | |
| 85 | |
| 3544 | 86 volatile int child_std_end = (mode & std::ios::in) ? 1 : 0; |
| 3156 | 87 |
| 3147 | 88 volatile int parent_end, child_end; |
| 2094 | 89 |
| 90 if (is_open ()) | |
| 91 return 0; | |
| 92 | |
| 93 if (pipe (pipe_fds) < 0) | |
| 94 return 0; | |
| 95 | |
| 3544 | 96 if (mode & std::ios::in) |
| 2094 | 97 { |
| 98 parent_end = pipe_fds[0]; | |
| 99 child_end = pipe_fds[1]; | |
| 100 } | |
| 101 else | |
| 102 { | |
| 103 parent_end = pipe_fds[1]; | |
| 104 child_end = pipe_fds[0]; | |
| 105 } | |
| 106 | |
| 3156 | 107 proc_pid = ::fork (); |
| 2094 | 108 |
| 109 if (proc_pid == 0) | |
| 110 { | |
| 10411 | 111 gnulib::close (parent_end); |
| 2094 | 112 |
| 113 if (child_end != child_std_end) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
114 { |
| 10411 | 115 gnulib::dup2 (child_end, child_std_end); |
| 116 gnulib::close (child_end); | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
117 } |
| 2094 | 118 |
| 119 while (octave_procbuf_list) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
120 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
121 FILE *fp = octave_procbuf_list->f; |
| 3644 | 122 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
123 if (fp) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
124 { |
| 10411 | 125 gnulib::fclose (fp); |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
126 fp = 0; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
127 } |
| 3644 | 128 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
129 octave_procbuf_list = octave_procbuf_list->next; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
130 } |
| 2094 | 131 |
|
15756
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15195
diff
changeset
|
132 execl (SHELL_PATH, "sh", "-c", command, static_cast<void *> (0)); |
| 2094 | 133 |
| 134 exit (127); | |
| 135 } | |
| 136 | |
| 10411 | 137 gnulib::close (child_end); |
| 2094 | 138 |
| 139 if (proc_pid < 0) | |
| 140 { | |
| 10411 | 141 gnulib::close (parent_end); |
| 2094 | 142 return 0; |
| 143 } | |
| 144 | |
| 3632 | 145 f = ::fdopen (parent_end, (mode & std::ios::in) ? "r" : "w"); |
| 3631 | 146 |
| 3649 | 147 if (mode & std::ios::out) |
| 6094 | 148 ::setvbuf (f, 0, _IOLBF, BUFSIZ); |
| 3649 | 149 |
| 3631 | 150 open_p = true; |
| 2094 | 151 |
| 152 next = octave_procbuf_list; | |
| 153 octave_procbuf_list = this; | |
| 154 | |
| 155 return this; | |
| 156 | |
| 157 #else | |
| 158 | |
| 159 return 0; | |
| 160 | |
| 161 #endif | |
| 162 } | |
| 163 | |
| 3631 | 164 octave_procbuf * |
| 165 octave_procbuf::close (void) | |
| 2094 | 166 { |
| 6096 | 167 #if defined (__CYGWIN__) || defined (__MINGW32__) || defined (_MSC_VER) |
| 4472 | 168 |
| 169 if (f) | |
| 170 { | |
| 6726 | 171 wstatus = octave_pclose (f); |
| 4472 | 172 f = 0; |
| 173 } | |
| 174 | |
| 175 open_p = false; | |
| 176 | |
| 177 return this; | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
178 |
| 4472 | 179 #elif defined (HAVE_SYS_WAIT_H) |
| 2094 | 180 |
| 3644 | 181 if (f) |
| 182 { | |
| 183 pid_t wait_pid; | |
| 2094 | 184 |
| 3644 | 185 int status = -1; |
| 186 | |
| 187 for (octave_procbuf **ptr = &octave_procbuf_list; | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
188 *ptr != 0; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
189 ptr = &(*ptr)->next) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
190 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
191 if (*ptr == this) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
192 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
193 *ptr = (*ptr)->next; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
194 status = 0; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
195 break; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
196 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
197 } |
| 2094 | 198 |
| 10411 | 199 if (status == 0 && gnulib::fclose (f) == 0) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
200 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
201 using namespace std; |
| 3531 | 202 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
203 do |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
204 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
205 wait_pid = octave_syscalls::waitpid (proc_pid, &wstatus, 0); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
206 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
207 while (wait_pid == -1 && errno == EINTR); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
208 } |
| 3644 | 209 |
| 210 f = 0; | |
| 3631 | 211 } |
| 2094 | 212 |
| 3631 | 213 open_p = false; |
| 2094 | 214 |
| 3631 | 215 return this; |
| 2094 | 216 |
| 217 #else | |
| 218 | |
| 3631 | 219 return 0; |
| 2094 | 220 |
| 221 #endif | |
| 222 } |