diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2011-02-11 00:41:48 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2011-02-11 00:41:48 +0000 |
| commit | 6ac447dee9988b6f7363c15dad9537d3216283f2 (patch) | |
| tree | f773aa114c970dc3ca56bc379cb2df926074d800 /java/openjdk6/files/patch-test | |
| parent | Update to SVN r608, assorted bug fixes. (diff) | |
- Implement some missing FreeBSD-specific methods, i.e., swap info, committed
virtual memory, free physical memory, and number of open file descriptors.
For example, jconsole shows more realistic numbers instead of hardcoded bogus
numbers in VM Summary tab now. Correct a jtreg test case for the swap info.
- Mention procfs(5) is used for some features in this implementation.
Diffstat (limited to 'java/openjdk6/files/patch-test')
| -rw-r--r-- | java/openjdk6/files/patch-test | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/java/openjdk6/files/patch-test b/java/openjdk6/files/patch-test index 39c165ded6d3..b3593c658f3a 100644 --- a/java/openjdk6/files/patch-test +++ b/java/openjdk6/files/patch-test @@ -1,3 +1,31 @@ +--- jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh.orig 2011-02-10 12:34:40.000000000 -0500 ++++ jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh 2011-02-10 12:37:00.000000000 -0500 +@@ -72,6 +72,16 @@ + done + } + ++freebsd_swap_size() ++{ ++ total_swap=0 ++ for i in `/usr/sbin/swapinfo -k | awk '{print $2}' | grep -v blocks` ++ do ++ # swapinfo -k returns size in blocks of 1024 bytes. ++ total_swap=`expr $i \* 1024 + $total_swap` ++ done ++} ++ + # Test GetTotalSwapSpaceSize if we are running on Unix + total_swap=0 + case `uname -s` in +@@ -80,7 +90,7 @@ + runOne GetTotalSwapSpaceSize $total_swap + ;; + FreeBSD ) +- total_swap=`free -b | grep -i swap | awk '{print $2}'` ++ freebsd_swap_size + runOne GetTotalSwapSpaceSize $total_swap + ;; + * ) --- jdk/test/java/nio/channels/SocketChannel/LocalAddress.java 2010-01-18 12:03:26.000000000 +0100 +++ jdk/test/java/nio/channels/SocketChannel/LocalAddress.java 2010-01-18 12:03:42.000000000 +0100 @@ -40,7 +40,7 @@ |