hg: jdk7/tl/jdk: 4 new changesets

[paul.hohensee at oracle.com]

Changeset: c73c178159d8
Author:    phh
Date:      2011-01-20 19:34 -0500
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/c73c178159d8

6173675: M&M: approximate memory allocation rate/amount per thread
Summary: Subclass com.sun.management.ThreadMXBean from java.lang.management.ThreadMXBean, add getAllocatedBytes() and friends to c.s.m.ThreadMXBean and have sun.management.ThreadImpl implement c.s.m.ThreadMXBean rather than j.l.m.ThreadMXBean.
Reviewed-by: mchung, alanb, dholmes, emcmanus

! make/java/management/mapfile-vers
+ src/share/classes/com/sun/management/ThreadMXBean.java
! src/share/classes/sun/management/ThreadImpl.java
! src/share/classes/sun/management/VMManagement.java
! src/share/classes/sun/management/VMManagementImpl.java
! src/share/javavm/export/jmm.h
! src/share/native/sun/management/ThreadImpl.c
! src/share/native/sun/management/VMManagementImpl.c
+ test/com/sun/management/ThreadMXBean/ThreadAllocatedMemory.java
+ test/com/sun/management/ThreadMXBean/ThreadAllocatedMemoryArray.java
+ test/com/sun/management/ThreadMXBean/ThreadCpuTimeArray.java

Changeset: 64ef2f52d781
Author:    phh
Date:      2011-01-21 07:29 -0500
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/64ef2f52d781

7013682: two test checking cpuTime filed java/lang/management/ThreadMXBean
Summary: Typo in 6173675 fix dropped getThreadCpuTime(long) result on the floor.
Reviewed-by: mchung, dholmes

! src/share/classes/sun/management/ThreadImpl.java

Changeset: cd13b2114f2e
Author:    phh
Date:      2011-01-22 08:42 -0500
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/cd13b2114f2e

Merge

! src/share/classes/sun/management/ThreadImpl.java

Changeset: d1365fdfb3ea
Author:    phh
Date:      2011-01-22 08:43 -0500
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/d1365fdfb3ea

Merge

- test/java/net/InetAddress/B4762344.java
- test/java/net/InetAddress/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
- test/java/net/InetAddress/Simple1NameServiceDescriptor.java
- test/java/net/InetAddress/Simple2NameServiceDescriptor.java
- test/java/net/InetAddress/SimpleNameService.java
- test/sun/net/InetAddress/nameservice/B6442088.java
- test/sun/net/InetAddress/nameservice/CacheTest.java
- test/sun/net/InetAddress/nameservice/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
- test/sun/net/InetAddress/nameservice/SimpleNameService.java
- test/sun/net/InetAddress/nameservice/SimpleNameServiceDescriptor.java