Attachment #75798 for bug #148461

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





package org.eclipse.tptp.trace.arm.internal.agent;

import java.io.File;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Calendar;


	private static final String IP_ADDRESS_OVERRIDE = "org.eclipse.tptp.trace.arm.ip"; 

	private final static boolean _isNativesAvailable;

	private static boolean _isRACActive; 
	
	/*

	
	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.
	 */

			_agent.initialize();
			_isRACActive = true;
		} catch (AgentControllerUnavailableException e) {
			throw new NativesUnavailableException(e);
				throw new NativesUnavailableException(); 
			}
		}
		
		_logger.logDebug(ARMLogger.SEV_DEBUG_MIN, 

Lines 12-17 Link Here

(-)src-agent/org/eclipse/tptp/trace/arm/internal/agent/NativesUnavailableException.java (+9 lines)
12		12
13	package org.eclipse.tptp.trace.arm.internal.agent;	13	package org.eclipse.tptp.trace.arm.internal.agent;
14		14
		15	import org.eclipse.hyades.internal.execution.remote.AgentControllerUnavailableException;
		16
15	/**	17	/**
16	* Thrown to indicate that the RAC binaries (DLL/so) could not be loaded by the	18	* Thrown to indicate that the RAC binaries (DLL/so) could not be loaded by the
17	* JVM. If this exception is encountered, make sure that the PATH/LiBPATH in the	19	* JVM. If this exception is encountered, make sure that the PATH/LiBPATH in the
Lines 23-28 Link Here
23	*/	25	*/
24	public class NativesUnavailableException extends RuntimeException {	26	public class NativesUnavailableException extends RuntimeException {
25		27
		28	/*
		29	* Constructor
		30	*/
		31	public NativesUnavailableException(AgentControllerUnavailableException e) {
		32	super(e);
		33	}
		34
26	/**	35	/**
27	* Generated Id.	36	* Generated Id.
28	*/	37	*/

Lines 110-121 Link Here

(-)src-remote/org/eclipse/hyades/internal/execution/remote/RemoteComponentSkeleton.java (-6 / +13 lines)
110	boolean nativesLoadable = false;	110	boolean nativesLoadable = false;
111	String osName = (String) System.getProperties().get("os.name");	111	String osName = (String) System.getProperties().get("os.name");
112	String ext = (osName.toUpperCase().startsWith("WIN") ? ".dll" : ".so");	112	String ext = (osName.toUpperCase().startsWith("WIN") ? ".dll" : ".so");
113	String acLibraryPath = System.getProperty(AC_LIBRARY_PATH, null);	113
114	if (acLibraryPath != null && !acLibraryPath.endsWith(File.separator)) {
115	acLibraryPath = acLibraryPath.concat(File.separator);
116	}
117
118	try {	114	try {
		115	String acLibraryPath = System.getProperty(AC_LIBRARY_PATH, null);
		116	if (acLibraryPath != null && !acLibraryPath.endsWith(File.separator)) {
		117	acLibraryPath = acLibraryPath.concat(File.separator);
		118	}
		119
119	if (acLibraryPath != null) {	120	if (acLibraryPath != null) {
120	// Bug 112749 begins	121	// Bug 112749 begins
121	System.load(acLibraryPath+"hcclco"+ext); //$NON-NLS-1$	122	System.load(acLibraryPath+"hcclco"+ext); //$NON-NLS-1$
Lines 127-133 Link Here
127	System.load(acLibraryPath+"hcjbnd"+ext); //$NON-NLS-1$	128	System.load(acLibraryPath+"hcjbnd"+ext); //$NON-NLS-1$
128	nativesLoadable = true;	129	nativesLoadable = true;
129	}	130	}
130		131	} catch (Throwable e) {
		132	e.printStackTrace(System.err);
		133	}
		134
		135	try {
131	if (!nativesLoadable) {	136	if (!nativesLoadable) {
132	// Bug 112749 begins	137	// Bug 112749 begins
133	System.loadLibrary("hcclco");	138	System.loadLibrary("hcclco");
Lines 140-146 Link Here
140	nativesLoadable = true;	145	nativesLoadable = true;
141	}	146	}
142	} catch (Throwable e) {	147	} catch (Throwable e) {
		148	e.printStackTrace(System.err);
143	}	149	}
		150
144	nativesAvailable = nativesLoadable;	151	nativesAvailable = nativesLoadable;
145	}	152	}
146		153

Return to bug 148461