incubator-kato-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spo...@apache.org
Subject svn commit: r896801 - in /incubator/kato/trunk/org.apache.kato: kato.api/src/main/java/javax/tools/diagnostics/image/ kato.api/src/main/java/javax/tools/diagnostics/runtime/java/ kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/ kato.h...
Date Thu, 07 Jan 2010 08:47:08 GMT
Author: spoole
Date: Thu Jan  7 08:45:21 2010
New Revision: 896801

URL: http://svn.apache.org/viewvc?rev=896801&view=rev
Log:
updated implementation , tools and tests to handle new JavaThread , NativejavaThread separation.

Modified:
    incubator/kato/trunk/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/image/NativeMemoryAccess.java
    incubator/kato/trunk/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaMethod.java
    incubator/kato/trunk/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaRuntime.java
    incubator/kato/trunk/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JMethod.java
    incubator/kato/trunk/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaStackFrameImpl.java
    incubator/kato/trunk/org.apache.kato/kato.tck/testcases/src/main/java/org/apache/kato/tck/tests/legacy/TestCompiledMethods.java
    incubator/kato/trunk/org.apache.kato/kato.tck/testcases/src/main/java/org/apache/kato/tests/junit/ImageSectionTest.java
    incubator/kato/trunk/org.apache.kato/kato.tck/testcases/src/main/java/org/apache/kato/tests/junit/JavaMethodTest.java
    incubator/kato/trunk/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/WhatisCommand.java
    incubator/kato/trunk/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoJitmCommand.java

Modified: incubator/kato/trunk/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/image/NativeMemoryAccess.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/image/NativeMemoryAccess.java?rev=896801&r1=896800&r2=896801&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/image/NativeMemoryAccess.java
(original)
+++ incubator/kato/trunk/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/image/NativeMemoryAccess.java
Thu Jan  7 08:45:21 2010
@@ -1,3 +1,16 @@
+/*******************************************************************************
+ * 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.
+ ******************************************************************************/
 package javax.tools.diagnostics.image;
 
 import java.util.List;
@@ -21,12 +34,6 @@
      */
     List<ImageSection> getSections();
     
-    /**
-     * <p>Get the address of the JNIEnv structure which represents this thread instance
in JNI.</p>
-     * 
-     * @return the address of the JNIEnv structure which represents this thread instance
in JNI.
-     * @throws CorruptDataException 
-     */
-    ImagePointer getJNIEnv() throws CorruptDataException;
+   
     
 }

Modified: incubator/kato/trunk/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaMethod.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaMethod.java?rev=896801&r1=896800&r2=896801&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaMethod.java
(original)
+++ incubator/kato/trunk/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaMethod.java
Thu Jan  7 08:45:21 2010
@@ -60,7 +60,7 @@
      * @see javax.tools.diagnostics.image.ImageSection
      * 
      */
-    List<ImageSection> getCompiledSections();
+    List<ImageSection> getSections();
     
     
     /**

Modified: incubator/kato/trunk/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaRuntime.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaRuntime.java?rev=896801&r1=896800&r2=896801&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaRuntime.java
(original)
+++ incubator/kato/trunk/org.apache.kato/kato.api/src/main/java/javax/tools/diagnostics/runtime/java/JavaRuntime.java
Thu Jan  7 08:45:21 2010
@@ -99,7 +99,7 @@
      * Compiled methods are methods that have been converted into native code by the Java
Virtual Machine or related Just In Time Compiler
      * 
      * There is no expectation that any method has been compiled. The returned list could
be empty.
-     * However any JavaMethod reachable though the API which would return a non empty list
for calls to {@link JavaMethod#getCompiledSections()} must be contained within the list
+     * However any JavaMethod reachable though the API which would return a non empty list
for calls to {@link JavaMethod#getSections()} must be contained within the list
      * returned by this method.  
      * 
      * The returned list follows the standard semantics for javax.tools.diagnostics collections

Modified: incubator/kato/trunk/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JMethod.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JMethod.java?rev=896801&r1=896800&r2=896801&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JMethod.java
(original)
+++ incubator/kato/trunk/org.apache.kato/kato.cjvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JMethod.java
Thu Jan  7 08:45:21 2010
@@ -86,7 +86,7 @@
 	}
 
 	@Override
-	public List<ImageSection> getCompiledSections() {
+	public List<ImageSection> getSections() {
 		return Collections.emptyList();
 	}
 

Modified: incubator/kato/trunk/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaStackFrameImpl.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaStackFrameImpl.java?rev=896801&r1=896800&r2=896801&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaStackFrameImpl.java
(original)
+++ incubator/kato/trunk/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaStackFrameImpl.java
Thu Jan  7 08:45:21 2010
@@ -161,7 +161,7 @@
 		 * @return empty Iterator
 		 */
 		@Override
