Mercurial > octave

annotate libinterp/parse-tree/profiler.cc @ 23752:6be1bf9455e3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix argument checks for internal profiler functions * profiler.cc (F__profiler_enable__, F__profiler_reset__, F__profiler_data__): Error with usage message for incorrect number of arguments.
author John W. Eaton <jwe@octave.org>
date Sat, 08 Jul 2017 10:14:32 -0400
parents 0ebc4f1a5714
children c3828bd031cd
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
23219
3ac9f9ecfae5 maint: Update copyright dates.
John W. Eaton <jwe@octave.org>
parents: 23083
diff changeset
3 Copyright (C) 2014-2017 Julien Bect
22323
bac0d6f07a3e maint: Update copyright notices for 2016.
John W. Eaton <jwe@octave.org>
parents: 22131
diff changeset
4 Copyright (C) 2012-2016 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
22755
3a2b891d0b33 maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents: 22417
diff changeset
9 under the terms of the GNU General Public License as published by
3a2b891d0b33 maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents: 22417
diff changeset
10 the Free Software Foundation; either version 3 of the License, or
3a2b891d0b33 maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents: 22417
diff changeset
11 (at your option) any later version.
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
12
22755
3a2b891d0b33 maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents: 22417
diff changeset
13 Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents: 22417
diff changeset
14 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents: 22417
diff changeset
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents: 22417
diff changeset
16 GNU General Public License for more details.
12783
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 ()
22417
48c00363dc74 maint: Use '{ }' for empty function bodies in C++.
Rik <rik@octave.org>
parents: 22323
diff changeset
39 { }
12869
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;
22862
e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn.
Rik <rik@octave.org>
parents: 22755
diff changeset
48 for (const auto& nm : list)
e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn.
Rik <rik@octave.org>
parents: 22755
diff changeset
49 retval(i++) = nm;
e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn.
Rik <rik@octave.org>
parents: 22755
diff changeset
50
12869
de9a9719e594 Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents: 12784
diff changeset
51 assert (i == n);
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 return retval;
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
23449
c763214a8260 maint: Use convention 'int *x' for naming pointers.
Rik <rik@octave.org>
parents: 23220
diff changeset
56 profile_data_accumulator::tree_node::tree_node (tree_node *p, octave_idx_type f)
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
57 : parent (p), fcn_id (f), children (), time (0.0), calls (0)
22417
48c00363dc74 maint: Use '{ }' for empty function bodies in C++.
Rik <rik@octave.org>
parents: 22323
diff changeset
58 { }
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
59
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
60 profile_data_accumulator::tree_node::~tree_node ()
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
61 {
22862
e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn.
Rik <rik@octave.org>
parents: 22755
diff changeset
62 for (auto& idx_tnode : children)
e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn.
Rik <rik@octave.org>
parents: 22755
diff changeset
63 delete idx_tnode.second;
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
64 }
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
65
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
66 profile_data_accumulator::tree_node*
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
67 profile_data_accumulator::tree_node::enter (octave_idx_type fcn)
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
68 {
23449
c763214a8260 maint: Use convention 'int *x' for naming pointers.
Rik <rik@octave.org>
parents: 23220
diff changeset
69 tree_node *retval;
12954
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 child_map::iterator pos = children.find (fcn);
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
72 if (pos == children.end ())
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
73 {
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
74 retval = new tree_node (this, fcn);
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
75 children[fcn] = retval;
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
76 }
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
77 else
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
78 retval = pos->second;
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
79
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
80 ++retval->calls;
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
81 return retval;
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
82 }
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
83
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
84 profile_data_accumulator::tree_node*
19620
a1d172bfcb2f eliminate some unused variable and typedef warnings
John W. Eaton <jwe@octave.org>
parents: 19327
diff changeset
85 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
86 {
18751
b45d975aa38f Fix assert() segfaults with profiler (bug #39587, bug #39586).
Rik <rik@octave.org>
parents: 18750
diff changeset
87 // 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
88 // 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
89 // assert (parent);
b45d975aa38f Fix assert() segfaults with profiler (bug #39587, bug #39586).
Rik <rik@octave.org>
parents: 18750
diff changeset
90 // assert (fcn_id == fcn);
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
91
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
92 return parent;
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
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
95 void
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
96 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
97 {
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
98 // 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
99 if (fcn_id != 0)
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
100 {
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
101 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
102
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
103 entry.time += time;
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
104 entry.calls += calls;
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
105
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
106 assert (parent);
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
107 if (parent->fcn_id != 0)
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
108 {
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
109 entry.parents.insert (parent->fcn_id);
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
110 data[parent->fcn_id - 1].children.insert (fcn_id);
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
111 }
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
112
18751
b45d975aa38f Fix assert() segfaults with profiler (bug #39587, bug #39586).
Rik <rik@octave.org>
parents: 18750
diff changeset
113 if (! entry.recursive)
23449
c763214a8260 maint: Use convention 'int *x' for naming pointers.
Rik <rik@octave.org>
parents: 23220
diff changeset
114 for (const tree_node *i = parent; i; i = i->parent)
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
115 if (i->fcn_id == fcn_id)
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
116 {
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
117 entry.recursive = true;
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
118 break;
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
119 }
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
120 }
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 // Recurse on children.
22862
e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn.
Rik <rik@octave.org>
parents: 22755
diff changeset
123 for (const auto& idx_tnode : children)
e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn.
Rik <rik@octave.org>
parents: 22755
diff changeset
124 idx_tnode.second->build_flat (data);
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
125 }
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
126
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
127 octave_value
23449
c763214a8260 maint: Use convention 'int *x' for naming pointers.
Rik <rik@octave.org>
parents: 23220
diff changeset
128 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
129 {
20946
6eff66fb8a02 style fixes for comments
John W. Eaton <jwe@octave.org>
parents: 20941
diff changeset
130 // 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
131 // 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
132 // 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
133 // the final hierarchical profile data.
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
134
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
135 const octave_idx_type n = children.size ();
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
136
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
137 Cell rv_indices (n, 1);
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
138 Cell rv_times (n, 1);
13188
6d57e53b21ea Add field for total time to hierarchical profile.
Daniel Kraft <d@domob.eu>
parents: 13141
diff changeset
139 Cell rv_totals (n, 1);
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
140 Cell rv_calls (n, 1);
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
141 Cell rv_children (n, 1);
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
142
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
143 octave_idx_type i = 0;
22862
e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn.
Rik <rik@octave.org>
parents: 22755
diff changeset
144 for (const auto& idx_tnode : children)
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
145 {
22862
e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn.
Rik <rik@octave.org>
parents: 22755
diff changeset
146 const tree_node& entry = *idx_tnode.second;
13188
6d57e53b21ea Add field for total time to hierarchical profile.
Daniel Kraft <d@domob.eu>
parents: 13141
diff changeset
147 double child_total = entry.time;
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
148
22862
e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn.
Rik <rik@octave.org>
parents: 22755
diff changeset
149 rv_indices(i) = octave_value (idx_tnode.first);
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
150 rv_times(i) = octave_value (entry.time);
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
151 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
152 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
153 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
154
6d57e53b21ea Add field for total time to hierarchical profile.
Daniel Kraft <d@domob.eu>
parents: 13141
diff changeset
155 if (total)
6d57e53b21ea Add field for total time to hierarchical profile.
Daniel Kraft <d@domob.eu>
parents: 13141
diff changeset
156 *total += child_total;
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
157
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
158 ++i;
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
159 }
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
160 assert (i == n);
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
161
13052
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
162 octave_map retval;
12954
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 retval.assign ("Index", rv_indices);
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
165 retval.assign ("SelfTime", rv_times);
13188
6d57e53b21ea Add field for total time to hierarchical profile.
Daniel Kraft <d@domob.eu>
parents: 13141
diff changeset
166 retval.assign ("TotalTime", rv_totals);
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
167 retval.assign ("NumCalls", rv_calls);
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
168 retval.assign ("Children", rv_children);
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
169
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
170 return retval;
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
171 }
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
172
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
173 profile_data_accumulator::profile_data_accumulator ()
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
174 : known_functions (), fcn_index (),
22131
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
175 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
176 active_fcn (0), last_time (-1.0)
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
177 { }
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
178
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
179 profile_data_accumulator::~profile_data_accumulator ()
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
180 {
22131
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
181 delete call_tree;
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
182 }
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
183
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
184 void
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
185 profile_data_accumulator::set_active (bool value)
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
186 {
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
187 enabled = value;
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
188 }
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
189
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
190 void
12920
5d18231eee00 Extend profiling support to operators.
Daniel Kraft <d@domob.eu>
parents: 12870
diff changeset
191 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
192 {
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
193 // 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
194 assert (is_active ());
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
195 assert (call_tree);
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 // 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
198 // pushing the new one.
22131
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
199 if (active_fcn && active_fcn != call_tree)
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
200 add_current_time ();
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
201
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
202 // Map the function's name to its index.
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
203 octave_idx_type fcn_idx;
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
204 fcn_index_map::iterator pos = fcn_index.find (fcn);
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
205 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
206 {
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
207 known_functions.push_back (fcn);
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
208 fcn_idx = known_functions.size ();
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
209 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
210 }
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
211 else
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
212 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
213
22131
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
214 if (! active_fcn)
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
215 active_fcn = call_tree;
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
216
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
217 active_fcn = active_fcn->enter (fcn_idx);
22131
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
218
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
219 last_time = query_time ();
18751
b45d975aa38f Fix assert() segfaults with profiler (bug #39587, bug #39586).
Rik <rik@octave.org>
parents: 18750
diff changeset
220
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
221 }
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
222
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
223 void
12920
5d18231eee00 Extend profiling support to operators.
Daniel Kraft <d@domob.eu>
parents: 12870
diff changeset
224 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
225 {
22131
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
226 if (active_fcn)
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
227 {
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
228 assert (call_tree);
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
229 // 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
230 // 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
231 //assert (active_fcn != call_tree);
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
232
22131
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
233 // 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
234 // 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
235 // and only record the time if enabled.
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
236 if (is_active ())
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
237 add_current_time ();
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
238
22131
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
239 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
240 // 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
241 // 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
242 //assert (pos != fcn_index.end ());
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
243 active_fcn = active_fcn->exit (pos->second);
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
244
22131
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
245 // 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
246 // 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
247 last_time = query_time ();
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
248 }
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
249 }
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
250
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
251 void
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
252 profile_data_accumulator::reset (void)
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 if (is_active ())
20831
35241c4b696c eliminate return statements after calls to error
John W. Eaton <jwe@octave.org>
parents: 20819
diff changeset
255 error ("Can't reset active profiler.");
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
256
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
257 known_functions.clear ();
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
258 fcn_index.clear ();
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
259
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
260 if (call_tree)
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
261 {
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
262 delete call_tree;
22131
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
263 call_tree = new tree_node (0, 0);
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
264 active_fcn = 0;
12954
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
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
267 last_time = -1.0;
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
268 }
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
269
12869
de9a9719e594 Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents: 12784
diff changeset
270 octave_value
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
271 profile_data_accumulator::get_flat (void) const
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
272 {
13052
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
273 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
274
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
275 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
276
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
277 flat_profile flat (n);
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
278
13052
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
279 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
280 {
13052
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
281 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
282
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
283 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
284 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
285 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
286 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
287 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
288 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
289
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
290 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
291 {
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
292 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
293 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
294 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
295 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
296 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
297 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
298 }
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
299
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
300 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
301
13052
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
302 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
303 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
304 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
305 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
306 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
307 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
308
13052
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
309 retval = m;
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
310 }
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
311 else
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
312 {
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
313 static const char *fn[] =
17787
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
314 {
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
315 "FunctionName",
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
316 "TotalTime",
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
317 "NumCalls",
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
318 "IsRecursive",
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
319 "Parents",
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
320 "Children",
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
321 0
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
322 };
13052
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
323
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
324 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
325
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
326 retval = m;
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
327 }
12869
de9a9719e594 Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents: 12784
diff changeset
328
12784
c499d54796d6 Minor stylistic fixes to profiler code
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents: 12783
diff changeset
329 return retval;
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
330 }
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
331
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
332 octave_value
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
333 profile_data_accumulator::get_hierarchical (void) const
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
334 {
13052
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
335 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
336
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
337 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
338 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
339 else
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 static const char *fn[] =
17787
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
342 {
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
343 "Index",
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
344 "SelfTime",
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
345 "NumCalls",
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
346 "Children",
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
347 0
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
348 };
13052
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
349
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
350 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
351
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
352 retval = m;
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
43dcb0093ebd allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents: 12955
diff changeset
355 return retval;
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
356 }
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
357
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
358 double
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
359 profile_data_accumulator::query_time (void) const
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
360 {
21730
30c53770f47e use namespace for system time classes
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
361 octave::sys::time now;
14345
06f706e92771 avoid profiler test failure on more systems
John W. Eaton <jwe@octave.org>
parents: 14138
diff changeset
362
17787
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
363 // 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
364 // See bug #34210 for additional details.
06f706e92771 avoid profiler test failure on more systems
John W. Eaton <jwe@octave.org>
parents: 14138
diff changeset
365 volatile double dnow = now.double_value ();
06f706e92771 avoid profiler test failure on more systems
John W. Eaton <jwe@octave.org>
parents: 14138
diff changeset
366
13269
b1882a8217ab avoid apparent compiler optimization problem on Cygwin and MinGW systems (bug #34210)
John W. Eaton <jwe@octave.org>
parents: 13188
diff changeset
367 return dnow;
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
368 }
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
369
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
370 void
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
371 profile_data_accumulator::add_current_time (void)
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
372 {
22131
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
373 if (active_fcn)
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
374 {
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
375 const double t = query_time ();
12783
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 active_fcn->add_time (t - last_time);
fdbe2eab2aef fix profiler initialization (bug #46315)
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
378 }
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
379 }
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
380
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
381 profile_data_accumulator profiler;
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
382
12870
39d813616c8f Restore the docstrings for internal profiler functions as C++ comments
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents: 12869
diff changeset
383 // 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
384 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
385 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
386 @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
387 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
388 @end deftypefn */)
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
389 {
20802
8bb38ba1bad6 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
390 int nargin = args.length ();
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
391
20802
8bb38ba1bad6 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
392 if (nargin > 1)
8bb38ba1bad6 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
393 print_usage ();
8bb38ba1bad6 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
394
23752
6be1bf9455e3 fix argument checks for internal profiler functions
John W. Eaton <jwe@octave.org>
parents: 23751
diff changeset
395 if (nargin == 1)
20802
8bb38ba1bad6 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
396 profiler.set_active (args(0).bool_value ());
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
397
20939
b17fda023ca6 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20898
diff changeset
398 return ovl (profiler.is_active ());
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
399 }
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
400
12870
39d813616c8f Restore the docstrings for internal profiler functions as C++ comments
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents: 12869
diff changeset
401 // Clear all collected profiling data.
12955
05941540287c Style fixes on profiler internal functions
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents: 12954
diff changeset
402 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
403 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
404 @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
405 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
406 @end deftypefn */)
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
407 {
23752
6be1bf9455e3 fix argument checks for internal profiler functions
John W. Eaton <jwe@octave.org>
parents: 23751
diff changeset
408 if (args.length () != 0)
6be1bf9455e3 fix argument checks for internal profiler functions
John W. Eaton <jwe@octave.org>
parents: 23751
diff changeset
409 print_usage ();
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
410
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
411 profiler.reset ();
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
412
20941
a4f5da7c5463 maint: Replace "octave_value_list ()" with "ovl ()".
Rik <rik@octave.org>
parents: 20939
diff changeset
413 return ovl ();
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
12870
39d813616c8f Restore the docstrings for internal profiler functions as C++ comments
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents: 12869
diff changeset
416 // 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
417 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
418 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
419 @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
420 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
421 @end deftypefn */)
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
422 {
23752
6be1bf9455e3 fix argument checks for internal profiler functions
John W. Eaton <jwe@octave.org>
parents: 23751
diff changeset
423 if (args.length () != 0)
6be1bf9455e3 fix argument checks for internal profiler functions
John W. Eaton <jwe@octave.org>
parents: 23751
diff changeset
424 print_usage ();
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
425
12954
a451ae847adb Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents: 12920
diff changeset
426 if (nargout > 1)
20898
8da80da1ac37 maint: Use ovl() more places in the code.
Rik <rik@octave.org>
parents: 20892
diff changeset
427 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
428 else
8da80da1ac37 maint: Use ovl() more places in the code.
Rik <rik@octave.org>
parents: 20892
diff changeset
429 return ovl (profiler.get_flat ());
12783
ad9263d965dc First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff changeset
430 }