Project

General

Profile

« Previous | Next » 

Revision f8b00778

Added by Jim Pingle almost 12 years ago

Some more tweaks to state and mbuf update/output on dashboard widget.

View differences:

usr/local/www/includes/functions.inc.php
22 22
	$stats['cpufreq'] = get_cpufreq();
23 23
	$stats['load_average'] = get_load_average();
24 24
	$stats['mbuf'] = get_mbuf();
25
	$stats['mbufpercent'] = get_mbuf(true);
25 26
	$stats['statepercent'] = get_pfstate(true);
26 27
	$stats = join("|", $stats);
27 28
	return $stats;
......
151 152
		$curentries = $matches[1];
152 153
	}
153 154
	if ($percent)
154
		return ($curentries / $maxstates) * 100;
155
		return round(($curentries / $maxstates) * 100, 0);
155 156
	else
156 157
		return $curentries . "/" . $maxstates;
157 158
}
......
167 168
	return;
168 169
}
169 170

  
170
function get_mbuf() {
171
function get_mbuf($percent=false) {
171 172
	$mbufs_output=trim(`/usr/bin/netstat -mb | /usr/bin/grep "mbuf clusters in use" | /usr/bin/awk '{ print $1 }'`);
172 173
	list( $mbufs_current, $mbufs_cache, $mbufs_total, $mbufs_max ) = explode( "/", $mbufs_output);
173
	$mbufusage = round(($mbufs_total / $mbufs_max) * 100);
174
	return $mbufusage;
174
	if ($percent)
175
		return round(($mbufs_total / $mbufs_max) * 100, 0);
176
	else
177
		return "{$mbufs_total}/{$mbufs_max}";
175 178
}
176 179

  
177 180
function get_temp() {
usr/local/www/javascript/index/ajax.js
44 44
        updateCpuFreq(values[9]);
45 45
        updateLoadAverage(values[10]);
46 46
        updateMbuf(values[11]);
47
        updateStateMeter(values[12]);
47
        updateMbufMeter(values[12]);
48
        updateStateMeter(values[13]);
48 49
}
49 50

  
50 51
function updateMemory(x) {
......
57 58
}
58 59

  
59 60
function updateMbuf(x) {
61
	if(jQuery('#mbuf'))
62
		jQuery("#mbuf").html(x);
63
}
64

  
65
function updateMbufMeter(x) {
60 66
	if(jQuery('#mbufusagemeter'))
61 67
		jQuery("#mbufusagemeter").html(x + '%');
62 68
	if(jQuery('#mbufwidtha'))
usr/local/www/widgets/widgets/system_information.widget.php
199 199
			<td width="25%" class="vncellt">MBUF Usage</td>
200 200
			<td width="75%" class="listr">
201 201
				<?php
202
					$mbufs_output=trim(`netstat -mb | grep "mbuf clusters in use" | awk '{ print $1 }'`);
203
					list( $mbufs_current, $mbufs_cache, $mbufs_total, $mbufs_max ) = explode( "/", $mbufs_output);
204
					$mbufusage = sprintf("%.2f", ($mbufs_total / $mbufs_max) * 100);
202
					$mbufstext = get_mbuf();
203
					$mbufusage = get_mbuf(true);
205 204
				?>
206 205
				<img src="./themes/<?= $g['theme']; ?>/images/misc/bar_left.gif" height="15" width="4" border="0" align="middle" alt="left bar" /><img src="./themes/<?= $g['theme']; ?>/images/misc/bar_blue.gif" height="15" name="mbufwidtha" id="mbufwidtha" width="<?= round($mbufusage); ?>" border="0" align="middle" alt="red bar" /><img src="./themes/<?= $g['theme']; ?>/images/misc/bar_gray.gif" height="15" name="mbufwidthb" id="mbufwidthb" width="<?= (100 - $mbufusage); ?>" border="0" align="middle" alt="gray bar" /><img src="./themes/<?= $g['theme']; ?>/images/misc/bar_right.gif" height="15" width="5" border="0" align="middle" alt="right bar" />
207
				<br/><span id="mbufusagemeter"><?= $mbufusage.'%'; ?></span> (<?= $mbufs_total ?>/<?= $mbufs_max ?>)
206
				<br/><span id="mbufusagemeter"><?= $mbufusage.'%'; ?></span> (<span id="mbuf"><?= $mbufstext ?></span>)
208 207
			</td>
209 208
		</tr>
210 209
                <?php if (get_temp() != ""): ?>

Also available in: Unified diff