Attachment 75798 Details for Bug 148461 – Agent enhancements

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Agent enhancements

1.txt (text/plain), 6.48 KB, created by Ashish Patel

on 2007-08-09 17:06:08 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ashish Patel

Created: 2007-08-09 17:06:08 EDT

Size: 6.48 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.tptp.trace.arm
>Index: src-agent/org/eclipse/tptp/trace/arm/internal/agent/Agent.java
>===================================================================
>RCS file: /cvsroot/tptp/trace/org.eclipse.tptp.trace.arm/src-agent/org/eclipse/tptp/trace/arm/internal/agent/Agent.java,v
>retrieving revision 1.15
>diff -u -r1.15 Agent.java
>--- src-agent/org/eclipse/tptp/trace/arm/internal/agent/Agent.java	20 Jul 2007 22:33:14 -0000	1.15
>+++ src-agent/org/eclipse/tptp/trace/arm/internal/agent/Agent.java	9 Aug 2007 20:59:58 -0000
>@@ -12,7 +12,6 @@
> 
> package org.eclipse.tptp.trace.arm.internal.agent;
> 
>-import java.io.File;
> import java.net.InetAddress;
> import java.net.UnknownHostException;
> import java.util.Calendar;
>@@ -54,8 +53,6 @@
> 
> 	private static final String IP_ADDRESS_OVERRIDE = "org.eclipse.tptp.trace.arm.ip"; 
> 
>-	private final static boolean _isNativesAvailable;
>-
> 	private static boolean _isRACActive; 
> 	
> 	/*
>@@ -84,56 +81,6 @@
> 	
> 	private Object _monitorActiveSynch = new Object(); 
> 
>-	/*
>-	 * The following is duplicated from the RemoteComponentSkeleton class. The
>-	 * reason for this is because when you call RemoteComponentSkeleton's
>-	 * intialize method, it will throw an AgentControllerUnavailableException if
>-	 * either the native libraries can't be loaded, or if the RAC hasn't come up
>-	 * yet. In the latter case, we can simply wait for the RAC to come up. But
>-	 * in the former case, there's a problem with the system path, which is a
>-	 * fatal error.
>-	 */
>-	static {
>-		boolean nativesLoadable = false;
>-		String osName = (String) System.getProperties().get("os.name");
>-		String ext = (osName.toUpperCase().startsWith("WIN") ? ".dll" : ".so");
>-		String acLibraryPath = System.getProperty(RemoteComponentSkeleton.AC_LIBRARY_PATH, null);
>-		if (acLibraryPath != null && !acLibraryPath.endsWith(File.separator)) {
>-			acLibraryPath = acLibraryPath.concat(File.separator);
>-		}
>-		
>-		try {
>-			if (acLibraryPath != null) {
>-				// Bug 112749 begins
>-				System.load(acLibraryPath+"hcclco"+ext); //$NON-NLS-1$
>-				System.load(acLibraryPath+"hccls"+ext); //$NON-NLS-1$
>-				System.load(acLibraryPath+"hcbnd"+ext); //$NON-NLS-1$
>-				System.load(acLibraryPath+"hcclsm"+ext); //$NON-NLS-1$
>-				System.load(acLibraryPath+"hccldt"+ext); //$NON-NLS-1$
>-				// Bug 112749 ends
>-				System.load(acLibraryPath+"hcjbnd"+ext); //$NON-NLS-1$
>-				nativesLoadable = true;
>-			}
>-
>-			if (!nativesLoadable) {
>-				// Bug 112749 begins
>-				System.loadLibrary("hcclco");
>-				System.loadLibrary("hccls");
>-				System.loadLibrary("hcbnd");
>-				System.loadLibrary("hcclsm");
>-				System.loadLibrary("hccldt");
>-				// Bug 112749 ends
>-				System.loadLibrary("hcjbnd");
>-				nativesLoadable = true;
>-			}
>-		} catch (Throwable e) {
>-			_logger.logReport(ARMLogger.SEV_CRIT, "IWAT0886E", //$NON-NLS-1$
>-					ArmRuntimeMessages.getString("AgentNotReg_ERROR_"), //$NON-NLS-1$
>-					ARMLogger.LOG, e);
>-		}
>-		_isNativesAvailable = nativesLoadable;
>-	}
>-
> 	/**
> 	 * Serves as an interface to the RAC and ultimately the workbench.
> 	 */
>@@ -183,9 +130,7 @@
> 			_agent.initialize();
> 			_isRACActive = true;
> 		} catch (AgentControllerUnavailableException e) {
>-			if (!_isNativesAvailable) {
>-				throw new NativesUnavailableException(); 
>-			}
>+			throw new NativesUnavailableException(e);
> 		}
> 		
> 		_logger.logDebug(ARMLogger.SEV_DEBUG_MIN, 
>Index: src-agent/org/eclipse/tptp/trace/arm/internal/agent/NativesUnavailableException.java
>===================================================================
>RCS file: /cvsroot/tptp/trace/org.eclipse.tptp.trace.arm/src-agent/org/eclipse/tptp/trace/arm/internal/agent/NativesUnavailableException.java,v
>retrieving revision 1.2
>diff -u -r1.2 NativesUnavailableException.java
>--- src-agent/org/eclipse/tptp/trace/arm/internal/agent/NativesUnavailableException.java	7 Jul 2006 16:39:29 -0000	1.2
>+++ src-agent/org/eclipse/tptp/trace/arm/internal/agent/NativesUnavailableException.java	9 Aug 2007 20:59:58 -0000
>@@ -12,6 +12,8 @@
> 
> package org.eclipse.tptp.trace.arm.internal.agent;
> 
>+import org.eclipse.hyades.internal.execution.remote.AgentControllerUnavailableException;
>+
> /**
>  * Thrown to indicate that the RAC binaries (DLL/so) could not be loaded by the
>  * JVM. If this exception is encountered, make sure that the PATH/LiBPATH in the
>@@ -23,6 +25,13 @@
>  */
> public class NativesUnavailableException extends RuntimeException {
> 
>+	/*
>+	 * Constructor
>+	 */
>+	public NativesUnavailableException(AgentControllerUnavailableException e) {
>+		super(e);
>+	}
>+
> 	/**
> 	 * Generated Id.
> 	 */
>#P org.eclipse.hyades.execution
>Index: src-remote/org/eclipse/hyades/internal/execution/remote/RemoteComponentSkeleton.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.execution/src-remote/org/eclipse/hyades/internal/execution/remote/RemoteComponentSkeleton.java,v
>retrieving revision 1.13
>diff -u -r1.13 RemoteComponentSkeleton.java
>--- src-remote/org/eclipse/hyades/internal/execution/remote/RemoteComponentSkeleton.java	20 Jul 2007 22:33:10 -0000	1.13
>+++ src-remote/org/eclipse/hyades/internal/execution/remote/RemoteComponentSkeleton.java	9 Aug 2007 20:59:59 -0000
>@@ -110,12 +110,13 @@
> 		boolean nativesLoadable = false;
> 		String osName = (String) System.getProperties().get("os.name");
> 		String ext = (osName.toUpperCase().startsWith("WIN") ? ".dll" : ".so");
>-		String acLibraryPath = System.getProperty(AC_LIBRARY_PATH, null);
>-		if (acLibraryPath != null && !acLibraryPath.endsWith(File.separator)) {
>-			acLibraryPath = acLibraryPath.concat(File.separator);
>-		}
>-		
>+
> 		try {
>+			String acLibraryPath = System.getProperty(AC_LIBRARY_PATH, null);
>+			if (acLibraryPath != null && !acLibraryPath.endsWith(File.separator)) {
>+				acLibraryPath = acLibraryPath.concat(File.separator);
>+			}
>+		
> 			if (acLibraryPath != null) {
> 				// Bug 112749 begins
> 				System.load(acLibraryPath+"hcclco"+ext); //$NON-NLS-1$
>@@ -127,7 +128,11 @@
> 				System.load(acLibraryPath+"hcjbnd"+ext); //$NON-NLS-1$
> 				nativesLoadable = true;
> 			}
>-
>+		} catch (Throwable e) {
>+			e.printStackTrace(System.err);
>+		}
>+		
>+		try {
> 			if (!nativesLoadable) {
> 				// Bug 112749 begins
> 				System.loadLibrary("hcclco");
>@@ -140,7 +145,9 @@
> 				nativesLoadable = true;
> 			}
> 		} catch (Throwable e) {
>+			e.printStackTrace(System.err);
> 		}
>+		
> 		nativesAvailable = nativesLoadable;
> 	}
>

Actions: View | Diff

Attachments on bug 148461: 75786 | 75798 | 76255 | 76860