This is the mail archive of the
frysk-cvs@sources.redhat.com
mailing list for the frysk project.
[SCM] master: Fix error in observer sanity check
- From: pmachata at sourceware dot org
- To: frysk-cvs at sourceware dot org
- Date: 12 Jan 2008 22:01:14 -0000
- Subject: [SCM] master: Fix error in observer sanity check
- Reply-to: frysk at sourceware dot org
The branch, master has been updated
via 16dc92ed18a93d3a0377a3f894534a37a942a0f7 (commit)
via 498134ad01612f87af19a36f4cc023b2857d09b8 (commit)
via eb903dfcefe88d8c70e2a9da9b5af334c9fe187b (commit)
via f00c724ceafad8a210057b425147a3992c45c4da (commit)
from 5e06e147d965c1f702d5152ded4d88c971e12b42 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit 16dc92ed18a93d3a0377a3f894534a37a942a0f7
Author: Petr Machata <pmachata@redhat.com>
Date: Wed Jan 9 13:23:41 2008 +0100
Fix error in observer sanity check
commit 498134ad01612f87af19a36f4cc023b2857d09b8
Author: Petr Machata <pmachata@redhat.com>
Date: Wed Jan 9 12:54:06 2008 +0100
Fix syntax error.
commit eb903dfcefe88d8c70e2a9da9b5af334c9fe187b
Author: Petr Machata <pmachata@redhat.com>
Date: Tue Jan 8 16:03:58 2008 +0100
Reindent ObjectFile.java
commit f00c724ceafad8a210057b425147a3992c45c4da
Author: Petr Machata <pmachata@redhat.com>
Date: Tue Jan 8 16:01:32 2008 +0100
Handle fake /SYSV00000000 files
-----------------------------------------------------------------------
Summary of changes:
frysk-core/frysk/ftrace/ChangeLog | 14 +
frysk-core/frysk/ftrace/Ftrace.java | 8 +-
frysk-core/frysk/ftrace/Ltrace.java | 2 +-
frysk-core/frysk/ftrace/ObjectFile.java | 874 +++++++++++++++----------------
4 files changed, 450 insertions(+), 448 deletions(-)
First 500 lines of diff:
diff --git a/frysk-core/frysk/ftrace/ChangeLog b/frysk-core/frysk/ftrace/ChangeLog
index 96b10e7..48c8c1d 100644
--- a/frysk-core/frysk/ftrace/ChangeLog
+++ b/frysk-core/frysk/ftrace/ChangeLog
@@ -1,3 +1,17 @@
+2008-01-09 Petr Machata <pmachata@redhat.com>
+
+ * Ltrace.java (TracePointObserver.deletedFrom): Fix checking of
+ observers emptiness.
+
+2008-01-08 Petr Machata <pmachata@redhat.com>
+
+ * ObjectFile.java: Reindent.
+
+2008-01-08 Petr Machata <pmachata@redhat.com>
+
+ * Ftrace.java: Handle fake /SYSV00000000 files implementing the
+ memory sharing.
+
2008-01-07 Andrew Cagney <cagney@redhat.com>
* Ftrace.java: Update; use Host.requestProc(ProcId,FindProc).
diff --git a/frysk-core/frysk/ftrace/Ftrace.java b/frysk-core/frysk/ftrace/Ftrace.java
index 942530d..bda1595 100644
--- a/frysk-core/frysk/ftrace/Ftrace.java
+++ b/frysk-core/frysk/ftrace/Ftrace.java
@@ -583,7 +583,13 @@ public class Ftrace
if (traceMmapUnmap)
reporter.eventSingle(task, "map " + mapping.path);
- ObjectFile objf = ObjectFile.buildFromFile(mapping.path);
+ java.io.File path = mapping.path;
+ if (path.getPath().equals("/SYSV00000000 (deleted)")) {
+ // This is most probably artificial name of SYSV
+ // shared memory "file".
+ return Action.CONTINUE;
+ }
+ ObjectFile objf = ObjectFile.buildFromFile(path);
if (objf == null)
return Action.CONTINUE;
diff --git a/frysk-core/frysk/ftrace/Ltrace.java b/frysk-core/frysk/ftrace/Ltrace.java
index a802e32..ee836da 100644
--- a/frysk-core/frysk/ftrace/Ltrace.java
+++ b/frysk-core/frysk/ftrace/Ltrace.java
@@ -278,7 +278,7 @@ public class Ltrace
}
public void deletedFrom (Object observable) {
- if (observers.isEmpty())
+ if (!observers.isEmpty())
throw new AssertionError("Observers still present!");
if (last == null)
throw new AssertionError("No last observer set!");
diff --git a/frysk-core/frysk/ftrace/ObjectFile.java b/frysk-core/frysk/ftrace/ObjectFile.java
index 7c99f99..3b4016b 100644
--- a/frysk-core/frysk/ftrace/ObjectFile.java
+++ b/frysk-core/frysk/ftrace/ObjectFile.java
@@ -69,74 +69,73 @@ import lib.stdcpp.Demangler;
*/
public class ObjectFile
{
- private File filename;
- private String soname = null;
- private String interp = null;
+ private File filename;
+ private String soname = null;
+ private String interp = null;
private File resolvedInterp = null;
- private long baseAddress = 0;
- private long entryPoint = 0;
- private static HashMap cachedFiles = new HashMap();
- protected static final Logger logger = Logger.getLogger(FtraceLogger.LOGGER_ID);
-
- public ElfSection dynamicStrtab = null;
- public ElfSection dynamicSymtab = null;
- public ElfSection staticSymtab = null;
-
- public ElfSection dynamicVersym = null;
- public ElfSection dynamicVerdef = null;
- public ElfSection dynamicVerneed = null;
- public int dynamicVerdefCount = 0;
- public int dynamicVerneedCount = 0;
-
- public long pltAddr = 0;
- public long pltSize = 0;
- public ElfRel[] pltRelocs = null;
-
- /**
- * Implement this interface to create an iterator over tracepoints
- * defined in this file.
- */
- public interface TracePointIterator {
- void tracePoint(TracePoint tracePoint);
- }
-
- private static void assertFitsToInt(long num, String context)
- {
- int numi = (int)num;
- if ((long)numi != num)
- throw new ArithmeticException(context + ": " + num + " doesn't fit into int.");
- }
-
- /**
- * All-purpose builder for ftrace Symbols and TracePoints.
- */
+ private long baseAddress = 0;
+ private long entryPoint = 0;
+ private static HashMap cachedFiles = new HashMap();
+ protected static final Logger logger = Logger.getLogger(FtraceLogger.LOGGER_ID);
+
+ public ElfSection dynamicStrtab = null;
+ public ElfSection dynamicSymtab = null;
+ public ElfSection staticSymtab = null;
+
+ public ElfSection dynamicVersym = null;
+ public ElfSection dynamicVerdef = null;
+ public ElfSection dynamicVerneed = null;
+ public int dynamicVerdefCount = 0;
+ public int dynamicVerneedCount = 0;
+
+ public long pltAddr = 0;
+ public long pltSize = 0;
+ public ElfRel[] pltRelocs = null;
+
+ /**
+ * Implement this interface to create an iterator over tracepoints
+ * defined in this file.
+ */
+ public interface TracePointIterator {
+ void tracePoint(TracePoint tracePoint);
+ }
+
+ private static void assertFitsToInt(long num, String context) {
+ int numi = (int)num;
+ if ((long)numi != num)
+ throw new ArithmeticException(context + ": " + num + " doesn't fit into int.");
+ }
+
+ /**
+ * All-purpose builder for ftrace Symbols and TracePoints.
+ */
private class ObjFBuilder
implements ElfSymbol.Builder
{
- /** Used for tracking of what is currently being loaded. */
- private TracePointOrigin origin = null;
+ /** Used for tracking of what is currently being loaded. */
+ private TracePointOrigin origin = null;
/** For alias detection. */
private Map symbolWithValue = new HashMap();
- /** This is the array where newly created tracepoints go to. */
- private ArrayList tracePoints = null;
+ /** This is the array where newly created tracepoints go to. */
+ private ArrayList tracePoints = null;
- /**
- * This is the array where symbols from DYNAMIC are stored, should
- * they be needed for PLT tracepoints.
- */
- private Symbol[] dynamicSymbolList = null;
- private ElfSymbol.Loader dynamicLoader = null;
+ /**
+ * This is the array where symbols from DYNAMIC are stored, should
+ * they be needed for PLT tracepoints.
+ */
+ private Symbol[] dynamicSymbolList = null;
+ private ElfSymbol.Loader dynamicLoader = null;
- /**
- * Map with tracepoints of various origin.
- * HashMap<origin, ArrayList<TracePoint>>
- */
- private Map tracePointMap = new HashMap();
+ /**
+ * Map with tracepoints of various origin.
+ * HashMap<origin, ArrayList<TracePoint>>
+ */
+ private Map tracePointMap = new HashMap();
- /** Whether this file takes part in dynamic linking. */
- private boolean haveDynamic = false;
+ /** Whether this file takes part in dynamic linking. */
+ private boolean haveDynamic = false;
/** Keep track of loaded dynamic symbols. We will need this
* when building PLT entries. */
@@ -210,299 +209,296 @@ public class ObjectFile
tracePoints.add(tp);
}
- public synchronized ArrayList getTracePoints(TracePointOrigin origin)
- throws lib.dwfl.ElfException
- {
- ArrayList tracePoints = (ArrayList)this.tracePointMap.get(origin);
- if (tracePoints != null) {
- logger.log(Level.FINE, "" + tracePoints.size() + " tracepoints for origin " + origin + " retrieved from cache.");
- return tracePoints;
- }
-
- logger.log(Level.FINE, "Loading tracepoints for origin " + origin + ".");
- if ((origin == TracePointOrigin.PLT
- || origin == TracePointOrigin.DYNAMIC)
- && this.haveDynamic)
- {
- // Initialize dynamic symbol list for PLT if necessary...
- if (this.dynamicSymbolList == null) {
- long count = ElfSymbol.symbolsCount(ObjectFile.this.dynamicSymtab);
- assertFitsToInt(count, "Symbol count");
- this.dynamicSymbolList = new Symbol[(int)count];
- this.dynamicLoader
- = new ElfSymbol.Loader(ObjectFile.this.dynamicSymtab, ObjectFile.this.dynamicVersym,
- ObjectFile.this.dynamicVerdef, ObjectFile.this.dynamicVerdefCount,
- ObjectFile.this.dynamicVerneed, ObjectFile.this.dynamicVerneedCount);
- }
-
- if (origin == TracePointOrigin.DYNAMIC) {
- // Load dynamic symtab and PLT entries.
- logger.log(Level.FINER, "Loading dynamic symtab.");
- this.origin = TracePointOrigin.DYNAMIC;
- this.tracePoints = new ArrayList();
- this.tracePointMap.put(this.origin, this.tracePoints);
-
- this.dynamicLoader.loadAll(this);
- }
-
- if (origin == TracePointOrigin.PLT) {
- int pltCount = ObjectFile.this.pltRelocs.length;
- logger.log(Level.FINER, "Loading " + pltCount + " PLT entries.");
-
- ArrayList tracePointsPlt = new ArrayList();
- this.tracePointMap.put(TracePointOrigin.PLT, tracePointsPlt);
-
- ArrayList tracePointsDynamic
- = (ArrayList)this.tracePointMap.get(TracePointOrigin.DYNAMIC);
- if (tracePointsDynamic == null)
- this.tracePointMap.put(TracePointOrigin.DYNAMIC,
- tracePointsDynamic = new ArrayList());
-
- long pltEntrySize = ObjectFile.this.pltSize / (ObjectFile.this.pltRelocs.length + 1);
- for (int i = 0; i < pltCount; ++i)
- /* XXX HACK: 386/x64 specific. In general we want
- * platform-independent way of asking whether it's
- * JMP_SLOT relocation. */
- if (ObjectFile.this.pltRelocs[i].type == 7) {
- long pltEntryAddr = ObjectFile.this.pltAddr + pltEntrySize * (i + 1);
- long symbolIndex = ObjectFile.this.pltRelocs[i].symbolIndex;
-
- assertFitsToInt(symbolIndex, "Symbol associated with PLT entry");
- Symbol symbol = this.dynamicSymbolList[(int)symbolIndex];
- if (symbol == null) {
- logger.log(Level.FINEST,
- "Lazy loading symbol #" + symbolIndex);
- this.origin = TracePointOrigin.DYNAMIC;
- this.tracePoints = tracePointsDynamic;
- this.dynamicLoader.load(symbolIndex, this);
- symbol = this.dynamicSymbolList[(int)symbolIndex];
- }
- if (symbol == null)
- throw new AssertionError("Dynamic symbol still not initialized.");
-
- logger.log(Level.FINEST,
- "Got plt entry for `" + symbol.name
- + "' at 0x" + Long.toHexString(pltEntryAddr) + ".");
- this.origin = TracePointOrigin.PLT;
- this.tracePoints = tracePointsPlt;
- long pltEntryOffset = pltEntryAddr - ObjectFile.this.baseAddress;
- this.addNewTracepoint(pltEntryAddr, pltEntryOffset, symbol);
+ public synchronized ArrayList getTracePoints(TracePointOrigin origin)
+ throws lib.dwfl.ElfException
+ {
+ ArrayList tracePoints = (ArrayList)this.tracePointMap.get(origin);
+ if (tracePoints != null) {
+ logger.log(Level.FINE, "" + tracePoints.size() + " tracepoints for origin " + origin + " retrieved from cache.");
+ return tracePoints;
+ }
+
+ logger.log(Level.FINE, "Loading tracepoints for origin " + origin + ".");
+ if ((origin == TracePointOrigin.PLT
+ || origin == TracePointOrigin.DYNAMIC)
+ && this.haveDynamic) {
+ // Initialize dynamic symbol list for PLT if necessary...
+ if (this.dynamicSymbolList == null) {
+ long count = ElfSymbol.symbolsCount(ObjectFile.this.dynamicSymtab);
+ assertFitsToInt(count, "Symbol count");
+ this.dynamicSymbolList = new Symbol[(int)count];
+ this.dynamicLoader
+ = new ElfSymbol.Loader(ObjectFile.this.dynamicSymtab, ObjectFile.this.dynamicVersym,
+ ObjectFile.this.dynamicVerdef, ObjectFile.this.dynamicVerdefCount,
+ ObjectFile.this.dynamicVerneed, ObjectFile.this.dynamicVerneedCount);
}
- }
- }
- else if (origin == TracePointOrigin.SYMTAB
- && ObjectFile.this.staticSymtab != null) {
- // Load static symtab.
- logger.log(Level.FINER, "Loading static symtab.");
- this.origin = TracePointOrigin.SYMTAB;
- this.tracePoints = new ArrayList();
- this.tracePointMap.put(this.origin, this.tracePoints);
-
- ElfSymbol.Loader loader;
- loader = new ElfSymbol.Loader(ObjectFile.this.staticSymtab);
- loader.loadAll(this);
- }
- else
- this.tracePoints = new ArrayList(); //java.util.Collections.EMPTY_LIST;
-
- return this.tracePoints;
- }
+
+ if (origin == TracePointOrigin.DYNAMIC) {
+ // Load dynamic symtab and PLT entries.
+ logger.log(Level.FINER, "Loading dynamic symtab.");
+ this.origin = TracePointOrigin.DYNAMIC;
+ this.tracePoints = new ArrayList();
+ this.tracePointMap.put(this.origin, this.tracePoints);
+
+ this.dynamicLoader.loadAll(this);
+ }
+
+ if (origin == TracePointOrigin.PLT) {
+ int pltCount = ObjectFile.this.pltRelocs.length;
+ logger.log(Level.FINER, "Loading " + pltCount + " PLT entries.");
+
+ ArrayList tracePointsPlt = new ArrayList();
+ this.tracePointMap.put(TracePointOrigin.PLT, tracePointsPlt);
+
+ ArrayList tracePointsDynamic
+ = (ArrayList)this.tracePointMap.get(TracePointOrigin.DYNAMIC);
+ if (tracePointsDynamic == null)
+ this.tracePointMap.put(TracePointOrigin.DYNAMIC,
+ tracePointsDynamic = new ArrayList());
+
+ long pltEntrySize = ObjectFile.this.pltSize / (ObjectFile.this.pltRelocs.length + 1);
+ for (int i = 0; i < pltCount; ++i)
+ /* XXX HACK: 386/x64 specific. In general we want
+ * platform-independent way of asking whether it's
+ * JMP_SLOT relocation. */
+ if (ObjectFile.this.pltRelocs[i].type == 7) {
+ long pltEntryAddr = ObjectFile.this.pltAddr + pltEntrySize * (i + 1);
+ long symbolIndex = ObjectFile.this.pltRelocs[i].symbolIndex;
+
+ assertFitsToInt(symbolIndex, "Symbol associated with PLT entry");
+ Symbol symbol = this.dynamicSymbolList[(int)symbolIndex];
+ if (symbol == null) {
+ logger.log(Level.FINEST,
+ "Lazy loading symbol #" + symbolIndex);
+ this.origin = TracePointOrigin.DYNAMIC;
+ this.tracePoints = tracePointsDynamic;
+ this.dynamicLoader.load(symbolIndex, this);
+ symbol = this.dynamicSymbolList[(int)symbolIndex];
+ }
+ if (symbol == null)
+ throw new AssertionError("Dynamic symbol still not initialized.");
+
+ logger.log(Level.FINEST,
+ "Got plt entry for `" + symbol.name
+ + "' at 0x" + Long.toHexString(pltEntryAddr) + ".");
+ this.origin = TracePointOrigin.PLT;
+ this.tracePoints = tracePointsPlt;
+ long pltEntryOffset = pltEntryAddr - ObjectFile.this.baseAddress;
+ this.addNewTracepoint(pltEntryAddr, pltEntryOffset, symbol);
+ }
+ }
+ }
+ else if (origin == TracePointOrigin.SYMTAB
+ && ObjectFile.this.staticSymtab != null) {
+ // Load static symtab.
+ logger.log(Level.FINER, "Loading static symtab.");
+ this.origin = TracePointOrigin.SYMTAB;
+ this.tracePoints = new ArrayList();
+ this.tracePointMap.put(this.origin, this.tracePoints);
+
+ ElfSymbol.Loader loader;
+ loader = new ElfSymbol.Loader(ObjectFile.this.staticSymtab);
+ loader.loadAll(this);
+ }
+ else
+ this.tracePoints = new ArrayList(); //java.util.Collections.EMPTY_LIST;
+
+ return this.tracePoints;
+ }
}
private ObjFBuilder builder;
- protected ObjectFile(File file, final Elf elfFile, ElfEHeader eh)
- throws lib.dwfl.ElfException
- {
- this.filename = file;
- this.entryPoint = eh.entry;
- this.builder = new ObjFBuilder();
-
- boolean haveLoadable = false;
- boolean havePlt = false;
- boolean haveRelPlt = false;
- long offDynamic = 0;
- for (int i = 0; i < eh.phnum; ++i) {
- ElfPHeader ph = elfFile.getPHeader(i);
- if (ph.type == ElfPHeader.PTYPE_DYNAMIC) {
- builder.haveDynamic = true;
- offDynamic = ph.offset;
- logger.log(Level.FINER, "Found DYNAMIC segment.");
- }
- else if (ph.type == ElfPHeader.PTYPE_LOAD
- && ph.offset == 0) {
- haveLoadable = true;
- this.baseAddress = ph.vaddr;
- logger.log(Level.FINER,
- "Found LOADABLE segment, base address = 0x"
- + Long.toHexString(this.baseAddress));
- }
- else if (ph.type == ElfPHeader.PTYPE_INTERP) {
- ElfData interpData = elfFile.getRawData(ph.offset, ph.filesz - 1); // -1 for trailing zero
- String interp = new String(interpData.getBytes());
- this.setInterp(interp);
- logger.log(Level.FINEST, "Found INTERP `" + interp + "'.");
+ protected ObjectFile(File file, final Elf elfFile, ElfEHeader eh)
+ throws lib.dwfl.ElfException
+ {
+ this.filename = file;
+ this.entryPoint = eh.entry;
+ this.builder = new ObjFBuilder();
+
+ boolean haveLoadable = false;
+ boolean havePlt = false;
+ boolean haveRelPlt = false;
+ long offDynamic = 0;
+ for (int i = 0; i < eh.phnum; ++i) {
+ ElfPHeader ph = elfFile.getPHeader(i);
+ if (ph.type == ElfPHeader.PTYPE_DYNAMIC) {
+ builder.haveDynamic = true;
+ offDynamic = ph.offset;
+ logger.log(Level.FINER, "Found DYNAMIC segment.");
+ }
+ else if (ph.type == ElfPHeader.PTYPE_LOAD
+ && ph.offset == 0) {
+ haveLoadable = true;
+ this.baseAddress = ph.vaddr;
+ logger.log(Level.FINER,
+ "Found LOADABLE segment, base address = 0x"
+ + Long.toHexString(this.baseAddress));
+ }
+ else if (ph.type == ElfPHeader.PTYPE_INTERP) {
+ ElfData interpData = elfFile.getRawData(ph.offset, ph.filesz - 1); // -1 for trailing zero
+ String interp = new String(interpData.getBytes());
+ this.setInterp(interp);
+ logger.log(Level.FINEST, "Found INTERP `" + interp + "'.");
+ }
}
- }
- if (!haveLoadable) {
- logger.log(Level.FINE, "Failed, didn't find any loadable segments.");
- throw new lib.dwfl.ElfFileException("Failed, didn't find any loadable segments.");
- }
+ if (!haveLoadable) {
+ logger.log(Level.FINE, "Failed, didn't find any loadable segments.");
+ throw new lib.dwfl.ElfFileException("Failed, didn't find any loadable segments.");
+ }
- if (eh.type == ElfEHeader.PHEADER_ET_EXEC)
- logger.log(Level.FINER, "This file is EXECUTABLE.");
- else if (eh.type == ElfEHeader.PHEADER_ET_DYN)
- logger.log(Level.FINER, "This file is DSO or PIE EXECUTABLE.");
- else {
- logger.log(Level.FINE, "Failed, unsupported ELF file type.");
- throw new lib.dwfl.ElfFileException("Failed, unsupported ELF file type.");
- }
+ if (eh.type == ElfEHeader.PHEADER_ET_EXEC)
+ logger.log(Level.FINER, "This file is EXECUTABLE.");
+ else if (eh.type == ElfEHeader.PHEADER_ET_DYN)
+ logger.log(Level.FINER, "This file is DSO or PIE EXECUTABLE.");
+ else {
+ logger.log(Level.FINE, "Failed, unsupported ELF file type.");
+ throw new lib.dwfl.ElfFileException("Failed, unsupported ELF file type.");
+ }
- boolean foundDynamic = false;
+ boolean foundDynamic = false;
- class Locals {
- public int dynamicSonameIdx = -1;
- }
- final Locals locals = new Locals();
-
- // Find & interpret DYNAMIC section.
- for (ElfSection section = elfFile.getSection(0);
- section != null;
- section = elfFile.getNextSection(section)) {
- ElfSectionHeader sheader = section.getSectionHeader();
- if (builder.haveDynamic && sheader.offset == offDynamic) {
- logger.log(Level.FINER, "Processing DYNAMIC section.");
- foundDynamic = true;
- ElfDynamic.loadFrom(section, new ElfDynamic.Builder() {
- public void entry (int tag, long value)
- {
- if (tag == ElfDynamic.ELF_DT_STRTAB)
hooks/post-receive
--
frysk system monitor/debugger