diff options
author | friendica <info@friendica.com> | 2012-06-19 18:26:40 -0700 |
---|---|---|
committer | friendica <info@friendica.com> | 2012-06-19 18:26:40 -0700 |
commit | 1dd33770ed906c5c264166ae592779023ad2f919 (patch) | |
tree | f0881c4295fab772923261faa28ddbe36b3f19f0 | |
parent | 01aa9539516a5a530c017a5effc9c186a4313649 (diff) | |
download | volse-hubzilla-1dd33770ed906c5c264166ae592779023ad2f919.tar.gz volse-hubzilla-1dd33770ed906c5c264166ae592779023ad2f919.tar.bz2 volse-hubzilla-1dd33770ed906c5c264166ae592779023ad2f919.zip |
plugin optimisation - don't loop through every single plugin callback for every hook call, only those registered for that hook
-rw-r--r-- | boot.php | 8 | ||||
-rw-r--r-- | include/plugin.php | 35 |
2 files changed, 18 insertions, 25 deletions
@@ -78,14 +78,6 @@ define ( 'CONTACT_IS_FRIEND', 3); /** - * Hook array order - */ - -define ( 'HOOK_HOOK', 0); -define ( 'HOOK_FILE', 1); -define ( 'HOOK_FUNCTION', 2); - -/** * DB update return values */ diff --git a/include/plugin.php b/include/plugin.php index ae8eee78a..c6b61ae6e 100644 --- a/include/plugin.php +++ b/include/plugin.php @@ -148,7 +148,9 @@ function load_hooks() { $r = q("SELECT * FROM `hook` WHERE 1"); if(count($r)) { foreach($r as $rr) { - $a->hooks[] = array($rr['hook'], $rr['file'], $rr['function']); + if(! array_key_exists($rr['hook'],$a->hooks)) + $a->hooks[$rr['hook']] = array(); + $a->hooks[$rr['hook']][] = array($rr['file'],$rr['function']); } } }} @@ -158,25 +160,24 @@ if(! function_exists('call_hooks')) { function call_hooks($name, &$data = null) { $a = get_app(); - if(count($a->hooks)) { - foreach($a->hooks as $hook) { - if($hook[HOOK_HOOK] === $name) { - @include_once($hook[HOOK_FILE]); - if(function_exists($hook[HOOK_FUNCTION])) { - $func = $hook[HOOK_FUNCTION]; - $func($a,$data); - } - else { - // remove orphan hooks - q("delete from hook where hook = '%s' and file = '$s' and function = '%s' limit 1", - dbesc($hook[HOOK_HOOK]), - dbesc($hook[HOOK_FILE]), - dbesc($hook[HOOK_FUNCTION]) - ); - } + if((is_array($a->hooks)) && (array_key_exists($name,$a->hooks))) { + foreach($a->hooks[$name] as $hook) { + @include_once($hook[0]); + if(function_exists($hook[1])) { + $func = $hook[1]; + $func($a,$data); + } + else { + // remove orphan hooks + q("delete from hook where hook = '%s' and file = '$s' and function = '%s' limit 1", + dbesc($name), + dbesc($hook[0]), + dbesc($hook[1]) + ); } } } + }} |