Mercurial > octave

annotate libinterp/corefcn/profiler.cc @ 22131:fdbe2eab2aef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix profiler initialization (bug #46315) * profile.m: When turning profiler on, just enable it, don't reset it. * profiler.cc (profile_data_accumulator::profile_data_accumulator): Create new call tree on initialization. Initialize active_fcn to 0. (profile_data_accumulator::~profile_data_accumulator): Always delete call_tree. (profile_data_accumulator::set_acive): Simply set enabled flag. (profile_data_accumulator::enter_function): Don't call add_current_time if active_fcn isn't valid. If active_fcn isn't set, set it to call_tree. (profile_data_accumulator::exit_function): Don't to anything if there is no active_fcn. (profile_data_accumulator::add_current_time): Likewise. (profile_data_accumulator::reset): Reinitialize call_tree and active_fcn.
author John W. Eaton <jwe@octave.org>
date Fri, 15 Jul 2016 16:08:55 -0400
parents 112b20240c87
children bac0d6f07a3e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
1 /*
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
2
19697
4197fc428c7d maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents: 19625
diff changeset
3 Copyright (C) 2014-2015 Julien Bect
4197fc428c7d maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents: 19625
diff changeset
4 Copyright (C) 2012-2015 Daniel Kraft
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
5
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
6 This file is part of Octave.
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
7
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
8 Octave is free software; you can redistribute it and/or modify it
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
9 under the terms of the GNU General Public License as published by the
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
10 Free Software Foundation; either version 3 of the License, or (at your
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
11 option) any later version.
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
12
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
13 Octave is distributed in the hope that it will be useful, but WITHOUT
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
16 for more details.
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
17
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
18 You should have received a copy of the GNU General Public License
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
19 along with Octave; see the file COPYING. If not, see
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
20 <http://www.gnu.org/licenses/>.
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
21
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
22 */
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
23
21724
aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents: 21301
diff changeset
24 #if defined (HAVE_CONFIG_H)
21301
40de9f8f23a6 Use '#include "config.h"' rather than <config.h>.
Rik <rik@octave.org>
parents: 21200
diff changeset
25 # include "config.h"
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
26 #endif
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
27
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
28 #include <iostream>
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
29
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
30 #include "defun.h"
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
31 #include "oct-time.h"
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
32 #include "ov-struct.h"
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
33 #include "pager.h"
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
34 #include "profiler.h"
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
35
12869
de9a9719e594 Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents: 12784
diff changeset
36 profile_data_accumulator::stats::stats ()
de9a9719e594 Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents: 12784
diff changeset
37 : time (0.0), calls (0), recursive (false),
de9a9719e594 Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents: 12784
diff changeset
38 parents (), children ()
de9a9719e594 Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents: 12784
diff changeset
39 {}
de9a9719e594 Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents: 12784
diff changeset
40
de9a9719e594 Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents: 12784
diff changeset
41 octave_value
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
42 profile_data_accumulator::stats::function_set_value (const function_set& list)
12869
de9a9719e594 Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents: 12784
diff changeset
43 {
de9a9719e594 Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents: 12784
diff changeset
44 const octave_idx_type n = list.size ();
de9a9719e594 Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents: 12784
diff changeset
45
de9a9719e594 Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents: 12784
diff changeset
46 RowVector retval (n);
de9a9719e594 Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents: 12784
diff changeset
47 octave_idx_type i = 0;
de9a9719e594 Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents: 12784
diff changeset
48 for (function_set::const_iterator p = list.begin (); p != list.end (); ++p)
de9a9719e594 Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents: 12784
diff changeset
49 {
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
50 retval(i) = *p;
12869
de9a9719e594 Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents: 12784
diff changeset
51 ++i;
de9a9719e594 Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents: 12784
diff changeset
52 }
de9a9719e594 Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents: 12784
diff changeset
53 assert (i == n);
de9a9719e594 Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents: 12784
diff changeset
54
de9a9719e594 Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents: 12784
diff changeset
55 return retval;
de9a9719e594 Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents: 12784
diff changeset
56 }
de9a9719e594 Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents: 12784
diff changeset
57
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
58 profile_data_accumulator::tree_node::tree_node (tree_node* p, octave_idx_type f)
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
59 : parent (p), fcn_id (f), children (), time (0.0), calls (0)
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
60 {}
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
61
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
62 profile_data_accumulator::tree_node::~tree_node ()
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
63 {
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
64 for (child_map::iterator i = children.begin (); i != children.end (); ++i)
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
65 delete i->second;
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
66 }
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
67
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
68 profile_data_accumulator::tree_node*
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
69 profile_data_accumulator::tree_node::enter (octave_idx_type fcn)
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
70 {
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
71 tree_node* retval;
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
72
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
73 child_map::iterator pos = children.find (fcn);
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
74 if (pos == children.end ())
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
75 {
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
76 retval = new tree_node (this, fcn);
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
77 children[fcn] = retval;
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
78 }
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
79 else
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
80 retval = pos->second;
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
81
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
82 ++retval->calls;
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
83 return retval;
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
84 }
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
85
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
86 profile_data_accumulator::tree_node*
19620
a1d172bfcb2f eliminate some unused variable and typedef warnings
John W. Eaton <jwe@octave.org>
parents: 19327
diff changeset
87 profile_data_accumulator::tree_node::exit (octave_idx_type /* fcn */)
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
88 {
18751
b45d975aa38f Fix assert() segfaults with profiler (bug #39587, bug #39586).
Rik <rik@octave.org>
parents: 18750
diff changeset
89 // FIXME: These assert statements don't make sense if profile() is called
b45d975aa38f Fix assert() segfaults with profiler (bug #39587, bug #39586).
Rik <rik@octave.org>
parents: 18750
diff changeset
90 // from within a function hierarchy to begin with. See bug #39587.
b45d975aa38f Fix assert() segfaults with profiler (bug #39587, bug #39586).
Rik <rik@octave.org>
parents: 18750
diff changeset
91 // assert (parent);
b45d975aa38f Fix assert() segfaults with profiler (bug #39587, bug #39586).
Rik <rik@octave.org>
parents: 18750
diff changeset
92 // assert (fcn_id == fcn);
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
93
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
94 return parent;
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
95 }
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
96
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
97 void
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
98 profile_data_accumulator::tree_node::build_flat (flat_profile& data) const
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
99 {
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
100 // If this is not the top-level node, update profile entry for this function.
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
101 if (fcn_id != 0)
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
102 {
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
103 stats& entry = data[fcn_id - 1];
13141
e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 13052
diff changeset
104
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
105 entry.time += time;
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
106 entry.calls += calls;
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
107
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
108 assert (parent);
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
109 if (parent->fcn_id != 0)
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
110 {
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
111 entry.parents.insert (parent->fcn_id);
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
112 data[parent->fcn_id - 1].children.insert (fcn_id);
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
113 }
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
114
18751
b45d975aa38f Fix assert() segfaults with profiler (bug #39587, bug #39586).
Rik <rik@octave.org>
parents: 18750
diff changeset
115 if (! entry.recursive)
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
116 for (const tree_node* i = parent; i; i = i->parent)
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
117 if (i->fcn_id == fcn_id)
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
118 {
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
119 entry.recursive = true;
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
120 break;
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
121 }
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
122 }
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
123
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
124 // Recurse on children.
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
125 for (child_map::const_iterator i = children.begin ();
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
126 i != children.end (); ++i)
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
127 i->second->build_flat (data);
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
128 }
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
129
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
130 octave_value
13188
6d57e53b21ea Add field for total time to hierarchical profile.
Daniel Kraft <d@domob.eu>
parents: 13141
diff changeset
131 profile_data_accumulator::tree_node::get_hierarchical (double* total) const
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
132 {
20946
6eff66fb8a02 style fixes for comments
John W. Eaton <jwe@octave.org>
parents: 20941
diff changeset
133 // Note that we don't generate the entry just for this node, but
6eff66fb8a02 style fixes for comments
John W. Eaton <jwe@octave.org>
parents: 20941
diff changeset
134 // rather a struct-array with entries for all children. This way, the
6eff66fb8a02 style fixes for comments
John W. Eaton <jwe@octave.org>
parents: 20941
diff changeset
135 // top-node (for which we don't want a real entry) generates already
6eff66fb8a02 style fixes for comments
John W. Eaton <jwe@octave.org>
parents: 20941
diff changeset
136 // the final hierarchical profile data.
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
137
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
138 const octave_idx_type n = children.size ();
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
139
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
140 Cell rv_indices (n, 1);
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
141 Cell rv_times (n, 1);
13188
6d57e53b21ea Add field for total time to hierarchical profile.
Daniel Kraft <d@domob.eu>
parents: 13141
diff changeset
142 Cell rv_totals (n, 1);
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
143 Cell rv_calls (n, 1);
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
144 Cell rv_children (n, 1);
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
145
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
146 octave_idx_type i = 0;
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
147 for (child_map::const_iterator p = children.begin ();
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
148 p != children.end (); ++p)
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
149 {
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
150 const tree_node& entry = *p->second;
13188
6d57e53b21ea Add field for total time to hierarchical profile.
Daniel Kraft <d@domob.eu>
parents: 13141
diff changeset
151 double child_total = entry.time;
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
152
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
153 rv_indices(i) = octave_value (p->first);
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
154 rv_times(i) = octave_value (entry.time);
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
155 rv_calls(i) = octave_value (entry.calls);
13188
6d57e53b21ea Add field for total time to hierarchical profile.
Daniel Kraft <d@domob.eu>
parents: 13141
diff changeset
156 rv_children(i) = entry.get_hierarchical (&child_total);
6d57e53b21ea Add field for total time to hierarchical profile.
Daniel Kraft <d@domob.eu>
parents: 13141
diff changeset
157 rv_totals(i) = octave_value (child_total);
6d57e53b21ea Add field for total time to hierarchical profile.
Daniel Kraft <d@domob.eu>
parents: 13141
diff changeset
158
6d57e53b21ea Add field for total time to hierarchical profile.
Daniel Kraft <d@domob.eu>
parents: 13141
diff changeset
159 if (total)
6d57e53b21ea Add field for total time to hierarchical profile.
Daniel Kraft <d@domob.eu>
parents: 13141
diff changeset
160 *total += child_total;
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
161
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
162 ++i;
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
163 }
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
164 assert (i == n);
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
165
13052
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
166 octave_map retval;
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
167
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
168 retval.assign ("Index", rv_indices);
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
169 retval.assign ("SelfTime", rv_times);
13188
6d57e53b21ea Add field for total time to hierarchical profile.
Daniel Kraft <d@domob.eu>
parents: 13141
diff changeset
170 retval.assign ("TotalTime", rv_totals);
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
171 retval.assign ("NumCalls", rv_calls);
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
172 retval.assign ("Children", rv_children);
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
173
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
174 return retval;
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
175 }
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
176
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
177 profile_data_accumulator::profile_data_accumulator ()
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
178 : known_functions (), fcn_index (),
22131
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
179 enabled (false), call_tree (new tree_node (0, 0)),
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
180 active_fcn (0), last_time (-1.0)
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
181 { }
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
182
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
183 profile_data_accumulator::~profile_data_accumulator ()
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
184 {
22131
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
185 delete call_tree;
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
186 }
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
187
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
188 void
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
189 profile_data_accumulator::set_active (bool value)
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
190 {
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
191 enabled = value;
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
192 }
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
193
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
194 void
12920
5d18231eee00 Extend profiling support to operators.
Daniel Kraft <d@domob.eu>
parents: 12870
diff changeset
195 profile_data_accumulator::enter_function (const std::string& fcn)
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
196 {
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
197 // The enter class will check and only call us if the profiler is active.
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
198 assert (is_active ());
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
199 assert (call_tree);
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
200
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
201 // If there is already an active function, add to its time before
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
202 // pushing the new one.
22131
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
203 if (active_fcn && active_fcn != call_tree)
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
204 add_current_time ();
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
205
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
206 // Map the function's name to its index.
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
207 octave_idx_type fcn_idx;
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
208 fcn_index_map::iterator pos = fcn_index.find (fcn);
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
209 if (pos == fcn_index.end ())
12869
de9a9719e594 Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents: 12784
diff changeset
210 {
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
211 known_functions.push_back (fcn);
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
212 fcn_idx = known_functions.size ();
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
213 fcn_index[fcn] = fcn_idx;
12869
de9a9719e594 Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents: 12784
diff changeset
214 }
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
215 else
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
216 fcn_idx = pos->second;
12869
de9a9719e594 Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents: 12784
diff changeset
217
22131
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
218 if (! active_fcn)
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
219 active_fcn = call_tree;
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
220
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
221 active_fcn = active_fcn->enter (fcn_idx);
22131
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
222
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
223 last_time = query_time ();
18751
b45d975aa38f Fix assert() segfaults with profiler (bug #39587, bug #39586).
Rik <rik@octave.org>
parents: 18750
diff changeset
224
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
225 }
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
226
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
227 void
12920
5d18231eee00 Extend profiling support to operators.
Daniel Kraft <d@domob.eu>
parents: 12870
diff changeset
228 profile_data_accumulator::exit_function (const std::string& fcn)
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
229 {
22131
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
230 if (active_fcn)
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
231 {
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
232 assert (call_tree);
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
233 // FIXME: This assert statements doesn't make sense if profile() is called
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
234 // from within a function hierarchy to begin with. See bug #39587.
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
235 //assert (active_fcn != call_tree);
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
236
22131
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
237 // Usually, if we are disabled this function is not even called. But the
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
238 // call disabling the profiler is an exception. So also check here
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
239 // and only record the time if enabled.
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
240 if (is_active ())
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
241 add_current_time ();
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
242
22131
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
243 fcn_index_map::iterator pos = fcn_index.find (fcn);
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
244 // FIXME: This assert statements doesn't make sense if profile() is called
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
245 // from within a function hierarchy to begin with. See bug #39587.
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
246 //assert (pos != fcn_index.end ());
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
247 active_fcn = active_fcn->exit (pos->second);
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
248
22131
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
249 // If this was an "inner call", we resume executing the parent function
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
250 // up the stack. So note the start-time for this!
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
251 last_time = query_time ();
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
252 }
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
253 }
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
254
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
255 void
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
256 profile_data_accumulator::reset (void)
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
257 {
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
258 if (is_active ())
20831
35241c4b696c eliminate return statements after calls to error
John W. Eaton <jwe@octave.org>
parents: 20819
diff changeset
259 error ("Can't reset active profiler.");
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
260
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
261 known_functions.clear ();
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
262 fcn_index.clear ();
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
263
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
264 if (call_tree)
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
265 {
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
266 delete call_tree;
22131
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
267 call_tree = new tree_node (0, 0);
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
268 active_fcn = 0;
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
269 }
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
270
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
271 last_time = -1.0;
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
272 }
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
273
12869
de9a9719e594 Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents: 12784
diff changeset
274 octave_value
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
275 profile_data_accumulator::get_flat (void) const
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
276 {
13052
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
277 octave_value retval;
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
278
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
279 const octave_idx_type n = known_functions.size ();
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
280
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
281 flat_profile flat (n);
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
282
13052
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
283 if (call_tree)
12869
de9a9719e594 Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents: 12784
diff changeset
284 {
13052
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
285 call_tree->build_flat (flat);
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
286
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
287 Cell rv_names (n, 1);
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
288 Cell rv_times (n, 1);
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
289 Cell rv_calls (n, 1);
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
290 Cell rv_recursive (n, 1);
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
291 Cell rv_parents (n, 1);
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
292 Cell rv_children (n, 1);
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
293
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
294 for (octave_idx_type i = 0; i != n; ++i)
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
295 {
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
296 rv_names(i) = octave_value (known_functions[i]);
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
297 rv_times(i) = octave_value (flat[i].time);
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
298 rv_calls(i) = octave_value (flat[i].calls);
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
299 rv_recursive(i) = octave_value (flat[i].recursive);
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
300 rv_parents(i) = stats::function_set_value (flat[i].parents);
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
301 rv_children(i) = stats::function_set_value (flat[i].children);
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
302 }
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
303
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
304 octave_map m;
12869
de9a9719e594 Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents: 12784
diff changeset
305
13052
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
306 m.assign ("FunctionName", rv_names);
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
307 m.assign ("TotalTime", rv_times);
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
308 m.assign ("NumCalls", rv_calls);
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
309 m.assign ("IsRecursive", rv_recursive);
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
310 m.assign ("Parents", rv_parents);
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
311 m.assign ("Children", rv_children);
12869
de9a9719e594 Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents: 12784
diff changeset
312
13052
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
313 retval = m;
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
314 }
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
315 else
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
316 {
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
317 static const char *fn[] =
17787
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
318 {
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
319 "FunctionName",
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
320 "TotalTime",
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
321 "NumCalls",
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
322 "IsRecursive",
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
323 "Parents",
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
324 "Children",
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
325 0
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
326 };
13052
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
327
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
328 static octave_map m (dim_vector (0, 1), string_vector (fn));
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
329
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
330 retval = m;
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
331 }
12869
de9a9719e594 Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents: 12784
diff changeset
332
12784
c499d54796d6 Minor stylistic fixes to profiler code
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents: 12783
diff changeset
333 return retval;
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
334 }
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
335
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
336 octave_value
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
337 profile_data_accumulator::get_hierarchical (void) const
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
338 {
13052
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
339 octave_value retval;
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
340
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
341 if (call_tree)
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
342 retval = call_tree->get_hierarchical ();
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
343 else
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
344 {
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
345 static const char *fn[] =
17787
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
346 {
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
347 "Index",
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
348 "SelfTime",
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
349 "NumCalls",
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
350 "Children",
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
351 0
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
352 };
13052
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
353
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
354 static octave_map m (dim_vector (0, 1), string_vector (fn));
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
355
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
356 retval = m;
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
357 }
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
358
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
359 return retval;
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
360 }
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
361
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
362 double
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
363 profile_data_accumulator::query_time (void) const
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
364 {
21730
30c53770f47e use namespace for system time classes
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
365 octave::sys::time now;
14345
06f706e92771 avoid profiler test failure on more systems
John W. Eaton <jwe@octave.org>
parents: 14138
diff changeset
366
17787
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
367 // FIXME: is this volatile declaration really needed?
14345
06f706e92771 avoid profiler test failure on more systems
John W. Eaton <jwe@octave.org>
parents: 14138
diff changeset
368 // See bug #34210 for additional details.
06f706e92771 avoid profiler test failure on more systems
John W. Eaton <jwe@octave.org>
parents: 14138
diff changeset
369 volatile double dnow = now.double_value ();
06f706e92771 avoid profiler test failure on more systems
John W. Eaton <jwe@octave.org>
parents: 14138
diff changeset
370
13269
b1882a8217ab avoid apparent compiler optimization problem on Cygwin and MinGW systems (bug #34210)
John W. Eaton <jwe@octave.org>
parents: 13188
diff changeset
371 return dnow;
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
372 }
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
373
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
374 void
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
375 profile_data_accumulator::add_current_time (void)
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
376 {
22131
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
377 if (active_fcn)
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
378 {
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
379 const double t = query_time ();
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
380
22131
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
381 active_fcn->add_time (t - last_time);
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
382 }
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
383 }
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
384
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
385 profile_data_accumulator profiler;
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
386
12870
39d813616c8f Restore the docstrings for internal profiler functions as C++ comments
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents: 12869
diff changeset
387 // Enable or disable the profiler data collection.
12955
05941540287c Style fixes on profiler internal functions
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents: 12954
diff changeset
388 DEFUN (__profiler_enable__, args, ,
21966
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21730
diff changeset
389 doc: /* -*- texinfo -*-
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21730
diff changeset
390 @deftypefn {} {} __profiler_enable__ ()
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21730
diff changeset
391 Undocumented internal function.
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21730
diff changeset
392 @end deftypefn */)
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
393 {
20802
8bb38ba1bad6 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
394 int nargin = args.length ();
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
395
20802
8bb38ba1bad6 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
396 if (nargin > 1)
8bb38ba1bad6 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
397 print_usage ();
8bb38ba1bad6 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
398
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
399 if (nargin > 0)
20802
8bb38ba1bad6 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
400 profiler.set_active (args(0).bool_value ());
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
401
20939
b17fda023ca6 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20898
diff changeset
402 return ovl (profiler.is_active ());
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
403 }
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
404
12870
39d813616c8f Restore the docstrings for internal profiler functions as C++ comments
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents: 12869
diff changeset
405 // Clear all collected profiling data.
12955
05941540287c Style fixes on profiler internal functions
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents: 12954
diff changeset
406 DEFUN (__profiler_reset__, args, ,
21966
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21730
diff changeset
407 doc: /* -*- texinfo -*-
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21730
diff changeset
408 @deftypefn {} {} __profiler_reset__ ()
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21730
diff changeset
409 Undocumented internal function.
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21730
diff changeset
410 @end deftypefn */)
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
411 {
20819
f428cbe7576f eliminate unnecessary uses of nargin
John W. Eaton <jwe@octave.org>
parents: 20802
diff changeset
412 if (args.length () > 0)
12784
c499d54796d6 Minor stylistic fixes to profiler code
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents: 12783
diff changeset
413 warning ("profiler_reset: ignoring extra arguments");
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
414
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
415 profiler.reset ();
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
416
20941
a4f5da7c5463 maint: Replace "octave_value_list ()" with "ovl ()".
Rik <rik@octave.org>
parents: 20939
diff changeset
417 return ovl ();
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
418 }
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
419
12870
39d813616c8f Restore the docstrings for internal profiler functions as C++ comments
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents: 12869
diff changeset
420 // Query the timings collected by the profiler.
12955
05941540287c Style fixes on profiler internal functions
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents: 12954
diff changeset
421 DEFUN (__profiler_data__, args, nargout,
21966
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21730
diff changeset
422 doc: /* -*- texinfo -*-
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21730
diff changeset
423 @deftypefn {} {} __profiler_data__ ()
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21730
diff changeset
424 Undocumented internal function.
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21730
diff changeset
425 @end deftypefn */)
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
426 {
20819
f428cbe7576f eliminate unnecessary uses of nargin
John W. Eaton <jwe@octave.org>
parents: 20802
diff changeset
427 if (args.length () > 0)
12784
c499d54796d6 Minor stylistic fixes to profiler code
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents: 12783
diff changeset
428 warning ("profiler_data: ignoring extra arguments");
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
429
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
430 if (nargout > 1)
20898
8da80da1ac37 maint: Use ovl() more places in the code.
Rik <rik@octave.org>
parents: 20892
diff changeset
431 return ovl (profiler.get_flat (), profiler.get_hierarchical ());
8da80da1ac37 maint: Use ovl() more places in the code.
Rik <rik@octave.org>
parents: 20892
diff changeset
432 else
8da80da1ac37 maint: Use ovl() more places in the code.
Rik <rik@octave.org>
parents: 20892
diff changeset
433 return ovl (profiler.get_flat ());
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
434 }
18751
b45d975aa38f Fix assert() segfaults with profiler (bug #39587, bug #39586).
Rik <rik@octave.org>
parents: 18750
diff changeset
435