diff --git a/WebAdmin.iml b/WebAdmin.iml index 2d866e1..78b2cc5 100755 --- a/WebAdmin.iml +++ b/WebAdmin.iml @@ -1,31 +1,2 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/lib/libsigar-amd64-freebsd-6.so b/lib/libsigar-amd64-freebsd-6.so deleted file mode 100644 index 3e94f0d..0000000 Binary files a/lib/libsigar-amd64-freebsd-6.so and /dev/null differ diff --git a/lib/libsigar-amd64-linux.so b/lib/libsigar-amd64-linux.so deleted file mode 100644 index 5a2e4c2..0000000 Binary files a/lib/libsigar-amd64-linux.so and /dev/null differ diff --git a/lib/libsigar-amd64-solaris.so b/lib/libsigar-amd64-solaris.so deleted file mode 100644 index 6396482..0000000 Binary files a/lib/libsigar-amd64-solaris.so and /dev/null differ diff --git a/lib/libsigar-ia64-hpux-11.sl b/lib/libsigar-ia64-hpux-11.sl deleted file mode 100644 index d92ea4a..0000000 Binary files a/lib/libsigar-ia64-hpux-11.sl and /dev/null differ diff --git a/lib/libsigar-ia64-linux.so b/lib/libsigar-ia64-linux.so deleted file mode 100644 index 2bd2fc8..0000000 Binary files a/lib/libsigar-ia64-linux.so and /dev/null differ diff --git a/lib/libsigar-pa-hpux-11.sl b/lib/libsigar-pa-hpux-11.sl deleted file mode 100644 index 0dfd8a1..0000000 Binary files a/lib/libsigar-pa-hpux-11.sl and /dev/null differ diff --git a/lib/libsigar-ppc-aix-5.so b/lib/libsigar-ppc-aix-5.so deleted file mode 100644 index 7d4b519..0000000 Binary files a/lib/libsigar-ppc-aix-5.so and /dev/null differ diff --git a/lib/libsigar-ppc-linux.so b/lib/libsigar-ppc-linux.so deleted file mode 100644 index 4394b1b..0000000 Binary files a/lib/libsigar-ppc-linux.so and /dev/null differ diff --git a/lib/libsigar-ppc64-aix-5.so b/lib/libsigar-ppc64-aix-5.so deleted file mode 100644 index 35fd828..0000000 Binary files a/lib/libsigar-ppc64-aix-5.so and /dev/null differ diff --git a/lib/libsigar-ppc64-linux.so b/lib/libsigar-ppc64-linux.so deleted file mode 100644 index a1ba252..0000000 Binary files a/lib/libsigar-ppc64-linux.so and /dev/null differ diff --git a/lib/libsigar-s390x-linux.so b/lib/libsigar-s390x-linux.so deleted file mode 100644 index c275f4a..0000000 Binary files a/lib/libsigar-s390x-linux.so and /dev/null differ diff --git a/lib/libsigar-sparc-solaris.so b/lib/libsigar-sparc-solaris.so deleted file mode 100644 index aa847d2..0000000 Binary files a/lib/libsigar-sparc-solaris.so and /dev/null differ diff --git a/lib/libsigar-sparc64-solaris.so b/lib/libsigar-sparc64-solaris.so deleted file mode 100644 index 6c4fe80..0000000 Binary files a/lib/libsigar-sparc64-solaris.so and /dev/null differ diff --git a/lib/libsigar-universal-macosx.dylib b/lib/libsigar-universal-macosx.dylib deleted file mode 100644 index 27ab107..0000000 Binary files a/lib/libsigar-universal-macosx.dylib and /dev/null differ diff --git a/lib/libsigar-universal64-macosx.dylib b/lib/libsigar-universal64-macosx.dylib deleted file mode 100644 index 0c721fe..0000000 Binary files a/lib/libsigar-universal64-macosx.dylib and /dev/null differ diff --git a/lib/libsigar-x86-freebsd-5.so b/lib/libsigar-x86-freebsd-5.so deleted file mode 100644 index 8c50c61..0000000 Binary files a/lib/libsigar-x86-freebsd-5.so and /dev/null differ diff --git a/lib/libsigar-x86-freebsd-6.so b/lib/libsigar-x86-freebsd-6.so deleted file mode 100644 index f080027..0000000 Binary files a/lib/libsigar-x86-freebsd-6.so and /dev/null differ diff --git a/lib/libsigar-x86-linux.so b/lib/libsigar-x86-linux.so deleted file mode 100644 index a0b64ed..0000000 Binary files a/lib/libsigar-x86-linux.so and /dev/null differ diff --git a/lib/libsigar-x86-solaris.so b/lib/libsigar-x86-solaris.so deleted file mode 100644 index c6452e5..0000000 Binary files a/lib/libsigar-x86-solaris.so and /dev/null differ diff --git a/lib/sigar-amd64-winnt.dll b/lib/sigar-amd64-winnt.dll deleted file mode 100755 index 1ec8a03..0000000 Binary files a/lib/sigar-amd64-winnt.dll and /dev/null differ diff --git a/lib/sigar-x86-winnt.dll b/lib/sigar-x86-winnt.dll deleted file mode 100644 index 6afdc01..0000000 Binary files a/lib/sigar-x86-winnt.dll and /dev/null differ diff --git a/lib/sigar-x86-winnt.lib b/lib/sigar-x86-winnt.lib deleted file mode 100644 index 04924a1..0000000 Binary files a/lib/sigar-x86-winnt.lib and /dev/null differ diff --git a/lib/sigar.jar b/lib/sigar.jar deleted file mode 100644 index 58c733c..0000000 Binary files a/lib/sigar.jar and /dev/null differ diff --git a/lib/sigar_AUTHORS b/lib/sigar_AUTHORS deleted file mode 100644 index 40ca23a..0000000 --- a/lib/sigar_AUTHORS +++ /dev/null @@ -1,23 +0,0 @@ -Doug MacEachern - -Jan Kneschke - -Matthew Kent - -Ryan Beasley - -Bjoern Martin - -Kay Ropke - -Ryan Morgan - -Monty Taylor - -Trevor Pounds - -Jon Travis - -Tony Ashburner - -Ryan Bloom diff --git a/lib/sigar_ChangeLog b/lib/sigar_ChangeLog deleted file mode 100644 index 258ad1e..0000000 --- a/lib/sigar_ChangeLog +++ /dev/null @@ -1,1062 +0,0 @@ -2010-04-28 Doug MacEachern - - * 1.6.4 release - - * GPL v2 license -> Apache 2 license - - * (SIGAR-188) implement mem actual free/used on Windows - -2010-04-27 Doug MacEachern - - * (SIGAR-215) use swapctl SC_LIST for Solaris swap_get impl - -2010-04-15 Doug MacEachern - - * osf1 no longer supported - - * netware no longer supported - - * (SIGAR-201) JNIEnv->ExceptionCheck to avoid possible SEGV on OutOfMemoryError - -2010-04-14 Doug MacEachern - - * (SIGAR-192) avoid possible stack corruption in Windows proc_env impl - - * (SIGAR-213) check ENV.ANT_HOME/lib for junit in Main-Class - -2010-04-09 Doug MacEachern - - * (SIGAR-214) properly adjust jni.javahome when JAVA_HOME is not set - -2010-04-08 Doug MacEachern - - * cpptasks patches moved to http://github.com/dougm/ant-contrib-cpptasks - - * mv tools/PerfBrowser http://github.com/dougm/csharp-perfbrowser - - * mv exp/ http://github.com/dougm/sigar-stuff - -2010-04-07 Doug MacEachern - - * (SIGAR-213) remove junit.jar from distribution - - * (SIGAR-188) implement mem actual free/used on HPUX - - * (SIGAR-188) implement mem actual free/used on AIX - -2010-04-05 Doug MacEachern - - * (SIGAR-188) implement mem actual free/used on OpenBSD and NetBSD - - * (SIGAR-188) implement mem actual free/used on Solaris - -2010-04-02 Doug MacEachern - - * (SIGAR-212) pass LANG_ENGLISH to FormatMessage in Windows sigar_strerror impl - -2010-04-01 Doug MacEachern - - * (SIGAR-188) implement mem actual free/used on Windows - -2010-04-01 Trevor Pounds - - * (SIGAR-202) Change CreateFile() access flags to prevent potential inode calculation - errors on Windows when tailing a file. - -2010-04-01 Doug MacEachern - - * (SIGAR-207) append instance index in Pdh.getInstances() - -2010-03-31 Doug MacEachern - - * (SIGAR-207) Add Pdh.getCounterType method - - * (SIGAR-207) Add Pdh.getDescription method - - * (SIGAR-210) recognize cifs as a network file system - -2010-03-30 Doug MacEachern - - * (SIGAR-211) HPUX file_system_list needs to read /etc/mnttab instead of /etc/fstab - -2010-02-09 Doug MacEachern - - * add -i (inode format) support to df command - -2010-02-05 Doug MacEachern - - * (SIGAR-205) Vista and higher changed wireless card type to IF_TYPE_IEEE80211 - -2010-01-18 Doug MacEachern - - * rid dup in solaris route_list impl - -2010-01-17 Doug MacEachern - - * (SIGAR-181) fill-in sigar_net_route_t.ifname on HPUX - -2010-01-12 Doug MacEachern - - * (SIGAR-196) use pst_processor.psp_cpu_frequency to calculate cpu_info.mhz on HP-UX 11.31+ - -2010-01-04 Doug MacEachern - - * (SIGAR-194) sigar_file_system_t.dev_name on Windows should be the network path for remote drives - -2009-12-23 Doug MacEachern - - * (SIGAR-193) Migrate from mach/shared_memory_server.h to mach/shared_region.h on Darwin - -2009-11-09 Doug MacEachern - - * only display event code in toString as the Event Viewer does - - * 'N/A' for null user in EventLogRecord.toString - - * include the same fields as Event Viewer in EventLogRecord.toString - - * (SIGAR-191) fix EventLogRecord.computerName - - * (SIGAR-190) add category to EventLogRecord - -2009-11-05 Doug MacEachern - - * (SIGAR-189) ignore CP_WAIT time on HPUX - -2009-11-03 Doug MacEachern - - * (SIGAR-187) implement proc_exe on AIX - - * (SIGAR-188) implement mem actual free/used on MacOSX - -2009-11-02 Doug MacEachern - - * (SIGAR-188) implement mem actual free/used on FreeBSD - -2009-10-23 Doug MacEachern - - * Pdh test adjustments for windows 2000 - - * (SIGAR-185) fix RegistryKey open on windows 2000 - - * (SIGAR-186) fix Win32.getFileVersion on windows 2000 - -2009-09-30 Doug MacEachern - - * hpux pa 64-bit support - -2009-09-17 Doug MacEachern - - * 64-bit MacOSX 10.6 sdk does not support ppc64, switch from universal build to i386 only - -2009-09-15 Doug MacEachern - - * (SIGAR-181) net_route.ifname impl for Win32 - - * (SIGAR-181) net_route.ifname impl for MacOSX and *BSD - - * (SIGAR-182) use mib2_ip_t.ipRouteEntrySize to determine mib2_ipRouteEntry_t size - -2009-09-08 Doug MacEachern - - * fix MacOSX10.6.sdk build issues - -2009-09-01 Doug MacEachern - - * (SIGAR-168) always fallback to wmi when peb fails for proc_args - -2009-08-30 Doug MacEachern - - * 6.1 == Windows 7 - - * 10.6 == Snow Leopard - -2009-08-23 Doug MacEachern - - * (SIGAR-179) Increase buffer size in cpu_list query from 16 to 128 - -2009-08-11 Jan Kneschke - - * (SIGAR-137) sdl_data isn't 0-terminated - -2009-08-05 Doug MacEachern - - * try wmi if peb fails for proc_exe - - * add wmi proc_args wrapper - -2009-07-31 Doug MacEachern - - * only exclude nfs/rpcv2.h on FreeBSD 8+ - -2009-07-30 Doug MacEachern - - * net_route_list bandaid for FreeBSD 8.0 - - * sigar_proc_port_get does not compile on FreeBSD 8.0 - - * only need nfs/rpcv2.h on darwin - -2009-07-18 Doug MacEachern - - * (SIGAR-164) return ENXIO instead of ENOENT in disk_usage win32 impl - - * (SIGAR-164) return ENXIO instead of ENOENT in disk_usage linux impl - - * (SIGAR-164) return ENXIO instead of ENOENT in disk_usage aix impl - - * (SIGAR-164) return ENXIO instead of ESRCH in disk_usage darwin impl - -2009-07-17 Doug MacEachern - - * (SIGAR-163) Recognize cvfs (StorNext) as local filesystem type - -2009-07-16 Doug MacEachern - - * (SIGAR-162) plug possible memory leak in sigar_iodev_get util - -2009-07-14 Doug MacEachern - - * remove pdh.dll (only used on NT 4.0) - -2009-07-13 Doug MacEachern - - * (SIGAR-155) Plug memory leak sigar_proc_exe_get Darwin impl - - * bump version to 1.6.4 - -2008-07-13 Doug MacEachern - - * 1.6.3 release - -2009-07-08 Doug MacEachern - - * (SIGAR-130) Use pstat(PSTAT_GETCOMMANDLINE,...) on HP-UX < 11iv2 - - * (SIGAR-130) Use pstat_getcommandline on HP-UX 11iv2+ - - * (SIGAR-131) switch to pst_fileinfo2 on all HPUX flavors - -2009-07-08 Jon Travis - - * (SIGAR-150) Wrapper class to synchronize Sigar method invocation - -2009-07-07 Doug MacEachern - - * add getNetServicesName to SigarProxy interface - -2009-07-02 Doug MacEachern - - * (SIGAR-145) default to 'Irix mode' for proc_cpu.percent - - * (SIGAR-144) Solaris net_interface_stat should use 64-bit kstats - -2009-07-01 Doug MacEachern - - * (SIGAR-148) statfs usage compiled with LFS flags - -2009-06-30 Doug MacEachern - - * (SIGAR-152) Add support for 31-bit s390 builds - -2009-06-17 Doug MacEachern - - * darwin sigar_dlinfo_modules impl - -2009-06-06 Doug MacEachern - - * (SIGAR-151) Add Modules support to PTQL - -2009-06-01 Kay Röpke - - * (SIGAR-149) fix Darwin side of SIGAR-47: integer multlipcation overflow on - 32bit builds with more than 4GB available memory - -2009-05-24 Doug MacEachern - - * (SIGAR-142) loosen net_interface_list filters on MacOSX - -2009-05-15 Doug MacEachern - - * (SIGAR-150) make SigarProxyCached.invoke synchronized - -2009-05-13 Doug MacEachern - - * fix so SigarPermissionDeniedException is throw on open /dev/kmem EACCES - - * add 64-bit compile/link flags for AIX - - * require libperfstat on aix - -2009-04-25 Doug MacEachern - - * getrusage on NetBSD may not return monotonically increasing - values for CPU time. - - * (SIGAR-39) Use kern.cp_times in cpu_list on FreeBSD 7.x+ - -2009-03-27 Doug MacEachern - - * (SIGAR-141) sigar.jar location is not required to find native library - -2009-03-25 Doug MacEachern - - * (SIGAR-140) interface aliases are valid in sigar_net_interface_config_primary_get - -2008-02-13 Doug MacEachern - - * 1.6.2 release - -2009-02-12 Doug MacEachern - - * (SIGAR-134) use UNICODE in EventLog wrapper - -2009-02-10 Doug MacEachern - - * (SIGAR-73) check for 'ocfs' in addition to 'ocfs2' - -2009-02-08 Doug MacEachern - - * (SIGAR-138) Recognize zfs as local filesystem type - -2009-02-06 Doug MacEachern - - * fix osx version on 64-bit platforms - - * [SIGAR-133] use InputStream.skip (bytes) instead of Reader.skip (chars) in onChange - - * [SIGAR-132] Fix possible memory leak in sigar_rpc_ping - - * [SIGAR-129] fix possible integer overflow in time_now_millis - - * [SIGAR-129] add another sanity check - - * [SIGAR-129] prevent possible wrapping - - * [SIGAR-129] prevent possible integer overflow - - * [SIGAR-127] use KERN_ARGMAX for KERN_PROCARGS2 buffer size - - * [SIGAR-126] /dev/kmem not usable in aix 6 - - * rid "warning: cast from pointer to integer of different size" on 64-bit builds - - * [SIGAR-125] bring back /private/var/vm swap impl for osx 10.3 - - * [SIGAR-123] do not include global shared text+data region size - - * [SIGAR-122] ARG_MAX undefined on glibc 2.8 - -2008-09-13 Doug MacEachern - - * include ptql and log in dist headers - - * dont include ant and mx4j jars in dist - - * add cpu_perc typemap to bindings/perl - -2008-09-11 Doug MacEachern - - * [SIGAR-120] Support WoW registry reflection - -2008-09-08 Doug MacEachern - - * [SIGAR-119] Use 64-bit performance counter for uptime - -2008-09-06 Doug MacEachern - - * 1.6 released, change summary: - - * OpenBSD support (binaries not included) - - * NetBSD support (binaries not included) - - * CPU list functions now return entry per-core rather than - per-socket rollup - - * Added CPU irq, softirq and stolen metrics - - * PTQL enhancements for Windows Services - - * Added interface to Windows GetFileVersionInfo function - - * Bug fixes: http://jira.hyperic.com/secure/IssueNavigator.jspa?requestId=10710 - -2008-02-01 Doug MacEachern - - * 1.5 released, change summary: - - * PTQL impl ported from Java to C - - * Added api for TCP-MIB metrics - - * Added api for NFS client+server metrics - - * Started bindings for Ruby, Python and PHP - - * Bug fixes: http://jira.hyperic.com/secure/IssueNavigator.jspa?requestId=10500 - -2007-04-14 Doug MacEachern - - * 1.4 released - -2007-04-06 Doug MacEachern - - * [SIGAR-47] Fix sigar_mem_get on 64-bit FreeBSD - -2007-04-05 Doug MacEachern - - * Add net_listen_address function to lookup bind address of a listen socket - - * Add net_stat_port function to provide metrics on specific port+address - - * [SIGAR-46] Fix cpu_info.{mhz,cache_size} fields in UML vms - -2007-03-29 Doug MacEachern - - * Fix cpu ticks to msec on linux/ia64 - Submitted by: Jan Kneschke - -2007-03-24 Doug MacEachern - - * Implement proc_state_t.threads on OS X - -2007-03-11 Doug MacEachern - - * Implement native sigar_proc_cpu_get function - -2007-03-07 Doug MacEachern - - * Plug various handle+mem leaks on win32 - Submitted by: Jan Kneschke - -2007-03-04 Doug MacEachern - - * [SIGAR-29] Add pdh language translation support - - * Add RegistryKey.getMultiStringValue() - - * Add win32.LocaleInfo class - -2007-02-28 Doug MacEachern - - * Add signal name lookup support - -2007-02-24 Doug MacEachern - - * Make Java objects returned by Sigar class Serializable - -2007-02-21 Doug MacEachern - - * Perl binding updates - Submitted by: Nicolas Laurent - - * [SIGAR-45] Fix disk reads/writes for LVM managed volumes - -2007-02-15 Doug MacEachern - - * [SIGAR-42] Honor Solaris mnttab ignore flag in file_system_list - -2007-02-12 Doug MacEachern - - * [SIGAR-17] Fix possible bad cpu list number on Solaris - -2007-02-07 Doug MacEachern - - * Make sure solaris has _POSIX_PTHREAD_SEMANTICS defined - Submitted by: Jan Kneschke - -2007-02-06 Doug MacEachern - - * Fix possible overflow in FreeBSD cpu_get impl - Submitted by: Jan Kneschke - -2007-02-02 Doug MacEachern - - * [SIGAR-40] Change win32 file_system_list to ignore removable disks - such as floppy, usb, etc. - -2007-01-29 Doug MacEachern - - * [SIGAR-38] Change win32 swap_get to use GlobalMemoryStatusEx - -2007-01-24 Doug MacEachern - - * Add proper thread_cpu impl for OS X - -2007-01-23 Doug MacEachern - - * Fix proc_mem.size on HP-UX - Submitted by: Ragnar - -2007-01-22 Doug MacEachern - - * [SIGAR-32] Fix FileTail on Windows - -2007-01-19 Doug MacEachern - - * [SIGAR-31] Improve truncation detection in FileTail - -2007-01-18 Doug MacEachern - - * Add EventLog.getLogNames() method - -2007-01-17 Doug MacEachern - - * Various fixes for sparc64 - -2007-01-09 Doug MacEachern - - * Add XenSource vendor support to sys_info api - -2006-12-10 Doug MacEachern - - * 1.3 released - -2006-12-04 Doug MacEachern - - * Added Java wrapper for VMware vmcontrol API - - * [SIGAR-26] Change Pdh.getFormattedValue() to collect 2 counters if needed - -2006-12-03 Doug MacEachern - - * [SIGAR-19] Change cpu time units to milliseconds - -2006-11-05 Doug MacEachern - - * [SIGAR-23] Overhaul windows net_interface_* implementations to - ensure data is reported for the correct interface - -2006-11-03 Doug MacEachern - - * [SIGAR-24] Any network adapter with a description of - "Microsoft Loopback Adapter" is now flagged LOOPBACK - -2006-10-27 Doug MacEachern - - * [SIGAR-22] Prevent RuntimeException in FileTail impl from - killing the FileWatcherThread - -2006-10-24 Doug MacEachern - - * [SIGAR-20] Fix windows sigar_net_inteface_list to handle > 100 - interfaces (internal buffer size was fixed at 8k) - -2006-10-19 Doug MacEachern - - * Compile on Windows AMD x64 - Submitted by: Jan Kneschke - - * Changes to compile with modern visual studios on Windows - -2006-10-10 Doug MacEachern - - * [SIGAR-18] Change Linux impl to use strtoull() where appropriate - -2006-09-30 Doug MacEachern - - * OperatingSystem.java has been ported to the C sigar_sys_info API - -2006-09-21 Doug MacEachern - - * [SIGAR-15] Fix sigar_fqdn_get so 'hostname' won't be resolved to 'localhost.localdomain' - -2006-09-20 Doug MacEachern - - * Use kstat.cpu_info.brand to determine sigar_cpu_info_t.vendor on Solaris 10+ - - * Fix Linux cpu_info /proc/cpuinfo parsing on ia64 - -2006-09-08 Doug MacEachern - - * [SIGAR-13] Use EnumProcesses for sigar_proc_list_get on Win32 - -2006-09-07 Doug MacEachern - - * [SIGAR-14] Fix sigar_cpu_t.total on Linux and Solaris with multi-core CPUs - -2006-08-25 Doug MacEachern - - * Implement proc_env for Darwin - -2006-08-24 Doug MacEachern - - * Sigar.getProc*(String) methods now convert PTQL queries - -2006-08-04 Doug MacEachern - - * Port hpux impl to ia64 arch - -2006-07-24 Doug MacEachern - - * [SIGAR-11] Initialize log fields in solaris_sigar.c:sigar_os_open - -2006-07-15 Doug MacEachern - - * 1.2 released - - * [SIGAR-10] Fix sigar_net_info_get /etc/resolv.conf parsing - -2006-07-13 Doug MacEachern - - * Validate that sigar.jar is binary compatible with the native library - -2006-07-11 Doug MacEachern - - * Port linux impl to ppc64 arch - - * [SIGAR-9] Fix possible overflow in solaris sigar_mem_get impl - -2006-07-10 Doug MacEachern - - * [SIGAR-4] Implement native sigar_net_stat_get and use w/ Java - -2006-07-07 Doug MacEachern - - * [SIGAR-8] Change win32 mem_get to use GlobalMemoryStatusEx - -2006-07-06 Doug MacEachern - - * Change AIX impl to use libperfstat where available for net_interface_stat - - * Change sigar_net_route_t, net_interface_config_t and - sigar_net_connection_t to use sigar_net_address_t - -2006-06-30 Doug MacEachern - - * Remove mem.shared, gone in Linux 2.6 and which only left Solaris and Win32 - -2006-06-27 Doug MacEachern - - * Created SIGAR_1_1 branch, trunk is now 1.2 - - * Java net.hyperic package renamed to org.hyperic - -2006-06-21 Doug MacEachern - - * [SIGAR-7] Convert sectors to bytes in Linux file system - read/write bytes metrics - -2006-06-09 Doug MacEachern - - * [SIGAR-6] Use rounding for mem.ram on Linux rather than - /proc/mtrr if write-back registers don't add up to a reasonable number - - * [SIGAR-5] Fix netinfo default gateway where the first gateway in the routing table - had been selected without checking for the default destination == 0.0.0.0 - -2006-05-30 Doug MacEachern - - * Prevent possible integer overflow in filesystem_usage - -2006-05-24 Doug MacEachern - - * ProcUtil.getJavaMainClass improvements - -2006-05-04 Doug MacEachern - - * Fold UltraSPARC-T1 virtual cpus into physical cpus - - * Fix net_connection_list on linux to handle invalid /proc/net/tcp entries - - * Switch to universal binary for osx - -2006-04-03 Doug MacEachern - - * Fix sigar_proc_args_get on linux and osx when argv has an empty "" arg - -2006-03-31 Doug MacEachern - - * Added binary for FreeBSD 6.x - -2006-03-16 Doug MacEachern - - * Remove Darwin proc_mem.shared impl. More trouble that it is - worth and the code did not compile on x86. - -2006-03-14 Doug MacEachern - - * Enhance native library finder to work with -jar foo.jar and - within an IDE such as Eclipse - -2006-03-08 Doug MacEachern - - * 1.1.29 released - -2006-03-04 Doug MacEachern - - * Add net_interface_config.description - - * Use IFMIB (GetIfEntry) rather netbios to get hwaddr on Win32 - - * Add net_interface_config.mtu for Win32 - -2006-03-03 Doug MacEachern - - * Removed proc_mem.vsize (same as proc_mem.size) - - * Removed proc_mem.rss (same as proc_mem.resident) - -2006-03-01 Doug MacEachern - - * 1.1.28 released - -2006-02-28 Doug MacEachern - - * Add Sigar.getNetListenAddress method - - * Add Sigar.getNetInterfaceConfig() method - -2006-02-26 Doug MacEachern - - * Replace sigar_nfs_ping with generic sigar_rpc_ping - -2006-02-23 Doug MacEachern - - * Use asm/cpuid instead of /proc/cpuinfo to detect - HyperThreading on Linux - - * Use gethostbyname_r in sigar_fqdn_get - -2006-01-10 Doug MacEachern - - * Add ProcUtil class - - * Pdh: if counter name does not exist, try appending "/sec" - - * Add Win32.findExecutable method - - * Add win32.Service.{pause,resume} methods - -2006-01-04 Doug MacEachern - - * Fix cpu_list on Darwin - - * Add FreeBSD 4.x support - -2005-12-19 Doug MacEachern - - * 1.1.27 released - - * Add net_interface_config.mtu for Solaris, HPUX, AIX - - * Add version api for native binaries - - * Add dir_usage api, recursive version of dir_stat api - - * Add dir_stat.disk_usage field - -2005-12-12 Doug MacEachern - - * Fix internal hash table used for caching to properly rehash - - * Fix overzealous cache in net_interface_stat on Darwin - - * Solaris fixes to keep kstat chain up-to-date - - * Fallback to /usr/ucb/ps on solaris for proc_args if permissions - deny reading /proc/nnnnn/as - - * Add option to use sudo+cat with FileTail - -2005-12-05 Doug MacEachern - - * 1.1.26 released - - * Filter out network interface types other than loopback and - ethernet on Darwin and FreeBSD - - * Filter out auto-mounted filesystems on Darwin - -2005-12-01 Doug MacEachern - - * Fix net_route_list for Solaris 10 - - * Add sigar_cpu_info_t.{mhz,cache_size,model} for Darwin - - * Fix OperatingSystem.getDescription() for Darwin - -2005-11-28 Doug MacEachern - - * 1.1.25 released - - * Fix sigar_file_system_usage_t.free_files for Solaris and Darwin - -2005-11-23 Doug MacEachern - - * Add sigar_proc_mem page fault metrics for AIX, Darwin, HPUX, - Linux, Solaris and Win32 - -2005-11-22 Doug MacEachern - - * Add sigar_proc_state.processor for AIX, HPUX, Linux and - Solaris - - * Add sigar_proc_state.threads for AIX, HPUX, Linux (2.6+), - Solaris and Win32 - -2005-11-18 Doug MacEachern - - * net_interface related changes to support VMware vmnic - - * Add sigar_net_interface_config.type field - -2005-11-11 Doug MacEachern - - * Add dmalloc support for linux and solaris - (enable w/ -Djni.dmalloc=true) - -2005-11-08 Doug MacEachern - - * 1.1.24 released - - * fix possible segv in sigar_fqdn_get - - * fix possible fault in sigar_filesystem_usage_get on win32 if - LogicalDisk perf counters are uninstalled - -2005-11-01 Doug MacEachern - - * proc_mem.resident for all platforms - -2005-10-10 Doug MacEachern - - * 1.1.23 released - -2005-10-08 Doug MacEachern - - * Add support for solaris 'bge' network interface metrics - - * Add win32 sigar_who_list impl - - * sigar_proc_args fixes for linux and solaris - - * java -Dsigar.nativeLogging=true enables native logging - -2005-09-24 Doug MacEachern - - * 1.1.22 released - -2005-07-18 Doug MacEachern - - * Add net_info function - - * Add various helpers to OperatingSystem class - -2005-07-07 Doug MacEachern - - * Add resource_limit function - - * Fix sigar_file_attrs_get times on win32 - -2005-06-25 Doug MacEachern - - * Add win32 ServiceConfig class and Service.getConfig method - -2005-06-16 Doug MacEachern - - * 1.1.21 released - - * Implement proc_mem for Darwin - - * Include darwin binary (OSX Tiger) - -2005-06-14 Doug MacEachern - - * Pdh.getSingleValue renamed to Pdh.getRawValue - - * Added Pdh.getFormattedValue method - -2005-05-25 Doug MacEachern - - * Implement sigar_proc_args for Darwin - -2005-05-11 Doug MacEachern - - * 1.1.20 released - - * Use psapi instead of CreateTool32Snapshot in win32 sigar_proc_modules - It is possible for the latter to hang on win2k, the former also - works on NT. - - * Implement sigar_net_connection_list for AIX and HPUX - - * Convert Cpu times to seconds - -2005-05-10 Doug MacEachern - - * 1.1.19 released - -2005-04-27 Doug MacEachern - - * Add disk i/o metrics for Windows 2000 - - * Add file_system_usage_t.used field - -2005-04-06 Doug MacEachern - - * Add new disk i/o metrics (disk_write_bytes, disk_read_bytes, - disk_queue) for Win32, Linux, Solaris, AIX and HPUX. - -2005-03-19 Doug MacEachern - - * Add udp support to sigar_proc_port_get win32 impl - - * Implement sigar_proc_port_get for FreeBSD 5.x - -2005-03-15 Doug MacEachern - - * Change Sigar.getMountedFileSystemUsage to throw - NfsUnreachableException if FileSystem is Nfs and nfs ping fails - - * Implement sigar_net_connection for FreeBSD - - * Implement sigar_proc_port_get for AIX - -2005-03-11 Doug MacEachern - - * Add sigar.NetStat class - - * Add sigar_net_connection_t.state field - - * Add sigar_net_connection_t.{send,receive}_queue fields - - * Implement sigar_net_connection for solaris - - * Netstat enhancements - -2005-03-09 Doug MacEachern - - * Add CpuTimer class, helper around ThreadCpu class - -2005-03-01 Doug MacEachern - - * 1.1.18 released - - * fix bug in ptql args glob substring operators (Args.*.{sw,ew,ct}) - - * fix bug where Pentium III was reported as II - - * added OperatingSystem class to help determine linux - vendor/version info, etc. - -2005-02-24 Doug MacEachern - - * 1.1.17 released - - * Optimize aix disk i/o metric collection - - * Add 'time' command to the shell - -2005-02-23 Doug MacEachern - - * 1.1.16 released - - * Add function to get data seen in the 'who' command - -2005-02-20 Doug MacEachern - - * Add NfsFileSystem class w/ ping method - -2005-02-16 Doug MacEachern - - * Add FreeBSD support - - * Add 64-bit linux support - -2005-01-26 Doug MacEachern - - * 1.1.15 released - - * fix windows 2003 problem with metrics that use the perfdata - registry interface when pdh.dll functions are used by the same - process. - - * Pdh.getSingleValue now uses PdhGetRawCounterValue underneath - - * fix win32.Pdh.close method - - * fix win32.Service.finalize method - -2005-01-07 Doug MacEachern - - * implement thread-cpu metrics for aix - -2005-01-06 Doug MacEachern - - * 1.1.14 released - - * fix solaris bug w/ multiple network interfaces that have the - same name (hme0, hme1, etc) - - * fix bug in MultiProc that sometimes resulted in negative numbers - - * add win32.Service.getServiceNames method - -2004-12-11 Doug MacEachern - - * 1.1.13 released - -2004-12-06 Doug MacEachern - - * add iostat shell command - - * implement disk io metrics for aix, solaris and hpux - -2004-12-05 Doug MacEachern - - * added sigar_file_system_usage_t.disk_{reads,writes} fields. - implement only on linux and win32 for the moment. - -2004-11-29 Doug MacEachern - - * fix possible segfault in sigar_group_name_get if gid == -1 - -2004-11-22 Doug MacEachern - - * fix bug in RegistryKey.openSubKey under WebSphere 4.0 jdk - -2004-11-21 Doug MacEachern - - * 1.1.11 released - - * merged hyperic win32bindings package into sigar.win32 - - * added sigar_cpu_t.wait metric - -2004-11-19 Doug MacEachern - - * added sigar_mem_t.actual_{used,free} fields. - on linux for example adjusts -/+ buffers/cache - -2004-11-17 Doug MacEachern - - * added sigar_thread_cpu_t, per-thread cpu metrics - -2004-11-16 Doug MacEachern - - * 1.1.10 released - -2004-11-12 John Sachs - - * added sysinfo shell command - -2004-11-10 Doug MacEachern - - * added MultiProcCpu and MultiProcMem classes - - * added mps (multi-process ps) shell command - -2004-11-02 Doug MacEachern - - * fix cpu idle metric for windows 2000 and NT versions - -2004-10-05 Doug MacEachern - - * make sigar_swap and sigar_mem compatible with linux 2.6 kernel - -2004-09-07 Doug MacEachern - - * starting ChangeLog for version 1.1.10 - diff --git a/lib/sigar_LICENSE b/lib/sigar_LICENSE deleted file mode 100644 index 11069ed..0000000 --- a/lib/sigar_LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - -2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - -3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - -4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - -5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - -6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - -8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - -Copyright [yyyy] [name of copyright owner] - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. diff --git a/lib/sigar_NOTICE b/lib/sigar_NOTICE deleted file mode 100644 index 5c3ccaa..0000000 --- a/lib/sigar_NOTICE +++ /dev/null @@ -1,35 +0,0 @@ -Hyperic SIGAR includes some third-party open source components -in its distribution. The list below identifies the community or -organization and links to their appropriate license terms. - -The Hyperic team would like to thank all the communities -of the projects listed below for their contributions. ---------------------------------------------------------------------- - -The following components are included without modification: - -- log4j - -Information: http://logging.apache.org/ -License: http://www.apache.org/licenses/LICENSE-2.0 - -The following components are included with modification: - -- cpptasks - -Information: http://ant-contrib.sourceforge.net/ -License: http://ant-contrib.sourceforge.net/LICENSE.txt - -- (portions of) APR - -Information: http://apr.apache.org/ -License: http://www.apache.org/licenses/LICENSE-2.0 - -- solaris get_mib2 - -Information: ftp://vic.cc.purdue.edu/pub/tools/unix/solaris/get_mib2/ -License: within src/os/solaris/get_mib2.[ch] - -- getline by Chris Thewalt - -Information: http://tinyurl.com/r438r -License: within src/sigar_getline.c - -- PrintfFormat.java - -Information: http://java.sun.com/developer/technicalArticles/Programming/sprintf/PrintfFormat.java -License: within bindings/java/src/org/hyperic/sigar/util/PrintfFormat.java diff --git a/lib/sigar_README b/lib/sigar_README deleted file mode 100644 index ccbf285..0000000 --- a/lib/sigar_README +++ /dev/null @@ -1,2 +0,0 @@ -Visit the SIGAR Wiki for documentation, bugs, support, etc.: -http://sigar.hyperic.com/ diff --git a/lib/sigar_javadoc.zip b/lib/sigar_javadoc.zip deleted file mode 100644 index f415f28..0000000 Binary files a/lib/sigar_javadoc.zip and /dev/null differ diff --git a/src/examples/CpuInfo.java b/src/examples/CpuInfo.java deleted file mode 100755 index fa9eeec..0000000 --- a/src/examples/CpuInfo.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Copyright (C) [2004, 2005, 2006], Hyperic, Inc. - * This file is part of SIGAR. - * - * SIGAR is free software; you can redistribute it and/or modify - * it under the terms version 2 of the GNU General Public License as - * published by the Free Software Foundation. This program is distributed - * in the hope that it will be useful, but WITHOUT ANY WARRANTY; without - * even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU General Public License for more - * details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - */ - -package test; - -import org.hyperic.sigar.CpuPerc; -import org.hyperic.sigar.Sigar; -import org.hyperic.sigar.SigarException; -import org.hyperic.sigar.SigarLoader; -import org.hyperic.sigar.cmd.Shell; -import org.hyperic.sigar.cmd.SigarCommandBase; - -/** - * Display cpu information for each cpu found on the system. - */ -public class CpuInfo extends SigarCommandBase { - - public boolean displayTimes = true; - - public CpuInfo(Shell shell) { - super(shell); - } - - public CpuInfo() { - super(); - } - - public String getUsageShort() { - return "Display cpu information"; - } - - private void output(CpuPerc cpu) { - println("User Time....." + CpuPerc.format(cpu.getUser())); - println("Sys Time......" + CpuPerc.format(cpu.getSys())); - println("Idle Time....." + CpuPerc.format(cpu.getIdle())); - println("Wait Time....." + CpuPerc.format(cpu.getWait())); - println("Nice Time....." + CpuPerc.format(cpu.getNice())); - println("Combined......" + CpuPerc.format(cpu.getCombined())); - println("Irq Time......" + CpuPerc.format(cpu.getIrq())); - if (SigarLoader.IS_LINUX) { - println("SoftIrq Time.." + CpuPerc.format(cpu.getSoftIrq())); - println("Stolen Time...." + CpuPerc.format(cpu.getStolen())); - } - println(""); - } - - public void output(String[] args) throws SigarException { - org.hyperic.sigar.CpuInfo[] infos = - this.sigar.getCpuInfoList(); - - CpuPerc[] cpus = - this.sigar.getCpuPercList(); - - org.hyperic.sigar.CpuInfo info = infos[0]; - long cacheSize = info.getCacheSize(); - println("Vendor........." + info.getVendor()); - println("Model.........." + info.getModel()); - println("Mhz............" + info.getMhz()); - println("Total CPUs....." + info.getTotalCores()); - if ((info.getTotalCores() != info.getTotalSockets()) || - (info.getCoresPerSocket() > info.getTotalCores())) - { - println("Physical CPUs.." + info.getTotalSockets()); - println("Cores per CPU.." + info.getCoresPerSocket()); - } - - if (cacheSize != Sigar.FIELD_NOTIMPL) { - println("Cache size...." + cacheSize); - } - println(""); - - if (!this.displayTimes) { - return; - } - - for (int i=0; i max) { - address = address.substring(0, max); - } - - return address + ":" + port; - } - - private void outputTcpStats() throws SigarException { - Tcp stat = this.sigar.getTcp(); - final String dnt = " "; - println(dnt + stat.getActiveOpens() + " active connections openings"); - println(dnt + stat.getPassiveOpens() + " passive connection openings"); - println(dnt + stat.getAttemptFails() + " failed connection attempts"); - println(dnt + stat.getEstabResets() + " connection resets received"); - println(dnt + stat.getCurrEstab() + " connections established"); - println(dnt + stat.getInSegs() + " segments received"); - println(dnt + stat.getOutSegs() + " segments send out"); - println(dnt + stat.getRetransSegs() + " segments retransmited"); - println(dnt + stat.getInErrs() + " bad segments received."); - println(dnt + stat.getOutRsts() + " resets sent"); - } - - private void outputStats(int flags) throws SigarException { - if ((flags & NetFlags.CONN_TCP) != 0) { - println("Tcp:"); - try { - outputTcpStats(); - } catch (SigarException e) { - println(" " + e); - } - } - } - - //XXX currently weak sauce. should end up like netstat command. - public void output(String[] args) throws SigarException { - //default - int flags = NetFlags.CONN_CLIENT | NetFlags.CONN_PROTOCOLS; - - if (args.length > 0) { - flags = getFlags(args, flags); - if (isStat) { - outputStats(flags); - return; - } - } - - NetConnection[] connections = this.sigar.getNetConnectionList(flags); - printf(HEADER); - - for (int i=0; i"); - output.append(""); - - //****************** CPU ********************** - CpuInfo cpu_info = sigar.getCpuInfoList()[0]; - CpuPerc[] cpus = sigar.getCpuPercList(); - - output.append(""); - //output.append(cpu_info.getTotalCores()); - for(int i=0; i"); - } - output.append(""); - - //***************** Memory ******************* - Mem mem = sigar.getMem(); - Swap swap = sigar.getSwap(); - - output.append(""); - - output.append(""); - - //**************** NETWORK ****************** - output.append(""); - String[] net_intfs = sigar.getNetInterfaceList(); - for( String intf : net_intfs ){ - NetInterfaceStat net_stat = sigar.getNetInterfaceStat( intf ); - NetInterfaceConfig net_conf = sigar.getNetInterfaceConfig( intf ); - output.append(""); - } - output.append(""); - - //***************** HDD ******************** - FileSystem[] hdds = sigar.getFileSystemList(); - output.append(""); - for(FileSystem hdd : hdds){ - if( hdd.getType() != FileSystem.TYPE_LOCAL_DISK ) - continue; - //System.out.println("HDD: "+hdd); - FileSystemUsage hdd_use = sigar.getFileSystemUsage(hdd.getDirName()); - output.append(""); - } - output.append(""); - - //****************************************************************** - //*************************** EXTENDED ************************ - if(extended){ - //****************** ROUTING TABLE ************************* - NetRoute[] routes = sigar.getNetRouteList(); - output.append(""); - for( NetRoute route : routes ) { - output.append(""); - } - output.append(""); - - //****************** APPLICATIONS ************************* - long[] pids = Shell.getPids(sigar, new String[0]); - output.append(""); - for( long pid : pids ) { - String app_user = "UNKNOWN"; - long app_time = 0; - String app_load = "-"; - try{ - ProcCpu cpu = sigar.getProcCpu(pid); - app_load = CpuPerc.format(cpu.getPercent()); - }catch(SigarException e){} - try{ - app_user = sigar.getProcCredName(pid).getUser(); - }catch(SigarException e){} - try{ - app_time = sigar.getProcTime(pid).getTotal() / 1000; - }catch(SigarException e){} - output.append(""); - } - output.append(""); - - //****************** UPTIME ************************* - output.append(""); - output.append( formatUptime(sigar.getUptime().getUptime()) ); - output.append(""); - - //****************** HARDWARE INFO ************************* - - } - - output.append(""); - out.println(output.toString()); - } catch (SigarException e) { - e.printStackTrace(); - } - } - - private static String routing_flags(long flags) { - StringBuffer sb = new StringBuffer(); - if ((flags & NetFlags.RTF_UP) != 0) { - sb.append('U'); - } - if ((flags & NetFlags.RTF_GATEWAY) != 0) { - sb.append('G'); - } - return sb.toString(); - } - - /** - * Formats a time to "Xdays Xh Xmin" - */ - private static String formatUptime(double uptime) { - StringBuilder ret = new StringBuilder(); - - int days = (int)uptime / (60*60*24); - int minutes, hours; - - if (days != 0) { - ret.append(days); - if( days > 1 ) - ret.append( " days " ); - else - ret.append( " day " ); - } - - minutes = (int)uptime / 60; - hours = minutes / 60; - hours %= 24; - minutes %= 60; - - if (hours != 0) { - ret.append( hours ); - ret.append( "h " ); - } - ret.append( minutes ); - ret.append( "min " ); - return ret.toString(); - } - - /** - * Takes in a size of B and returns MB - */ - private static double format(long size){ - double tmp = ((double)size/(1024*1024)); - tmp = (int)(tmp*10)/10.0; - return tmp; - } -} diff --git a/src/examples/Version.java b/src/examples/Version.java deleted file mode 100755 index aff8cb2..0000000 --- a/src/examples/Version.java +++ /dev/null @@ -1,146 +0,0 @@ -/* - * Copyright (C) [2004, 2005, 2006], Hyperic, Inc. - * This file is part of SIGAR. - * - * SIGAR is free software; you can redistribute it and/or modify - * it under the terms version 2 of the GNU General Public License as - * published by the Free Software Foundation. This program is distributed - * in the hope that it will be useful, but WITHOUT ANY WARRANTY; without - * even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU General Public License for more - * details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - */ - -package test; - -import org.hyperic.sigar.OperatingSystem; -import org.hyperic.sigar.Sigar; -import org.hyperic.sigar.SigarException; -import org.hyperic.sigar.SigarLoader; -import org.hyperic.sigar.cmd.Shell; -import org.hyperic.sigar.cmd.SigarCommandBase; -import org.hyperic.sigar.win32.LocaleInfo; - -import java.io.File; -import java.io.PrintStream; -import java.net.InetAddress; -import java.net.UnknownHostException; - -/** - * Display Sigar, java and system version information. - */ -public class Version extends SigarCommandBase { - - public Version(Shell shell) { - super(shell); - } - - public Version() { - super(); - } - - public String getUsageShort() { - return "Display sigar and system version info"; - } - - private static String getHostName() { - try { - return InetAddress.getLocalHost().getHostName(); - } catch (UnknownHostException e) { - return "unknown"; - } - } - - private static void printNativeInfo(PrintStream os) { - String version = - "java=" + Sigar.VERSION_STRING + - ", native=" + Sigar.NATIVE_VERSION_STRING; - String build = - "java=" + Sigar.BUILD_DATE + - ", native=" + Sigar.NATIVE_BUILD_DATE; - String scm = - "java=" + Sigar.SCM_REVISION + - ", native=" + Sigar.NATIVE_SCM_REVISION; - String archlib = - SigarLoader.getNativeLibraryName(); - - os.println("Sigar version......." + version); - os.println("Build date.........." + build); - os.println("SCM rev............." + scm); - String host = getHostName(); - String fqdn; - Sigar sigar = new Sigar(); - try { - File lib = sigar.getNativeLibrary(); - if (lib != null) { - archlib = lib.getName(); - } - fqdn = sigar.getFQDN(); - } catch (SigarException e) { - fqdn = "unknown"; - } finally { - sigar.close(); - } - - os.println("Archlib............." + archlib); - - os.println("Current fqdn........" + fqdn); - if (!fqdn.equals(host)) { - os.println("Hostname............" + host); - } - - if (SigarLoader.IS_WIN32) { - LocaleInfo info = new LocaleInfo(); - os.println("Language............" + info); - os.println("Perflib lang id....." + - info.getPerflibLangId()); - } - } - - public static void printInfo(PrintStream os) { - try { - printNativeInfo(os); - } catch (UnsatisfiedLinkError e) { - os.println("*******ERROR******* " + e); - } - - os.println("Current user........" + - System.getProperty("user.name")); - os.println(""); - - OperatingSystem sys = OperatingSystem.getInstance(); - os.println("OS description......" + sys.getDescription()); - os.println("OS name............." + sys.getName()); - os.println("OS arch............." + sys.getArch()); - os.println("OS machine.........." + sys.getMachine()); - os.println("OS version.........." + sys.getVersion()); - os.println("OS patch level......" + sys.getPatchLevel()); - os.println("OS vendor..........." + sys.getVendor()); - os.println("OS vendor version..." + sys.getVendorVersion()); - if (sys.getVendorCodeName() != null) { - os.println("OS code name........" + sys.getVendorCodeName()); - } - os.println("OS data model......." + sys.getDataModel()); - os.println("OS cpu endian......." + sys.getCpuEndian()); - - os.println("Java vm version....." + - System.getProperty("java.vm.version")); - os.println("Java vm vendor......" + - System.getProperty("java.vm.vendor")); - os.println("Java home..........." + - System.getProperty("java.home")); - } - - public void output(String[] args) { - printInfo(this.out); - } - - public static void main(String[] args) throws Exception { - new Version().processCommand(args); - } -} diff --git a/src/examples/real_time_status.jsp b/src/examples/real_time_status.jsp deleted file mode 100755 index 56c295b..0000000 --- a/src/examples/real_time_status.jsp +++ /dev/null @@ -1,165 +0,0 @@ - -

Server Status

-
- - - - - - - - - - -
-
CPU -
-
- 		-
Memory -
-
-
-
Network -
-
- 		-
HDD -
-
-
-
- -