[Orca-checkins] r479 - in orca/trunk: . config data_gatherers/aix data_gatherers/hp lib/SE/3.2.1 lib/SE/3.3 lib/SE/3.3.1 lib/SE/3.4
blair at orcaware.com
blair at orcaware.com
Tue Aug 2 20:35:01 PDT 2005
Author: blair at orcaware.com
Date: Tue Aug 2 20:31:27 2005
New Revision: 479
Modified:
orca/trunk/CHANGES
orca/trunk/FAQ
orca/trunk/INSTALL
orca/trunk/README
orca/trunk/README.DEVELOPERS
orca/trunk/config/install-sh
orca/trunk/data_gatherers/aix/orca-aix-stat.pl.in
orca/trunk/data_gatherers/aix/orcallatorAIX.cfg
orca/trunk/data_gatherers/aix/orcallatorTSM.cfg
orca/trunk/data_gatherers/hp/hporcallator.cfg
orca/trunk/data_gatherers/hp/orca-hp-stat.pl.in
orca/trunk/data_gatherers/procallator/BUGS
orca/trunk/data_gatherers/procallator/CHANGES
orca/trunk/data_gatherers/procallator/README
orca/trunk/data_gatherers/procallator/TODO
orca/trunk/data_gatherers/procallator/procallator.cfg.in
orca/trunk/data_gatherers/procallator/procallator.pl.in
orca/trunk/data_gatherers/procallator/update_orca_server.sh.in
orca/trunk/lib/SE/3.2.1/live_rules.se
orca/trunk/lib/SE/3.2.1/orca_p_netstat_class.se
orca/trunk/lib/SE/3.2.1/orca_p_vmstat_class.se
orca/trunk/lib/SE/3.2.1/orca_process_class.se
orca/trunk/lib/SE/3.2.1/tapeinfo.se
orca/trunk/lib/SE/3.2.1/workinfo_class.se
orca/trunk/lib/SE/3.3.1/live_rules.se
orca/trunk/lib/SE/3.3.1/orca_p_netstat_class.se
orca/trunk/lib/SE/3.3.1/orca_p_vmstat_class.se
orca/trunk/lib/SE/3.3.1/orca_process_class.se
orca/trunk/lib/SE/3.3.1/tapeinfo.se
orca/trunk/lib/SE/3.3.1/workinfo_class.se
orca/trunk/lib/SE/3.3/live_rules.se
orca/trunk/lib/SE/3.3/orca_p_netstat_class.se
orca/trunk/lib/SE/3.3/orca_p_vmstat_class.se
orca/trunk/lib/SE/3.3/orca_process_class.se
orca/trunk/lib/SE/3.3/tapeinfo.se
orca/trunk/lib/SE/3.3/workinfo_class.se
orca/trunk/lib/SE/3.4/live_rules.se
orca/trunk/lib/SE/3.4/orca_p_netstat_class.se
orca/trunk/lib/SE/3.4/orca_p_vmstat_class.se
orca/trunk/lib/SE/3.4/orca_process_class.se
orca/trunk/lib/SE/3.4/workinfo_class.se
Log:
Trim all trailing whitespace from lines.
* CHANGES,
* config/install-sh,
* data_gatherers/aix/orca-aix-stat.pl.in,
* data_gatherers/aix/orcallatorAIX.cfg,
* data_gatherers/aix/orcallatorTSM.cfg,
* data_gatherers/hp/hporcallator.cfg,
* data_gatherers/hp/orca-hp-stat.pl.in,
* data_gatherers/procallator/BUGS,
* data_gatherers/procallator/CHANGES,
* data_gatherers/procallator/procallator.cfg.in,
* data_gatherers/procallator/procallator.pl.in,
* data_gatherers/procallator/README,
* data_gatherers/procallator/TODO,
* data_gatherers/procallator/update_orca_server.sh.in,
* FAQ,
* INSTALL,
* lib/SE/3.2.1/live_rules.se,
* lib/SE/3.2.1/orca_p_netstat_class.se,
* lib/SE/3.2.1/orca_process_class.se,
* lib/SE/3.2.1/orca_p_vmstat_class.se,
* lib/SE/3.2.1/tapeinfo.se,
* lib/SE/3.2.1/workinfo_class.se,
* lib/SE/3.3.1/live_rules.se,
* lib/SE/3.3.1/orca_p_netstat_class.se,
* lib/SE/3.3.1/orca_process_class.se,
* lib/SE/3.3.1/orca_p_vmstat_class.se,
* lib/SE/3.3.1/tapeinfo.se,
* lib/SE/3.3.1/workinfo_class.se,
* lib/SE/3.3/live_rules.se,
* lib/SE/3.3/orca_p_netstat_class.se,
* lib/SE/3.3/orca_process_class.se,
* lib/SE/3.3/orca_p_vmstat_class.se,
* lib/SE/3.3/tapeinfo.se,
* lib/SE/3.3/workinfo_class.se,
* lib/SE/3.4/live_rules.se,
* lib/SE/3.4/orca_p_netstat_class.se,
* lib/SE/3.4/orca_process_class.se,
* lib/SE/3.4/orca_p_vmstat_class.se,
* lib/SE/3.4/workinfo_class.se,
* README,
* README.DEVELOPERS:
Trim all trailing whitespace.
Modified: orca/trunk/CHANGES
==============================================================================
--- orca/trunk/CHANGES (original)
+++ orca/trunk/CHANGES Tue Aug 2 20:31:27 2005
@@ -455,7 +455,7 @@
WATCH_OS was defined, but if WATCH_DISK was defined and
WATCH_OS was not, then the new raw disk code was not being
used. This change makes the behavior consistent.
-
+
Sun Oct 21 14:40:41 PDT 2001 <blair at orcaware.com> Blair Zajac
* README: Add wish list URL.
Modified: orca/trunk/FAQ
==============================================================================
--- orca/trunk/FAQ (original)
+++ orca/trunk/FAQ Tue Aug 2 20:31:27 2005
@@ -471,7 +471,7 @@
#SE_PATCHES="$SE_PATCHES -DHME_PATCH"
#SE_PATCHES="$SE_PATCHES -DHME_PATCH_IFSPEED"
+SE_PATCHES="$SE_PATCHES -DMAX_IF=10"
-
+
# Check if the SE executable was found upon configure.
if test -z "$SE"; then
Modified: orca/trunk/INSTALL
==============================================================================
--- orca/trunk/INSTALL (original)
+++ orca/trunk/INSTALL Tue Aug 2 20:31:27 2005
@@ -138,7 +138,7 @@
Orca will only read each file every five minutes.
The HTML output directory is not set by default and must be
- specified by the Orca administrator with the
+ specified by the Orca administrator with the
--with-html-dir=DIR
Modified: orca/trunk/README
==============================================================================
--- orca/trunk/README (original)
+++ orca/trunk/README Tue Aug 2 20:31:27 2005
@@ -81,7 +81,7 @@
KEEPING BLAIR HAPPY
===================
-If you want to show your appreciation for Orca, go to
+If you want to show your appreciation for Orca, go to
http://www.orcaware.com/wish_list.html
Modified: orca/trunk/README.DEVELOPERS
==============================================================================
--- orca/trunk/README.DEVELOPERS (original)
+++ orca/trunk/README.DEVELOPERS Tue Aug 2 20:31:27 2005
@@ -256,11 +256,11 @@
'twirling_baton_fast', they may not find it if they just search for
"_fast". A better entry would be:
- * twirl.c
+ * twirl.c
(twirling_baton_fast, twirling_baton_slow): Removed these
- obsolete structures.
+ obsolete structures.
(handle_parser_warning): Pass data directly to callees, instead
- of storing in twirling_baton_*.
+ of storing in twirling_baton_*.
* twirl.h: Fix indentation.
Modified: orca/trunk/config/install-sh
==============================================================================
--- orca/trunk/config/install-sh (original)
+++ orca/trunk/config/install-sh Tue Aug 2 20:31:27 2005
@@ -115,7 +115,7 @@
if [ x"$dir_arg" != x ]; then
dst=$src
src=""
-
+
if [ -d $dst ]; then
instcmd=:
chmodcmd=""
@@ -125,7 +125,7 @@
else
# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad
+# might cause directories to be created, which would be especially bad
# if $src (and thus $dsttmp) contains '*'.
if [ -f $src -o -d $src ]
@@ -135,7 +135,7 @@
echo "install: $src does not exist"
exit 1
fi
-
+
if [ x"$dst" = x ]
then
echo "install: no destination specified"
@@ -163,7 +163,7 @@
# Skip lots of stat calls in the usual case.
if [ ! -d "$dstdir" ]; then
-defaultIFS='
+defaultIFS='
'
IFS="${IFS-${defaultIFS}}"
@@ -202,17 +202,17 @@
# If we're going to rename the final executable, determine the name now.
- if [ x"$transformarg" = x ]
+ if [ x"$transformarg" = x ]
then
dstfile=`basename $dst`
else
- dstfile=`basename $dst $transformbasename |
+ dstfile=`basename $dst $transformbasename |
sed $transformarg`$transformbasename
fi
# don't allow the sed command to completely eliminate the filename
- if [ x"$dstfile" = x ]
+ if [ x"$dstfile" = x ]
then
dstfile=`basename $dst`
else
@@ -243,7 +243,7 @@
# Now rename the file to the real destination.
$doit $rmcmd -f $dstdir/$dstfile &&
- $doit $mvcmd $dsttmp $dstdir/$dstfile
+ $doit $mvcmd $dsttmp $dstdir/$dstfile
fi &&
Modified: orca/trunk/data_gatherers/aix/orca-aix-stat.pl.in
==============================================================================
--- orca/trunk/data_gatherers/aix/orca-aix-stat.pl.in (original)
+++ orca/trunk/data_gatherers/aix/orca-aix-stat.pl.in Tue Aug 2 20:31:27 2005
@@ -1,25 +1,25 @@
# Collect general AIX performance statistics formatted for
# interpretation by Orca.
#
-# Usage:
+# Usage:
# The following variables may be set:
-#
+#
# OUT_ROOT root directory for data files (eg /opt/log/performance)
# INTERVAL the number of seconds between checks (eg 300 = 5 min)
# DURATION number of hours to run (eg 1 = 1 hr)
-#
+#
# This script runs various standard system utilities to collect
# system performance statistics and writes them out to datafile named
# HOSTNAME/stats.YYYY-MM-DD-HHmm under the OUT_ROOT directory.
-#
+#
# It runs for the the numbers specified by DURATION collecting data
# every INTERVAL number of seconds. After DURATION, the script
# closes and compresses it's datafile via /usr/bin/compress and then
# exits. If DURATION=24 and INTERVAL=300 (recommended) then the
# following cron entry would collect continuous stats for a system:
-#
+#
# 0 0 * * * /<PATH_TO_SCRIPT>/orca-aix-stat.pl
-#
+#
# 2003-09-10 - RV - Modified for AIX 4.3/5.x.. by Rajesh Verma
# (rajeshverma at aixdude.com)
# v1.7 - RV - ignores /proc now
@@ -312,7 +312,7 @@
$ipct_used, $mnt) = split;
# Recalculate percents because df rounds.
- $fs_info .= "\t"
+ $fs_info .= "\t"
. sprintf("%s\t%s\t%s\t%.5f\t%d\t%s\t%s\t%.5f",
$blocks,
$used,
Modified: orca/trunk/data_gatherers/aix/orcallatorAIX.cfg
==============================================================================
--- orca/trunk/data_gatherers/aix/orcallatorAIX.cfg (original)
+++ orca/trunk/data_gatherers/aix/orcallatorAIX.cfg Tue Aug 2 20:31:27 2005
@@ -56,7 +56,7 @@
# This sets the HTML markup that is placed at the very top of every
# web page and is primarly used to display the site's logo.
-html_page_header
+html_page_header
<tr>
</tr>
@@ -216,7 +216,7 @@
line_type stack
line_type stack
legend Working Segment
-legend Presistent Segment
+legend Presistent Segment
legend Client Segment
y_legend Number Of Bytes
data_min 0
@@ -234,8 +234,8 @@
data swap_free
line_type area
line_type stack
-legend Used swap space
-legend Free swap space
+legend Used swap space
+legend Free swap space
y_legend Bytes
base 1024
data_min 0
@@ -301,18 +301,18 @@
source orcallator
data disk_t/s
line_type area
-legend Number of transfer/s
+legend Number of transfer/s
y_legend Bytes/s
data_min 0
href http://www.orcaware.com/orca/docs/orcallator.html#disk_system_wide_transfer_rate
}
plot {
-title %g Number of Users
+title %g Number of Users
source orcallator
data nusr
line_type area
-legend Number of Users/s
+legend Number of Users/s
y_legend Users
data_min 0
href http://www.orcaware.com/orca/docs/orcallator.html#disk_system_wide_transfer_rate
@@ -323,7 +323,7 @@
source orcallator
data uptime /86400
line_type area
-legend Number of Day/s
+legend Number of Day/s
y_legend Days
data_min 0
href http://www.orcaware.com/orca/docs/orcallator.html#system_uptime
Modified: orca/trunk/data_gatherers/aix/orcallatorTSM.cfg
==============================================================================
--- orca/trunk/data_gatherers/aix/orcallatorTSM.cfg (original)
+++ orca/trunk/data_gatherers/aix/orcallatorTSM.cfg Tue Aug 2 20:31:27 2005
@@ -56,7 +56,7 @@
# This sets the HTML markup that is placed at the very top of every
# web page and is primarly used to display the site's logo.
-html_page_header
+html_page_header
<tr>
</tr>
Modified: orca/trunk/data_gatherers/hp/hporcallator.cfg
==============================================================================
--- orca/trunk/data_gatherers/hp/hporcallator.cfg (original)
+++ orca/trunk/data_gatherers/hp/hporcallator.cfg Tue Aug 2 20:31:27 2005
@@ -56,7 +56,7 @@
# This sets the HTML markup that is placed at the very top of every
# web page and is primarly used to display the site's logo.
-html_page_header
+html_page_header
<tr>
</tr>
@@ -141,7 +141,7 @@
title %g System Uptime
source orcallator
data uptime
-legend Uptime
+legend Uptime
y_legend Days
data_min 0
data_max 1000
@@ -224,7 +224,7 @@
line_type stack
line_type line2
legend Working Segment
-legend Presistent Segment
+legend Presistent Segment
legend Clinet Segment
legend Total Memory Used
y_legend Number Of Pages
@@ -245,9 +245,9 @@
line_type area
line_type stack
line_type stack
-legend Available swap space
-legend Available swap space
-legend Available swap space
+legend Available swap space
+legend Available swap space
+legend Available swap space
y_legend Bytes
base 1024
data_min 0
@@ -302,7 +302,7 @@
source orcallator
data disk_t/s
line_type area
-legend Number of transfer/s
+legend Number of transfer/s
y_legend Bytes/s
data_min 0
href http://www.orcaware.com/orca/docs/orcallator.html#disk_system_wide_transfer_rate
Modified: orca/trunk/data_gatherers/hp/orca-hp-stat.pl.in
==============================================================================
--- orca/trunk/data_gatherers/hp/orca-hp-stat.pl.in (original)
+++ orca/trunk/data_gatherers/hp/orca-hp-stat.pl.in Tue Aug 2 20:31:27 2005
@@ -1,25 +1,25 @@
# Collect general HP performance statistics formatted for
# interpretation by Orca.
#
-# Usage:
+# Usage:
# The following variables may be set:
-#
+#
# OUT_ROOT root directory for data files (eg /opt/log/performance)
# INTERVAL the number of seconds between checks (eg 300 = 5 min)
# DURATION number of hours to run (eg 1 = 1 hr)
-#
+#
# This script runs various standard system utilities to collect
# system performance statistics and writes them out to datafile named
# HOSTNAME/stats.YYYY-MM-DD-HHmm under the OUT_ROOT directory.
-#
+#
# It runs for the the numbers specified by DURATION collecting data
# every INTERVAL number of seconds. After DURATION, the script
# closes and compresses it's datafile via /usr/bin/compress and then
# exits. If DURATION=24 and INTERVAL=300 (recommended) then the
# following cron entry would collect continuous stats for a system:
-#
+#
# 0 0 * * * /<PATH_TO_SCRIPT>/orca-hp-stat.pl
-#
+#
# 2003-09-10 - RV - Modifies for HP ... Rajesh Verma(rajeshverma at aixdude.com)
# ver 1.0
# 2001-04-16 - JDK - Genesis... by Jason D. Kelleher
@@ -272,7 +272,7 @@
$ipct_used, $mnt) = split;
# Recalculate percents because df rounds.
- $fs_info .= "\t"
+ $fs_info .= "\t"
. sprintf("%s\t%s\t%s\t%.5f\t%d\t%s\t%s\t%.5f",
$blocks,
$used,
Modified: orca/trunk/data_gatherers/procallator/BUGS
==============================================================================
--- orca/trunk/data_gatherers/procallator/BUGS (original)
+++ orca/trunk/data_gatherers/procallator/BUGS Tue Aug 2 20:31:27 2005
@@ -2,8 +2,8 @@
Version 0.3 - and probably the older versions
- When running as a guest OS in MWARE Workstation the perl sleep function (that
- calls nanosleep system call) seems to hang when the virtual machine is idle
+ calls nanosleep system call) seems to hang when the virtual machine is idle
(or with low load). There is no known workaround, and apparently it happens
with other programs using this system call. Have to confirm that this occurs
- with other installations and verify viable alternatives, like time-hires or
+ with other installations and verify viable alternatives, like time-hires or
other ways to create reliable timers on vmware guests.
Modified: orca/trunk/data_gatherers/procallator/CHANGES
==============================================================================
--- orca/trunk/data_gatherers/procallator/CHANGES (original)
+++ orca/trunk/data_gatherers/procallator/CHANGES Tue Aug 2 20:31:27 2005
@@ -9,7 +9,7 @@
- Removed support for page-ins and page-outs metrics due to
misunderstood interpretations real meaning of values
- New cfg file, with better handling of tcp stats - every stat is now a
- counter and not gauges, this corrects the way the stats are plotted,
+ counter and not gauges, this corrects the way the stats are plotted,
sadly its not compatible with older versions
- Added IO Wait for 2.6 kernels
- Using real device names on disk statistics for 2.4 and 2.6 kernels
@@ -21,8 +21,8 @@
- Now it is integrated with orca install and makefiles
- Used perltidy to embelish and uniformize perl source code
IMPORTANT - Due to the various fixes and additions the new config file
- as well as the new collected files are not compatible with older
- versions, that way, using the new cfg with older collected data, or
+ as well as the new collected files are not compatible with older
+ versions, that way, using the new cfg with older collected data, or
the older cfg with newer collected data may lead to some problems, like
missing graphs and so. That way the upgrade should be planned with care
0.04 - Added support for @COMPRESS@ variable in configure scripts, defaults
Modified: orca/trunk/data_gatherers/procallator/README
==============================================================================
--- orca/trunk/data_gatherers/procallator/README (original)
+++ orca/trunk/data_gatherers/procallator/README Tue Aug 2 20:31:27 2005
@@ -1,6 +1,6 @@
Linux ORCA-aware statistics collector
-This piece of software is for use with Orca, by Blair Zajac -
+This piece of software is for use with Orca, by Blair Zajac -
http://www.orcaware.com/ - and intends to provide relevant system statistics
in a friendly and graphical interface.
@@ -14,7 +14,7 @@
Check the update_orca_server.sh script (I use it in crontab) for
reference on doing it.
-Installation:
+Installation:
The installation is quite simple. It installs with orca normal installations
For instructions check orca documents
Modified: orca/trunk/data_gatherers/procallator/TODO
==============================================================================
--- orca/trunk/data_gatherers/procallator/TODO (original)
+++ orca/trunk/data_gatherers/procallator/TODO Tue Aug 2 20:31:27 2005
@@ -1,7 +1,7 @@
Procallator TODO list:
-- Use the same names for data sets as in the Solaris version to use the same
+- Use the same names for data sets as in the Solaris version to use the same
config files -- that seems harder each version -> too many different metrics
-- Document and optimize collector source code. It is possible to do lots of
+- Document and optimize collector source code. It is possible to do lots of
optimizations and better memory handling
- Write better config file for network and NFS stats
- Add web server stats
Modified: orca/trunk/data_gatherers/procallator/procallator.cfg.in
==============================================================================
--- orca/trunk/data_gatherers/procallator/procallator.cfg.in (original)
+++ orca/trunk/data_gatherers/procallator/procallator.cfg.in Tue Aug 2 20:31:27 2005
@@ -45,7 +45,7 @@
# expressions use the word `interval' to get the interval number for
# the data source.
warn_email @WARN_EMAIL@
-late_interval interval + 30
+late_interval interval + 30
# These parameters specify which plots to generate.
generate_hourly_plot 0
@@ -107,9 +107,9 @@
title %g Average # Processes in Run Queue (Load Average) & number of CPUs
source procallator
data 1runq
-data 5runq
+data 5runq
data 15runq
-data ncpus
+data ncpus
color 00ff00
color 0000ff
color ff00ff
@@ -155,7 +155,7 @@
rigid_min_max 1
color 00ff00
color 0000ff
-color ffff4f
+color ffff4f
color ff0000
color ffffd0
href http://www.orcaware.com/orca/docs/procallator.html#cpu_usage
@@ -295,7 +295,7 @@
plot {
title %g Interface Input Bits Per Second
source procallator
-data 8 * if_in_b_(.*)
+data 8 * if_in_b_(.*)
line_type line1
legend $1
y_legend Bits/s
@@ -334,7 +334,7 @@
plot {
title %g Interface Output Packets Per Second
source procallator
-data if_out_p_(.*)
+data if_out_p_(.*)
line_type line1
legend $1
y_legend Packets/s
@@ -633,7 +633,7 @@
}
plot {
-title %g Physical Memory usage percent
+title %g Physical Memory usage percent
source procallator
data mem_used%
data mem_free%
Modified: orca/trunk/data_gatherers/procallator/procallator.pl.in
==============================================================================
--- orca/trunk/data_gatherers/procallator/procallator.pl.in (original)
+++ orca/trunk/data_gatherers/procallator/procallator.pl.in Tue Aug 2 20:31:27 2005
@@ -9,7 +9,7 @@
# $LastChangedRevision$
# $LastChangedDate$
# $LastChangedBy$
-#
+#
#This program is free software; you can redistribute it and/or
#modify it under the terms of the GNU General Public License
#as published by the Free Software Foundation; either version 2
Modified: orca/trunk/data_gatherers/procallator/update_orca_server.sh.in
==============================================================================
--- orca/trunk/data_gatherers/procallator/update_orca_server.sh.in (original)
+++ orca/trunk/data_gatherers/procallator/update_orca_server.sh.in Tue Aug 2 20:31:27 2005
@@ -1,5 +1,5 @@
server=Orca_Server::package
-host=`hostname`
+host=`hostname`
cd @VAR_DIR@/procallator:/$host
rsync --times --delete --recursive . $server/$host
cd /
Modified: orca/trunk/lib/SE/3.2.1/live_rules.se
==============================================================================
--- orca/trunk/lib/SE/3.2.1/live_rules.se (original)
+++ orca/trunk/lib/SE/3.2.1/live_rules.se Tue Aug 2 20:31:27 2005
@@ -1,7 +1,7 @@
/*
- Copyright (c) 1995-1998, by Sun Microsystems, Inc.
+ Copyright (c) 1995-1998, by Sun Microsystems, Inc.
All Rights Reserved
Written by Adrian Cockcroft, based on Appendix A of "Sun Performance
@@ -73,7 +73,7 @@
#include <p_iostat_class.se>
#include <p_netstat_class.se>
#include <p_vmstat_class.se>
-#include <pure_rules.se>
+#include <pure_rules.se>
*/
/* common string to use */
@@ -162,18 +162,18 @@
/* Disk I/O live rule - special extra disk type thresholds */
rule_thresh_dbl slowfd_thr = {"LR_DISK_SLOW_FD", 10.0, "x", 4, 1,
- "derate slow floppys" };
-rule_thresh_dbl slowcd_thr = {"LR_DISK_SLOW_CD", 10.0, "x", 4, 1,
- "derate slow CDs" };
+ "derate slow floppys" };
+rule_thresh_dbl slowcd_thr = {"LR_DISK_SLOW_CD", 10.0, "x", 4, 1,
+ "derate slow CDs" };
rule_thresh_str fdname = {"LR_DISK_FLOPPY", "fd0", "", 6, "default floppy device" };
rule_thresh_str cdname = {"LR_DISK_CDROM", "c0t6d0", "", 6, "default CD device" };
rule_thresh_str diskerr_thr = {"LR_DISK_ERROR", "new", "", 4, "report on <any> since boot, or only <new> errors" };
print_lr_disk(ulong f) {
print_thresh_dbl(f, slowfd_thr);
- print_thresh_dbl(f, slowcd_thr);
- print_thresh_str(f, fdname);
- print_thresh_str(f, cdname);
+ print_thresh_dbl(f, slowcd_thr);
+ print_thresh_str(f, fdname);
+ print_thresh_str(f, cdname);
print_thresh_str(f, diskerr_thr);
}
@@ -243,13 +243,13 @@
diskerr_mode = get_thresh_str(diskerr_thr);
GLOBAL_sderr = new ks_sderr[GLOBAL_sderr_size];
- GLOBAL_sderr_state = new int[GLOBAL_sderr_size];
- GLOBAL_sderr_errcnt = new int[GLOBAL_sderr_size];
+ GLOBAL_sderr_state = new int[GLOBAL_sderr_size];
+ GLOBAL_sderr_errcnt = new int[GLOBAL_sderr_size];
timestamp = time(0);
lasttime = timestamp;
GLOBAL_disk_update_time = timestamp;
-#ifdef LIVE_DISK_DEBUG
+#ifdef LIVE_DISK_DEBUG
debug_off();
#endif
return;
@@ -318,7 +318,7 @@
disk_count = GLOBAL_disk_count;
for(i=0; i < disk_count; i++){
states[i] = disk_rule.states[i];
- }
+ }
#ifdef LIVE_PRINTOUT
printf("\nDisk %-5s %s\n", state_string(state), action);
printf("disk r/s w/s Kr/s Kw/s wait actv svc_t %%w %%b State\n");
@@ -430,7 +430,7 @@
}
lasttime = timestamp;
-#ifdef LIVE_DISK_DEBUG
+#ifdef LIVE_DISK_DEBUG
debug_off();
#endif
}
@@ -459,21 +459,21 @@
char ifname[12];
int enet_count;
int net[MAX_IF]; /* index between ethernets and all nets */
-
+
if (timestamp == 0) { /* reset defaults */
GLOBAL_net[0] = p_netstat$GLOBAL_net;
net_count = GLOBAL_net[0].net_count;
for(i=1; i < GLOBAL_net[0].net_count; i++){
p_netstat$GLOBAL_net.number$ = i;
GLOBAL_net[i] = p_netstat$GLOBAL_net;
- }
+ }
net_rule.enet_count = net_count;
net_rule.timestamp = 0; /* force pure rule to reset */
refresh$(net_rule);
state = ST_GREEN; /* non-ethernets should default to ST_GREEN */
for(i=0; i < MAX_IF; i++){
states[i] = ST_GREEN;
- }
+ }
action = uninit;
explanation = action;
timestamp = time(0);
@@ -512,7 +512,7 @@
/* XXX: add code to check FDDI, ATM, token ring here */
states[i] = ST_GREEN; /* not an ethernet so assume its OK */
}
- }
+ }
net_rule.enet_count = enet_count;
net_rule.timestamp = timestamp;
refresh$(net_rule);
@@ -540,13 +540,13 @@
double badxids;
lr_rpcclient$()
- {
+ {
ulong lasttime = 0; /* previous timestamp */
ulong timestamp = 0;
pr_rpcclient_t rpcc_rule;
double ttmp;
double dtmp;
-
+
if (timestamp == 0) {
rpcc_rule.timestamp = 0;
refresh$(rpcc_rule);
@@ -567,10 +567,10 @@
return; /* wait at least a second between rule invocations */
}
/* use the rule */
- if (timestamp - GLOBAL_ks_rpc_client_update_time >=
+ if (timestamp - GLOBAL_ks_rpc_client_update_time >=
KS_RPC_CLIENT_UPDATE_RATE) {
GLOBAL_this_rpcc = kstat$GLOBAL_ks_rpc_client;
- GLOBAL_ks_rpc_client_update_time = lasttime;
+ GLOBAL_ks_rpc_client_update_time = lasttime;
}
ttmp = timestamp - lasttime; /* double temporaries */
dtmp = GLOBAL_this_rpcc.calls - GLOBAL_last_rpcc.calls;
@@ -613,13 +613,13 @@
int state;
string action;
string explanation;
-
+
lr_swapspace$()
{
ulong lasttime = 0; /* previous timestamp */
ulong timestamp = 0;
pr_swapspace_t swap_rule;
-
+
if (timestamp == 0) {
timestamp = time(0);
pvm_update(timestamp);
@@ -664,7 +664,7 @@
ulong timestamp = 0;
pr_ram_t ram_rule;
ulong pages;
-
+
if (timestamp == 0) {
ram_rule.timestamp = 0;
/* default max handspread is 64MB worth of pages */
@@ -777,19 +777,19 @@
lasttime = timestamp;
return;
}
- timestamp = time(0);
- if (timestamp == lasttime) {
+ timestamp = time(0);
+ if (timestamp == lasttime) {
return; /* wait at least a second between rule invocations */
}
/* use the rule */
pvm_update(timestamp);
cpu_rule.runque = GLOBAL_pvm[0].runque;
- cpu_rule.timestamp = timestamp;
+ cpu_rule.timestamp = timestamp;
refresh$(cpu_rule);
state = cpu_rule.state;
action = cpu_rule.action;
explanation = cpu_rule.explanation;
- lasttime = timestamp;
+ lasttime = timestamp;
}
};
@@ -802,14 +802,14 @@
string explanation;
int smtx; /* back compatible sum of p_vmstat.smtx for all cpus */
int ncpus; /* i.e. sysconf(_SC_NPROCESSORS_ONLN) */
-
+
lr_mutex$()
- {
+ {
ulong lasttime = 0; /* previous timestamp */
ulong timestamp = 0;
pr_mutex_t mutex_rule;
int i;
-
+
if (timestamp == 0) {
timestamp = time(0);
pvm_update(timestamp);
@@ -859,15 +859,15 @@
string explanation;
double refrate; /* current DNLC reference rate */
double hitrate; /* current DNLC hit rate */
-
+
lr_dnlc$()
- {
+ {
ulong lasttime = 0; /* previous timestamp */
ulong timestamp = 0;
pr_dnlc_t dnlc_rule;
ks_ncstats ncstats;
int i;
-
+
if (timestamp == 0) {
timestamp = time(0);
dnlc_rule.timestamp = 0;
Modified: orca/trunk/lib/SE/3.2.1/orca_p_netstat_class.se
==============================================================================
--- orca/trunk/lib/SE/3.2.1/orca_p_netstat_class.se (original)
+++ orca/trunk/lib/SE/3.2.1/orca_p_netstat_class.se Tue Aug 2 20:31:27 2005
@@ -176,7 +176,7 @@
/* grab the info for this net */
interface.number$ = i;
refresh$(interface);
-
+
/* compute new values */
pnetGLOB_net_ipackets[i] =
UD_DIFF(interface.ipackets, pnetGLOB_save_nets[i].ipackets) / et;
@@ -213,7 +213,7 @@
/* save old */
pnetGLOB_save_nets[i] = interface;
}
-
+
/* update and return */
strncpy(name$, pnetGLOB_save_nets[i].name$, 12);
ipackets = pnetGLOB_net_ipackets[i];
Modified: orca/trunk/lib/SE/3.2.1/orca_p_vmstat_class.se
==============================================================================
--- orca/trunk/lib/SE/3.2.1/orca_p_vmstat_class.se (original)
+++ orca/trunk/lib/SE/3.2.1/orca_p_vmstat_class.se Tue Aug 2 20:31:27 2005
@@ -170,7 +170,7 @@
/* memory values */
old_vminfo = kstat$vminfo;
old_sysinfo = kstat$info;
-
+
initialized = 1;
last_number = number$;
@@ -213,7 +213,7 @@
sysfork = pvmGLOB_cpu_sysinfo[i].sysfork/pvmGLOB_etime[i];
sysvfork = pvmGLOB_cpu_sysinfo[i].sysvfork/pvmGLOB_etime[i];
sysexec = pvmGLOB_cpu_sysinfo[i].sysexec/pvmGLOB_etime[i];
-
+
namei = pvmGLOB_cpu_sysinfo[i].namei/pvmGLOB_etime[i];
ufsiget = pvmGLOB_cpu_sysinfo[i].ufsiget/pvmGLOB_etime[i];
ufsdirblk = pvmGLOB_cpu_sysinfo[i].ufsdirblk/pvmGLOB_etime[i];
@@ -246,7 +246,7 @@
}
pvmGLOB_etime[i] = itime / hz;
pvmGLOB_old_time[i] = new_time;
-
+
csi.number$ = i;
refresh$(csi);
@@ -285,7 +285,7 @@
CSI_DIFF(ufsinopage);
- /* compute percentages
+ /* compute percentages
total = pvmGLOB_cpu_sysinfo[i].cpu[CPU_USER] +
pvmGLOB_cpu_sysinfo[i].cpu[CPU_KERNEL] +
pvmGLOB_cpu_sysinfo[i].cpu[CPU_WAIT] +
Modified: orca/trunk/lib/SE/3.2.1/orca_process_class.se
==============================================================================
--- orca/trunk/lib/SE/3.2.1/orca_process_class.se (original)
+++ orca/trunk/lib/SE/3.2.1/orca_process_class.se Tue Aug 2 20:31:27 2005
@@ -21,7 +21,7 @@
#include <se_trees.se>
#if MINOR_VERSION >= 60
#define PCSET 16 /* set modes from long argument */
-#define PCUNSET 17
+#define PCUNSET 17
long msaccton[2] = { PCSET, PR_MSACCT | PR_MSFORK };
long msacctoff[2] = { PCUNSET, PR_MSACCT };
@@ -41,7 +41,7 @@
/* index$ returns -1 if no more data */
/* proc data updates if index$ is -1 */
-struct pr_header_t {
+struct pr_header_t {
long number_lwps;
size_t size_of_entries;
};
@@ -77,7 +77,7 @@
char pr_fname[PRFNSZ]; // last component of execed pathname
#define PRARGSZ 80
char pr_psargs[PRARGSZ];// initial characters of arg list
- int lwp_count;
+ int lwp_count;
pointer_t olwp; // pointers to prev. lwp prusage linked list
pointer_t nlwp; // pointers to current lwp prusage linked list
};
@@ -111,7 +111,7 @@
ulong next_class;
};
/* the process class that does all the real work */
-
+
/* get both types of hires timestamp into a common more useful form */
double timestruc(timestruc_t ts_time)
{
@@ -136,16 +136,16 @@
printf("Elapsed time %12s ", hr_min_sec(pru.pr_rtime));
printf("Create time %s Timestamp %s\n", hr_min_sec(pru.pr_create),
hr_min_sec(pru.pr_tstamp));
- printf("User CPU time %12s ", hr_min_sec(pru.pr_utime));
- printf("System call time %12s\n", hr_min_sec(pru.pr_stime));
- printf("System trap time %12s ", hr_min_sec(pru.pr_ttime));
- printf("Text pfault sleep %12s\n", hr_min_sec(pru.pr_tftime));
- printf("Data pfault sleep %12s ", hr_min_sec(pru.pr_dftime));
- printf("Kernel pfault sleep %12s\n", hr_min_sec(pru.pr_kftime));
- printf("User lock sleep %12s ", hr_min_sec(pru.pr_ltime));
- printf("Other sleep time %12s\n", hr_min_sec(pru.pr_slptime));
- printf("Wait for CPU time %12s ", hr_min_sec(pru.pr_wtime));
- printf("Stopped time %12s\n", hr_min_sec(pru.pr_stoptime));
+ printf("User CPU time %12s ", hr_min_sec(pru.pr_utime));
+ printf("System call time %12s\n", hr_min_sec(pru.pr_stime));
+ printf("System trap time %12s ", hr_min_sec(pru.pr_ttime));
+ printf("Text pfault sleep %12s\n", hr_min_sec(pru.pr_tftime));
+ printf("Data pfault sleep %12s ", hr_min_sec(pru.pr_dftime));
+ printf("Kernel pfault sleep %12s\n", hr_min_sec(pru.pr_kftime));
+ printf("User lock sleep %12s ", hr_min_sec(pru.pr_ltime));
+ printf("Other sleep time %12s\n", hr_min_sec(pru.pr_slptime));
+ printf("Wait for CPU time %12s ", hr_min_sec(pru.pr_wtime));
+ printf("Stopped time %12s\n", hr_min_sec(pru.pr_stoptime));
printf("pf %d mf %d sw %d inb %d oub %d ms %d mr %d\n", pru.pr_minf, pru.pr_majf, pru.pr_nswap, pru.pr_inblk, pru.pr_oublk,
pru.pr_msnd, pru.pr_mrcv);
printf("sig %d vctx %d ictx %d sysc %d ioch %d\n", pru.pr_sigs, pru.pr_vctx,
@@ -159,7 +159,7 @@
/* for ACTION_PID mode set pid$ and set index$ to -1 to get new data */
int action$;
int off$;
- int wantlwp$; /* 0 = do not want lwps, 1 = want lsps */
+ int wantlwp$; /* 0 = do not want lwps, 1 = want lsps */
/* summary totals */
double lasttime; /* timestamp for the end of the last update */
int nproc; /* current number of processes */
@@ -218,7 +218,7 @@
char fname[PRFNSZ]; /* last components of exec'd pathname */
char args[PRARGSZ]; /* initial part of arg list */
ulong lwp_class_ptr; /* head of linked list of lwp_class_ptrs */
-
+
proc$() {
ulong MAX_PID;
ulong_t pp; /* pointer to malloc for raw proc info */
@@ -266,8 +266,8 @@
pointer_t olwp_t_ptr;
lwp_prusage lwp_t_struct;
lwp_prusage olwp_t_struct;
- lwp_pr_info lwp_t_class;
- long lwp_t_class_ptr;
+ lwp_pr_info lwp_t_class;
+ long lwp_t_class_ptr;
int ircw;
/* ********************************************************** */
@@ -438,7 +438,7 @@
err = read(lfd, lwp_t_ptr, sizeof(prh));
prh = *((pr_header_t *) lwp_t_ptr);
free(lwp_t_ptr);
- if (err <= 0){
+ if (err <= 0){
printf("Error reading pr_header %s error code = %d \n", lwpname, err); }
else { /* good read of pr_head */
/* printf (" size of lwp_prusage = %d, size from pr header = %d \n", sizeof(lwp_info), prh.size_of_entries ); */
@@ -481,7 +481,7 @@
} /* end of wantlwp */
/* ********** lwp info read ************************************** */
} /* good read on pfd */
-
+
if (new_entry == 1 ) {
rpi.nextpid = first_process;
first_process = process_number;
@@ -493,7 +493,7 @@
newproc++;
if (new_entry == 0) {
/* leftover from an old process at same pid */
- if (rpi.orp != NULL) {
+ if (rpi.orp != NULL) {
free(rpi.orp);
rpi.orp = NULL; /* dump old rp, and overwrite new */
}
@@ -556,7 +556,7 @@
/* go through list and remove deadwood */
/* printf("first process_number %d \n",first_process); */
process_number = first_process;
- next_process = -1;
+ next_process = -1;
previous_process = -1;
while ( process_number > 0 ) {
/* printf("processing %d \n",process_number); */
@@ -625,7 +625,7 @@
first_process = next_process;
}
} else {
- /* update previous process ptr */
+ /* update previous process ptr */
previous_process = process_number;
}
}
@@ -652,10 +652,10 @@
/* ran out of data */
process_number = -1;
index$ = -1;
- pid$ = -1;
+ pid$ = -1;
/* printf(" thats all there is \n"); */
- return;
- }
+ return;
+ }
index$++;
}
@@ -669,16 +669,16 @@
index$++;
/* look for the next data */
pp = NULL;
- pp_ret=int2int_get(pp_tree,process_number);
+ pp_ret=int2int_get(pp_tree,process_number);
if ( pp_ret != NULL ) {
- pp = ((ulong_t) *((ulong_t *) pp_ret));
+ pp = ((ulong_t) *((ulong_t *) pp_ret));
}
while (process_number < MAX_PID && pp == NULL) {
process_number++;
pp = NULL;
- pp_ret=int2int_get(pp_tree,process_number);
+ pp_ret=int2int_get(pp_tree,process_number);
if ( pp_ret != NULL ) {
- pp = ((ulong_t) *((ulong_t *) pp_ret));
+ pp = ((ulong_t) *((ulong_t *) pp_ret));
}
}
if (process_number < 0 || process_number > MAX_PID) {
@@ -702,7 +702,7 @@
pp_ret=int2int_get(pp_tree,process_number);
pp = NULL;
if (pp_ret != NULL) {
- pp = ((ulong_t) *((ulong_t *) pp_ret));
+ pp = ((ulong_t) *((ulong_t *) pp_ret));
}
if ( pp != NULL) {
rpi = *((raw_proc_info_t *) pp);
@@ -758,18 +758,18 @@
vcontexts = NU.pr_vctx - ou.pr_vctx;
icontexts = NU.pr_ictx - ou.pr_ictx;
charios = NU.pr_ioch - ou.pr_ioch;
- } else {
+ } else {
/* new process will only have rpi.nrp set */
interval = timestamp - creation; /* elapsed time so far */
if (interval == 0.0) {
printf("zero interval on pid %d state %c\n", pid$, rpi.pr_sname);
msprint(NU, pid$, fname, args);
interval = 1.0;
- }
+ }
user_time = total_user;
system_time = total_system;
sampled_cpu = total_sampled_cpu;
- trap_time = timestruc(NU.pr_ttime);
+ trap_time = timestruc(NU.pr_ttime);
child_time = total_child;
text_pf_time = timestruc(NU.pr_tftime);
data_pf_time = timestruc(NU.pr_dftime);
@@ -793,7 +793,7 @@
sched_class = rpi.pr_clname;
lwp_max = NU.pr_count;
lwp_count = rpi.lwp_count;
- ppid = rpi.pr_ppid;
+ ppid = rpi.pr_ppid;
bindpset = rpi.pr_bindpset;
fname = rpi.pr_fname;
if (fname == "" && rpi.pr_sname == 'Z') {
@@ -844,12 +844,12 @@
lwp_t_class.inblocks = lwp_t_struct.lwp_pru.pr_inblk ;
lwp_t_class.outblocks = lwp_t_struct.lwp_pru.pr_oublk ;
lwp_t_class.messages = lwp_t_struct.lwp_pru.pr_msnd + lwp_t_struct.lwp_pru.pr_mrcv;
- lwp_t_class.signals = lwp_t_struct.lwp_pru.pr_sigs;
- lwp_t_class.vcontexts = lwp_t_struct.lwp_pru.pr_vctx;
- lwp_t_class.icontexts = lwp_t_struct.lwp_pru.pr_ictx;
- lwp_t_class.syscalls = lwp_t_struct.lwp_pru.pr_sysc;
- lwp_t_class.charios = lwp_t_struct.lwp_pru.pr_ioch;
-
+ lwp_t_class.signals = lwp_t_struct.lwp_pru.pr_sigs;
+ lwp_t_class.vcontexts = lwp_t_struct.lwp_pru.pr_vctx;
+ lwp_t_class.icontexts = lwp_t_struct.lwp_pru.pr_ictx;
+ lwp_t_class.syscalls = lwp_t_struct.lwp_pru.pr_sysc;
+ lwp_t_class.charios = lwp_t_struct.lwp_pru.pr_ioch;
+
olwp_t_ptr = rpi.olwp;
while ( olwp_t_ptr != NULL ) {
olwp_t_struct = *((lwp_prusage *) olwp_t_ptr);
@@ -873,12 +873,12 @@
lwp_t_class.inblocks = lwp_t_class.inblocks - olwp_t_struct.lwp_pru.pr_inblk ;
lwp_t_class.outblocks = lwp_t_class.outblocks - olwp_t_struct.lwp_pru.pr_oublk ;
lwp_t_class.messages = lwp_t_class.messages - olwp_t_struct.lwp_pru.pr_msnd + lwp_t_struct.lwp_pru.pr_mrcv;
- lwp_t_class.signals = lwp_t_class.signals - olwp_t_struct.lwp_pru.pr_sigs;
- lwp_t_class.vcontexts = lwp_t_class.vcontexts - olwp_t_struct.lwp_pru.pr_vctx;
- lwp_t_class.icontexts = lwp_t_class.icontexts - olwp_t_struct.lwp_pru.pr_ictx;
- lwp_t_class.syscalls = lwp_t_class.syscalls - olwp_t_struct.lwp_pru.pr_sysc;
- lwp_t_class.charios = lwp_t_class.charios - olwp_t_struct.lwp_pru.pr_ioch;
-
+ lwp_t_class.signals = lwp_t_class.signals - olwp_t_struct.lwp_pru.pr_sigs;
+ lwp_t_class.vcontexts = lwp_t_class.vcontexts - olwp_t_struct.lwp_pru.pr_vctx;
+ lwp_t_class.icontexts = lwp_t_class.icontexts - olwp_t_struct.lwp_pru.pr_ictx;
+ lwp_t_class.syscalls = lwp_t_class.syscalls - olwp_t_struct.lwp_pru.pr_sysc;
+ lwp_t_class.charios = lwp_t_class.charios - olwp_t_struct.lwp_pru.pr_ioch;
+
} /* end of if old pointer */
lwp_t_class_ptr = malloc(sizeof(lwp_t_class));
memset(lwp_t_class_ptr, NULL, sizeof(lwp_t_class));
@@ -889,7 +889,7 @@
} /* end of while */
} /* end of if we have lwps */
}/* end of we want lwps */
-/* End if valid pp */
+/* End if valid pp */
}else {
process_number = -1;
index$ = -1;
@@ -898,5 +898,5 @@
}
}
};
-
-
+
+
Modified: orca/trunk/lib/SE/3.2.1/tapeinfo.se
==============================================================================
--- orca/trunk/lib/SE/3.2.1/tapeinfo.se (original)
+++ orca/trunk/lib/SE/3.2.1/tapeinfo.se Tue Aug 2 20:31:27 2005
@@ -258,7 +258,7 @@
// use this function to get the data for an index
tape_info_t
-tape_info(int i, string name)
+tape_info(int i, string name)
{
tape_info_t no_info;
Modified: orca/trunk/lib/SE/3.2.1/workinfo_class.se
==============================================================================
--- orca/trunk/lib/SE/3.2.1/workinfo_class.se (original)
+++ orca/trunk/lib/SE/3.2.1/workinfo_class.se Tue Aug 2 20:31:27 2005
@@ -187,7 +187,7 @@
firstmatch = atoi(fmstring);
} else {
// Default to each process in one workload only
- firstmatch = 1;
+ firstmatch = 1;
}
// Allocate memory for collecting totals
Modified: orca/trunk/lib/SE/3.3.1/live_rules.se
==============================================================================
--- orca/trunk/lib/SE/3.3.1/live_rules.se (original)
+++ orca/trunk/lib/SE/3.3.1/live_rules.se Tue Aug 2 20:31:27 2005
@@ -1,5 +1,5 @@
//
-// Copyright (c) 1995-1998, by Sun Microsystems, Inc.
+// Copyright (c) 1995-1998, by Sun Microsystems, Inc.
// All Rights Reserved
//
@@ -77,7 +77,7 @@
#include <p_iostat_class.se>
#include <p_netstat_class.se>
#include <p_vmstat_class.se>
-#include <pure_rules.se>
+#include <pure_rules.se>
*/
/* common string to use */
@@ -166,18 +166,18 @@
/* Disk I/O live rule - special extra disk type thresholds */
rule_thresh_dbl slowfd_thr = {"LR_DISK_SLOW_FD", 10.0, "x", 4, 1,
- "derate slow floppys" };
-rule_thresh_dbl slowcd_thr = {"LR_DISK_SLOW_CD", 10.0, "x", 4, 1,
- "derate slow CDs" };
+ "derate slow floppys" };
+rule_thresh_dbl slowcd_thr = {"LR_DISK_SLOW_CD", 10.0, "x", 4, 1,
+ "derate slow CDs" };
rule_thresh_str fdname = {"LR_DISK_FLOPPY", "fd0", "", 6, "default floppy device" };
rule_thresh_str cdname = {"LR_DISK_CDROM", "c0t6d0", "", 6, "default CD device" };
rule_thresh_str diskerr_thr = {"LR_DISK_ERROR", "new", "", 4, "report on <any> since boot, or only <new> errors" };
print_lr_disk(ulong f) {
print_thresh_dbl(f, slowfd_thr);
- print_thresh_dbl(f, slowcd_thr);
- print_thresh_str(f, fdname);
- print_thresh_str(f, cdname);
+ print_thresh_dbl(f, slowcd_thr);
+ print_thresh_str(f, fdname);
+ print_thresh_str(f, cdname);
print_thresh_str(f, diskerr_thr);
}
@@ -247,13 +247,13 @@
diskerr_mode = get_thresh_str(diskerr_thr);
GLOBAL_sderr = new ks_sderr[GLOBAL_sderr_size];
- GLOBAL_sderr_state = new int[GLOBAL_sderr_size];
- GLOBAL_sderr_errcnt = new int[GLOBAL_sderr_size];
+ GLOBAL_sderr_state = new int[GLOBAL_sderr_size];
+ GLOBAL_sderr_errcnt = new int[GLOBAL_sderr_size];
timestamp = time(0);
lasttime = timestamp;
GLOBAL_disk_update_time = timestamp;
-#ifdef LIVE_DISK_DEBUG
+#ifdef LIVE_DISK_DEBUG
debug_off();
#endif
return;
@@ -322,7 +322,7 @@
disk_count = GLOBAL_disk_count;
for(i=0; i < disk_count; i++){
states[i] = disk_rule.states[i];
- }
+ }
#ifdef LIVE_PRINTOUT
printf("\nDisk %-5s %s\n", state_string(state), action);
printf("disk r/s w/s Kr/s Kw/s wait actv svc_t %%w %%b State\n");
@@ -434,7 +434,7 @@
}
lasttime = timestamp;
-#ifdef LIVE_DISK_DEBUG
+#ifdef LIVE_DISK_DEBUG
debug_off();
#endif
}
@@ -463,21 +463,21 @@
char ifname[12];
int enet_count;
int net[MAX_IF]; /* index between ethernets and all nets */
-
+
if (timestamp == 0) { /* reset defaults */
GLOBAL_net[0] = p_netstat$GLOBAL_net;
net_count = GLOBAL_net[0].net_count;
for(i=1; i < GLOBAL_net[0].net_count; i++){
p_netstat$GLOBAL_net.number$ = i;
GLOBAL_net[i] = p_netstat$GLOBAL_net;
- }
+ }
net_rule.enet_count = net_count;
net_rule.timestamp = 0; /* force pure rule to reset */
refresh$(net_rule);
state = ST_GREEN; /* non-ethernets should default to ST_GREEN */
for(i=0; i < MAX_IF; i++){
states[i] = ST_GREEN;
- }
+ }
action = uninit;
explanation = action;
timestamp = time(0);
@@ -516,7 +516,7 @@
/* XXX: add code to check FDDI, ATM, token ring here */
states[i] = ST_GREEN; /* not an ethernet so assume its OK */
}
- }
+ }
net_rule.enet_count = enet_count;
net_rule.timestamp = timestamp;
refresh$(net_rule);
@@ -544,13 +544,13 @@
double badxids;
lr_rpcclient$()
- {
+ {
ulong lasttime = 0; /* previous timestamp */
ulong timestamp = 0;
pr_rpcclient_t rpcc_rule;
double ttmp;
double dtmp;
-
+
if (timestamp == 0) {
rpcc_rule.timestamp = 0;
refresh$(rpcc_rule);
@@ -571,10 +571,10 @@
return; /* wait at least a second between rule invocations */
}
/* use the rule */
- if (timestamp - GLOBAL_ks_rpc_client_update_time >=
+ if (timestamp - GLOBAL_ks_rpc_client_update_time >=
KS_RPC_CLIENT_UPDATE_RATE) {
GLOBAL_this_rpcc = kstat$GLOBAL_ks_rpc_client;
- GLOBAL_ks_rpc_client_update_time = lasttime;
+ GLOBAL_ks_rpc_client_update_time = lasttime;
}
ttmp = timestamp - lasttime; /* double temporaries */
dtmp = GLOBAL_this_rpcc.calls - GLOBAL_last_rpcc.calls;
@@ -617,13 +617,13 @@
int state;
string action;
string explanation;
-
+
lr_swapspace$()
{
ulong lasttime = 0; /* previous timestamp */
ulong timestamp = 0;
pr_swapspace_t swap_rule;
-
+
if (timestamp == 0) {
timestamp = time(0);
pvm_update(timestamp);
@@ -668,7 +668,7 @@
ulong timestamp = 0;
pr_ram_t ram_rule;
ulong pages;
-
+
if (timestamp == 0) {
ram_rule.timestamp = 0;
/* default max handspread is 64MB worth of pages */
@@ -803,19 +803,19 @@
lasttime = timestamp;
return;
}
- timestamp = time(0);
- if (timestamp == lasttime) {
+ timestamp = time(0);
+ if (timestamp == lasttime) {
return; /* wait at least a second between rule invocations */
}
/* use the rule */
pvm_update(timestamp);
cpu_rule.runque = GLOBAL_pvm[0].runque;
- cpu_rule.timestamp = timestamp;
+ cpu_rule.timestamp = timestamp;
refresh$(cpu_rule);
state = cpu_rule.state;
action = cpu_rule.action;
explanation = cpu_rule.explanation;
- lasttime = timestamp;
+ lasttime = timestamp;
}
};
@@ -828,14 +828,14 @@
string explanation;
int smtx; /* back compatible sum of p_vmstat.smtx for all cpus */
int ncpus; /* i.e. sysconf(_SC_NPROCESSORS_ONLN) */
-
+
lr_mutex$()
- {
+ {
ulong lasttime = 0; /* previous timestamp */
ulong timestamp = 0;
pr_mutex_t mutex_rule;
int i;
-
+
if (timestamp == 0) {
timestamp = time(0);
pvm_update(timestamp);
@@ -885,9 +885,9 @@
string explanation;
double refrate; /* current DNLC reference rate */
double hitrate; /* current DNLC hit rate */
-
+
lr_dnlc$()
- {
+ {
ulong lasttime = 0; /* previous timestamp */
ulong timestamp = 0;
pr_dnlc_t dnlc_rule;
@@ -897,7 +897,7 @@
ks_ncstats ncstats;
#endif
int i;
-
+
if (timestamp == 0) {
timestamp = time(0);
dnlc_rule.timestamp = 0;
Modified: orca/trunk/lib/SE/3.3.1/orca_p_netstat_class.se
==============================================================================
--- orca/trunk/lib/SE/3.3.1/orca_p_netstat_class.se (original)
+++ orca/trunk/lib/SE/3.3.1/orca_p_netstat_class.se Tue Aug 2 20:31:27 2005
@@ -176,7 +176,7 @@
/* grab the info for this net */
interface.number$ = i;
refresh$(interface);
-
+
/* compute new values */
pnetGLOB_net_ipackets[i] =
UD_DIFF(interface.ipackets, pnetGLOB_save_nets[i].ipackets) / et;
@@ -213,7 +213,7 @@
/* save old */
pnetGLOB_save_nets[i] = interface;
}
-
+
/* update and return */
strncpy(name$, pnetGLOB_save_nets[i].name$, 12);
ipackets = pnetGLOB_net_ipackets[i];
Modified: orca/trunk/lib/SE/3.3.1/orca_p_vmstat_class.se
==============================================================================
--- orca/trunk/lib/SE/3.3.1/orca_p_vmstat_class.se (original)
+++ orca/trunk/lib/SE/3.3.1/orca_p_vmstat_class.se Tue Aug 2 20:31:27 2005
@@ -170,7 +170,7 @@
/* memory values */
old_vminfo = kstat$vminfo;
old_sysinfo = kstat$info;
-
+
initialized = 1;
last_number = number$;
@@ -213,7 +213,7 @@
sysfork = pvmGLOB_cpu_sysinfo[i].sysfork/pvmGLOB_etime[i];
sysvfork = pvmGLOB_cpu_sysinfo[i].sysvfork/pvmGLOB_etime[i];
sysexec = pvmGLOB_cpu_sysinfo[i].sysexec/pvmGLOB_etime[i];
-
+
namei = pvmGLOB_cpu_sysinfo[i].namei/pvmGLOB_etime[i];
ufsiget = pvmGLOB_cpu_sysinfo[i].ufsiget/pvmGLOB_etime[i];
ufsdirblk = pvmGLOB_cpu_sysinfo[i].ufsdirblk/pvmGLOB_etime[i];
@@ -246,7 +246,7 @@
}
pvmGLOB_etime[i] = itime / hz;
pvmGLOB_old_time[i] = new_time;
-
+
csi.number$ = i;
refresh$(csi);
@@ -285,7 +285,7 @@
CSI_DIFF(ufsinopage);
- /* compute percentages
+ /* compute percentages
total = pvmGLOB_cpu_sysinfo[i].cpu[CPU_USER] +
pvmGLOB_cpu_sysinfo[i].cpu[CPU_KERNEL] +
pvmGLOB_cpu_sysinfo[i].cpu[CPU_WAIT] +
Modified: orca/trunk/lib/SE/3.3.1/orca_process_class.se
==============================================================================
--- orca/trunk/lib/SE/3.3.1/orca_process_class.se (original)
+++ orca/trunk/lib/SE/3.3.1/orca_process_class.se Tue Aug 2 20:31:27 2005
@@ -1,5 +1,5 @@
//
-// Copyright (c) 1995-1998, by Sun Microsystems, Inc.
+// Copyright (c) 1995-1998, by Sun Microsystems, Inc.
// All Rights Reserved
//
Modified: orca/trunk/lib/SE/3.3.1/tapeinfo.se
==============================================================================
--- orca/trunk/lib/SE/3.3.1/tapeinfo.se (original)
+++ orca/trunk/lib/SE/3.3.1/tapeinfo.se Tue Aug 2 20:31:27 2005
@@ -258,7 +258,7 @@
// use this function to get the data for an index
tape_info_t
-tape_info(int i, string name)
+tape_info(int i, string name)
{
tape_info_t no_info;
Modified: orca/trunk/lib/SE/3.3.1/workinfo_class.se
==============================================================================
--- orca/trunk/lib/SE/3.3.1/workinfo_class.se (original)
+++ orca/trunk/lib/SE/3.3.1/workinfo_class.se Tue Aug 2 20:31:27 2005
@@ -187,7 +187,7 @@
firstmatch = atoi(fmstring);
} else {
// Default to each process in one workload only
- firstmatch = 1;
+ firstmatch = 1;
}
// Allocate memory for collecting totals
Modified: orca/trunk/lib/SE/3.3/live_rules.se
==============================================================================
--- orca/trunk/lib/SE/3.3/live_rules.se (original)
+++ orca/trunk/lib/SE/3.3/live_rules.se Tue Aug 2 20:31:27 2005
@@ -1,5 +1,5 @@
//
-// Copyright (c) 1995-1998, by Sun Microsystems, Inc.
+// Copyright (c) 1995-1998, by Sun Microsystems, Inc.
// All Rights Reserved
//
@@ -77,7 +77,7 @@
#include <p_iostat_class.se>
#include <p_netstat_class.se>
#include <p_vmstat_class.se>
-#include <pure_rules.se>
+#include <pure_rules.se>
*/
/* common string to use */
@@ -166,18 +166,18 @@
/* Disk I/O live rule - special extra disk type thresholds */
rule_thresh_dbl slowfd_thr = {"LR_DISK_SLOW_FD", 10.0, "x", 4, 1,
- "derate slow floppys" };
-rule_thresh_dbl slowcd_thr = {"LR_DISK_SLOW_CD", 10.0, "x", 4, 1,
- "derate slow CDs" };
+ "derate slow floppys" };
+rule_thresh_dbl slowcd_thr = {"LR_DISK_SLOW_CD", 10.0, "x", 4, 1,
+ "derate slow CDs" };
rule_thresh_str fdname = {"LR_DISK_FLOPPY", "fd0", "", 6, "default floppy device" };
rule_thresh_str cdname = {"LR_DISK_CDROM", "c0t6d0", "", 6, "default CD device" };
rule_thresh_str diskerr_thr = {"LR_DISK_ERROR", "new", "", 4, "report on <any> since boot, or only <new> errors" };
print_lr_disk(ulong f) {
print_thresh_dbl(f, slowfd_thr);
- print_thresh_dbl(f, slowcd_thr);
- print_thresh_str(f, fdname);
- print_thresh_str(f, cdname);
+ print_thresh_dbl(f, slowcd_thr);
+ print_thresh_str(f, fdname);
+ print_thresh_str(f, cdname);
print_thresh_str(f, diskerr_thr);
}
@@ -247,13 +247,13 @@
diskerr_mode = get_thresh_str(diskerr_thr);
GLOBAL_sderr = new ks_sderr[GLOBAL_sderr_size];
- GLOBAL_sderr_state = new int[GLOBAL_sderr_size];
- GLOBAL_sderr_errcnt = new int[GLOBAL_sderr_size];
+ GLOBAL_sderr_state = new int[GLOBAL_sderr_size];
+ GLOBAL_sderr_errcnt = new int[GLOBAL_sderr_size];
timestamp = time(0);
lasttime = timestamp;
GLOBAL_disk_update_time = timestamp;
-#ifdef LIVE_DISK_DEBUG
+#ifdef LIVE_DISK_DEBUG
debug_off();
#endif
return;
@@ -322,7 +322,7 @@
disk_count = GLOBAL_disk_count;
for(i=0; i < disk_count; i++){
states[i] = disk_rule.states[i];
- }
+ }
#ifdef LIVE_PRINTOUT
printf("\nDisk %-5s %s\n", state_string(state), action);
printf("disk r/s w/s Kr/s Kw/s wait actv svc_t %%w %%b State\n");
@@ -434,7 +434,7 @@
}
lasttime = timestamp;
-#ifdef LIVE_DISK_DEBUG
+#ifdef LIVE_DISK_DEBUG
debug_off();
#endif
}
@@ -463,21 +463,21 @@
char ifname[12];
int enet_count;
int net[MAX_IF]; /* index between ethernets and all nets */
-
+
if (timestamp == 0) { /* reset defaults */
GLOBAL_net[0] = p_netstat$GLOBAL_net;
net_count = GLOBAL_net[0].net_count;
for(i=1; i < GLOBAL_net[0].net_count; i++){
p_netstat$GLOBAL_net.number$ = i;
GLOBAL_net[i] = p_netstat$GLOBAL_net;
- }
+ }
net_rule.enet_count = net_count;
net_rule.timestamp = 0; /* force pure rule to reset */
refresh$(net_rule);
state = ST_GREEN; /* non-ethernets should default to ST_GREEN */
for(i=0; i < MAX_IF; i++){
states[i] = ST_GREEN;
- }
+ }
action = uninit;
explanation = action;
timestamp = time(0);
@@ -516,7 +516,7 @@
/* XXX: add code to check FDDI, ATM, token ring here */
states[i] = ST_GREEN; /* not an ethernet so assume its OK */
}
- }
+ }
net_rule.enet_count = enet_count;
net_rule.timestamp = timestamp;
refresh$(net_rule);
@@ -544,13 +544,13 @@
double badxids;
lr_rpcclient$()
- {
+ {
ulong lasttime = 0; /* previous timestamp */
ulong timestamp = 0;
pr_rpcclient_t rpcc_rule;
double ttmp;
double dtmp;
-
+
if (timestamp == 0) {
rpcc_rule.timestamp = 0;
refresh$(rpcc_rule);
@@ -571,10 +571,10 @@
return; /* wait at least a second between rule invocations */
}
/* use the rule */
- if (timestamp - GLOBAL_ks_rpc_client_update_time >=
+ if (timestamp - GLOBAL_ks_rpc_client_update_time >=
KS_RPC_CLIENT_UPDATE_RATE) {
GLOBAL_this_rpcc = kstat$GLOBAL_ks_rpc_client;
- GLOBAL_ks_rpc_client_update_time = lasttime;
+ GLOBAL_ks_rpc_client_update_time = lasttime;
}
ttmp = timestamp - lasttime; /* double temporaries */
dtmp = GLOBAL_this_rpcc.calls - GLOBAL_last_rpcc.calls;
@@ -617,13 +617,13 @@
int state;
string action;
string explanation;
-
+
lr_swapspace$()
{
ulong lasttime = 0; /* previous timestamp */
ulong timestamp = 0;
pr_swapspace_t swap_rule;
-
+
if (timestamp == 0) {
timestamp = time(0);
pvm_update(timestamp);
@@ -668,7 +668,7 @@
ulong timestamp = 0;
pr_ram_t ram_rule;
ulong pages;
-
+
if (timestamp == 0) {
ram_rule.timestamp = 0;
/* default max handspread is 64MB worth of pages */
@@ -803,19 +803,19 @@
lasttime = timestamp;
return;
}
- timestamp = time(0);
- if (timestamp == lasttime) {
+ timestamp = time(0);
+ if (timestamp == lasttime) {
return; /* wait at least a second between rule invocations */
}
/* use the rule */
pvm_update(timestamp);
cpu_rule.runque = GLOBAL_pvm[0].runque;
- cpu_rule.timestamp = timestamp;
+ cpu_rule.timestamp = timestamp;
refresh$(cpu_rule);
state = cpu_rule.state;
action = cpu_rule.action;
explanation = cpu_rule.explanation;
- lasttime = timestamp;
+ lasttime = timestamp;
}
};
@@ -828,14 +828,14 @@
string explanation;
int smtx; /* back compatible sum of p_vmstat.smtx for all cpus */
int ncpus; /* i.e. sysconf(_SC_NPROCESSORS_ONLN) */
-
+
lr_mutex$()
- {
+ {
ulong lasttime = 0; /* previous timestamp */
ulong timestamp = 0;
pr_mutex_t mutex_rule;
int i;
-
+
if (timestamp == 0) {
timestamp = time(0);
pvm_update(timestamp);
@@ -885,9 +885,9 @@
string explanation;
double refrate; /* current DNLC reference rate */
double hitrate; /* current DNLC hit rate */
-
+
lr_dnlc$()
- {
+ {
ulong lasttime = 0; /* previous timestamp */
ulong timestamp = 0;
pr_dnlc_t dnlc_rule;
@@ -897,7 +897,7 @@
ks_ncstats ncstats;
#endif
int i;
-
+
if (timestamp == 0) {
timestamp = time(0);
dnlc_rule.timestamp = 0;
Modified: orca/trunk/lib/SE/3.3/orca_p_netstat_class.se
==============================================================================
--- orca/trunk/lib/SE/3.3/orca_p_netstat_class.se (original)
+++ orca/trunk/lib/SE/3.3/orca_p_netstat_class.se Tue Aug 2 20:31:27 2005
@@ -176,7 +176,7 @@
/* grab the info for this net */
interface.number$ = i;
refresh$(interface);
-
+
/* compute new values */
pnetGLOB_net_ipackets[i] =
UD_DIFF(interface.ipackets, pnetGLOB_save_nets[i].ipackets) / et;
@@ -213,7 +213,7 @@
/* save old */
pnetGLOB_save_nets[i] = interface;
}
-
+
/* update and return */
strncpy(name$, pnetGLOB_save_nets[i].name$, 12);
ipackets = pnetGLOB_net_ipackets[i];
Modified: orca/trunk/lib/SE/3.3/orca_p_vmstat_class.se
==============================================================================
--- orca/trunk/lib/SE/3.3/orca_p_vmstat_class.se (original)
+++ orca/trunk/lib/SE/3.3/orca_p_vmstat_class.se Tue Aug 2 20:31:27 2005
@@ -170,7 +170,7 @@
/* memory values */
old_vminfo = kstat$vminfo;
old_sysinfo = kstat$info;
-
+
initialized = 1;
last_number = number$;
@@ -213,7 +213,7 @@
sysfork = pvmGLOB_cpu_sysinfo[i].sysfork/pvmGLOB_etime[i];
sysvfork = pvmGLOB_cpu_sysinfo[i].sysvfork/pvmGLOB_etime[i];
sysexec = pvmGLOB_cpu_sysinfo[i].sysexec/pvmGLOB_etime[i];
-
+
namei = pvmGLOB_cpu_sysinfo[i].namei/pvmGLOB_etime[i];
ufsiget = pvmGLOB_cpu_sysinfo[i].ufsiget/pvmGLOB_etime[i];
ufsdirblk = pvmGLOB_cpu_sysinfo[i].ufsdirblk/pvmGLOB_etime[i];
@@ -246,7 +246,7 @@
}
pvmGLOB_etime[i] = itime / hz;
pvmGLOB_old_time[i] = new_time;
-
+
csi.number$ = i;
refresh$(csi);
@@ -285,7 +285,7 @@
CSI_DIFF(ufsinopage);
- /* compute percentages
+ /* compute percentages
total = pvmGLOB_cpu_sysinfo[i].cpu[CPU_USER] +
pvmGLOB_cpu_sysinfo[i].cpu[CPU_KERNEL] +
pvmGLOB_cpu_sysinfo[i].cpu[CPU_WAIT] +
Modified: orca/trunk/lib/SE/3.3/orca_process_class.se
==============================================================================
--- orca/trunk/lib/SE/3.3/orca_process_class.se (original)
+++ orca/trunk/lib/SE/3.3/orca_process_class.se Tue Aug 2 20:31:27 2005
@@ -1,5 +1,5 @@
//
-// Copyright (c) 1995-1998, by Sun Microsystems, Inc.
+// Copyright (c) 1995-1998, by Sun Microsystems, Inc.
// All Rights Reserved
//
Modified: orca/trunk/lib/SE/3.3/tapeinfo.se
==============================================================================
--- orca/trunk/lib/SE/3.3/tapeinfo.se (original)
+++ orca/trunk/lib/SE/3.3/tapeinfo.se Tue Aug 2 20:31:27 2005
@@ -258,7 +258,7 @@
// use this function to get the data for an index
tape_info_t
-tape_info(int i, string name)
+tape_info(int i, string name)
{
tape_info_t no_info;
Modified: orca/trunk/lib/SE/3.3/workinfo_class.se
==============================================================================
--- orca/trunk/lib/SE/3.3/workinfo_class.se (original)
+++ orca/trunk/lib/SE/3.3/workinfo_class.se Tue Aug 2 20:31:27 2005
@@ -187,7 +187,7 @@
firstmatch = atoi(fmstring);
} else {
// Default to each process in one workload only
- firstmatch = 1;
+ firstmatch = 1;
}
// Allocate memory for collecting totals
Modified: orca/trunk/lib/SE/3.4/live_rules.se
==============================================================================
--- orca/trunk/lib/SE/3.4/live_rules.se (original)
+++ orca/trunk/lib/SE/3.4/live_rules.se Tue Aug 2 20:31:27 2005
@@ -1,5 +1,5 @@
//
-// Copyright (c) 1995-1998, by Sun Microsystems, Inc.
+// Copyright (c) 1995-1998, by Sun Microsystems, Inc.
// All Rights Reserved
//
@@ -77,7 +77,7 @@
#include <p_iostat_class.se>
#include <p_netstat_class.se>
#include <p_vmstat_class.se>
-#include <pure_rules.se>
+#include <pure_rules.se>
*/
/* common string to use */
@@ -166,18 +166,18 @@
/* Disk I/O live rule - special extra disk type thresholds */
rule_thresh_dbl slowfd_thr = {"LR_DISK_SLOW_FD", 10.0, "x", 4, 1,
- "derate slow floppys" };
-rule_thresh_dbl slowcd_thr = {"LR_DISK_SLOW_CD", 10.0, "x", 4, 1,
- "derate slow CDs" };
+ "derate slow floppys" };
+rule_thresh_dbl slowcd_thr = {"LR_DISK_SLOW_CD", 10.0, "x", 4, 1,
+ "derate slow CDs" };
rule_thresh_str fdname = {"LR_DISK_FLOPPY", "fd0", "", 6, "default floppy device" };
rule_thresh_str cdname = {"LR_DISK_CDROM", "c0t6d0", "", 6, "default CD device" };
rule_thresh_str diskerr_thr = {"LR_DISK_ERROR", "new", "", 4, "report on <any> since boot, or only <new> errors" };
print_lr_disk(ulong f) {
print_thresh_dbl(f, slowfd_thr);
- print_thresh_dbl(f, slowcd_thr);
- print_thresh_str(f, fdname);
- print_thresh_str(f, cdname);
+ print_thresh_dbl(f, slowcd_thr);
+ print_thresh_str(f, fdname);
+ print_thresh_str(f, cdname);
print_thresh_str(f, diskerr_thr);
}
@@ -247,13 +247,13 @@
diskerr_mode = get_thresh_str(diskerr_thr);
GLOBAL_sderr = new ks_sderr[GLOBAL_sderr_size];
- GLOBAL_sderr_state = new int[GLOBAL_sderr_size];
- GLOBAL_sderr_errcnt = new int[GLOBAL_sderr_size];
+ GLOBAL_sderr_state = new int[GLOBAL_sderr_size];
+ GLOBAL_sderr_errcnt = new int[GLOBAL_sderr_size];
timestamp = time(0);
lasttime = timestamp;
GLOBAL_disk_update_time = timestamp;
-#ifdef LIVE_DISK_DEBUG
+#ifdef LIVE_DISK_DEBUG
debug_off();
#endif
return;
@@ -322,7 +322,7 @@
disk_count = GLOBAL_disk_count;
for(i=0; i < disk_count; i++){
states[i] = disk_rule.states[i];
- }
+ }
#ifdef LIVE_PRINTOUT
printf("\nDisk %-5s %s\n", state_string(state), action);
printf("disk r/s w/s Kr/s Kw/s wait actv svc_t %%w %%b State\n");
@@ -434,7 +434,7 @@
}
lasttime = timestamp;
-#ifdef LIVE_DISK_DEBUG
+#ifdef LIVE_DISK_DEBUG
debug_off();
#endif
}
@@ -463,21 +463,21 @@
char ifname[12];
int enet_count;
int net[MAX_IF]; /* index between ethernets and all nets */
-
+
if (timestamp == 0) { /* reset defaults */
GLOBAL_net[0] = p_netstat$GLOBAL_net;
net_count = GLOBAL_net[0].net_count;
for(i=1; i < GLOBAL_net[0].net_count; i++){
p_netstat$GLOBAL_net.number$ = i;
GLOBAL_net[i] = p_netstat$GLOBAL_net;
- }
+ }
net_rule.enet_count = net_count;
net_rule.timestamp = 0; /* force pure rule to reset */
refresh$(net_rule);
state = ST_GREEN; /* non-ethernets should default to ST_GREEN */
for(i=0; i < MAX_IF; i++){
states[i] = ST_GREEN;
- }
+ }
action = uninit;
explanation = action;
timestamp = time(0);
@@ -516,7 +516,7 @@
/* XXX: add code to check FDDI, ATM, token ring here */
states[i] = ST_GREEN; /* not an ethernet so assume its OK */
}
- }
+ }
net_rule.enet_count = enet_count;
net_rule.timestamp = timestamp;
refresh$(net_rule);
@@ -544,13 +544,13 @@
double badxids;
lr_rpcclient$()
- {
+ {
ulong lasttime = 0; /* previous timestamp */
ulong timestamp = 0;
pr_rpcclient_t rpcc_rule;
double ttmp;
double dtmp;
-
+
if (timestamp == 0) {
rpcc_rule.timestamp = 0;
refresh$(rpcc_rule);
@@ -571,10 +571,10 @@
return; /* wait at least a second between rule invocations */
}
/* use the rule */
- if (timestamp - GLOBAL_ks_rpc_client_update_time >=
+ if (timestamp - GLOBAL_ks_rpc_client_update_time >=
KS_RPC_CLIENT_UPDATE_RATE) {
GLOBAL_this_rpcc = kstat$GLOBAL_ks_rpc_client;
- GLOBAL_ks_rpc_client_update_time = lasttime;
+ GLOBAL_ks_rpc_client_update_time = lasttime;
}
ttmp = timestamp - lasttime; /* double temporaries */
dtmp = GLOBAL_this_rpcc.calls - GLOBAL_last_rpcc.calls;
@@ -617,13 +617,13 @@
int state;
string action;
string explanation;
-
+
lr_swapspace$()
{
ulong lasttime = 0; /* previous timestamp */
ulong timestamp = 0;
pr_swapspace_t swap_rule;
-
+
if (timestamp == 0) {
timestamp = time(0);
pvm_update(timestamp);
@@ -668,7 +668,7 @@
ulong timestamp = 0;
pr_ram_t ram_rule;
ulong pages;
-
+
if (timestamp == 0) {
ram_rule.timestamp = 0;
/* default max handspread is 64MB worth of pages */
@@ -803,19 +803,19 @@
lasttime = timestamp;
return;
}
- timestamp = time(0);
- if (timestamp == lasttime) {
+ timestamp = time(0);
+ if (timestamp == lasttime) {
return; /* wait at least a second between rule invocations */
}
/* use the rule */
pvm_update(timestamp);
cpu_rule.runque = GLOBAL_pvm[0].runque;
- cpu_rule.timestamp = timestamp;
+ cpu_rule.timestamp = timestamp;
refresh$(cpu_rule);
state = cpu_rule.state;
action = cpu_rule.action;
explanation = cpu_rule.explanation;
- lasttime = timestamp;
+ lasttime = timestamp;
}
};
@@ -828,14 +828,14 @@
string explanation;
int smtx; /* back compatible sum of p_vmstat.smtx for all cpus */
int ncpus; /* i.e. sysconf(_SC_NPROCESSORS_ONLN) */
-
+
lr_mutex$()
- {
+ {
ulong lasttime = 0; /* previous timestamp */
ulong timestamp = 0;
pr_mutex_t mutex_rule;
int i;
-
+
if (timestamp == 0) {
timestamp = time(0);
pvm_update(timestamp);
@@ -885,9 +885,9 @@
string explanation;
double refrate; /* current DNLC reference rate */
double hitrate; /* current DNLC hit rate */
-
+
lr_dnlc$()
- {
+ {
ulong lasttime = 0; /* previous timestamp */
ulong timestamp = 0;
pr_dnlc_t dnlc_rule;
@@ -897,7 +897,7 @@
ks_ncstats ncstats;
#endif
int i;
-
+
if (timestamp == 0) {
timestamp = time(0);
dnlc_rule.timestamp = 0;
Modified: orca/trunk/lib/SE/3.4/orca_p_netstat_class.se
==============================================================================
--- orca/trunk/lib/SE/3.4/orca_p_netstat_class.se (original)
+++ orca/trunk/lib/SE/3.4/orca_p_netstat_class.se Tue Aug 2 20:31:27 2005
@@ -176,7 +176,7 @@
/* grab the info for this net */
interface.number$ = i;
refresh$(interface);
-
+
/* compute new values */
pnetGLOB_net_ipackets[i] =
UD_DIFF(interface.ipackets, pnetGLOB_save_nets[i].ipackets) / et;
@@ -213,7 +213,7 @@
/* save old */
pnetGLOB_save_nets[i] = interface;
}
-
+
/* update and return */
strncpy(name$, pnetGLOB_save_nets[i].name$, 12);
ipackets = pnetGLOB_net_ipackets[i];
Modified: orca/trunk/lib/SE/3.4/orca_p_vmstat_class.se
==============================================================================
--- orca/trunk/lib/SE/3.4/orca_p_vmstat_class.se (original)
+++ orca/trunk/lib/SE/3.4/orca_p_vmstat_class.se Tue Aug 2 20:31:27 2005
@@ -170,7 +170,7 @@
/* memory values */
old_vminfo = kstat$vminfo;
old_sysinfo = kstat$info;
-
+
initialized = 1;
last_number = number$;
@@ -213,7 +213,7 @@
sysfork = pvmGLOB_cpu_sysinfo[i].sysfork/pvmGLOB_etime[i];
sysvfork = pvmGLOB_cpu_sysinfo[i].sysvfork/pvmGLOB_etime[i];
sysexec = pvmGLOB_cpu_sysinfo[i].sysexec/pvmGLOB_etime[i];
-
+
namei = pvmGLOB_cpu_sysinfo[i].namei/pvmGLOB_etime[i];
ufsiget = pvmGLOB_cpu_sysinfo[i].ufsiget/pvmGLOB_etime[i];
ufsdirblk = pvmGLOB_cpu_sysinfo[i].ufsdirblk/pvmGLOB_etime[i];
@@ -246,7 +246,7 @@
}
pvmGLOB_etime[i] = itime / hz;
pvmGLOB_old_time[i] = new_time;
-
+
csi.number$ = i;
refresh$(csi);
@@ -285,7 +285,7 @@
CSI_DIFF(ufsinopage);
- /* compute percentages
+ /* compute percentages
total = pvmGLOB_cpu_sysinfo[i].cpu[CPU_USER] +
pvmGLOB_cpu_sysinfo[i].cpu[CPU_KERNEL] +
pvmGLOB_cpu_sysinfo[i].cpu[CPU_WAIT] +
Modified: orca/trunk/lib/SE/3.4/orca_process_class.se
==============================================================================
--- orca/trunk/lib/SE/3.4/orca_process_class.se (original)
+++ orca/trunk/lib/SE/3.4/orca_process_class.se Tue Aug 2 20:31:27 2005
@@ -1,5 +1,5 @@
//
-// Copyright (c) 1995-1998, by Sun Microsystems, Inc.
+// Copyright (c) 1995-1998, by Sun Microsystems, Inc.
// All Rights Reserved
//
Modified: orca/trunk/lib/SE/3.4/workinfo_class.se
==============================================================================
--- orca/trunk/lib/SE/3.4/workinfo_class.se (original)
+++ orca/trunk/lib/SE/3.4/workinfo_class.se Tue Aug 2 20:31:27 2005
@@ -187,7 +187,7 @@
firstmatch = atoi(fmstring);
} else {
// Default to each process in one workload only
- firstmatch = 1;
+ firstmatch = 1;
}
// Allocate memory for collecting totals
More information about the Orca-checkins
mailing list