integrated profiler

diff --git a/database.sql b/database.sql
index f8d4c7fc2476e824d080bddbe0179a7a03ea8d53..e07e9e0701065ff24efaf2806781eb56c5d29d68 100755 (executable)
--- a/database.sql
+++ b/database.sql
@@ -858,12 +858,12 @@ INDEX ( `term` )
 ) ENGINE = MyISAM DEFAULT CHARSET=utf8;
 
 CREATE TABLE IF NOT EXISTS `profiling` (
-`id` INT NOT NULL AUTO_INCREMENT PRIMARY_KEY , 
-`function` VARCHAR(255) NOT NULL, 
-`file` VARCHAR(255) NOT NULL, 
-`line` INT NOT NULL DEFAULT '-1', 
-`class` VARCHAR(255), 
-`time` FLOAT(10, 2) NOT NULL, 
-INDEX(`function`), 
-INDEX(`file`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8; 
+`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+`function` VARCHAR( 255 ) NOT NULL ,
+`file` VARCHAR( 255 ) NOT NULL ,
+`line` INT NOT NULL DEFAULT '-1',
+`class` VARCHAR( 255 ) NOT NULL ,
+`time` FLOAT( 10, 2 ) NOT NULL ,
+INDEX ( `function` ) ,
+INDEX ( `file` )
+) ENGINE = MyISAM DEFAULT CHARSET=utf8;

diff --git a/update.php b/update.php
index 36116341a08b109e8d4be707a8d435d732e19fb0..8c8a2a5e425ad80b37464f03f324455333562e49 100755 (executable)
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1131 );
+define( 'UPDATE_VERSION' , 1132 );
 
 /**
  *
@@ -1125,16 +1125,16 @@ function update_1130() {
 /**
  * CREATE TABLE for profiling
  */
-function update_1132() {\r
+function update_1131() {\r
        q("CREATE TABLE IF NOT EXISTS `profiling` (
-`id` INT NOT NULL AUTO_INCREMENT PRIMARY_KEY , 
-`function` VARCHAR(255) NOT NULL, 
-`file` VARCHAR(255) NOT NULL, 
-`line` INT NOT NULL DEFAULT '-1', 
-`class` VARCHAR(255), 
-`time` FLOAT(10, 2) NOT NULL, 
-INDEX(`function`), 
-INDEX(`file`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8; ");\r
+`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+`function` VARCHAR( 255 ) NOT NULL ,
+`file` VARCHAR( 255 ) NOT NULL ,
+`line` INT NOT NULL DEFAULT '-1',
+`class` VARCHAR( 255 ) NOT NULL ,
+`time` FLOAT( 10, 2 ) NOT NULL ,
+INDEX ( `function` ) ,
+INDEX ( `file` )
+) ENGINE = MyISAM DEFAULT CHARSET=utf8;");\r
 }
 

diff --git a/util/profiler.php b/util/profiler.php
index 3a3de53739033c4e6f8359805870e19f60f01672..fe33fe429d6762c9c99fc421569abdd10f9da775 100755 (executable)
--- a/util/profiler.php
+++ b/util/profiler.php
@@ -1,24 +1,12 @@
 <?php
 function microtime_float()\r
 {\r
-       list($usec, $sec) = explode(" ", microtime());\r
-       return ((float)$usec + (float)$sec);\r
+       return microtime(true);\r
 }\r
 \r
 function tick_event() {
-       static $time = NULL; 
-       
-       if(NULL===$time) {
-               //initialise time with now
-               $time=microtime_float(); 
-               
-               q("INSERT INTO `profiling` (`function`, `file`, `line`, `class`, `time`) VALUES ('initialization', 'index.php', '-1', NULL, '%f'); ",\r
-                               floatval($time-$_SERVER['REQUEST_TIME']));
-       }
-       
-       $elapsed=microtime_float()-$time; 
-       
-       $db_info=array_shift(debug_backtrace()); 
+       $db_info=debug_backtrace(); 
+       $db_info=$db_info[1]; 
        $function=$db_info['function']; 
        $file=$db_info['file'];
        $line=$db_info['line'];
@@ -26,11 +14,8 @@ function tick_event() {
        
        //save results
        q("INSERT INTO `profiling` (`function`, `file`, `line`, `class`, `time`) VALUES ('%s', '%s', '%d', '%s', '%f'); ", 
-                       dbesc($function), dbesc($file), intval($line), dbesc($class), floatval($time)); 
-       
-       //set time to now
-       $time=microtime_float();
+                       dbesc($function), dbesc($file), intval($line), dbesc($class), microtime_float()*1000); 
 }
 
-declare(ticks=1);\r
-register_tick_function('tick_event');
\ No newline at end of file
+register_tick_function('tick_event');\r
+declare(ticks=50);
\ No newline at end of file