diff options
| -rw-r--r-- | debug_toolbar/debug/__init__.py | 0 | ||||
| -rw-r--r-- | debug_toolbar/debug/timer.py | 28 | ||||
| -rw-r--r-- | debug_toolbar/panels/timer.py | 49 |
3 files changed, 48 insertions, 29 deletions
diff --git a/debug_toolbar/debug/__init__.py b/debug_toolbar/debug/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/debug_toolbar/debug/__init__.py diff --git a/debug_toolbar/debug/timer.py b/debug_toolbar/debug/timer.py new file mode 100644 index 0000000..d685bd4 --- /dev/null +++ b/debug_toolbar/debug/timer.py @@ -0,0 +1,28 @@ +try: + import resource +except ImportError: + pass # Will fail on Win32 systems +import time + + +class DebugTimer(object): + try: # if resource module not available, don't show content panel + resource + except NameError: + has_resource = False + else: + has_resource = True + + def elapsed_ru(self, name): + return getattr(self._end_rusage, name) - getattr(self._start_rusage, name) + + def start(self, request): + self._start_time = time.time() + if self.has_resource: + self._start_rusage = resource.getrusage(resource.RUSAGE_SELF) + + def stop(self, request, response): + self.total_time = (time.time() - self._start_time) * 1000 + if self.has_resource: + self._end_rusage = resource.getrusage(resource.RUSAGE_SELF) + diff --git a/debug_toolbar/panels/timer.py b/debug_toolbar/panels/timer.py index d866166..2687fc1 100644 --- a/debug_toolbar/panels/timer.py +++ b/debug_toolbar/panels/timer.py @@ -6,42 +6,36 @@ import time from django.template.loader import render_to_string from django.utils.translation import ugettext_lazy as _ from debug_toolbar.panels import DebugPanel +from debug_toolbar.debug.timer import DebugTimer class TimerDebugPanel(DebugPanel): """ Panel that displays the time a response took in milliseconds. """ name = 'Timer' - try: # if resource module not available, don't show content panel - resource - except NameError: - has_content = False - has_resource = False - else: - has_content = True - has_resource = True + + def __init__(self, context={}): + super(TimerDebugPanel, self).__init__(context) + self.timer = DebugTimer() + self.has_content = self.timer.has_resource def process_request(self, request): - self._start_time = time.time() - if self.has_resource: - self._start_rusage = resource.getrusage(resource.RUSAGE_SELF) + self.timer.start(request) def process_response(self, request, response): - self.total_time = (time.time() - self._start_time) * 1000 - if self.has_resource: - self._end_rusage = resource.getrusage(resource.RUSAGE_SELF) + self.timer.stop(request, response) def nav_title(self): return _('Time') def nav_subtitle(self): # TODO l10n - if self.has_resource: - utime = self._end_rusage.ru_utime - self._start_rusage.ru_utime - stime = self._end_rusage.ru_stime - self._start_rusage.ru_stime - return 'CPU: %0.2fms (%0.2fms)' % ((utime + stime) * 1000.0, self.total_time) + if self.timer.has_resource: + utime = self.timer._end_rusage.ru_utime - self.timer._start_rusage.ru_utime + stime = self.timer._end_rusage.ru_stime - self.timer._start_rusage.ru_stime + return 'CPU: %0.2fms (%0.2fms)' % ((utime + stime) * 1000.0, self.timer.total_time) else: - return 'TOTAL: %0.2fms' % (self.total_time) + return 'TOTAL: %0.2fms' % (self.timer.total_time) def title(self): return _('Resource Usage') @@ -49,17 +43,14 @@ class TimerDebugPanel(DebugPanel): def url(self): return '' - def _elapsed_ru(self, name): - return getattr(self._end_rusage, name) - getattr(self._start_rusage, name) - def content(self): - utime = 1000 * self._elapsed_ru('ru_utime') - stime = 1000 * self._elapsed_ru('ru_stime') - vcsw = self._elapsed_ru('ru_nvcsw') - ivcsw = self._elapsed_ru('ru_nivcsw') - minflt = self._elapsed_ru('ru_minflt') - majflt = self._elapsed_ru('ru_majflt') + utime = 1000 * self.timer.elapsed_ru('ru_utime') + stime = 1000 * self.timer.elapsed_ru('ru_stime') + vcsw = self.timer.elapsed_ru('ru_nvcsw') + ivcsw = self.timer.elapsed_ru('ru_nivcsw') + minflt = self.timer.elapsed_ru('ru_minflt') + majflt = self.timer.elapsed_ru('ru_majflt') # these are documented as not meaningful under Linux. If you're running BSD # feel free to enable them, and add any others that I hadn't gotten to before @@ -78,7 +69,7 @@ class TimerDebugPanel(DebugPanel): (_('User CPU time'), '%0.3f msec' % utime), (_('System CPU time'), '%0.3f msec' % stime), (_('Total CPU time'), '%0.3f msec' % (utime + stime)), - (_('Elapsed time'), '%0.3f msec' % self.total_time), + (_('Elapsed time'), '%0.3f msec' % self.timer.total_time), (_('Context switches'), '%d voluntary, %d involuntary' % (vcsw, ivcsw)), # ('Memory use', '%d max RSS, %d shared, %d unshared' % (rss, srss, urss + usrss)), # ('Page faults', '%d no i/o, %d requiring i/o' % (minflt, majflt)), |