-		public List getCompiledSections() {
+		public List getSections() {
 			return new LinkedList();
 		}
 

Modified: incubator/kato/trunk/org.apache.kato/kato.tck/testcases/src/main/java/org/apache/kato/tck/tests/legacy/TestCompiledMethods.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.tck/testcases/src/main/java/org/apache/kato/tck/tests/legacy/TestCompiledMethods.java?rev=896801&r1=896800&r2=896801&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck/testcases/src/main/java/org/apache/kato/tck/tests/legacy/TestCompiledMethods.java
(original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck/testcases/src/main/java/org/apache/kato/tck/tests/legacy/TestCompiledMethods.java
Thu Jan  7 08:45:21 2010
@@ -46,7 +46,7 @@
 				
 			assertNotNull("Entry "+counter+":bytecode sections is null",sections);
 			
-			sections=m.getCompiledSections();
+			sections=m.getSections();
 			
 			assertNotNull("Entry "+counter+":compiled sections is null",sections);
 		

Modified: incubator/kato/trunk/org.apache.kato/kato.tck/testcases/src/main/java/org/apache/kato/tests/junit/ImageSectionTest.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.tck/testcases/src/main/java/org/apache/kato/tests/junit/ImageSectionTest.java?rev=896801&r1=896800&r2=896801&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck/testcases/src/main/java/org/apache/kato/tests/junit/ImageSectionTest.java
(original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck/testcases/src/main/java/org/apache/kato/tests/junit/ImageSectionTest.java
Thu Jan  7 08:45:21 2010
@@ -28,7 +28,7 @@
 	{
 		//for now we will just grab a compiled method section
 		JavaMethod method = defaultJavaMethod();
-		Iterator it = method.getCompiledSections().iterator();
+		Iterator it = method.getSections().iterator();
 		assertNotNull(it);
 		assertTrue(it.hasNext());
 		return (ImageSection) it.next();

Modified: incubator/kato/trunk/org.apache.kato/kato.tck/testcases/src/main/java/org/apache/kato/tests/junit/JavaMethodTest.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.tck/testcases/src/main/java/org/apache/kato/tests/junit/JavaMethodTest.java?rev=896801&r1=896800&r2=896801&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck/testcases/src/main/java/org/apache/kato/tests/junit/JavaMethodTest.java
(original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck/testcases/src/main/java/org/apache/kato/tests/junit/JavaMethodTest.java
Thu Jan  7 08:45:21 2010
@@ -54,7 +54,7 @@
 	 */
 	public void testGetCompiledSections()
 	{
-		Iterator it = _method.getCompiledSections().iterator();
+		Iterator it = _method.getSections().iterator();
 		assertNotNull(it);
 		assertTrue(it.hasNext());
 	}

Modified: incubator/kato/trunk/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/WhatisCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/WhatisCommand.java?rev=896801&r1=896800&r2=896801&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/WhatisCommand.java
(original)
+++ incubator/kato/trunk/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/WhatisCommand.java
Thu Jan  7 08:45:21 2010
@@ -135,7 +135,7 @@
 			while(methods.hasNext()){
 				JavaMethod jMethod = (JavaMethod)methods.next();
 				Iterator bytecodeSections = jMethod.getBytecodeSections().iterator();
-				Iterator compiledSections = jMethod.getCompiledSections().iterator();
+				Iterator compiledSections = jMethod.getSections().iterator();
 				isWithinImageSections(bytecodeSections, jMethod, false, address);
 				isWithinImageSections(compiledSections, jMethod, true, address);
 			}

Modified: incubator/kato/trunk/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoJitmCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoJitmCommand.java?rev=896801&r1=896800&r2=896801&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoJitmCommand.java
(original)
+++ incubator/kato/trunk/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoJitmCommand.java
Thu Jan  7 08:45:21 2010
@@ -91,9 +91,9 @@
 								sig = Exceptions.getCorruptDataExceptionString();
 							}
 
-							if (jm.getCompiledSections().isEmpty()==false)
+							if (jm.getSections().isEmpty()==false)
 							{
-								Iterator itImageSection = jm.getCompiledSections().iterator();
+								Iterator itImageSection = jm.getSections().iterator();
 								while (itImageSection.hasNext())
 								{
 									ImageSection is = (ImageSection)itImageSection.next();



Mime
View raw message