truffle: agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebuggerLocal.java comparison

comparison agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebuggerLocal.java @ 2072:d6cd0d55d0b5

6987812: 2/3 SAJDI: "gHotSpotVMTypes was not initialized properly in the remote process" Summary: Change ExportDirectoryTableImpl to return the 'Export RVA' field without modification. Read 'Base Of Data' field in optional header when PE32 format COFF file is read. Refine search for dbgeng.dll and dbghelp.dll. Other cleanups. Reviewed-by: swamyv, poonam

author	dcubed
date	Thu, 23 Dec 2010 07:58:35 -0800
parents	c18cbe5936b8
children	8e47bac5643a

comparison

equal deleted inserted replaced

-:07c62ff47437
+:d6cd0d55d0b5
 /*
-* Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 throws UnmappedAddressException, DebuggerException {
 // FIXME
 throw new DebuggerException("Unimplemented");
 }
-private static String  DTFWHome;
 private static String  imagePath;
 private static String  symbolPath;
 private static boolean useNativeLookup;
 static {
 /*
-* sawindbg.dll depends on dbgeng.dll which
+* sawindbg.dll depends on dbgeng.dll which itself depends on
-* itself depends on dbghelp.dll. dbgeng.dll and dbghelp.dll.
+* dbghelp.dll. We have to make sure that the dbgeng.dll and
-* On systems newer than Windows 2000, these two .dlls are
+* dbghelp.dll that we load are compatible with each other. We
-* in the standard system directory so we will find them there.
+* load both of those libraries from the same directory based
-* On Windows 2000 and earlier, these files do not exist.
+* on the theory that co-located libraries are compatible.
-* The user must download Debugging Tools For Windows (DTFW)
-* and install it in order to use SA.
 *
-* We have to make sure we use the two files from the same directory
+* On Windows 2000 and earlier, dbgeng.dll and dbghelp.dll were
-* in case there are more than one copy on the system because
+* not included as part of the standard system directory. On
-* one version of dbgeng.dll might not be compatible with a
+* systems newer than Windows 2000, dbgeng.dll and dbghelp.dll
-* different version of dbghelp.dll.
+* are included in the standard system directory. However, the
-* We first look for them in the directory pointed at by
+* versions included in the standard system directory may not
-* env. var. DEBUGGINGTOOLSFORWINDOWS, next in the default
+* be able to handle symbol information for the newer compilers.
-* installation dir for DTFW, and lastly in the standard
+*
-* system directory.  We expect that that we will find
+* We search for and explicitly load the libraries using the
-* them in the standard system directory on all systems
+* following directory search order:
-* newer than Windows 2000.
+*
+* - java.home/bin (same as $JAVA_HOME/jre/bin)
+* - dir named by DEBUGGINGTOOLSFORWINDOWS environment variable
+* - various "Debugging Tools For Windows" program directories
+* - the system directory ($SYSROOT/system32)
+*
+* If SA is invoked with -Dsun.jvm.hotspot.loadLibrary.DEBUG=1,
+* then debug messages about library loading are printed to
+* System.err.
 */
