diff options
| author | Andrey Andreev <narf@bofh.bg> | 2013-02-14 13:24:13 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2013-02-14 13:24:13 +0100 |
| commit | 3a533ac93a62f15c2abd186878238b0a99e10f88 (patch) | |
| tree | 37c9993f1b4208a509432e8ec87f88c10b74a770 | |
| parent | c2268711a27809575f82b21e64fde6cd953ef7f9 (diff) | |
| parent | 3224f077c37a054ea1995c07fe54bbe8b00e058a (diff) | |
Merge pull request #2241 from TimHas/develop
Added small feature to profiler: total execution time count
| -rw-r--r-- | system/language/english/profiler_lang.php | 1 | ||||
| -rw-r--r-- | system/libraries/Profiler.php | 4 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/system/language/english/profiler_lang.php b/system/language/english/profiler_lang.php index dfe034e79..0ed5f4cb0 100644 --- a/system/language/english/profiler_lang.php +++ b/system/language/english/profiler_lang.php @@ -46,6 +46,7 @@ $lang['profiler_no_memory'] = 'Memory Usage Unavailable'; $lang['profiler_no_profiles'] = 'No Profile data - all Profiler sections have been disabled.'; $lang['profiler_section_hide'] = 'Hide'; $lang['profiler_section_show'] = 'Show'; +$lang['profiler_seconds'] = 'seconds'; /* End of file profiler_lang.php */ /* Location: ./system/language/english/profiler_lang.php */
\ No newline at end of file diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php index e93239901..ac8f6ba71 100644 --- a/system/libraries/Profiler.php +++ b/system/libraries/Profiler.php @@ -238,6 +238,8 @@ class CI_Profiler { foreach ($dbs as $name => $db) { $hide_queries = (count($db->queries) > $this->_query_toggle_count) ? ' display:none' : ''; + + $total_time = number_format(array_sum($db->query_times), 4).' '.$this->CI->lang->line('profiler_seconds'); $show_hide_js = '(<span style="cursor: pointer;" onclick="var s=document.getElementById(\'ci_profiler_queries_db_'.$count.'\').style;s.display=s.display==\'none\'?\'\':\'none\';this.innerHTML=this.innerHTML==\''.$this->CI->lang->line('profiler_section_hide').'\'?\''.$this->CI->lang->line('profiler_section_show').'\':\''.$this->CI->lang->line('profiler_section_hide').'\';">'.$this->CI->lang->line('profiler_section_hide').'</span>)'; @@ -250,7 +252,7 @@ class CI_Profiler { ."\n" .'<legend style="color:#0000FF;"> '.$this->CI->lang->line('profiler_database') .': '.$db->database.' ('.$name.') '.$this->CI->lang->line('profiler_queries') - .': '.count($db->queries).' '.$show_hide_js."</legend>\n\n\n" + .': '.count($db->queries).'('.$total_time.')'.' '.$show_hide_js."</legend>\n\n\n" .'<table style="width:100%;'.$hide_queries.'" id="ci_profiler_queries_db_'.$count."\">\n"; if (count($db->queries) === 0) diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 893c3db61..3969943f6 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -271,7 +271,9 @@ Release Date: Not Released - :doc:`Encryption Library <libraries/encryption>` changes include: - Added support for hashing algorithms other than SHA1 and MD5. - Removed previously deprecated ``sha1()`` method. - - :doc:`Profiler Library <general/profiling>` now also displays database object names. + - :doc:`Profiler Library <general/profiling>` changes include: + - Database object names displayed. + - The sum of all queries running times in seconds displayed. - :doc:`Migration Library <libraries/migration>` changes include: - Added support for timestamp-based migrations (enabled by default). - Added ``$config['migration_type']`` to allow switching between *sequential* and *timestamp* migrations. |