You are viewing a plain text version of this content. The canonical link for it is here.
Posted to kato-commits@incubator.apache.org by sp...@apache.org on 2009/05/18 07:57:00 UTC

svn commit: r775852 - in /incubator/kato/trunk/org.apache.kato.jvmti/src/org/apache/kato/jvmti: javaruntime/JavaRuntimeImpl.java process/ImageImpl.java reader/BinReader.java

Author: spoole
Date: Mon May 18 07:57:00 2009
New Revision: 775852

URL: http://svn.apache.org/viewvc?rev=775852&view=rev
Log:
filling in of some empty methods and a little restructure of  the jvmti reader

Modified:
    incubator/kato/trunk/org.apache.kato.jvmti/src/org/apache/kato/jvmti/javaruntime/JavaRuntimeImpl.java
    incubator/kato/trunk/org.apache.kato.jvmti/src/org/apache/kato/jvmti/process/ImageImpl.java
    incubator/kato/trunk/org.apache.kato.jvmti/src/org/apache/kato/jvmti/reader/BinReader.java

Modified: incubator/kato/trunk/org.apache.kato.jvmti/src/org/apache/kato/jvmti/javaruntime/JavaRuntimeImpl.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato.jvmti/src/org/apache/kato/jvmti/javaruntime/JavaRuntimeImpl.java?rev=775852&r1=775851&r2=775852&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato.jvmti/src/org/apache/kato/jvmti/javaruntime/JavaRuntimeImpl.java (original)
+++ incubator/kato/trunk/org.apache.kato.jvmti/src/org/apache/kato/jvmti/javaruntime/JavaRuntimeImpl.java Mon May 18 07:57:00 2009
@@ -57,8 +57,8 @@
 
 	@Override
 	public Iterator getJavaClassLoaders() {
-		// TODO Auto-generated method stub
-		return null;
+		
+		return base.getJavaClassLoaderIterator();
 	}
 
 	@Override
@@ -70,22 +70,20 @@
 	@Override
 	public JavaVMInitArgs getJavaVMInitArgs() throws DataUnavailable,
 			CorruptDataException {
-		// TODO Auto-generated method stub
-		return null;
+		throw new DataUnavailable();
 	}
 
 	@Override
 	public Iterator getMonitors() {
-		// TODO Auto-generated method stub
-		return null;
+		
+		return base.getJavaMonitorIterator();
 	}
 
 	@Override
 	public JavaObject getObjectAtAddress(ImagePointer arg0)
 			throws CorruptDataException, IllegalArgumentException,
 			MemoryAccessException, DataUnavailable {
-		// TODO Auto-generated method stub
-		return null;
+		throw new DataUnavailable();
 	}
 
 	@Override

