natas_hw
/
intrace
mirror of https://github.com/mchr3k/org.intrace
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Implement fallback to handle the case where we get the bitness wrong

This commit is contained in:
mchr3k 2011-04-25 14:56:41 +01:00
parent e12d1be61e
commit ac57fa2135
2 changed files with 43 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
binaries/jars/latest_development/intrace-ui.jar
View File

Binary file not shown.

60
org.intrace/src/org/intrace/client/loader/TraceClientLoader.java
View File

@ -12,14 +12,27 @@ public class TraceClientLoader
{
public static void main(String[] args) throws Throwable
{
ClassLoader cl = getSWTClassloader();
ClassLoader cl = getSWTClassloader(false);
Thread.currentThread().setContextClassLoader(cl);
try
{
System.err.println("Launching InTrace UI");
Class<?> c = Class.forName("org.intrace.client.gui.TraceClient", true, cl);
Method main = c.getMethod("main", new Class[]{args.getClass()});
main.invoke((Object)null, new Object[]{args});
try
{
System.err.println("Launching InTrace UI");
Class<?> c = Class.forName("org.intrace.client.gui.TraceClient", true, cl);
Method main = c.getMethod("main", new Class[]{args.getClass()});
main.invoke((Object)null, new Object[]{args});
}
catch (UnsatisfiedLinkError ex)
{
System.err.println("Launch failed (UnsatisfiedLinkError), try other bitness");
cl = getSWTClassloader(true);
Thread.currentThread().setContextClassLoader(cl);
System.err.println("Launching InTrace UI");
Class<?> c = Class.forName("org.intrace.client.gui.TraceClient", true, cl);
Method main = c.getMethod("main", new Class[]{args.getClass()});
main.invoke((Object)null, new Object[]{args});
}
}
catch (ClassNotFoundException ex)
{
@ -31,16 +44,26 @@ public class TraceClientLoader
}
catch (InvocationTargetException ex)
{
throw ex.getCause();
Throwable th = ex.getCause();
if ((th.getMessage() != null) &&
th.getMessage().toLowerCase().contains("invalid thread access"))
{
System.err.println("If you are running on OSX, try restarting with " +
"command line option -XstartOnFirstThread");
}
else
{
throw th;
}
}
}
private static ClassLoader getSWTClassloader()
private static ClassLoader getSWTClassloader(boolean xiInvertArch)
{
ClassLoader parent = Thread.currentThread().getContextClassLoader();
URL.setURLStreamHandlerFactory(new RsrcURLStreamHandlerFactory(parent));
String swtFileName = getSwtJarName();
String swtFileName = getSwtJarName(xiInvertArch);
try
{
URL intraceFileUrl = new URL("rsrc:intrace-ui-wrapper.jar");
@ -67,7 +90,7 @@ public class TraceClientLoader
}
}
private static String getSwtJarName()
private static String getSwtJarName(boolean xiInvertArch)
{
// Detect OS
String osName = System.getProperty("os.name").toLowerCase();
@ -80,15 +103,18 @@ public class TraceClientLoader
}
// Detect 32bit vs 64 bit
// NOTE: sun.arch.data.model is only available on SUN JVMs
String osArch = System.getProperty("sun.arch.data.model");
String jvmArch = System.getProperty("os.arch").toLowerCase();
String swtFileNameArchPart = (osArch != null ? osArch :
(jvmArch.contains("64") ? "64" : "32"));
if (osArch == null)
String jvmArch = System.getProperty("os.arch").toLowerCase();
String swtFileNameArchPart = (jvmArch.contains("64") ? "64" : "32");
if (xiInvertArch)
{
System.err.println("Warning: Picked SWT 32 vs 64 bit based on JVM bitness. " +
"If you are running a different bitness OS and JVM the this may fail.");
if ("64".equals(swtFileNameArchPart))
{
swtFileNameArchPart = "32";
}
else if ("32".equals(swtFileNameArchPart))
{
swtFileNameArchPart = "64";
}
}
String swtFileName = "swt-" + swtFileNameOsPart + swtFileNameArchPart
+ "-3.6.2.jar";