Mercurial > octave
view libinterp/corefcn/oct-procbuf.h @ 23738:8acd390d16c9
don't use singleton for stream_list object
* oct-stream.h, oct-stream.cc (stream_list): Don't use singleton
pattern. Change all uses.
(stream_list::stream_list): Initialize stdin, stdout, and stderr
streams here.
(stream_list::~stream_list): Close files here.
(stream_list::m_stdin_file, stream_list::m_stdout_file,
stream_list::m_stderr_file): New data members.
(stream_list::stdin_file, stream_list::stdout_file,
stream_list::stderr_file): New functions.
* interpreter.h, interpreter.cc (interpreter::m_stream_list):
New data member.
(interpreter::interpreter): Initialize it. Don't call
initialize_file_io.
(interpreter::~interpreter): Don't call close_files.
(interpreter::get_stream_list): New function.
* file-io.h, file-io.cc (stdin_file, stdout_file, stderr_file,
stdin_stream, stdout_stream, stderr_stream): Delete static variables.
(initialize_file_io, close_files): Delete. These actions are now
handled by the stream_list constructor and destructor.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 06 Jul 2017 13:34:31 -0400 |
parents | cd4e1ee28716 |
children | 980f39c3ab90 |
line wrap: on
line source
/* Copyright (C) 1996-2017 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/>. */ // This class is based on the procbuf class from libg++, written by // Per Bothner, Copyright (C) 1993 Free Software Foundation. #if ! defined (octave_oct_procbuf_h) #define octave_oct_procbuf_h 1 #include "octave-config.h" #include <sys/types.h> #include "c-file-ptr-stream.h" class octave_procbuf : public c_file_ptr_buf { public: octave_procbuf (void) : c_file_ptr_buf (0), wstatus (-1), open_p (false), proc_pid (-1), next (0) { } octave_procbuf (const char *command, int mode) : c_file_ptr_buf (0), wstatus (-1), open_p (false), proc_pid (-1), next (0) { open (command, mode); } // No copying! octave_procbuf (const octave_procbuf&) = delete; octave_procbuf& operator = (const octave_procbuf&) = delete; ~octave_procbuf (void) { close (); } octave_procbuf * open (const char *command, int mode); octave_procbuf * close (void); int wait_status (void) const { return wstatus; } bool is_open (void) const { return open_p; } pid_t pid (void) const { return proc_pid; } protected: int wstatus; bool open_p; pid_t proc_pid; octave_procbuf *next; }; extern void symbols_of_oct_procbuf (void); #endif