Changeset 56609 for trunk/src/wp-includes/class-wp-hook.php

Timestamp:

09/18/2023 12:39:18 PM (16 months ago)

Author:

spacedmonkey

Message:

Plugins: Store result of call to array_keys, to save repeated calls in WP_Hook class.

In the WP_Hook class the function array_keys was called every time an array of hook priorities was needed. For sites with lots of filters or actions, this would result in thousands of calls to the array_keys function, which uses server resources. Instead of recomputing this array every time it is needed, only compute it when filters are added and removed, then store the result as a class property. Improve unit tests to ensure this behaviour is tested.

Props spacedmonkey, bor0, flixos90, hellofromTonya, mukesh27.
Fixes #58458.

File:

• trunk/src/wp-includes/class-wp-hook.php (modified) (9 diffs)

trunk/src/wp-includes/class-wp-hook.php

@@ -28 +28 @@
 
     /**
+     * Priorities list.
+     *
+     * @since 6.4.0
+     * @var array
+     */
+    protected $priorities = array();
+
+    /**
      * The priority keys of actively running iterations of a hook.
      *
@@ -87 +95 @@
         }
 
+        $this->priorities = array_keys( $this->callbacks );
+
         if ( $this->nesting_level > 0 ) {
             $this->resort_active_iterations( $priority, $priority_existed );
@@ -103 +113 @@
      */
     private function resort_active_iterations( $new_priority = false, $priority_existed = false ) {
-        $new_priorities = array_keys( $this->callbacks );
+        $new_priorities = $this->priorities;
 
         // If there are no remaining hooks, clear out all running iterations.
@@ -187 +197 @@
             if ( ! $this->callbacks[ $priority ] ) {
                 unset( $this->callbacks[ $priority ] );
+
+                $this->priorities = array_keys( $this->callbacks );
 
                 if ( $this->nesting_level > 0 ) {
@@ -263 +275 @@
 
         if ( false === $priority ) {
-            $this->callbacks = array();
+            $this->callbacks  = array();
+            $this->priorities = array();
         } elseif ( isset( $this->callbacks[ $priority ] ) ) {
             unset( $this->callbacks[ $priority ] );
+            $this->priorities = array_keys( $this->callbacks );
         }
 
@@ -290 +304 @@
         $nesting_level = $this->nesting_level++;
 
-        $this->iterations[ $nesting_level ] = array_keys( $this->callbacks );
+        $this->iterations[ $nesting_level ] = $this->priorities;
 
         $num_args = count( $args );
@@ -349 +363 @@
     public function do_all_hook( &$args ) {
         $nesting_level                      = $this->nesting_level++;
-        $this->iterations[ $nesting_level ] = array_keys( $this->callbacks );
+        $this->iterations[ $nesting_level ] = $this->priorities;
 
         do {
@@ -482 +496 @@
             $this->callbacks[ $offset ] = $value;
         }
+
+        $this->priorities = array_keys( $this->callbacks );
     }
 
@@ -496 +512 @@
     public function offsetUnset( $offset ) {
         unset( $this->callbacks[ $offset ] );
+        $this->priorities = array_keys( $this->callbacks );
     }