libjava/classpath/ChangeLog.gcj:
2007-05-31 Matthias Klose <doko@ubuntu.com>
* javax/management/NotificationBroadcasterSupport.java
(getNotificationInfo): Add cast.
* native/jni/qt-peer/Makefile.am (AM_CXXFLAGS): Add libstdc++ include
directories.
* native/jni/qt-peer/Makefile.in: Regenerate.
libjava/ChangeLog:
2007-06-03 Matthias Klose <doko@ubuntu.com>
* java/io/natFileWin32.cc (setFilePermissions): New (stub only).
_access: Handle EXEC query, stub only.
2007-06-03 Matthias Klose <doko@ubuntu.com>
Merged from classpath:
* gnu/java/nio/SelectorProviderImpl.java: Whitespace merge.
* java/lang/System.java(inheritedChannel): New.
* java/lang/Character.java: Remove stray`;'.
* java/net/MulticastSocket.java: Merged.
* java/text/DateFormatSymbols.java(getInstance): New, comment updates.
* java/text/Collator.java(getInstance): Merged.
* java/util/Calendar.java: New attributes ALL_STYLES, SHORT, LONG.
getDisplayName, getDisplayNames: New.
* java/util/logging/Logger.java: Merged.
* Regenerate .class and .h files.
2007-06-03 Matthias Klose <doko@ubuntu.com>
* java/io/File.java: Merge with classpath-0.95, new method
setFilePermissions, new attribute EXEC.
* java/io/natFilePosix.cc (setFilePermissions): New.
_access: Handle EXEC query.
* classpath/lib/java/io/File.class, java/io/File.h: Regenerate.
2007-06-03 Matthias Klose <doko@ubuntu.com>
Imported GNU Classpath 0.95.
* classpath/Makefile.in,
classpath/native/jni/midi-dssi/Makefile.in,
classpath/native/jni/classpath/Makefile.in,
classpath/native/jni/Makefile.in,
classpath/native/jni/gconf-peer/Makefile.in,
classpath/native/jni/java-io/Makefile.in,
classpath/native/jni/native-lib/Makefile.in,
classpath/native/jni/java-util/Makefile.in,
classpath/native/jni/midi-alsa/Makefile.in,
classpath/native/jni/java-lang/Makefile.in,
classpath/native/jni/java-nio/Makefile.in,
classpath/native/jni/java-net/Makefile.in,
classpath/native/jni/xmlj/Makefile.in,
classpath/native/jni/qt-peer/Makefile.in,
classpath/native/jni/gtk-peer/Makefile.in,
classpath/native/Makefile.in, classpath/native/jawt/Makefile.in,
classpath/native/fdlibm/Makefile.in,
classpath/native/plugin/Makefile.in,
classpath/resource/Makefile.in, classpath/scripts/Makefile.in,
classpath/tools/Makefile.in, classpath/doc/Makefile.in,
classpath/doc/api/Makefile.in, classpath/lib/Makefile.in,
classpath/external/Makefile.in, classpath/external/jsr166/Makefile.in,
classpath/external/sax/Makefile.in,
classpath/external/w3c_dom/Makefile.in,
classpath/external/relaxngDatatype/Makefile.in,
classpath/include/Makefile.in,
classpath/examples/Makefile.in: Regenerate.
* classpath/config.guess, classpath/config.sub,
classpath/ltmain.sh : Update.
* classpath/configure, classpath/depcomp, classpath/missing,
classpath/aclocal.m4, classpath/install-sh: Regenerate.
* gnu/classpath/Configuration.java (CLASSPATH_VERSION): Now 0.95.
* sources.am: Regenerate.
* Makefile.in: Regenerate.
* Update the .class files and generated CNI header files, add new
.class and generated CNI header files.
* Remove generated files for removed java source files:
classpath/gnu/java/net/BASE64.java,
classpath/gnu/java/security/util/Base64.java,
classpath/gnu/java/awt/peer/gtk/GThreadMutex.java,
classpath/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java,
classpath/gnu/java/awt/font/autofit/Scaler.java,
classpath/gnu/classpath/jdwp/util/Value.java,
classpath/gnu/javax/net/ssl/Base64.java.
* Remove empty directories.
* Makefile.am(nat_source_files): Add natVMOperatingSystemMXBeanImpl.cc.
* java/lang/Class.java(setAccessible): Merge from classpath.
* java/util/Locale.java: Remove.
* gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java,
gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.cc: New.
* gcj/javaprims.h: Update class declarations.
* scripts/classes.pl: Update usage.
* HACKING: Mention to build all peers.
From-SVN: r125302
This commit is contained in:
Matthias Klose
parent
af333b9a7f
commit
e1bea0c068
2951 changed files with 80982 additions and 68583 deletions
179
libjava/classpath/java/lang/management/MonitorInfo.java
Normal file
179
libjava/classpath/java/lang/management/MonitorInfo.java
Normal file
|
|
@ -0,0 +1,179 @@
|
|||
/* MonitorInfo.java - Information on a monitor lock.
|
||||
Copyright (C) 2006 Free Software Foundation
|
||||
|
||||
This file is part of GNU Classpath.
|
||||
|
||||
GNU Classpath 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, or (at your option)
|
||||
any later version.
|
||||
|
||||
GNU Classpath 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 GNU Classpath; see the file COPYING. If not, write to the
|
||||
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
||||
02110-1301 USA.
|
||||
|
||||
Linking this library statically or dynamically with other modules is
|
||||
making a combined work based on this library. Thus, the terms and
|
||||
conditions of the GNU General Public License cover the whole
|
||||
combination.
|
||||
|
||||
As a special exception, the copyright holders of this library give you
|
||||
permission to link this library with independent modules to produce an
|
||||
executable, regardless of the license terms of these independent
|
||||
modules, and to copy and distribute the resulting executable under
|
||||
terms of your choice, provided that you also meet, for each linked
|
||||
independent module, the terms and conditions of the license of that
|
||||
module. An independent module is a module which is not derived from
|
||||
or based on this library. If you modify this library, you may extend
|
||||
this exception to your version of the library, but you are not
|
||||
obligated to do so. If you do not wish to do so, delete this
|
||||
exception statement from your version. */
|
||||
|
||||
package java.lang.management;
|
||||
|
||||
import javax.management.openmbean.CompositeData;
|
||||
import javax.management.openmbean.CompositeType;
|
||||
import javax.management.openmbean.SimpleType;
|
||||
|
||||
/**
|
||||
* Provides information on a monitor lock held by a thread.
|
||||
* A monitor lock is obtained when a thread enters a synchronized
|
||||
* block or method.
|
||||
*
|
||||
* @author Andrew John Hughes (gnu_andrew@member.fsf.org)
|
||||
* @since 1.6
|
||||
*/
|
||||
public class MonitorInfo
|
||||
extends LockInfo
|
||||
{
|
||||
|
||||
/**
|
||||
* The stack depth at which the lock was obtained.
|
||||
*/
|
||||
private int stackDepth;
|
||||
|
||||
/**
|
||||
* The stack frame at which the lock was obtained.
|
||||
*/
|
||||
private StackTraceElement stackFrame;
|
||||
|
||||
/**
|
||||
* Constructs a new {@link MonitorInfo} using the specified
|
||||
* lock class name and identity hash code, and the given
|
||||
* stack depth and frame.
|
||||
*
|
||||
* @param className the class name of the lock object.
|
||||
* @param identityHashCode the identity hash code of the lock object.
|
||||
* @param stackDepth the depth of the stack at which the lock
|
||||
* was obtained.
|
||||
* @param stackFrame the frame of the stack at which the lock was
|
||||
* obtained.
|
||||
* @throws IllegalArgumentException if the stack depth and frame are
|
||||
* inconsistent i.e. the frame is
|
||||
* <code>null</code> but the depth is
|
||||
* ≥ 0, or the frame is not
|
||||
* <code>null</code> but the depth is
|
||||
* < 0.
|
||||
*/
|
||||
public MonitorInfo(String className, int identityHashCode, int stackDepth,
|
||||
StackTraceElement stackFrame)
|
||||
{
|
||||
super(className, identityHashCode);
|
||||
if (stackFrame == null && stackDepth >= 0)
|
||||
throw new IllegalArgumentException("The stack frame is null, but the " +
|
||||
"stack depth is greater than or equal " +
|
||||
"to zero.");
|
||||
if (stackFrame != null && stackDepth < 0)
|
||||
throw new IllegalArgumentException("The stack frame is not null, but the " +
|
||||
"stack depth is less than zero.");
|
||||
this.stackDepth = stackDepth;
|
||||
this.stackFrame = stackFrame;
|
||||
}
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* Returns a {@link MonitorInfo} instance using the values
|
||||
* given in the supplied
|
||||
* {@link javax.management.openmbean.CompositeData} object.
|
||||
* The composite data instance should contain the following
|
||||
* attributes with the specified types:
|
||||
* </p>
|
||||
* <table>
|
||||
* <th><td>Name</td><td>Type</td></th>
|
||||
* <tr><td>className</td><td>java.lang.String</td></tr>
|
||||
* <tr><td>identityHashCode</td><td>java.lang.Integer</td></tr>
|
||||
* <tr><td>lockedStackDepth</td><td>java.lang.Integer</td></tr>
|
||||
* <tr><td>lockedStackFrame</td><td>javax.management.openmbean.CompositeData
|
||||
* </td></tr>
|
||||
* </table>
|
||||
* <p>
|
||||
* The stack trace is further described as:
|
||||
* </p>
|
||||
* <table>
|
||||
* <th><td>Name</td><td>Type</td></th>
|
||||
* <tr><td>className</td><td>java.lang.String</td></tr>
|
||||
* <tr><td>methodName</td><td>java.lang.String</td></tr>
|
||||
* <tr><td>fileName</td><td>java.lang.String</td></tr>
|
||||
* <tr><td>lineNumber</td><td>java.lang.Integer</td></tr>
|
||||
* <tr><td>nativeMethod</td><td>java.lang.Boolean</td></tr>
|
||||
* </table>
|
||||
*
|
||||
* @param data the composite data structure to take values from.
|
||||
* @return a new instance containing the values from the
|
||||
* composite data structure, or <code>null</code>
|
||||
* if the data structure was also <code>null</code>.
|
||||
* @throws IllegalArgumentException if the composite data structure
|
||||
* does not match the structure
|
||||
* outlined above.
|
||||
*/
|
||||
public static MonitorInfo from(CompositeData data)
|
||||
{
|
||||
if (data == null)
|
||||
return null;
|
||||
CompositeType type = data.getCompositeType();
|
||||
ThreadInfo.checkAttribute(type, "ClassName", SimpleType.STRING);
|
||||
ThreadInfo.checkAttribute(type, "IdentityHashCode", SimpleType.INTEGER);
|
||||
ThreadInfo.checkAttribute(type, "LockedStackDepth", SimpleType.INTEGER);
|
||||
ThreadInfo.checkAttribute(type, "LockedStackFrame",
|
||||
ThreadInfo.getStackTraceType());
|
||||
CompositeData frame = (CompositeData) data.get("LockedStackFrame");
|
||||
return new MonitorInfo((String) data.get("ClassName"),
|
||||
(Integer) data.get("IdentityHashCode"),
|
||||
(Integer) data.get("LockedStackDepth"),
|
||||
new StackTraceElement((String) frame.get("ClassName"),
|
||||
(String) frame.get("MethodName"),
|
||||
(String) frame.get("FileName"),
|
||||
(Integer) frame.get("LineNumber")));
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the depth of the stack at which the lock was obtained.
|
||||
* This works as an index into the array returned by
|
||||
* {@link ThreadInfo#getStackTrace()}.
|
||||
*
|
||||
* @return the depth of the stack at which the lock was obtained,
|
||||
* or a negative number if this information is unavailable.
|
||||
*/
|
||||
public int getLockedStackDepth()
|
||||
{
|
||||
return stackDepth;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the stack frame at which the lock was obtained.
|
||||
*
|
||||
* @return the stack frame at which the lock was obtained,
|
||||
* or <code>null</code> if this informati0on is unavailable.
|
||||
*/
|
||||
public StackTraceElement getLockedStackFrame()
|
||||
{
|
||||
return stackFrame;
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue