Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions ext/apcinfo.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,27 @@
$detail = FALSE;
}

if(function_exists('apcu_cache_info')) {
//APCu
$cache_sys = array();
$cache_user = apcu_cache_info();
} elseif (!function_exists('apcu_cache_info') && function_exists('apc_cache_info')) {
//APC
$cache_sys = apc_cache_info('', true);
$cache_user = apc_cache_info('user', true);
} else {
die('Neither APC nor APCu installed.');
}

$cache_sys = apc_cache_info('', true);
$cache_user = apc_cache_info('user', true);
$mem = apc_sma_info(true);
$mem_detail = apc_sma_info();

foreach ($cache_sys as $key => $val) {
printf("%s:%s:%s\n",'cache_sys', $key, $val);
}

foreach ($cache_user as $key => $val) {
if(is_array($val)) continue;
printf("%s:%s:%s\n",'cache_user', $key, $val);
}

Expand Down
77 changes: 54 additions & 23 deletions pymunin/plugins/phpapcstats.py
Original file line number Diff line number Diff line change
Expand Up @@ -198,10 +198,12 @@ def retrieveVals(self):
apcinfo = APCinfo(self._host, self._port, self._user, self._password,
self._monpath, self._ssl, self._extras)
stats = apcinfo.getAllStats()
cache_user = stats.get('cache_user')
cache_sys = stats.get('cache_sys')

if self.hasGraph('php_apc_memory') and stats:
filecache = stats['cache_sys']['mem_size']
usercache = stats['cache_user']['mem_size']
filecache = cache_sys['mem_size'] if cache_sys is not None else 0
usercache = cache_user['mem_size']
total = stats['memory']['seg_size'] * stats['memory']['num_seg']
free = stats['memory']['avail_mem']
other = total - free - filecache - usercache
Expand All @@ -210,29 +212,58 @@ def retrieveVals(self):
self.setGraphVal('php_apc_memory', 'other', other)
self.setGraphVal('php_apc_memory', 'free', free)
if self.hasGraph('php_apc_items') and stats:
self.setGraphVal('php_apc_items', 'filecache',
stats['cache_sys']['num_entries'])
self.setGraphVal('php_apc_items', 'usercache',
stats['cache_user']['num_entries'])
if self.hasGraph('php_apc_reqs_filecache') and stats:
self.setGraphVal('php_apc_reqs_filecache', 'hits',
stats['cache_sys']['num_hits'])
self.setGraphVal('php_apc_reqs_filecache', 'misses',
stats['cache_sys']['num_misses'])
self.setGraphVal('php_apc_reqs_filecache', 'inserts',
stats['cache_sys']['num_inserts'])
if cache_sys is not None:
self.setGraphVal('php_apc_items', 'filecache',
cache_sys['num_entries'])

#APC
if cache_user and 'num_entries' in cache_user:
self.setGraphVal('php_apc_items', 'usercache',
cache_user['num_entries'])

#APCu
if cache_user and 'nentries' in cache_user:
self.setGraphVal('php_apc_items', 'usercache',
cache_user['nentries'])

if self.hasGraph('php_apc_reqs_filecache') and cache_sys is not None:
if cache_sys is not None:
self.setGraphVal('php_apc_reqs_filecache', 'hits',
cache_sys['num_hits'])
self.setGraphVal('php_apc_reqs_filecache', 'misses',
cache_sys['num_misses'])
self.setGraphVal('php_apc_reqs_filecache', 'inserts',
cache_sys['num_inserts'])

if self.hasGraph('php_apc_reqs_usercache') and stats:
self.setGraphVal('php_apc_reqs_usercache', 'hits',
stats['cache_user']['num_hits'])
self.setGraphVal('php_apc_reqs_usercache', 'misses',
stats['cache_user']['num_misses'])
self.setGraphVal('php_apc_reqs_usercache', 'inserts',
stats['cache_user']['num_inserts'])
if 'num_hits' in cache_user:
self.setGraphVal('php_apc_reqs_usercache', 'hits',
cache_user['num_hits'])
self.setGraphVal('php_apc_reqs_usercache', 'misses',
cache_user['num_misses'])
self.setGraphVal('php_apc_reqs_usercache', 'inserts',
cache_user['num_inserts'])

elif 'nhits' in cache_user:
self.setGraphVal('php_apc_reqs_usercache', 'hits',
cache_user['nhits'])
self.setGraphVal('php_apc_reqs_usercache', 'misses',
cache_user['nmisses'])
self.setGraphVal('php_apc_reqs_usercache', 'inserts',
cache_user['ninserts'])

if self.hasGraph('php_apc_expunge') and stats:
self.setGraphVal('php_apc_expunge', 'filecache',
stats['cache_sys']['expunges'])
self.setGraphVal('php_apc_expunge', 'usercache',
stats['cache_user']['expunges'])
if cache_sys is not None:
self.setGraphVal('php_apc_expunge', 'filecache',
cache_sys['expunges'])

if 'expunges' in cache_user:
self.setGraphVal('php_apc_expunge', 'usercache',
cache_user['expunges'])
elif 'nexpunges' in cache_user:
self.setGraphVal('php_apc_expunge', 'usercache',
cache_user['nexpunges'])

if self.hasGraph('php_apc_mem_util_frag'):
self.setGraphVal('php_apc_mem_util_frag', 'util',
stats['memory']['utilization_ratio'] * 100)
Expand Down