Modified: incubator/kato/trunk/org.apache.kato.jvmti/src/org/apache/kato/jvmti/process/ImageImpl.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato.jvmti/src/org/apache/kato/jvmti/process/ImageImpl.java?rev=775852&r1=775851&r2=775852&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato.jvmti/src/org/apache/kato/jvmti/process/ImageImpl.java (original)
+++ incubator/kato/trunk/org.apache.kato.jvmti/src/org/apache/kato/jvmti/process/ImageImpl.java Mon May 18 07:57:00 2009
@@ -34,6 +34,128 @@
 
 public class ImageImpl implements Image{
 
+	public final class ImageAddressSpaceImpl implements ImageAddressSpace {
+		public final class ImageProcessImpl implements ImageProcess {
+			private List<ManagedRuntime> runtimes=null;
+
+			@Override
+			public String getCommandLine()
+					throws DataUnavailable,
+					CorruptDataException {
+				throw new DataUnavailable("no env");
+			}
+
+			@Override
+			public ImageThread getCurrentThread()
+					throws CorruptDataException {
+				// TODO Auto-generated method stub
+				return null;
+			}
+
+			@Override
+			public Properties getEnvironment()
+					throws DataUnavailable,
+					CorruptDataException {
+				
+				throw new DataUnavailable("no env");
+			}
+
+			@Override
+			public ImageModule getExecutable()
+					throws DataUnavailable,
+					CorruptDataException {
+				throw new DataUnavailable("no env");
+			}
+
+			@Override
+			public String getID() throws DataUnavailable,
+					CorruptDataException {
+				throw new DataUnavailable("no env");
+			}
+
+			@Override
+			public Iterator getLibraries()
+					throws DataUnavailable,
+					CorruptDataException {
+				throw new DataUnavailable("no env");
+			}
+
+			@Override
+			public int getPointerSize() {
+				// TODO Auto-generated method stub
+				return 0;
+			}
+
+			@Override
+			public Iterator getRuntimes() {
+				if(runtimes==null) {
+					runtimes=new LinkedList<ManagedRuntime>();
+					try {
+						runtimes.add(new JavaRuntimeImpl(file));
+					} catch (IOException e) {
+						e.printStackTrace();
+						
+					}
+				}
+				return runtimes.iterator();
+			}
+
+			@Override
+			public String getSignalName()
+					throws DataUnavailable,
+					CorruptDataException {
+				throw new DataUnavailable("no env");
+			}
+
+			@Override
+			public int getSignalNumber()
+					throws DataUnavailable,
+					CorruptDataException {
+				throw new DataUnavailable("no env");
+			}
+
+			@Override
+			public Iterator getThreads() {
+				// TODO Auto-generated method stub
+				return null;
+			}
+		}
+
+		private List<ImageProcess> processes=null;
+
+		@Override
+		public ImageProcess getCurrentProcess() {
+			fill();
+			return processes.get(0);
+		}
+
+		private void fill() {
+			if(processes==null) {
+				processes=new LinkedList<ImageProcess>();
+				processes.add(new ImageProcessImpl());
+			}
+			
+		}
+
+		@Override
+		public Iterator getImageSections() {
+			// TODO Auto-generated method stub
+			return null;
+		}
+
+		@Override
+		public ImagePointer getPointer(long arg0) {
+			// TODO Auto-generated method stub
+			return null;
+		}
+
+		@Override
+		public Iterator getProcesses() {
+			fill();
+			return processes.iterator();
+		}
+	}
+
 	private List<ImageAddressSpace> spaces=null;
 	private File file=null;
 	
@@ -44,129 +166,7 @@
 	public Iterator getAddressSpaces() {
 		if(spaces==null) {
 			spaces=new LinkedList<ImageAddressSpace>();
-			spaces.add(new ImageAddressSpace(){
-				
-				private List<ImageProcess> processes=null;
-				@Override
-				public ImageProcess getCurrentProcess() {
-					fill();
-					return processes.get(0);
-				}
-
-				private void fill() {
-					if(processes==null) {
-						processes=new LinkedList<ImageProcess>();
-						processes.add(new ImageProcess(){
-							
-							private List<ManagedRuntime> runtimes=null;
-							@Override
-							public String getCommandLine()
-									throws DataUnavailable,
-									CorruptDataException {
-								// TODO Auto-generated method stub
-								return null;
-							}
-
-							@Override
-							public ImageThread getCurrentThread()
-									throws CorruptDataException {
-								// TODO Auto-generated method stub
-								return null;
-							}
-
-							@Override
-							public Properties getEnvironment()
-									throws DataUnavailable,
-									CorruptDataException {
-								// TODO Auto-generated method stub
-								return null;
-							}
-
-							@Override
-							public ImageModule getExecutable()
-									throws DataUnavailable,
-									CorruptDataException {
-								// TODO Auto-generated method stub
-								return null;
-							}
-
-							@Override
-							public String getID() throws DataUnavailable,
-									CorruptDataException {
-								// TODO Auto-generated method stub
-								return null;
-							}
-
-							@Override
-							public Iterator getLibraries()
-									throws DataUnavailable,
-									CorruptDataException {
-								// TODO Auto-generated method stub
-								return null;
-							}
-
-							@Override
-							public int getPointerSize() {
-								// TODO Auto-generated method stub
-								return 0;
-							}
-
-							@Override
-							public Iterator getRuntimes() {
-								if(runtimes==null) {
-									runtimes=new LinkedList<ManagedRuntime>();
-									try {
-										runtimes.add(new JavaRuntimeImpl(file));
-									} catch (IOException e) {
-										e.printStackTrace();
-										
-									}
-								}
-								return runtimes.iterator();
-							}
-
-							@Override
-							public String getSignalName()
-									throws DataUnavailable,
-									CorruptDataException {
-								// TODO Auto-generated method stub
-								return null;
-							}
-
-							@Override
-							public int getSignalNumber()
-									throws DataUnavailable,
-									CorruptDataException {
-								// TODO Auto-generated method stub
-								return 0;
-							}
-
-							@Override
-							public Iterator getThreads() {
-								// TODO Auto-generated method stub
-								return null;
-							}});
-					}
-					
-				}
-
-				@Override
-				public Iterator getImageSections() {
-					// TODO Auto-generated method stub
-					return null;
-				}
-
-				@Override
-				public ImagePointer getPointer(long arg0) {
-					// TODO Auto-generated method stub
-					return null;
-				}
-
-				@Override
-				public Iterator getProcesses() {
-					fill();
-					return processes.iterator();
-				}});
+			spaces.add(new ImageAddressSpaceImpl());
 		}
 		return spaces.iterator();
 		
@@ -174,59 +174,50 @@
 
 	@Override
 	public long getCreationTime() throws DataUnavailable {
-		// TODO Auto-generated method stub
-		return 0;
+		throw new DataUnavailable();
 	}
 
 	@Override
 	public String getHostName() throws DataUnavailable, CorruptDataException {
-		// TODO Auto-generated method stub
-		return null;
+		throw new DataUnavailable();
 	}
 
 	@Override
 	public Iterator getIPAddresses() throws DataUnavailable {
-		// TODO Auto-generated method stub
-		return null;
+		throw new DataUnavailable();
 	}
 
 	@Override
 	public long getInstalledMemory() throws DataUnavailable {
-		// TODO Auto-generated method stub
-		return 0;
+		throw new DataUnavailable();
 	}
 
 	@Override
 	public int getProcessorCount() throws DataUnavailable {
-		// TODO Auto-generated method stub
-		return 0;
+		throw new DataUnavailable();
 	}
 
 	@Override
 	public String getProcessorSubType() throws DataUnavailable,
 			CorruptDataException {
-		// TODO Auto-generated method stub
-		return null;
+		throw new DataUnavailable();
 	}
 
 	@Override
 	public String getProcessorType() throws DataUnavailable,
 			CorruptDataException {
-		// TODO Auto-generated method stub
-		return null;
+		throw new DataUnavailable();
 	}
 
 	@Override
 	public String getSystemSubType() throws DataUnavailable,
 			CorruptDataException {
-		// TODO Auto-generated method stub
-		return null;
+		throw new DataUnavailable();
 	}
 
 	@Override
 	public String getSystemType() throws DataUnavailable, CorruptDataException {
-		// TODO Auto-generated method stub
-		return null;
+		throw new DataUnavailable();
 	}
 
 }

Modified: incubator/kato/trunk/org.apache.kato.jvmti/src/org/apache/kato/jvmti/reader/BinReader.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato.jvmti/src/org/apache/kato/jvmti/reader/BinReader.java?rev=775852&r1=775851&r2=775852&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato.jvmti/src/org/apache/kato/jvmti/reader/BinReader.java (original)
+++ incubator/kato/trunk/org.apache.kato.jvmti/src/org/apache/kato/jvmti/reader/BinReader.java Mon May 18 07:57:00 2009
@@ -899,4 +899,12 @@
 		public int start;
 		
 	}
+
+	public Iterator getJavaClassLoaderIterator() {
+		
+		return loadersMap.values().iterator();
+	}
+	public Iterator getJavaMonitorIterator() {
+		return monitorsMap.values().iterator();
+	}
 }