diff options
Diffstat (limited to 'debug_toolbar')
| -rw-r--r-- | debug_toolbar/panels/profiling.py | 1 | ||||
| -rw-r--r-- | debug_toolbar/panels/timer.py | 34 |
2 files changed, 20 insertions, 15 deletions
diff --git a/debug_toolbar/panels/profiling.py b/debug_toolbar/panels/profiling.py index 26f7888..e08591a 100644 --- a/debug_toolbar/panels/profiling.py +++ b/debug_toolbar/panels/profiling.py @@ -3,6 +3,7 @@ from __future__ import division from django.template.loader import render_to_string from django.utils.translation import ugettext_lazy as _ from django.utils.safestring import mark_safe +from debug_toolbar.middleware import DebugToolbarMiddleware from debug_toolbar.panels import DebugPanel try: diff --git a/debug_toolbar/panels/timer.py b/debug_toolbar/panels/timer.py index 43cc202..1e44212 100644 --- a/debug_toolbar/panels/timer.py +++ b/debug_toolbar/panels/timer.py @@ -5,6 +5,7 @@ except ImportError: import time from django.template.loader import render_to_string from django.utils.translation import ugettext_lazy as _ +from debug_toolbar.middleware import DebugToolbarMiddleware from debug_toolbar.panels import DebugPanel class TimerDebugPanel(DebugPanel): @@ -50,21 +51,24 @@ class TimerDebugPanel(DebugPanel): # usrss = self._end_rusage.ru_isrss self.stats = { - 'total_time': total_time, - 'utime': utime, - 'stime': stime, - 'vcsw': vcsw, - 'ivcsw': ivcsw, - 'minflt': minflt, - 'majflt': majflt, -# 'blkin': blkin, -# 'blkout': blkout, -# 'swap': swap, -# 'rss': rss, -# 'urss': urss, -# 'srss': srss, -# 'usrss': usrss, - } + 'total_time': total_time, + 'utime': utime, + 'stime': stime, + 'vcsw': vcsw, + 'ivcsw': ivcsw, + 'minflt': minflt, + 'majflt': majflt, +# 'blkin': blkin, +# 'blkout': blkout, +# 'swap': swap, +# 'rss': rss, +# 'urss': urss, +# 'srss': srss, +# 'usrss': usrss, + } + + toolbar = DebugToolbarMiddleware.get_current() + toolbar.stats['timer'] = self.stats def nav_title(self): return _('Time') |