Mercurial > octave-nkf
annotate libinterp/corefcn/profiler.cc @ 18784:0eea9ccbae22
Fix blank line appearing in profiler output (bug #39524).
* profiler.cc (profile_data_accumulator::enter::enter): Don't enter functions
which don't have a name, such as the readline event hook function.
author | Rik <rik@octave.org> |
---|---|
date | Tue, 13 May 2014 21:56:39 -0700 |
parents | 8c33abdd2f9a |
children | b45d975aa38f |
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 |
17744
d63878346099
maint: Update copyright notices for release.
John W. Eaton <jwe@octave.org>
parents:
16892
diff
changeset
|
3 Copyright (C) 2012-2013 Daniel Kraft |
12783
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
4 |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
5 This file is part of Octave. |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
6 |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
7 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
|
8 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
|
9 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
|
10 option) any later version. |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
11 |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
12 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
|
13 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
|
14 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
|
15 for more details. |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
16 |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
17 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
|
18 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
|
19 <http://www.gnu.org/licenses/>. |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
20 |
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 #ifdef HAVE_CONFIG_H |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
24 #include <config.h> |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
25 #endif |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
26 |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
27 #include <iostream> |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
28 |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
29 #include "defun.h" |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
30 #include "oct-time.h" |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
31 #include "ov-struct.h" |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
32 #include "pager.h" |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
33 #include "profiler.h" |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
34 |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
35 profile_data_accumulator::enter::enter (profile_data_accumulator& a, |
12920
5d18231eee00
Extend profiling support to operators.
Daniel Kraft <d@domob.eu>
parents:
12870
diff
changeset
|
36 const std::string& f) |
12783
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
37 : acc (a) |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
38 { |
18784
0eea9ccbae22
Fix blank line appearing in profiler output (bug #39524).
Rik <rik@octave.org>
parents:
17898
diff
changeset
|
39 // FIXME: Add test for f != "" to prevent a blank line showing up |
0eea9ccbae22
Fix blank line appearing in profiler output (bug #39524).
Rik <rik@octave.org>
parents:
17898
diff
changeset
|
40 // in profiler statistics. See bug #39524. The root cause |
0eea9ccbae22
Fix blank line appearing in profiler output (bug #39524).
Rik <rik@octave.org>
parents:
17898
diff
changeset
|
41 // is that the function name is not set for the recurring readline |
0eea9ccbae22
Fix blank line appearing in profiler output (bug #39524).
Rik <rik@octave.org>
parents:
17898
diff
changeset
|
42 // hook function. |
0eea9ccbae22
Fix blank line appearing in profiler output (bug #39524).
Rik <rik@octave.org>
parents:
17898
diff
changeset
|
43 if (acc.is_active () && f != "") |
12783
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
44 { |
12920
5d18231eee00
Extend profiling support to operators.
Daniel Kraft <d@domob.eu>
parents:
12870
diff
changeset
|
45 fcn = f; |
5d18231eee00
Extend profiling support to operators.
Daniel Kraft <d@domob.eu>
parents:
12870
diff
changeset
|
46 acc.enter_function (fcn); |
12783
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
47 } |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
48 else |
12920
5d18231eee00
Extend profiling support to operators.
Daniel Kraft <d@domob.eu>
parents:
12870
diff
changeset
|
49 fcn = ""; |
12783
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
50 } |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
51 |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
52 profile_data_accumulator::enter::~enter () |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
53 { |
12920
5d18231eee00
Extend profiling support to operators.
Daniel Kraft <d@domob.eu>
parents:
12870
diff
changeset
|
54 if (fcn != "") |
5d18231eee00
Extend profiling support to operators.
Daniel Kraft <d@domob.eu>
parents:
12870
diff
changeset
|
55 acc.exit_function (fcn); |
12783
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
56 } |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
57 |
12869
de9a9719e594
Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents:
12784
diff
changeset
|
58 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
|
59 : 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
|
60 parents (), children () |
de9a9719e594
Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents:
12784
diff
changeset
|
61 {} |
de9a9719e594
Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents:
12784
diff
changeset
|
62 |
de9a9719e594
Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents:
12784
diff
changeset
|
63 octave_value |
12954
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
64 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
|
65 { |
de9a9719e594
Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents:
12784
diff
changeset
|
66 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
|
67 |
de9a9719e594
Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents:
12784
diff
changeset
|
68 RowVector retval (n); |
de9a9719e594
Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents:
12784
diff
changeset
|
69 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
|
70 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
|
71 { |
12954
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
72 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
|
73 ++i; |
de9a9719e594
Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents:
12784
diff
changeset
|
74 } |
de9a9719e594
Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents:
12784
diff
changeset
|
75 assert (i == n); |
de9a9719e594
Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents:
12784
diff
changeset
|
76 |
de9a9719e594
Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents:
12784
diff
changeset
|
77 return retval; |
de9a9719e594
Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents:
12784
diff
changeset
|
78 } |
de9a9719e594
Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents:
12784
diff
changeset
|
79 |
12954
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
80 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
|
81 : 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
|
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::~tree_node () |
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 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
|
87 delete i->second; |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
88 } |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
89 |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
90 profile_data_accumulator::tree_node* |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
91 profile_data_accumulator::tree_node::enter (octave_idx_type fcn) |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
92 { |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
93 tree_node* retval; |
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 child_map::iterator pos = children.find (fcn); |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
96 if (pos == children.end ()) |
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 retval = new tree_node (this, fcn); |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
99 children[fcn] = retval; |
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 else |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
102 retval = pos->second; |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
103 |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
104 ++retval->calls; |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
105 return retval; |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
106 } |
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 profile_data_accumulator::tree_node* |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
109 profile_data_accumulator::tree_node::exit (octave_idx_type fcn) |
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 assert (parent); |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
112 assert (fcn_id == fcn); |
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 return parent; |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
115 } |
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 void |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
118 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
|
119 { |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
120 // 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
|
121 if (fcn_id != 0) |
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 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
|
124 |
12954
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
125 entry.time += time; |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
126 entry.calls += calls; |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
127 |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
128 assert (parent); |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
129 if (parent->fcn_id != 0) |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
130 { |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
131 entry.parents.insert (parent->fcn_id); |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
132 data[parent->fcn_id - 1].children.insert (fcn_id); |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
133 } |
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 if (!entry.recursive) |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
136 for (const tree_node* i = parent; i; i = i->parent) |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
137 if (i->fcn_id == fcn_id) |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
138 { |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
139 entry.recursive = true; |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
140 break; |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
141 } |
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 |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
144 // Recurse on children. |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
145 for (child_map::const_iterator i = children.begin (); |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
146 i != children.end (); ++i) |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
147 i->second->build_flat (data); |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
148 } |
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 octave_value |
13188
6d57e53b21ea
Add field for total time to hierarchical profile.
Daniel Kraft <d@domob.eu>
parents:
13141
diff
changeset
|
151 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
|
152 { |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
153 /* Note that we don't generate the entry just for this node, but rather |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
154 a struct-array with entries for all children. This way, the top-node |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
155 (for which we don't want a real entry) generates already the final |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
156 hierarchical profile data. */ |
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 const octave_idx_type n = children.size (); |
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 Cell rv_indices (n, 1); |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
161 Cell rv_times (n, 1); |
13188
6d57e53b21ea
Add field for total time to hierarchical profile.
Daniel Kraft <d@domob.eu>
parents:
13141
diff
changeset
|
162 Cell rv_totals (n, 1); |
12954
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
163 Cell rv_calls (n, 1); |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
164 Cell rv_children (n, 1); |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
165 |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
166 octave_idx_type i = 0; |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
167 for (child_map::const_iterator p = children.begin (); |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
168 p != children.end (); ++p) |
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 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
|
171 double child_total = entry.time; |
12954
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
172 |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
173 rv_indices(i) = octave_value (p->first); |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
174 rv_times(i) = octave_value (entry.time); |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
175 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
|
176 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
|
177 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
|
178 |
6d57e53b21ea
Add field for total time to hierarchical profile.
Daniel Kraft <d@domob.eu>
parents:
13141
diff
changeset
|
179 if (total) |
6d57e53b21ea
Add field for total time to hierarchical profile.
Daniel Kraft <d@domob.eu>
parents:
13141
diff
changeset
|
180 *total += child_total; |
12954
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
181 |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
182 ++i; |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
183 } |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
184 assert (i == n); |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
185 |
13052
43dcb0093ebd
allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents:
12955
diff
changeset
|
186 octave_map retval; |
12954
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
187 |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
188 retval.assign ("Index", rv_indices); |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
189 retval.assign ("SelfTime", rv_times); |
13188
6d57e53b21ea
Add field for total time to hierarchical profile.
Daniel Kraft <d@domob.eu>
parents:
13141
diff
changeset
|
190 retval.assign ("TotalTime", rv_totals); |
12954
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
191 retval.assign ("NumCalls", rv_calls); |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
192 retval.assign ("Children", rv_children); |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
193 |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
194 return retval; |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
195 } |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
196 |
12783
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
197 profile_data_accumulator::profile_data_accumulator () |
12954
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
198 : known_functions (), fcn_index (), |
17898
8c33abdd2f9a
maint: Avoid using NULL in C++ code.
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
199 enabled (false), call_tree (0), last_time (-1.0) |
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 |
12954
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
202 profile_data_accumulator::~profile_data_accumulator () |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
203 { |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
204 if (call_tree) |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
205 delete call_tree; |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
206 } |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
207 |
12783
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
208 void |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
209 profile_data_accumulator::set_active (bool value) |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
210 { |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
211 if (value) |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
212 { |
12954
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
213 // Create a call-tree top-node if there isn't yet one. |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
214 if (!call_tree) |
17898
8c33abdd2f9a
maint: Avoid using NULL in C++ code.
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
215 call_tree = new tree_node (0, 0); |
12954
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
216 |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
217 // Let the top-node be the active one. This ensures we have a clean |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
218 // fresh start collecting times. |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
219 active_fcn = call_tree; |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
220 } |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
221 else |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
222 { |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
223 // Make sure we start with fresh timing if we're re-enabled later. |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
224 last_time = -1.0; |
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 enabled = value; |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
228 } |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
229 |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
230 void |
12920
5d18231eee00
Extend profiling support to operators.
Daniel Kraft <d@domob.eu>
parents:
12870
diff
changeset
|
231 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
|
232 { |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
233 // 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
|
234 assert (is_active ()); |
12954
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
235 assert (call_tree); |
12783
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
236 |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
237 // 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
|
238 // pushing the new one. |
12954
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
239 if (active_fcn != call_tree) |
12783
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
240 add_current_time (); |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
241 |
12954
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
242 // Map the function's name to its index. |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
243 octave_idx_type fcn_idx; |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
244 fcn_index_map::iterator pos = fcn_index.find (fcn); |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
245 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
|
246 { |
12954
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
247 known_functions.push_back (fcn); |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
248 fcn_idx = known_functions.size (); |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
249 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
|
250 } |
12954
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
251 else |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
252 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
|
253 |
12954
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
254 active_fcn = active_fcn->enter (fcn_idx); |
12783
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
255 last_time = query_time (); |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
256 } |
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 void |
12920
5d18231eee00
Extend profiling support to operators.
Daniel Kraft <d@domob.eu>
parents:
12870
diff
changeset
|
259 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
|
260 { |
12954
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
261 assert (call_tree); |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
262 assert (active_fcn != call_tree); |
12783
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
263 |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
264 // Usually, if we are disabled this function is not even called. But the |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
265 // call disabling the profiler is an exception. So also check here |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
266 // and only record the time if enabled. |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
267 if (is_active ()) |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
268 add_current_time (); |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
269 |
12954
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
270 fcn_index_map::iterator pos = fcn_index.find (fcn); |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
271 assert (pos != fcn_index.end ()); |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
272 active_fcn = active_fcn->exit (pos->second); |
12783
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
273 |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
274 // If this was an "inner call", we resume executing the parent function |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
275 // up the stack. So note the start-time for this! |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
276 last_time = query_time (); |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
277 } |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
278 |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
279 void |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
280 profile_data_accumulator::reset (void) |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
281 { |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
282 if (is_active ()) |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
283 { |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
284 error ("Can't reset active profiler."); |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
285 return; |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
286 } |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
287 |
12954
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
288 known_functions.clear (); |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
289 fcn_index.clear (); |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
290 |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
291 if (call_tree) |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
292 { |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
293 delete call_tree; |
17898
8c33abdd2f9a
maint: Avoid using NULL in C++ code.
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
294 call_tree = 0; |
12954
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
295 } |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
296 |
12783
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
297 last_time = -1.0; |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
298 } |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
299 |
12869
de9a9719e594
Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents:
12784
diff
changeset
|
300 octave_value |
12954
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
301 profile_data_accumulator::get_flat (void) const |
12783
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
302 { |
13052
43dcb0093ebd
allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents:
12955
diff
changeset
|
303 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
|
304 |
12954
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
305 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
|
306 |
12954
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
307 flat_profile flat (n); |
12783
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
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 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
|
310 { |
13052
43dcb0093ebd
allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents:
12955
diff
changeset
|
311 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
|
312 |
43dcb0093ebd
allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents:
12955
diff
changeset
|
313 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
|
314 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
|
315 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
|
316 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
|
317 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
|
318 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
|
319 |
43dcb0093ebd
allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents:
12955
diff
changeset
|
320 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
|
321 { |
43dcb0093ebd
allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents:
12955
diff
changeset
|
322 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
|
323 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
|
324 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
|
325 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
|
326 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
|
327 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
|
328 } |
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 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
|
331 |
13052
43dcb0093ebd
allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents:
12955
diff
changeset
|
332 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
|
333 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
|
334 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
|
335 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
|
336 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
|
337 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
|
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 retval = m; |
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 else |
43dcb0093ebd
allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents:
12955
diff
changeset
|
342 { |
43dcb0093ebd
allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents:
12955
diff
changeset
|
343 static const char *fn[] = |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
344 { |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
345 "FunctionName", |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
346 "TotalTime", |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
347 "NumCalls", |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
348 "IsRecursive", |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
349 "Parents", |
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 } |
12869
de9a9719e594
Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents:
12784
diff
changeset
|
358 |
12784
c499d54796d6
Minor stylistic fixes to profiler code
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12783
diff
changeset
|
359 return retval; |
12783
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
360 } |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
361 |
12954
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
362 octave_value |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
363 profile_data_accumulator::get_hierarchical (void) const |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
364 { |
13052
43dcb0093ebd
allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents:
12955
diff
changeset
|
365 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
|
366 |
43dcb0093ebd
allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents:
12955
diff
changeset
|
367 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
|
368 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
|
369 else |
43dcb0093ebd
allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents:
12955
diff
changeset
|
370 { |
43dcb0093ebd
allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents:
12955
diff
changeset
|
371 static const char *fn[] = |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
372 { |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
373 "Index", |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
374 "SelfTime", |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
375 "NumCalls", |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
376 "Children", |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
377 0 |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
378 }; |
13052
43dcb0093ebd
allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents:
12955
diff
changeset
|
379 |
43dcb0093ebd
allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents:
12955
diff
changeset
|
380 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
|
381 |
43dcb0093ebd
allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents:
12955
diff
changeset
|
382 retval = m; |
43dcb0093ebd
allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents:
12955
diff
changeset
|
383 } |
43dcb0093ebd
allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents:
12955
diff
changeset
|
384 |
43dcb0093ebd
allow profile ('info') to work if no profiling data is available
John W. Eaton <jwe@octave.org>
parents:
12955
diff
changeset
|
385 return retval; |
12954
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
386 } |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
387 |
12783
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
388 double |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
389 profile_data_accumulator::query_time (void) const |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
390 { |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
391 octave_time now; |
14345
06f706e92771
avoid profiler test failure on more systems
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
392 |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
393 // 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
|
394 // See bug #34210 for additional details. |
06f706e92771
avoid profiler test failure on more systems
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
395 volatile double dnow = now.double_value (); |
06f706e92771
avoid profiler test failure on more systems
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
396 |
13269
b1882a8217ab
avoid apparent compiler optimization problem on Cygwin and MinGW systems (bug #34210)
John W. Eaton <jwe@octave.org>
parents:
13188
diff
changeset
|
397 return dnow; |
12783
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
398 } |
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 void |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
401 profile_data_accumulator::add_current_time (void) |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
402 { |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
403 const double t = query_time (); |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
404 assert (last_time >= 0.0 && last_time <= t); |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
405 |
12954
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
406 assert (call_tree && active_fcn != call_tree); |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
407 active_fcn->add_time (t - last_time); |
12783
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
408 } |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
409 |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
410 profile_data_accumulator profiler; |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
411 |
12870
39d813616c8f
Restore the docstrings for internal profiler functions as C++ comments
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12869
diff
changeset
|
412 // 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
|
413 DEFUN (__profiler_enable__, args, , |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
414 "-*- texinfo -*-\n\ |
12869
de9a9719e594
Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents:
12784
diff
changeset
|
415 @deftypefn {Function File} __profiler_enable ()\n\ |
de9a9719e594
Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents:
12784
diff
changeset
|
416 Undocumented internal function.\n\ |
12783
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
417 @end deftypefn") |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
418 { |
12784
c499d54796d6
Minor stylistic fixes to profiler code
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12783
diff
changeset
|
419 octave_value_list retval; |
12783
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
420 |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
421 const int nargin = args.length (); |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
422 if (nargin > 0) |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
423 { |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
424 if (nargin > 1) |
12784
c499d54796d6
Minor stylistic fixes to profiler code
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12783
diff
changeset
|
425 { |
c499d54796d6
Minor stylistic fixes to profiler code
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12783
diff
changeset
|
426 print_usage (); |
c499d54796d6
Minor stylistic fixes to profiler code
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12783
diff
changeset
|
427 return retval; |
c499d54796d6
Minor stylistic fixes to profiler code
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12783
diff
changeset
|
428 } |
12783
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
429 |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
430 profiler.set_active (args(0).bool_value ()); |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
431 } |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
432 |
12784
c499d54796d6
Minor stylistic fixes to profiler code
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12783
diff
changeset
|
433 retval(0) = profiler.is_active (); |
c499d54796d6
Minor stylistic fixes to profiler code
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12783
diff
changeset
|
434 |
c499d54796d6
Minor stylistic fixes to profiler code
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12783
diff
changeset
|
435 return retval; |
12783
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
436 } |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
437 |
12870
39d813616c8f
Restore the docstrings for internal profiler functions as C++ comments
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12869
diff
changeset
|
438 // Clear all collected profiling data. |
12955
05941540287c
Style fixes on profiler internal functions
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12954
diff
changeset
|
439 DEFUN (__profiler_reset__, args, , |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
440 "-*- texinfo -*-\n\ |
12869
de9a9719e594
Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents:
12784
diff
changeset
|
441 @deftypefn {Function File} __profiler_reset ()\n\ |
de9a9719e594
Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents:
12784
diff
changeset
|
442 Undocumented internal function.\n\ |
12783
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
443 @end deftypefn") |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
444 { |
12784
c499d54796d6
Minor stylistic fixes to profiler code
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12783
diff
changeset
|
445 octave_value_list retval; |
12783
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
446 const int nargin = args.length (); |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
447 |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
448 if (nargin > 0) |
12784
c499d54796d6
Minor stylistic fixes to profiler code
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12783
diff
changeset
|
449 warning ("profiler_reset: ignoring extra arguments"); |
12783
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
450 |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
451 profiler.reset (); |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
452 |
12784
c499d54796d6
Minor stylistic fixes to profiler code
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12783
diff
changeset
|
453 return retval; |
12783
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
454 } |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
455 |
12870
39d813616c8f
Restore the docstrings for internal profiler functions as C++ comments
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12869
diff
changeset
|
456 // 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
|
457 DEFUN (__profiler_data__, args, nargout, |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
458 "-*- texinfo -*-\n\ |
12869
de9a9719e594
Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents:
12784
diff
changeset
|
459 @deftypefn {Function File} __profiler_data ()\n\ |
de9a9719e594
Extend data collection in profiler and add user-interface profile function.
Daniel Kraft <d@domob.eu>
parents:
12784
diff
changeset
|
460 Undocumented internal function.\n\ |
12783
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
461 @end deftypefn") |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
462 { |
12784
c499d54796d6
Minor stylistic fixes to profiler code
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12783
diff
changeset
|
463 octave_value_list retval; |
12783
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
464 const int nargin = args.length (); |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
465 |
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
466 if (nargin > 0) |
12784
c499d54796d6
Minor stylistic fixes to profiler code
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12783
diff
changeset
|
467 warning ("profiler_data: ignoring extra arguments"); |
12783
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
468 |
12954
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
469 retval(0) = profiler.get_flat (); |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
470 if (nargout > 1) |
a451ae847adb
Collect hierarchical data profile.
Daniel Kraft <d@domob.eu>
parents:
12920
diff
changeset
|
471 retval(1) = profiler.get_hierarchical (); |
12783
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
472 |
12784
c499d54796d6
Minor stylistic fixes to profiler code
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12783
diff
changeset
|
473 return retval; |
12783
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
diff
changeset
|
474 } |