Mercurial > hg > octave-nkf
view liboctave/oct-shlib.h @ 13983:7dd7cccf0757
clean up memory allocated for singletons before exit
* singleton-cleanup.h, singleton-cleanup.cc: New files.
* liboctave/Makefile.am (INCS, LIBOCTAVE_CXX_SOURCES):
Add them to the lists.
* toplev.cc (clean_up_and_exit): Call singleton_cleanup_list::cleanup.
* debug.h, debug.cc (bp_table::instance_ok): Move definition to
debug.cc.
* coment-list.h (octave_comment_buffer::~octave_comment_buffer):
Define destructor for class.
* ov-typeinfo.h (octave_value_typeinfo::~octave_value_typeinfo):
Likewise.
* cmd-edit.h (command_editor::cleanup_instance): New function.
* cmd-hist.h (command_history::cleanup_instance): New function.
* file-ops.h (file_ops::cleanup_instance): New function.
* mach-info.h (oct_mach_info::cleanup_instance): New function.
* oct-env.h (octave_env::cleanup_instance): New function.
* oct-fftw.h (octave_fftw_planner::cleanup_instance): New function.
* oct-rand.h (octave_rand::cleanup_instance): New function.
* oct-spparms.h (octave_sparse_params::cleanup_instance):
New function.
* pathsearch.h (static_members::cleanup_instance): New function.
* comment-list.h (octave_comment_buffer::cleanup_instance):
New function.
* debug.h (bp_table::cleanup_instance): New function.
* display.h (display_info::cleanup_instance): New function.
* dynamic-ld.cc (octave_shlib_list::cleanup_instance,
octave_mex_file_list::cleanup_instance): New functions.
* dynamic-ld.h (octave_dynamic_loader::cleanup_instance):
New function.
* load-path.h (load_path::cleanup_instance): New function.
* oct-stream.h (octave_stream_list::cleanup_instance): New function.
* ov-typeinfo.h (octave_value_typeinfo::cleanup_instance):
New function.
* pager.h, pager.cc (octave_pager_stream::instance_ok,
octave_pager_stream::cleanup_instance): New functions.
(octave_diary_stream::instance_ok,
octave_diary_stream::cleanup_instance): New functions.
* sighandlers.h (octave_child_list::cleanup_instance): New function.
* toplev.h (octave_call_stack
* pager.cc (octave_pager_stream::stream, octave_diary_stream::stream):
Use instance_ok to create instance.
* toplev.h (octave_call_stack::cleanup_instance): New function.
* cmd-edit.cc (command_editor::instance_ok):
Register cleanup function.
* cmd-hist.cc (command_history::instance_ok): Likewise.
* file-ops.cc (file_ops::instance_ok): Likewise.
* mach-info.cc (oct_mach_info::instance_ok): Likewise.
* oct-env.cc (octave_env::instance_ok): Likewise.
* oct-fftw.cc (octave_fftw_planner::instance_ok): Likewise.
* oct-rand.cc (octave_rand::instance_ok): Likewise.
* oct-spparms.cc (octave_sparse_params::instance_ok): Likewise.
* pathsearch.cc (dir_path::static_members::instance_ok): Likewise.
* comment-list.cc (comment_list::instance_ok): Likewise.
* debug.cc (bp_table::instance_ok): Likewise.
* display.cc (display_info::instance_ok): Likewise.
* dynamic-ld.cc (octave_shlib_list::instance_ok,
octave_mex_file_list::instance_ok, octave_dynamic_loader): Likewise.
* load-path.cc (load_path::instance_ok): Likewise.
* oct-stream.cc (octave_stream_list::instance_ok): Likewise.
* ov-typeinfo.cc (octave_value_typeinfo::instance_ok): Likewise.
* sighandlers.cc (octave_child_list::instance_ok): Likewise.
* symtab.h, symtab.cc (symbol_table::scope_id::create_instance):
New function.
* symtab.h (symbol_table::scope_id::instance_ok): Call create_instance.
* toplev.h, toplev.cc (octave_call_stack::create_instance):
New function.
* toplev.cc (octave_call_stack::instance_ok): Call create_instance.
* pager.h, pager.cc (octave_pager_stream::set_diary_skip,
octave_pager_stream::flush_current_contents_to_diary): Now static.
octave_pager_stream::do_set_diary_skip,
octave_pager_stream::do_flush_current_contents_to_diary):
New functions.
(octave_pager_stream::stream): Return std::ostream&, not
octave_pager_stream&. If instance creation fails, return std::cout.
(octave_diary_stream::stream): Return std::ostream&, not
octave_diary_stream&. If instance creation fails, return std::cout.
(octave_pager_stream::do_reset, octave_diary_stream::do_reset):
Use instance_ok to create instance.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sat, 03 Dec 2011 04:34:17 -0500 |
parents | a21a3875ca83 |
children | 72c96de7a403 |
line wrap: on
line source
/* Copyright (C) 1999-2011 John W. Eaton Copyright (C) 2009 VZLU Prague 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_shlib_h) #define octave_shlib_h 1 #include <string> #include <map> #include "oct-time.h" #include "oct-refcount.h" class OCTAVE_API octave_shlib { public: // FIXME: make this class private? typedef std::string (*name_mangler) (const std::string&); typedef void (*close_hook) (const std::string&); class shlib_rep { public: shlib_rep (void) : count (1), file (), tm_loaded (time_t ()), fcn_names () { } protected: shlib_rep (const std::string& f); public: virtual ~shlib_rep (void) { instances.erase (file); } virtual bool is_open (void) const { return false; } virtual void *search (const std::string&, name_mangler = 0) { return 0; } bool is_out_of_date (void) const; // This method will be overriden conditionally. static shlib_rep *new_instance (const std::string& f); static shlib_rep *get_instance (const std::string& f, bool fake); octave_time time_loaded (void) const { return tm_loaded; } std::string file_name (void) const { return file; } size_t num_fcn_names (void) const { return fcn_names.size (); } void add_fcn_name (const std::string&); bool remove_fcn_name (const std::string&); void do_close_hook (close_hook cl_hook); public: octave_refcount<int> count; protected: void fake_reload (void); std::string file; octave_time tm_loaded; // Set of hooked function names. typedef std::map<std::string, size_t>::iterator fcn_names_iterator; typedef std::map<std::string, size_t>::const_iterator fcn_names_const_iterator; std::map<std::string, size_t> fcn_names; static std::map<std::string, shlib_rep *> instances; }; private: static shlib_rep nil_rep; public: octave_shlib (void) : rep (&nil_rep) { rep->count++; } octave_shlib (const std::string& f, bool fake = true) : rep (shlib_rep::get_instance (f, fake)) { } ~octave_shlib (void) { if (--rep->count == 0) delete rep; } octave_shlib (const octave_shlib& sl) : rep (sl.rep) { rep->count++; } octave_shlib& operator = (const octave_shlib& sl) { if (rep != sl.rep) { if (--rep->count == 0) delete rep; rep = sl.rep; rep->count++; } return *this; } bool operator == (const octave_shlib& sl) const { return (rep == sl.rep); } operator bool () const { return rep->is_open (); } void open (const std::string& f) { *this = octave_shlib (f); } void close (close_hook cl_hook = 0) { if (cl_hook) rep->do_close_hook (cl_hook); *this = octave_shlib (); } void *search (const std::string& nm, name_mangler mangler = 0) const { void *f = rep->search (nm, mangler); if (f) rep->add_fcn_name (nm); return f; } void add (const std::string& name) { rep->add_fcn_name (name); } bool remove (const std::string& name) { return rep->remove_fcn_name (name); } size_t number_of_functions_loaded (void) const { return rep->num_fcn_names (); } bool is_out_of_date (void) const { return rep->is_out_of_date (); } std::string file_name (void) const { return rep->file_name (); } octave_time time_loaded (void) const { return rep->time_loaded (); } private: shlib_rep *rep; }; #endif