Commit Graph

255 Commits

Author SHA1 Message Date
Doug MacEachern
4fe3feb198 Merge branch 'sigar-1.6'
Conflicts:
	bindings/java/src/org/hyperic/sigar/jmx/SigarCpu.java
	bindings/java/src/org/hyperic/sigar/jmx/SigarCpuInfo.java
	bindings/java/src/org/hyperic/sigar/jmx/SigarCpuPerc.java
	bindings/java/src/org/hyperic/sigar/jmx/SigarLoadAverage.java
	bindings/java/src/org/hyperic/sigar/jmx/SigarMem.java
	bindings/java/src/org/hyperic/sigar/jmx/SigarSwap.java
	bindings/ruby/examples/cpu_info.rb
	bindings/ruby/examples/df.rb
	bindings/ruby/examples/free.rb
	bindings/ruby/examples/ifconfig.rb
	bindings/ruby/examples/netstat.rb
	bindings/ruby/examples/pargs.rb
	bindings/ruby/examples/penv.rb
	bindings/ruby/examples/who.rb
2010-04-28 15:03:12 -07:00
Doug MacEachern
73f9b8cf84 GPL v2 license -> Apache 2 license
(grit-generated)
2010-04-28 14:57:11 -07:00
Doug MacEachern
37c22746b2 Merge branch 'sigar-1.6' 2010-04-28 11:10:57 -07:00
Doug MacEachern
1c9b45eab1 (SIGAR-188) implement mem actual free/used on Windows
This rev uses "System Cache Resident Bytes" aka file cache instead of PERFORMANCE_INFORMATION.SystemCache
2010-04-28 11:09:32 -07:00
Doug MacEachern
54ef26bab6 Revert "(SIGAR-188) implement mem actual free/used on Windows"
This reverts commit e4fda73a29.
2010-04-28 10:57:08 -07:00
Doug MacEachern
4a0dc0cef3 Merge branch 'sigar-1.6' into cleanup
Conflicts:
	bindings/SigarWrapper.pm
	src/os/netware/Makefile.nw
	src/os/netware/netware_sigar.c
	src/os/osf1/osf1_sigar.c
	src/os/stub/stub_sigar.c
2010-04-15 14:14:38 -07:00
Doug MacEachern
5324c6f235 mv to sigar-stuff 2010-04-15 13:21:47 -07:00
Doug MacEachern
247b90618b Merge branch 'sigar-1.6' 2010-04-14 13:56:17 -07:00
Doug MacEachern
6c1f0a9871 (SIGAR-192) avoid possible stack corruption in Windows proc_env impl 2010-04-14 13:55:57 -07:00
Doug MacEachern
aa46186a2d Merge branch 'sigar-1.6' 2010-04-01 17:37:28 -07:00
Doug MacEachern
e4fda73a29 (SIGAR-188) implement mem actual free/used on Windows 2010-04-01 17:36:46 -07:00
Doug MacEachern
6193cb516f Merge branch 'sigar-1.6' 2010-02-05 14:41:45 -08:00
Doug MacEachern
a210aa7e23 (SIGAR-205) Vista and higher changed wireless card type to IF_TYPE_IEEE80211 2010-02-05 14:41:35 -08:00
Doug MacEachern
8eb87135e4 (SIGAR-199) arp_list win32 impl 2010-01-27 12:17:26 -08:00
Doug MacEachern
5da26ff5e4 (SIGAR-199) arp_list win32 impl 2010-01-25 18:01:29 -08:00
Doug MacEachern
ecd0ad6ab8 (SIGAR-199) stub sigar_arp_list_get impls 2010-01-18 19:09:10 -08:00
Doug MacEachern
99ac66307a Merge branch 'sigar-1.6' 2010-01-04 13:50:31 -08:00
Doug MacEachern
3e98f20197 (SIGAR-194) sigar_file_system_t.dev_name on Windows should be the network path for remote drives 2010-01-04 13:48:20 -08:00
Doug MacEachern
dec7508ed1 Merge branch 'sigar-1.6' 2009-10-23 14:59:07 -07:00
Doug MacEachern
6eef4f7cdc (SIGAR-186) fix Win32.getFileVersion on windows 2000 2009-10-23 14:49:44 -07:00
Doug MacEachern
623cbee5b5 Merge branch 'sigar-1.6' 2009-09-15 15:22:59 -07:00
Doug MacEachern
f16b3e3daa (SIGAR-181) net_route.ifname impl for Win32 2009-09-15 14:54:37 -07:00
Doug MacEachern
e9fcf4b336 Merge branch 'sigar-1.6' 2009-09-10 21:44:26 -07:00
Doug MacEachern
f5766d5593 rm obsolete build-cpu.bat 2009-09-10 21:44:10 -07:00
Doug MacEachern
ac44312b5e remove msvc_iptypes.h 2009-09-10 21:42:55 -07:00
Doug MacEachern
1676d54123 Merge branch 'sigar-1.6' 2009-09-01 15:39:42 -07:00
Doug MacEachern
fdc0cf5c1f add mapping from wmi HRESULT to NTRESULT 2009-09-01 15:39:33 -07:00
Doug MacEachern
c6b35167c8 fix proc_exe fallback to wmi 2009-09-01 14:31:22 -07:00
Doug MacEachern
c88b49abe2 (SIGAR-168) always fallback to wmi when peb fails for proc_args 2009-09-01 14:09:46 -07:00
Doug MacEachern
0b335d9025 6.1 == Windows 7 2009-08-30 12:40:54 -07:00
Doug MacEachern
bf1543877a Merge branch 'SIGAR-179' 2009-08-23 15:59:14 -07:00
Doug MacEachern
e3b378ecd1 (SIGAR-179) Increase buffer size in cpu_list query from 16 to 128 2009-08-23 15:58:52 -07:00
Jan Kneschke
d65177559d fixed the autotools setup
* fixed compile on all Unixes
  * added unit-tests
  * added cmake to build natively on win32
  * fixed the "make dist" setup to include all os-dirs
