Mercurial > octave
annotate src/dynamic-ld.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 | fd0a3ac60b0e |
| children | 72c96de7a403 |
| rev | line source |
|---|---|
| 1 | 1 /* |
| 2 | |
| 11523 | 3 Copyright (C) 1993-2011 John W. Eaton |
| 1 | 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. | |
| 1 | 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/>. | |
| 1 | 20 |
| 21 */ | |
| 22 | |
| 383 | 23 #if !defined (octave_dynamic_ld_h) |
| 24 #define octave_dynamic_ld_h 1 | |
| 1 | 25 |
| 2862 | 26 #include <string> |
| 27 | |
| 3325 | 28 #include "oct-shlib.h" |
| 2894 | 29 |
| 7336 | 30 class octave_function; |
| 31 | |
| 2894 | 32 class |
| 33 octave_dynamic_loader | |
| 34 { | |
| 35 protected: | |
| 36 | |
| 2926 | 37 octave_dynamic_loader (void) { } |
| 2894 | 38 |
| 39 public: | |
| 40 | |
| 2926 | 41 virtual ~octave_dynamic_loader (void) { } |
| 1 | 42 |
| 7336 | 43 static octave_function * |
| 44 load_oct (const std::string& fcn_name, | |
| 10313 | 45 const std::string& file_name = std::string (), |
| 46 bool relative = false); | |
| 5864 | 47 |
| 7336 | 48 static octave_function * |
| 49 load_mex (const std::string& fcn_name, | |
| 10313 | 50 const std::string& file_name = std::string (), |
| 51 bool relative = false); | |
| 3325 | 52 |
| 7872 | 53 static bool remove_oct (const std::string& fcn_name, octave_shlib& shl); |
| 54 | |
| 55 static bool remove_mex (const std::string& fcn_name, octave_shlib& shl); | |
| 2894 | 56 |
| 57 private: | |
| 58 | |
| 59 // No copying! | |
| 60 | |
| 61 octave_dynamic_loader (const octave_dynamic_loader&); | |
| 62 | |
| 63 octave_dynamic_loader& operator = (const octave_dynamic_loader&); | |
| 2926 | 64 |
| 65 static octave_dynamic_loader *instance; | |
| 66 | |
|
13983
7dd7cccf0757
clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
67 static void cleanup_instance (void) { delete instance; instance = 0; } |
|
7dd7cccf0757
clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
68 |
| 2926 | 69 static bool instance_ok (void); |
| 70 | |
| 7336 | 71 octave_function * |
| 72 do_load_oct (const std::string& fcn_name, | |
| 10313 | 73 const std::string& file_name = std::string (), |
| 74 bool relative = false); | |
| 5864 | 75 |
| 7336 | 76 octave_function * |
| 77 do_load_mex (const std::string& fcn_name, | |
| 10313 | 78 const std::string& file_name = std::string (), |
| 79 bool relative = false); | |
| 3325 | 80 |
| 7872 | 81 bool do_remove_oct (const std::string& fcn_name, octave_shlib& shl); |
| 82 | |
| 83 bool do_remove_mex (const std::string& fcn_name, octave_shlib& shl); | |
| 3325 | 84 |
| 85 static bool doing_load; | |
| 2926 | 86 |
| 87 protected: | |
| 88 | |
|
7996
6a7db240b3a3
configure.in: eliminate CXX_ABI and OCTAVE_CXX_PREPEND_UNDERSCORE
John W. Eaton <jwe@octave.org>
parents:
7872
diff
changeset
|
89 static std::string name_mangler (const std::string& name); |
| 7336 | 90 |
|
7996
6a7db240b3a3
configure.in: eliminate CXX_ABI and OCTAVE_CXX_PREPEND_UNDERSCORE
John W. Eaton <jwe@octave.org>
parents:
7872
diff
changeset
|
91 static std::string name_uscore_mangler (const std::string& name); |
| 7872 | 92 |
| 93 static std::string mex_mangler (const std::string& name); | |
| 94 | |
| 95 static std::string mex_uscore_mangler (const std::string& name); | |
| 96 | |
| 97 static std::string mex_f77_mangler (const std::string& name); | |
| 2894 | 98 }; |
| 1 | 99 |
| 100 #endif |