jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

plugin optimisation - don't loop through every single plugin callback for every hook call, only those registered for that hook

Browse source
This commit is contained in:
friendica 2012-06-19 18:26:40 -07:00
parent 01aa953951
commit 1dd33770ed
2 changed files with 18 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
boot.php
View file

@ -77,14 +77,6 @@ define ( 'CONTACT_IS_SHARING', 2);
define ( 'CONTACT_IS_FRIEND', 3); define ( 'CONTACT_IS_FRIEND', 3);
/**
* Hook array order
*/
define ( 'HOOK_HOOK', 0);
define ( 'HOOK_FILE', 1);
define ( 'HOOK_FUNCTION', 2);
/** /**
* DB update return values * DB update return values
*/ */

23
include/plugin.php
View file

@ -148,7 +148,9 @@ function load_hooks() {
$r = q("SELECT * FROM `hook` WHERE 1"); $r = q("SELECT * FROM `hook` WHERE 1");
if(count($r)) { if(count($r)) {
foreach($r as $rr) { 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) { function call_hooks($name, &$data = null) {
$a = get_app(); $a = get_app();
if(count($a->hooks)) { if((is_array($a->hooks)) && (array_key_exists($name,$a->hooks))) {
foreach($a->hooks as $hook) { foreach($a->hooks[$name] as $hook) {
if($hook[HOOK_HOOK] === $name) { @include_once($hook[0]);
@include_once($hook[HOOK_FILE]); if(function_exists($hook[1])) {
if(function_exists($hook[HOOK_FUNCTION])) { $func = $hook[1];
$func = $hook[HOOK_FUNCTION];
$func($a,$data); $func($a,$data);
} }
else { else {
// remove orphan hooks // remove orphan hooks
q("delete from hook where hook = '%s' and file = '$s' and function = '%s' limit 1", q("delete from hook where hook = '%s' and file = '$s' and function = '%s' limit 1",
dbesc($hook[HOOK_HOOK]), dbesc($name),
dbesc($hook[HOOK_FILE]), dbesc($hook[0]),
dbesc($hook[HOOK_FUNCTION]) dbesc($hook[1])
); );
} }
} }
} }
}
}} }}