Changeset 19611

Timestamp:

12/20/2011 09:36:53 PM (15 years ago)

Author:

nacin

Message:

Ask for a float from microtime() for timer_start(), timer_stop(). Clarify docs. props solarissmoke, fixes #19157.

Location:

trunk/wp-includes

Files:

• load.php (modified) (3 diffs)
• wp-db.php (modified) (2 diffs)

trunk/wp-includes/load.php

@@ -183 +183 @@
 
 /**
- * PHP 4 standard microtime start capture.
+ * PHP 5 standard microtime start capture.
  *
  * @access private
  * @since 0.71
- * @global int $timestart Seconds and microseconds added together from when function is called.
+ * @global float $timestart Seconds from when function is called.
  * @return bool Always returns true.
  */
 function timer_start() {
         global $timestart;
-        $mtime = explode( ' ', microtime() );
-        $timestart = $mtime[1] + $mtime[0];
+        $timestart = microtime( true );
         return true;
 }
@@ -214 +213 @@
  *
  * @since 0.71
- * @global int $timestart Seconds and microseconds added together from when timer_start() is called
- * @global int $timeend Seconds and microseconds added together from when function is called
+ * @global float $timestart Seconds from when timer_start() is called
+ * @global float $timeend Seconds from when function is called
  *
  * @param int $display Use '0' or null to not echo anything and 1 to echo the total time
@@ -223 +222 @@
 function timer_stop( $display = 0, $precision = 3 ) { // if called like timer_stop(1), will echo $timetotal
         global $timestart, $timeend;
-        $mtime = microtime();
-        $mtime = explode( ' ', $mtime );
-        $timeend = $mtime[1] + $mtime[0];
+        $timeend = microtime( true );
         $timetotal = $timeend - $timestart;
         $r = ( function_exists( 'number_format_i18n' ) ) ? number_format_i18n( $timetotal, $precision ) : number_format( $timetotal, $precision );

trunk/wp-includes/wp-db.php

@@ -1442 +1442 @@
          */
         function timer_start() {
-                $mtime            = explode( ' ', microtime() );
-                $this->time_start = $mtime[1] + $mtime[0];
+                $this->time_start = microtime( true );
                 return true;
         }
@@ -1452 +1451 @@
          * @since 1.5.0
          *
-         * @return int Total time spent on the query, in milliseconds
+         * @return float Total time spent on the query, in seconds
          */
         function timer_stop() {
-                $mtime      = explode( ' ', microtime() );
-                $time_end   = $mtime[1] + $mtime[0];
-                $time_total = $time_end - $this->time_start;
-                return $time_total;
+                return ( microtime( true ) - $this->time_start );
         }