Mercurial > octave
annotate src/pager.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 | c053740eb2aa |
| 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_pager_h) |
| 24 #define octave_pager_h 1 | |
| 1 | 25 |
|
8950
d865363208d6
include <iosfwd> instead of <iostream> in header files
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
26 #include <iosfwd> |
| 5765 | 27 #include <sstream> |
| 1760 | 28 #include <string> |
| 29 | |
| 2095 | 30 #include <sys/types.h> |
| 31 | |
| 32 class | |
| 6109 | 33 OCTINTERP_API |
| 5765 | 34 octave_pager_buf : public std::stringbuf |
| 2095 | 35 { |
| 36 public: | |
| 37 | |
| 5765 | 38 octave_pager_buf (void) : std::stringbuf (), diary_skip (0) { } |
| 2095 | 39 |
| 3477 | 40 void flush_current_contents_to_diary (void); |
| 41 | |
| 3756 | 42 void set_diary_skip (void); |
| 43 | |
| 2095 | 44 protected: |
| 45 | |
| 46 int sync (void); | |
| 3756 | 47 |
| 48 private: | |
| 49 | |
| 50 size_t diary_skip; | |
| 2095 | 51 }; |
| 52 | |
| 53 class | |
| 6109 | 54 OCTINTERP_API |
| 3537 | 55 octave_pager_stream : public std::ostream |
| 2095 | 56 { |
| 57 protected: | |
| 58 | |
| 59 octave_pager_stream (void); | |
| 60 | |
| 61 public: | |
| 62 | |
| 63 ~octave_pager_stream (void); | |
| 64 | |
|
13983
7dd7cccf0757
clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents:
13266
diff
changeset
|
65 static void flush_current_contents_to_diary (void); |
| 3477 | 66 |
|
13983
7dd7cccf0757
clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents:
13266
diff
changeset
|
67 static void set_diary_skip (void); |
| 3756 | 68 |
|
13983
7dd7cccf0757
clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents:
13266
diff
changeset
|
69 static std::ostream& stream (void); |
| 2095 | 70 |
|
13266
c053740eb2aa
improve memory use for the pager and diary streams (bug #34431)
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
71 static void reset (void); |
|
c053740eb2aa
improve memory use for the pager and diary streams (bug #34431)
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
72 |
| 2095 | 73 private: |
| 74 | |
|
13983
7dd7cccf0757
clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents:
13266
diff
changeset
|
75 void do_flush_current_contents_to_diary (void); |
|
7dd7cccf0757
clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents:
13266
diff
changeset
|
76 |
|
7dd7cccf0757
clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents:
13266
diff
changeset
|
77 void do_set_diary_skip (void); |
|
7dd7cccf0757
clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents:
13266
diff
changeset
|
78 |
|
13266
c053740eb2aa
improve memory use for the pager and diary streams (bug #34431)
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
79 void do_reset (void); |
|
c053740eb2aa
improve memory use for the pager and diary streams (bug #34431)
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
80 |
| 2095 | 81 static octave_pager_stream *instance; |
| 82 | |
|
13983
7dd7cccf0757
clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents:
13266
diff
changeset
|
83 static bool instance_ok (void); |
|
7dd7cccf0757
clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents:
13266
diff
changeset
|
84 |
|
7dd7cccf0757
clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents:
13266
diff
changeset
|
85 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:
13266
diff
changeset
|
86 |
| 2095 | 87 octave_pager_buf *pb; |
| 88 | |
| 89 // No copying! | |
| 90 | |
| 91 octave_pager_stream (const octave_pager_stream&); | |
| 92 | |
| 93 octave_pager_stream& operator = (const octave_pager_stream&); | |
| 94 }; | |
| 1 | 95 |
| 2095 | 96 class |
| 6109 | 97 OCTINTERP_API |
| 5765 | 98 octave_diary_buf : public std::stringbuf |
| 2095 | 99 { |
| 100 public: | |
| 101 | |
| 5765 | 102 octave_diary_buf (void) : std::stringbuf () { } |
| 2095 | 103 |
| 104 protected: | |
| 105 | |
| 106 int sync (void); | |
| 107 }; | |
| 108 | |
| 109 class | |
| 6109 | 110 OCTINTERP_API |
| 3537 | 111 octave_diary_stream : public std::ostream |
| 2095 | 112 { |
| 113 protected: | |
| 114 | |
| 115 octave_diary_stream (void); | |
| 116 | |
| 117 public: | |
| 118 | |
| 119 ~octave_diary_stream (void); | |
| 120 | |
|
13983
7dd7cccf0757
clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents:
13266
diff
changeset
|
121 static std::ostream& stream (void); |
| 2095 | 122 |
|
13266
c053740eb2aa
improve memory use for the pager and diary streams (bug #34431)
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
123 static void reset (void); |
|
c053740eb2aa
improve memory use for the pager and diary streams (bug #34431)
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
124 |
| 2095 | 125 private: |
| 126 | |
|
13266
c053740eb2aa
improve memory use for the pager and diary streams (bug #34431)
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
127 void do_reset (void); |
|
c053740eb2aa
improve memory use for the pager and diary streams (bug #34431)
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
128 |
| 2095 | 129 static octave_diary_stream *instance; |
| 130 | |
|
13983
7dd7cccf0757
clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents:
13266
diff
changeset
|
131 static bool instance_ok (void); |
|
7dd7cccf0757
clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents:
13266
diff
changeset
|
132 |
|
7dd7cccf0757
clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents:
13266
diff
changeset
|
133 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:
13266
diff
changeset
|
134 |
| 2095 | 135 octave_diary_buf *db; |
| 136 | |
| 137 // No copying! | |
| 138 | |
| 139 octave_diary_stream (const octave_diary_stream&); | |
| 140 | |
| 141 octave_diary_stream& operator = (const octave_diary_stream&); | |
| 142 }; | |
| 143 | |
| 144 #define octave_stdout (octave_pager_stream::stream ()) | |
| 145 | |
| 146 #define octave_diary (octave_diary_stream::stream ()) | |
| 147 | |
| 6109 | 148 extern OCTINTERP_API void flush_octave_stdout (void); |
| 2095 | 149 |
| 1 | 150 #endif |