Mercurial > hg > octave-lyh
annotate liboctave/oct-spparms.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 | 12df7854fa7c |
| children | 72c96de7a403 |
| rev | line source |
|---|---|
| 5164 | 1 /* |
| 2 | |
| 11523 | 3 Copyright (C) 2004-2011 David Bateman |
| 4 Copyright (C) 1998-2004 Andy Adler | |
| 7016 | 5 |
| 6 This file is part of Octave. | |
| 5164 | 7 |
| 8 Octave is free software; you can redistribute it and/or modify it | |
| 9 under the terms of the GNU General Public License as published by the | |
| 7016 | 10 Free Software Foundation; either version 3 of the License, or (at your |
| 11 option) any later version. | |
| 5164 | 12 |
| 13 Octave is distributed in the hope that it will be useful, but WITHOUT | |
| 14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 16 for more details. | |
| 17 | |
| 18 You should have received a copy of the GNU General Public License | |
| 7016 | 19 along with Octave; see the file COPYING. If not, see |
| 20 <http://www.gnu.org/licenses/>. | |
| 5164 | 21 |
| 22 */ | |
| 23 | |
| 24 #if !defined (octave_oct_spparms_h) | |
| 25 #define octave_oct_spparms_h 1 | |
| 26 | |
| 27 #include <cassert> | |
| 28 #include <cstddef> | |
| 29 | |
|
8950
d865363208d6
include <iosfwd> instead of <iostream> in header files
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
30 #include <iosfwd> |
| 5164 | 31 |
| 32 #include "str-vec.h" | |
| 33 #include "dColVector.h" | |
| 5893 | 34 #include "dNDArray.h" |
| 5164 | 35 |
|
7515
f3c00dc0912b
Eliminate the rest of the dispatched sparse functions
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
36 #define OCTAVE_SPARSE_CONTROLS_SIZE 13 |
| 5164 | 37 |
| 38 class | |
| 6108 | 39 OCTAVE_API |
| 5893 | 40 octave_sparse_params |
| 5164 | 41 { |
| 5893 | 42 protected: |
| 5164 | 43 |
| 5893 | 44 octave_sparse_params (void) |
| 45 : params (OCTAVE_SPARSE_CONTROLS_SIZE), | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
46 keys (OCTAVE_SPARSE_CONTROLS_SIZE) |
| 5893 | 47 { |
| 48 init_keys (); | |
| 49 do_defaults (); | |
| 50 } | |
| 51 | |
| 52 public: | |
| 53 | |
| 6482 | 54 octave_sparse_params (const octave_sparse_params& a) |
| 55 : params (a.params), keys (a.keys) { } | |
| 56 | |
| 57 octave_sparse_params& operator = (const octave_sparse_params& a) | |
| 58 { | |
| 59 if (&a != this) | |
| 60 { | |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
61 params = a.params; |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
62 keys = a.keys; |
| 6482 | 63 } |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
64 |
| 6482 | 65 return *this; |
| 66 } | |
| 67 | |
| 68 ~octave_sparse_params (void) { } | |
| 69 | |
| 5893 | 70 static bool instance_ok (void); |
| 71 | |
| 72 static void defaults (void); | |
| 73 | |
| 74 static void tight (void); | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
75 |
| 5893 | 76 static string_vector get_keys (void); |
| 5164 | 77 |
| 5893 | 78 static ColumnVector get_vals (void); |
| 5164 | 79 |
| 5893 | 80 static bool set_vals (const NDArray& vals); |
| 5164 | 81 |
| 5893 | 82 static bool set_key (const std::string& key, const double& val); |
| 5164 | 83 |
| 5893 | 84 static double get_key (const std::string& key); |
| 5164 | 85 |
| 6460 | 86 static double get_bandden (void); |
| 87 | |
| 5893 | 88 static void print_info (std::ostream& os, const std::string& prefix); |
| 89 | |
| 90 private: | |
| 5164 | 91 |
| 92 ColumnVector params; | |
| 93 | |
| 94 string_vector keys; | |
| 5893 | 95 |
| 96 static octave_sparse_params *instance; | |
| 97 | |
|
13983
7dd7cccf0757
clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
98 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:
11586
diff
changeset
|
99 |
| 5893 | 100 void do_defaults (void); |
| 101 | |
| 102 void do_tight (void); | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
103 |
| 5893 | 104 string_vector do_get_keys (void) const { return keys; } |
| 105 | |
| 106 ColumnVector do_get_vals (void) const { return params; } | |
| 5164 | 107 |
| 5893 | 108 bool do_set_vals (const NDArray& vals); |
| 109 | |
| 110 bool do_set_key (const std::string& key, const double& val); | |
| 111 | |
| 112 double do_get_key (const std::string& key); | |
| 113 | |
| 6460 | 114 double do_get_bandden (void); |
| 115 | |
| 5893 | 116 void do_print_info (std::ostream& os, const std::string& prefix) const; |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
117 |
| 5893 | 118 void init_keys (void); |
| 119 }; | |
| 5164 | 120 |
| 121 #endif |