2009-08-09 15:35:24 +02:00
Doug MacEachern
7ccd02ef91 Merge branch 'sigar-1.6' 2009-08-05 17:12:48 -07:00
Doug MacEachern
b05f332705 fix compile against visual studio 6 2009-08-05 16:56:37 -07:00
Doug MacEachern
c310dffb84 try wmi if peb fails for proc_exe 2009-08-05 15:09:00 -07:00
Doug MacEachern
57b8fff72f add wmi proc_exe wrapper decl 2009-08-05 15:08:51 -07:00
Doug MacEachern
8c1608bb76 add wmi proc_exe wrapper 2009-08-05 15:08:43 -07:00
Doug MacEachern
2550c6373a try wmi if peb fails for proc_args 2009-08-05 14:30:16 -07:00
Doug MacEachern
7d236ebc39 add wmi proc_args wrapper decl 2009-08-05 14:29:44 -07:00
Doug MacEachern
e5c1e8ac07 return ERROR_DATATYPE_MISMATCH if query does not get PebBaseAddress 2009-08-05 14:29:16 -07:00
Doug MacEachern
8dd2a25568 add wmi proc_args wrapper 2009-08-05 14:27:08 -07:00
Doug MacEachern
00a4ebf85e wmi com interface wrapper 2009-08-05 13:46:40 -07:00
unknown
ba22cc0531 net_interface ipv6 support requires msvc7 or higher 2009-07-30 10:32:42 -07:00
Doug MacEachern
10051fa8ff win32 net_interface_ipv6_config impl 2009-07-29 15:23:09 -07:00
Doug MacEachern
0e763c13e2 stub net_interface_config ipv6 support 2009-07-24 17:13:19 -07:00
Doug MacEachern
49e769bbd8 Merge branch 'sigar-1.6' 2009-07-18 18:44:26 -07:00
Doug MacEachern
ceab542f7b (SIGAR-164) return ENXIO instead of ENOENT in disk_usage win32 impl 2009-07-18 18:43:54 -07:00
Doug MacEachern
85838c3512 remove msvc_iptypes.h 2009-03-25 13:44:30 -07:00
Doug MacEachern
634cd53a79 6.1 == Windows 7 2009-03-07 06:40:23 -08:00