Development

Changeset 33570

You must first sign up to be able to contribute.

Changeset 33570

Show
Ignore:
Timestamp:
10/25/12 11:44:55 (7 months ago)
Author:
fabien
Message:

[1.4] fixed Doctrine queries execution time in the profiler (closes #10079, patch from jakub.turek)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/1.4/lib/debug/sfTimerManager.class.php

    r13339 r33570  
    3030   * @return sfTimer The timer instance 
    3131   */ 
    32   public static function getTimer($name) 
     32  public static function getTimer($name,$reset=true) 
    3333  { 
    3434    if (!isset(self::$timers[$name])) 
    …… 
    3737    } 
    3838 
    39     self::$timers[$name]->startTimer(); 
     39    if($reset){ 
     40       self::$timers[$name]->startTimer(); 
     41    } 
    4042 
    4143    return self::$timers[$name]; 

  • branches/1.4/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionProfiler.class.php

    r20157 r33570  
    8383  public function postQuery(Doctrine_Event $event) 
    8484  { 
    85     sfTimerManager::getTimer('Database (Doctrine)')->addTime(); 
     85    sfTimerManager::getTimer('Database (Doctrine)',false)->addTime(); 
    8686 
    8787    $args = func_get_args(); 
    …… 
    119119  public function postExec(Doctrine_Event $event) 
    120120  { 
    121     sfTimerManager::getTimer('Database (Doctrine)')->addTime(); 
     121    sfTimerManager::getTimer('Database (Doctrine)',false)->addTime(); 
    122122 
    123123    $args = func_get_args(); 
    …… 
    155155  public function postStmtExecute(Doctrine_Event $event) 
    156156  { 
    157     sfTimerManager::getTimer('Database (Doctrine)')->addTime(); 
     157    sfTimerManager::getTimer('Database (Doctrine)',false)->addTime(); 
    158158 
    159159    $args = func_get_args();