Mercurial > octave
view libinterp/corefcn/profiler.cc @ 16892:68fc671a9339
maint: Collapse interpfcn and interpfcn-core directories into corefcn directory.
* libgui/src/module.mk: Remove -I references to interp-core, interpfcn, add
reference to corefcn.
* libinterp/Makefile.am: Remove -I references to interp-core, interpfcn, add
reference to corefcn.
* libinterp/corefcn/module.mk: Add files from interp-core, interpfcn to
build system. Copy over special rules from module.mk files in interp-core
andd interpfcn.
* src/Makefile.am: Replace references to interp-core, interpfcn with those
to corefcn.
* libinterp/corefcn/Cell.cc, libinterp/corefcn/Cell.h,
libinterp/corefcn/action-container.h, libinterp/corefcn/c-file-ptr-stream.cc,
libinterp/corefcn/c-file-ptr-stream.h, libinterp/corefcn/comment-list.cc,
libinterp/corefcn/comment-list.h, libinterp/corefcn/cutils.c,
libinterp/corefcn/cutils.h, libinterp/corefcn/data.cc,
libinterp/corefcn/data.h, libinterp/corefcn/debug.cc,
libinterp/corefcn/debug.h, libinterp/corefcn/defaults.cc,
libinterp/corefcn/defaults.in.h, libinterp/corefcn/defun-dld.h,
libinterp/corefcn/defun-int.h, libinterp/corefcn/defun.cc,
libinterp/corefcn/defun.h, libinterp/corefcn/dirfns.cc,
libinterp/corefcn/dirfns.h, libinterp/corefcn/display.cc,
libinterp/corefcn/display.h, libinterp/corefcn/dynamic-ld.cc,
libinterp/corefcn/dynamic-ld.h, libinterp/corefcn/error.cc,
libinterp/corefcn/error.h, libinterp/corefcn/event-queue.h,
libinterp/corefcn/file-io.cc, libinterp/corefcn/file-io.h,
libinterp/corefcn/gl-render.cc, libinterp/corefcn/gl-render.h,
libinterp/corefcn/gl2ps-renderer.cc, libinterp/corefcn/gl2ps-renderer.h,
libinterp/corefcn/gl2ps.c, libinterp/corefcn/gl2ps.h,
libinterp/corefcn/graphics.cc, libinterp/corefcn/graphics.in.h,
libinterp/corefcn/gripes.cc, libinterp/corefcn/gripes.h,
libinterp/corefcn/help.cc, libinterp/corefcn/help.h,
libinterp/corefcn/hook-fcn.cc, libinterp/corefcn/hook-fcn.h,
libinterp/corefcn/input.cc, libinterp/corefcn/input.h,
libinterp/corefcn/jit-ir.cc, libinterp/corefcn/jit-ir.h,
libinterp/corefcn/jit-typeinfo.cc, libinterp/corefcn/jit-typeinfo.h,
libinterp/corefcn/jit-util.cc, libinterp/corefcn/jit-util.h,
libinterp/corefcn/load-path.cc, libinterp/corefcn/load-path.h,
libinterp/corefcn/load-save.cc, libinterp/corefcn/load-save.h,
libinterp/corefcn/ls-ascii-helper.cc, libinterp/corefcn/ls-ascii-helper.h,
libinterp/corefcn/ls-hdf5.cc, libinterp/corefcn/ls-hdf5.h,
libinterp/corefcn/ls-mat-ascii.cc, libinterp/corefcn/ls-mat-ascii.h,
libinterp/corefcn/ls-mat4.cc, libinterp/corefcn/ls-mat4.h,
libinterp/corefcn/ls-mat5.cc, libinterp/corefcn/ls-mat5.h,
libinterp/corefcn/ls-oct-ascii.cc, libinterp/corefcn/ls-oct-ascii.h,
libinterp/corefcn/ls-oct-binary.cc, libinterp/corefcn/ls-oct-binary.h,
libinterp/corefcn/ls-utils.cc, libinterp/corefcn/ls-utils.h,
libinterp/corefcn/matherr.c, libinterp/corefcn/mex.cc, libinterp/corefcn/mex.h,
libinterp/corefcn/mexproto.h, libinterp/corefcn/mxarray.in.h,
libinterp/corefcn/oct-errno.h, libinterp/corefcn/oct-errno.in.cc,
libinterp/corefcn/oct-fstrm.cc, libinterp/corefcn/oct-fstrm.h,
libinterp/corefcn/oct-hdf5.h, libinterp/corefcn/oct-hist.cc,
libinterp/corefcn/oct-hist.h, libinterp/corefcn/oct-iostrm.cc,
libinterp/corefcn/oct-iostrm.h, libinterp/corefcn/oct-lvalue.cc,
libinterp/corefcn/oct-lvalue.h, libinterp/corefcn/oct-map.cc,
libinterp/corefcn/oct-map.h, libinterp/corefcn/oct-obj.cc,
libinterp/corefcn/oct-obj.h, libinterp/corefcn/oct-prcstrm.cc,
libinterp/corefcn/oct-prcstrm.h, libinterp/corefcn/oct-procbuf.cc,
libinterp/corefcn/oct-procbuf.h, libinterp/corefcn/oct-stdstrm.h,
libinterp/corefcn/oct-stream.cc, libinterp/corefcn/oct-stream.h,
libinterp/corefcn/oct-strstrm.cc, libinterp/corefcn/oct-strstrm.h,
libinterp/corefcn/oct.h, libinterp/corefcn/octave-link.cc,
libinterp/corefcn/octave-link.h, libinterp/corefcn/pager.cc,
libinterp/corefcn/pager.h, libinterp/corefcn/pr-output.cc,
libinterp/corefcn/pr-output.h, libinterp/corefcn/procstream.cc,
libinterp/corefcn/procstream.h, libinterp/corefcn/profiler.cc,
libinterp/corefcn/profiler.h, libinterp/corefcn/pt-jit.cc,
libinterp/corefcn/pt-jit.h, libinterp/corefcn/sighandlers.cc,
libinterp/corefcn/sighandlers.h, libinterp/corefcn/siglist.c,
libinterp/corefcn/siglist.h, libinterp/corefcn/sparse-xdiv.cc,
libinterp/corefcn/sparse-xdiv.h, libinterp/corefcn/sparse-xpow.cc,
libinterp/corefcn/sparse-xpow.h, libinterp/corefcn/symtab.cc,
libinterp/corefcn/symtab.h, libinterp/corefcn/sysdep.cc,
libinterp/corefcn/sysdep.h, libinterp/corefcn/toplev.cc,
libinterp/corefcn/toplev.h, libinterp/corefcn/txt-eng-ft.cc,
libinterp/corefcn/txt-eng-ft.h, libinterp/corefcn/txt-eng.h,
libinterp/corefcn/unwind-prot.cc, libinterp/corefcn/unwind-prot.h,
libinterp/corefcn/utils.cc, libinterp/corefcn/utils.h,
libinterp/corefcn/variables.cc, libinterp/corefcn/variables.h,
libinterp/corefcn/workspace-element.h, libinterp/corefcn/xdiv.cc,
libinterp/corefcn/xdiv.h, libinterp/corefcn/xgl2ps.c,
libinterp/corefcn/xnorm.cc, libinterp/corefcn/xnorm.h,
libinterp/corefcn/xpow.cc, libinterp/corefcn/xpow.h,
libinterp/corefcn/zfstream.cc, libinterp/corefcn/zfstream.h:
Files moved from interp-core and interpfcn directories.
* libinterp/interp-core/Cell.cc, libinterp/interp-core/Cell.h,
libinterp/interp-core/action-container.h,
libinterp/interp-core/c-file-ptr-stream.cc,
libinterp/interp-core/c-file-ptr-stream.h,
libinterp/interp-core/comment-list.cc, libinterp/interp-core/comment-list.h,
libinterp/interp-core/cutils.c, libinterp/interp-core/cutils.h,
libinterp/interp-core/defun-dld.h, libinterp/interp-core/defun-int.h,
libinterp/interp-core/display.cc, libinterp/interp-core/display.h,
libinterp/interp-core/dynamic-ld.cc, libinterp/interp-core/dynamic-ld.h,
libinterp/interp-core/event-queue.h, libinterp/interp-core/gl-render.cc,
libinterp/interp-core/gl-render.h, libinterp/interp-core/gl2ps-renderer.cc,
libinterp/interp-core/gl2ps-renderer.h, libinterp/interp-core/gl2ps.c,
libinterp/interp-core/gl2ps.h, libinterp/interp-core/gripes.cc,
libinterp/interp-core/gripes.h, libinterp/interp-core/jit-ir.cc,
libinterp/interp-core/jit-ir.h, libinterp/interp-core/jit-typeinfo.cc,
libinterp/interp-core/jit-typeinfo.h, libinterp/interp-core/jit-util.cc,
libinterp/interp-core/jit-util.h, libinterp/interp-core/ls-ascii-helper.cc,
libinterp/interp-core/ls-ascii-helper.h, libinterp/interp-core/ls-hdf5.cc,
libinterp/interp-core/ls-hdf5.h, libinterp/interp-core/ls-mat-ascii.cc,
libinterp/interp-core/ls-mat-ascii.h, libinterp/interp-core/ls-mat4.cc,
libinterp/interp-core/ls-mat4.h, libinterp/interp-core/ls-mat5.cc,
libinterp/interp-core/ls-mat5.h, libinterp/interp-core/ls-oct-binary.cc,
libinterp/interp-core/ls-oct-binary.h, libinterp/interp-core/ls-utils.cc,
libinterp/interp-core/ls-utils.h, libinterp/interp-core/matherr.c,
libinterp/interp-core/mex.cc, libinterp/interp-core/mex.h,
libinterp/interp-core/mexproto.h, libinterp/interp-core/module.mk,
libinterp/interp-core/mxarray.in.h, libinterp/interp-core/oct-errno.h,
libinterp/interp-core/oct-errno.in.cc, libinterp/interp-core/oct-fstrm.cc,
libinterp/interp-core/oct-fstrm.h, libinterp/interp-core/oct-hdf5.h,
libinterp/interp-core/oct-iostrm.cc, libinterp/interp-core/oct-iostrm.h,
libinterp/interp-core/oct-lvalue.cc, libinterp/interp-core/oct-lvalue.h,
libinterp/interp-core/oct-map.cc, libinterp/interp-core/oct-map.h,
libinterp/interp-core/oct-obj.cc, libinterp/interp-core/oct-obj.h,
libinterp/interp-core/oct-prcstrm.cc, libinterp/interp-core/oct-prcstrm.h,
libinterp/interp-core/oct-procbuf.cc, libinterp/interp-core/oct-procbuf.h,
libinterp/interp-core/oct-stdstrm.h, libinterp/interp-core/oct-stream.cc,
libinterp/interp-core/oct-stream.h, libinterp/interp-core/oct-strstrm.cc,
libinterp/interp-core/oct-strstrm.h, libinterp/interp-core/oct.h,
libinterp/interp-core/procstream.cc, libinterp/interp-core/procstream.h,
libinterp/interp-core/pt-jit.cc, libinterp/interp-core/pt-jit.h,
libinterp/interp-core/siglist.c, libinterp/interp-core/siglist.h,
libinterp/interp-core/sparse-xdiv.cc, libinterp/interp-core/sparse-xdiv.h,
libinterp/interp-core/sparse-xpow.cc, libinterp/interp-core/sparse-xpow.h,
libinterp/interp-core/txt-eng-ft.cc, libinterp/interp-core/txt-eng-ft.h,
libinterp/interp-core/txt-eng.h, libinterp/interp-core/unwind-prot.cc,
libinterp/interp-core/unwind-prot.h, libinterp/interp-core/xdiv.cc,
libinterp/interp-core/xdiv.h, libinterp/interp-core/xgl2ps.c,
libinterp/interp-core/xnorm.cc, libinterp/interp-core/xnorm.h,
libinterp/interp-core/xpow.cc, libinterp/interp-core/xpow.h,
libinterp/interp-core/zfstream.cc, libinterp/interp-core/zfstream.h,
libinterp/interpfcn/data.cc, libinterp/interpfcn/data.h,
libinterp/interpfcn/debug.cc, libinterp/interpfcn/debug.h,
libinterp/interpfcn/defaults.cc, libinterp/interpfcn/defaults.in.h,
libinterp/interpfcn/defun.cc, libinterp/interpfcn/defun.h,
libinterp/interpfcn/dirfns.cc, libinterp/interpfcn/dirfns.h,
libinterp/interpfcn/error.cc, libinterp/interpfcn/error.h,
libinterp/interpfcn/file-io.cc, libinterp/interpfcn/file-io.h,
libinterp/interpfcn/graphics.cc, libinterp/interpfcn/graphics.in.h,
libinterp/interpfcn/help.cc, libinterp/interpfcn/help.h,
libinterp/interpfcn/hook-fcn.cc, libinterp/interpfcn/hook-fcn.h,
libinterp/interpfcn/input.cc, libinterp/interpfcn/input.h,
libinterp/interpfcn/load-path.cc, libinterp/interpfcn/load-path.h,
libinterp/interpfcn/load-save.cc, libinterp/interpfcn/load-save.h,
libinterp/interpfcn/ls-oct-ascii.cc, libinterp/interpfcn/ls-oct-ascii.h,
libinterp/interpfcn/module.mk, libinterp/interpfcn/oct-hist.cc,
libinterp/interpfcn/oct-hist.h, libinterp/interpfcn/octave-link.cc,
libinterp/interpfcn/octave-link.h, libinterp/interpfcn/pager.cc,
libinterp/interpfcn/pager.h, libinterp/interpfcn/pr-output.cc,
libinterp/interpfcn/pr-output.h, libinterp/interpfcn/profiler.cc,
libinterp/interpfcn/profiler.h, libinterp/interpfcn/sighandlers.cc,
libinterp/interpfcn/sighandlers.h, libinterp/interpfcn/symtab.cc,
libinterp/interpfcn/symtab.h, libinterp/interpfcn/sysdep.cc,
libinterp/interpfcn/sysdep.h, libinterp/interpfcn/toplev.cc,
libinterp/interpfcn/toplev.h, libinterp/interpfcn/utils.cc,
libinterp/interpfcn/utils.h, libinterp/interpfcn/variables.cc,
libinterp/interpfcn/variables.h, libinterp/interpfcn/workspace-element.h:
deleted files.
author | Rik <rik@octave.org> |
---|---|
date | Wed, 03 Jul 2013 17:43:48 -0700 |
parents | libinterp/interpfcn/profiler.cc@2fc554ffbc28 |
children | d63878346099 |
line wrap: on
line source
/* Copyright (C) 2012 Daniel Kraft This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include <iostream> #include "defun.h" #include "oct-time.h" #include "ov-struct.h" #include "pager.h" #include "profiler.h" profile_data_accumulator::enter::enter (profile_data_accumulator& a, const std::string& f) : acc (a) { if (acc.is_active ()) { fcn = f; acc.enter_function (fcn); } else fcn = ""; } profile_data_accumulator::enter::~enter () { if (fcn != "") acc.exit_function (fcn); } profile_data_accumulator::stats::stats () : time (0.0), calls (0), recursive (false), parents (), children () {} octave_value profile_data_accumulator::stats::function_set_value (const function_set& list) { const octave_idx_type n = list.size (); RowVector retval (n); octave_idx_type i = 0; for (function_set::const_iterator p = list.begin (); p != list.end (); ++p) { retval(i) = *p; ++i; } assert (i == n); return retval; } profile_data_accumulator::tree_node::tree_node (tree_node* p, octave_idx_type f) : parent (p), fcn_id (f), children (), time (0.0), calls (0) {} profile_data_accumulator::tree_node::~tree_node () { for (child_map::iterator i = children.begin (); i != children.end (); ++i) delete i->second; } profile_data_accumulator::tree_node* profile_data_accumulator::tree_node::enter (octave_idx_type fcn) { tree_node* retval; child_map::iterator pos = children.find (fcn); if (pos == children.end ()) { retval = new tree_node (this, fcn); children[fcn] = retval; } else retval = pos->second; ++retval->calls; return retval; } profile_data_accumulator::tree_node* profile_data_accumulator::tree_node::exit (octave_idx_type fcn) { assert (parent); assert (fcn_id == fcn); return parent; } void profile_data_accumulator::tree_node::build_flat (flat_profile& data) const { // If this is not the top-level node, update profile entry for this function. if (fcn_id != 0) { stats& entry = data[fcn_id - 1]; entry.time += time; entry.calls += calls; assert (parent); if (parent->fcn_id != 0) { entry.parents.insert (parent->fcn_id); data[parent->fcn_id - 1].children.insert (fcn_id); } if (!entry.recursive) for (const tree_node* i = parent; i; i = i->parent) if (i->fcn_id == fcn_id) { entry.recursive = true; break; } } // Recurse on children. for (child_map::const_iterator i = children.begin (); i != children.end (); ++i) i->second->build_flat (data); } octave_value profile_data_accumulator::tree_node::get_hierarchical (double* total) const { /* Note that we don't generate the entry just for this node, but rather a struct-array with entries for all children. This way, the top-node (for which we don't want a real entry) generates already the final hierarchical profile data. */ const octave_idx_type n = children.size (); Cell rv_indices (n, 1); Cell rv_times (n, 1); Cell rv_totals (n, 1); Cell rv_calls (n, 1); Cell rv_children (n, 1); octave_idx_type i = 0; for (child_map::const_iterator p = children.begin (); p != children.end (); ++p) { const tree_node& entry = *p->second; double child_total = entry.time; rv_indices(i) = octave_value (p->first); rv_times(i) = octave_value (entry.time); rv_calls(i) = octave_value (entry.calls); rv_children(i) = entry.get_hierarchical (&child_total); rv_totals(i) = octave_value (child_total); if (total) *total += child_total; ++i; } assert (i == n); octave_map retval; retval.assign ("Index", rv_indices); retval.assign ("SelfTime", rv_times); retval.assign ("TotalTime", rv_totals); retval.assign ("NumCalls", rv_calls); retval.assign ("Children", rv_children); return retval; } profile_data_accumulator::profile_data_accumulator () : known_functions (), fcn_index (), enabled (false), call_tree (NULL), last_time (-1.0) {} profile_data_accumulator::~profile_data_accumulator () { if (call_tree) delete call_tree; } void profile_data_accumulator::set_active (bool value) { if (value) { // Create a call-tree top-node if there isn't yet one. if (!call_tree) call_tree = new tree_node (NULL, 0); // Let the top-node be the active one. This ensures we have a clean // fresh start collecting times. active_fcn = call_tree; } else { // Make sure we start with fresh timing if we're re-enabled later. last_time = -1.0; } enabled = value; } void profile_data_accumulator::enter_function (const std::string& fcn) { // The enter class will check and only call us if the profiler is active. assert (is_active ()); assert (call_tree); // If there is already an active function, add to its time before // pushing the new one. if (active_fcn != call_tree) add_current_time (); // Map the function's name to its index. octave_idx_type fcn_idx; fcn_index_map::iterator pos = fcn_index.find (fcn); if (pos == fcn_index.end ()) { known_functions.push_back (fcn); fcn_idx = known_functions.size (); fcn_index[fcn] = fcn_idx; } else fcn_idx = pos->second; active_fcn = active_fcn->enter (fcn_idx); last_time = query_time (); } void profile_data_accumulator::exit_function (const std::string& fcn) { assert (call_tree); assert (active_fcn != call_tree); // Usually, if we are disabled this function is not even called. But the // call disabling the profiler is an exception. So also check here // and only record the time if enabled. if (is_active ()) add_current_time (); fcn_index_map::iterator pos = fcn_index.find (fcn); assert (pos != fcn_index.end ()); active_fcn = active_fcn->exit (pos->second); // If this was an "inner call", we resume executing the parent function // up the stack. So note the start-time for this! last_time = query_time (); } void profile_data_accumulator::reset (void) { if (is_active ()) { error ("Can't reset active profiler."); return; } known_functions.clear (); fcn_index.clear (); if (call_tree) { delete call_tree; call_tree = NULL; } last_time = -1.0; } octave_value profile_data_accumulator::get_flat (void) const { octave_value retval; const octave_idx_type n = known_functions.size (); flat_profile flat (n); if (call_tree) { call_tree->build_flat (flat); Cell rv_names (n, 1); Cell rv_times (n, 1); Cell rv_calls (n, 1); Cell rv_recursive (n, 1); Cell rv_parents (n, 1); Cell rv_children (n, 1); for (octave_idx_type i = 0; i != n; ++i) { rv_names(i) = octave_value (known_functions[i]); rv_times(i) = octave_value (flat[i].time); rv_calls(i) = octave_value (flat[i].calls); rv_recursive(i) = octave_value (flat[i].recursive); rv_parents(i) = stats::function_set_value (flat[i].parents); rv_children(i) = stats::function_set_value (flat[i].children); } octave_map m; m.assign ("FunctionName", rv_names); m.assign ("TotalTime", rv_times); m.assign ("NumCalls", rv_calls); m.assign ("IsRecursive", rv_recursive); m.assign ("Parents", rv_parents); m.assign ("Children", rv_children); retval = m; } else { static const char *fn[] = { "FunctionName", "TotalTime", "NumCalls", "IsRecursive", "Parents", "Children", 0 }; static octave_map m (dim_vector (0, 1), string_vector (fn)); retval = m; } return retval; } octave_value profile_data_accumulator::get_hierarchical (void) const { octave_value retval; if (call_tree) retval = call_tree->get_hierarchical (); else { static const char *fn[] = { "Index", "SelfTime", "NumCalls", "Children", 0 }; static octave_map m (dim_vector (0, 1), string_vector (fn)); retval = m; } return retval; } double profile_data_accumulator::query_time (void) const { octave_time now; // FIXME -- is this volatile declaration really needed? // See bug #34210 for additional details. volatile double dnow = now.double_value (); return dnow; } void profile_data_accumulator::add_current_time (void) { const double t = query_time (); assert (last_time >= 0.0 && last_time <= t); assert (call_tree && active_fcn != call_tree); active_fcn->add_time (t - last_time); } profile_data_accumulator profiler; // Enable or disable the profiler data collection. DEFUN (__profiler_enable__, args, , "-*- texinfo -*-\n\ @deftypefn {Function File} __profiler_enable ()\n\ Undocumented internal function.\n\ @end deftypefn") { octave_value_list retval; const int nargin = args.length (); if (nargin > 0) { if (nargin > 1) { print_usage (); return retval; } profiler.set_active (args(0).bool_value ()); } retval(0) = profiler.is_active (); return retval; } // Clear all collected profiling data. DEFUN (__profiler_reset__, args, , "-*- texinfo -*-\n\ @deftypefn {Function File} __profiler_reset ()\n\ Undocumented internal function.\n\ @end deftypefn") { octave_value_list retval; const int nargin = args.length (); if (nargin > 0) warning ("profiler_reset: ignoring extra arguments"); profiler.reset (); return retval; } // Query the timings collected by the profiler. DEFUN (__profiler_data__, args, nargout, "-*- texinfo -*-\n\ @deftypefn {Function File} __profiler_data ()\n\ Undocumented internal function.\n\ @end deftypefn") { octave_value_list retval; const int nargin = args.length (); if (nargin > 0) warning ("profiler_data: ignoring extra arguments"); retval(0) = profiler.get_flat (); if (nargout > 1) retval(1) = profiler.get_hierarchical (); return retval; }