-String dirName = null;
-DTFWHome = System.getenv("DEBUGGINGTOOLSFORWINDOWS");
+String dbgengPath   = null;
+String dbghelpPath  = null;
-if (DTFWHome == null) {
+String sawindbgPath = null;
-// See if we have the files in the default location.
+List   searchList   = new ArrayList();
+boolean loadLibraryDEBUG =
+System.getProperty("sun.jvm.hotspot.loadLibrary.DEBUG") != null;
+{
+// First place to search is co-located with sawindbg.dll in
+// $JAVA_HOME/jre/bin (java.home property is set to $JAVA_HOME/jre):
+searchList.add(System.getProperty("java.home") + File.separator + "bin");
+sawindbgPath = (String) searchList.get(0) + File.separator +
+"sawindbg.dll";
+// second place to search is specified by an environment variable:
+String DTFWHome = System.getenv("DEBUGGINGTOOLSFORWINDOWS");
+if (DTFWHome != null) {
+searchList.add(DTFWHome);
+}
+// The third place to search is the install directory for the
+// "Debugging Tools For Windows" package; so far there are three
+// name variations that we know of:
 String sysRoot = System.getenv("SYSTEMROOT");
-DTFWHome = sysRoot + File.separator +
+DTFWHome = sysRoot + File.separator + ".." + File.separator +
-".." + File.separator + "Program Files" +
+"Program Files" + File.separator + "Debugging Tools For Windows";
-File.separator + "Debugging Tools For Windows";
+searchList.add(DTFWHome);
-}
+searchList.add(DTFWHome + " (x86)");
+searchList.add(DTFWHome + " (x64)");
-{
-String dbghelp = DTFWHome + File.separator + "dbghelp.dll";
+// The last place to search is the system directory:
-String dbgeng = DTFWHome + File.separator + "dbgeng.dll";
+searchList.add(sysRoot + File.separator + "system32");
-File fhelp = new File(dbghelp);
+}
-File feng = new File(dbgeng);
-if (fhelp.exists() && feng.exists()) {
+for (int i = 0; i < searchList.size(); i++) {
-// found both, we are happy.
+File dir = new File((String) searchList.get(i));
-// NOTE: The order of loads is important! If we load dbgeng.dll
+if (!dir.exists()) {
-// first, then the dependency - dbghelp.dll - will be loaded
+if (loadLibraryDEBUG) {
-// from usual DLL search thereby defeating the purpose!
+System.err.println("DEBUG: '" + searchList.get(i) +
-System.load(dbghelp);
+"': directory does not exist.");
-System.load(dbgeng);
+}
-} else if (! fhelp.exists() && ! feng.exists()) {
+// this search directory doesn't exist so skip it
-// neither exist. We will ignore this dir and assume
+continue;
-// they are in the system dir.
+}
-DTFWHome = null;
+dbgengPath = (String) searchList.get(i) + File.separator + "dbgeng.dll";
+dbghelpPath = (String) searchList.get(i) + File.separator + "dbghelp.dll";
+File feng = new File(dbgengPath);
+File fhelp = new File(dbghelpPath);
+if (feng.exists() && fhelp.exists()) {
+// both files exist so we have a match
+break;
+}
+// At least one of the files does not exist; no warning if both
+// don't exist. If just one doesn't exist then we don't check
+// loadLibraryDEBUG because we have a mis-configured system.
+if (feng.exists()) {
+System.err.println("WARNING: found '" + dbgengPath +
+"' but did not find '" + dbghelpPath + "'; ignoring '" +
+dbgengPath + "'.");
+} else if (fhelp.exists()) {
+System.err.println("WARNING: found '" + dbghelpPath +
+"' but did not find '" + dbgengPath + "'; ignoring '" +
+dbghelpPath + "'.");
+} else if (loadLibraryDEBUG) {
+System.err.println("DEBUG: searched '" + searchList.get(i) +
+"': dbgeng.dll and dbghelp.dll were not found.");
+}
+dbgengPath = null;
+dbghelpPath = null;
+}
+if (dbgengPath == null || dbghelpPath == null) {
+// at least one of the files wasn't found anywhere we searched
+String mesg = null;
+if (dbgengPath == null && dbghelpPath == null) {
+mesg = "dbgeng.dll and dbghelp.dll cannot be found. ";
+} else if (dbgengPath == null) {
+mesg = "dbgeng.dll cannot be found (dbghelp.dll was found). ";
 } else {
-// one exists but not the other
+mesg = "dbghelp.dll cannot be found (dbgeng.dll was found). ";
-//System.err.println("Error: Both files dbghelp.dll and dbgeng.dll "
+}
-//                   "must exist in directory " + DTFWHome);
+throw new UnsatisfiedLinkError(mesg +
-throw new UnsatisfiedLinkError("Both files dbghelp.dll and " +
+"Please search microsoft.com for 'Debugging Tools For Windows', " +
-"dbgeng.dll must exist in " +
+"and either download it to the default location, or download it " +
-"directory " + DTFWHome);
+"to a custom location and set environment variable " +
-}
+"'DEBUGGINGTOOLSFORWINDOWS' to the pathname of that location.");
 }
-if (DTFWHome == null) {
-// The files better be in the system dir.
+// NOTE: The order of loads is important! If we load dbgeng.dll
-String sysDir = System.getenv("SYSTEMROOT") +
+// first, then the dependency - dbghelp.dll - will be loaded
-File.separator + "system32";
+// from usual DLL search thereby defeating the purpose!
+if (loadLibraryDEBUG) {
-File feng = new File(sysDir + File.separator + "dbgeng.dll");
+System.err.println("DEBUG: loading '" + dbghelpPath + "'.");
-if (!feng.exists()) {
+}
-throw new UnsatisfiedLinkError("File dbgeng.dll does not exist in " +
+System.load(dbghelpPath);
-sysDir + ".  Please search microsoft.com " +
+if (loadLibraryDEBUG) {
-"for Debugging Tools For Windows, and " +
+System.err.println("DEBUG: loading '" + dbgengPath + "'.");
-"either download it to the default " +
+}
-"location, or download it to a custom " +
+System.load(dbgengPath);
-"location and set environment variable " +
-"   DEBUGGINGTOOLSFORWINDOWS  "  +
-"to the pathname of that location.");
-}
-}
 // Now, load sawindbg.dll
-System.loadLibrary("sawindbg");
+if (loadLibraryDEBUG) {
+System.err.println("DEBUG: loading '" + sawindbgPath + "'.");
+}
+System.load(sawindbgPath);
 // where do I find '.exe', '.dll' files?
 imagePath = System.getProperty("sun.jvm.hotspot.debugger.windbg.imagePath");
 if (imagePath == null) {
 imagePath = System.getenv("PATH");
 }

Mercurial > hg > truffle

comparison agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebuggerLocal.java @ 2072:d6cd0d55d0b5