Add trace_plugin_load option to control display of Plugin load times …

…report #87
bobbingwide · Dec 31, 2021 · 4d5f579 · 4d5f579
1 parent 53c60a3
commit 4d5f579
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 9 deletions.
diff --git a/includes/bwtrace-actions.php b/includes/bwtrace-actions.php
@@ -60,7 +60,7 @@ function bw_trace_add_selected_actions() {
 	bw_trace_add_action( "wp", "trace_wp_action", "includes/oik-actions.php", "bw_trace_wp" );
 	bw_trace_add_action( "wp", "trace_wp_rewrite", "includes/oik-actions.php", "bw_trace_wp_rewrite" );
 	//bw_trace_add_action( 'shutdown', 'trace_plugin_loaded', 'includes/oik-actions.php', 'bw_trace_plugin_loaded_report' );
-	bw_trace_add_action( 'shutdown','trace_status_report', 'includes/oik-actions.php', 'bw_trace_plugin_loaded_report' );
+	bw_trace_add_action( 'shutdown','trace_plugin_load', 'includes/oik-actions.php', 'bw_trace_plugin_loaded_report' );
 	bw_trace_add_action( "shutdown", "trace_included_files", "includes/oik-actions.php", "bw_trace_included_files" );
 	bw_trace_add_action( "shutdown", "trace_saved_queries", "includes/oik-actions.php", "bw_trace_saved_queries" );
 	bw_trace_add_action( "shutdown", "trace_output_buffer", "includes/oik-actions.php", "bw_trace_output_buffer" );
@@ -479,11 +479,11 @@ function bw_trace_add_trace_rest() {
 
 function bw_trace_plugins_loaded() {
 	global $bw_trace_plugins_loaded;
-	global $bw_trace_plugins_loaded_unkeyed;
+	//global $bw_trace_plugins_loaded_unkeyed;
 	$bw_trace_plugins_loaded = [ 'REQUEST_TIME_FLOAT' =>$_SERVER['REQUEST_TIME_FLOAT'], 'WP_START_TIMESTAMP' => WP_START_TIMESTAMP ];
-	$bw_trace_plugins_loaded_unkeyed = [];
-	$bw_trace_plugins_loaded_unkeyed = ['REQUEST_TIME_FLOAT', $_SERVER['REQUEST_TIME_FLOAT'] ];
-	$bw_trace_plugins_loaded_unkeyed = [ 'WP_START_TIMESTAMP', WP_START_TIMESTAMP ];
+	//$bw_trace_plugins_loaded_unkeyed = [];
+	//$bw_trace_plugins_loaded_unkeyed = ['REQUEST_TIME_FLOAT', $_SERVER['REQUEST_TIME_FLOAT'] ];
+	//$bw_trace_plugins_loaded_unkeyed = [ 'WP_START_TIMESTAMP', WP_START_TIMESTAMP ];
 	add_action( "plugin_loaded", 'bw_trace_time_plugin_loaded',-9999);
 	add_action( 'mu_plugin_loaded', 'bw_trace_time_plugin_loaded',-9999);
 	add_action( 'network_plugin_loaded', 'bw_trace_time_plugin_loaded',-9999);
@@ -493,15 +493,25 @@ function bw_trace_plugins_loaded() {
 	add_action( 'muplugins_loaded', 'bw_trace_time_plugin_loaded',-9999);
 }
 
+/**
+ * Records the time the plugin was loaded.
+ *
+ * If BW_TRACE_VERBOSE then the trace record is also produced.
+ * This can show files loaded and other stuff such as memory usage.
+ *
+ * @param null $plugin
+ */
 function  bw_trace_time_plugin_loaded( $plugin=null ) {
 	global $bw_trace_plugins_loaded;
-	global $bw_trace_plugins_loaded_unkeyed;
+	//global $bw_trace_plugins_loaded_unkeyed;
 	if ( '' === $plugin ) {
 		$plugin = bw_current_filter();
 	}
 	$microtime = microtime( true );
 	$bw_trace_plugins_loaded[ $plugin ] = $microtime;
-	$bw_trace_plugins_loaded_unkeyed[] = [ $plugin, $microtime ];
+	//$bw_trace_plugins_loaded_unkeyed[] = [ $plugin, $microtime ];
+
+	bw_trace2( null, null, true, BW_TRACE_VERBOSE );
 }
 
 

diff --git a/includes/oik-actions.php b/includes/oik-actions.php
@@ -370,12 +370,12 @@ function bw_trace_functions_traced() {
  */
 function bw_trace_plugin_loaded_report() {
 	global $bw_trace_plugins_loaded;
-	global $bw_trace_plugins_loaded_unkeyed;
+	//global $bw_trace_plugins_loaded_unkeyed;
 	global $bw_trace_anonymous;
 	$saved_anon = $bw_trace_anonymous;
 	$bw_trace_anonymous = true;
 	bw_trace2( $bw_trace_plugins_loaded, 'bw_trace_plugins_loaded', false);
-	bw_trace2( $bw_trace_plugins_loaded_unkeyed, 'bw_trace_plugins_loaded_unkeyed', false);
+	//bw_trace2( $bw_trace_plugins_loaded_unkeyed, 'bw_trace_plugins_loaded_unkeyed', false);
 	$prev = $_SERVER['REQUEST_TIME_FLOAT'];
 	$accum = 0;
 	$output = "Plugin,Load time (msecs),$accum\n";