integrated profiler

3 files changed, 26 insertions, 41 deletions

diff --git a/database.sql b/database.sql
index f8d4c7fc2..e07e9e070 100755
--- 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 36116341a..8c8a2a5e4 100755
--- 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() {

+function update_1131() {

 	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; ");

+`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/util/profiler.php b/util/profiler.php
index 3a3de5373..fe33fe429 100755
--- a/util/profiler.php
+++ b/util/profiler.php
@@ -1,24 +1,12 @@
 <?php
 function microtime_float()

 {

-	list($usec, $sec) = explode(" ", microtime());

-	return ((float)$usec + (float)$sec);

+	return microtime(true);

 }

 

 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'); ",

-				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);

-register_tick_function('tick_event');
\ No newline at end of file
+register_tick_function('tick_event');

+declare(ticks=50);
\ No newline at end of file