mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

MFC 13723 - Here's another 7-10 second speedup on my 4801 by caching the carp interface counters

Browse Source
This commit is contained in:
Bill Marquette 2006-08-11 03:34:54 +00:00
parent 547a126d24
commit 7b2d4769ca
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etc/inc/interfaces.inc
View File

@ -422,6 +422,9 @@ function interfaces_carp_configure() {
unmute_kernel_msgs();
echo "done.\n";
}
/* update cache */
find_number_of_created_carp_interfaces();
}
function interfaces_carp_bring_up_final() {

29
etc/inc/pfsense-utils.inc
View File

@ -56,6 +56,9 @@ function reset_carp() {
mwexec("/sbin/sysctl net.inet.carp.allow=1");
interfaces_carp_configure();
interfaces_carp_bring_up_final();
/* update cache */
find_number_of_created_carp_interfaces();
}
/****f* pfsense-utils/get_dns_servers
@ -402,18 +405,22 @@ function is_interface_wireless($interface) {
* $tmp - Number of currently created CARP interfaces.
******/
function find_number_of_created_carp_interfaces() {
$command = "/sbin/ifconfig | /usr/bin/grep \"carp*:\" | /usr/bin/wc -l";
$fd = popen($command . " 2>&1 ", "r");
if(!$fd) {
log_error("Warning, could not execute command {$command}");
return 0;
global $carp_interface_count_cache;
if (!isset($carp_interface_count_cache)) {
$command = "/sbin/ifconfig | /usr/bin/grep \"carp*:\" | /usr/bin/wc -l";
$fd = popen($command . " 2>&1 ", "r");
if(!$fd) {
log_error("Warning, could not execute command {$command}");
return 0;
}
while(!feof($fd)) {
$tmp .= fread($fd,49);
}
fclose($fd);
$carp_interface_count_cache = intval($tmp);
}
while(!feof($fd)) {
$tmp .= fread($fd,49);
}
fclose($fd);
$tmp = intval($tmp);
return $tmp;
return $carp_interface_count_cache;
}
/****f* pfsense-utils/link_int_to_bridge_interface