public inbox for frysk-cvs@sourceware.org
help / color / mirror / Atom feed
* [SCM] master: New logging function
@ 2008-04-02 6:10 pmachata
0 siblings, 0 replies; only message in thread
From: pmachata @ 2008-04-02 6:10 UTC (permalink / raw)
To: frysk-cvs
The branch, master has been updated
via 72dcfe41b8fc7c1fbc546d25cd5f8ae96353b042 (commit)
via 45dcf2b5441cdb686b34af25a6f5a80cb779ea92 (commit)
from bcb3fa5fdc4667a15386f1ef9a116753d761fb90 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit 72dcfe41b8fc7c1fbc546d25cd5f8ae96353b042
Author: Petr Machata <pmachata@redhat.com>
Date: Wed Apr 2 02:52:22 2008 +0200
New logging function
commit 45dcf2b5441cdb686b34af25a6f5a80cb779ea92
Author: Petr Machata <pmachata@redhat.com>
Date: Tue Apr 1 23:47:18 2008 +0200
Coding style fix
-----------------------------------------------------------------------
Summary of changes:
frysk-core/frysk/ftrace/ObjectFile.java | 80 ++++++++++++++-----------------
frysk-sys/frysk/rsl/ChangeLog | 4 ++
frysk-sys/frysk/rsl/Log.java | 5 ++
3 files changed, 45 insertions(+), 44 deletions(-)
First 500 lines of diff:
diff --git a/frysk-core/frysk/ftrace/ObjectFile.java b/frysk-core/frysk/ftrace/ObjectFile.java
index 738aff0..2860589 100644
--- a/frysk-core/frysk/ftrace/ObjectFile.java
+++ b/frysk-core/frysk/ftrace/ObjectFile.java
@@ -370,49 +370,41 @@ public class ObjectFile
ElfDynamic.loadFrom(section, new ElfDynamic.Builder() {
public void entry (int tag, long value)
{
- if (tag == ElfDynamic.ELF_DT_STRTAB)
- {
- FtraceLogger.finest.log(" * dynamic strtab at 0x" + Long.toHexString(value));
- ObjectFile.this.dynamicStrtab = getElfSectionWithAddr(elfFile, value);
- }
- else if (tag == ElfDynamic.ELF_DT_SONAME)
- {
- FtraceLogger.finest.log(" * soname index = 0x" + Long.toHexString(value));
- assertFitsToInt(value, "SONAME index");
- locals.dynamicSonameIdx = (int)value;
- }
- else if (tag == ElfDynamic.ELF_DT_SYMTAB)
- {
- FtraceLogger.finest.log(" * dynamic symtab = 0x" + Long.toHexString(value));
- ObjectFile.this.dynamicSymtab = getElfSectionWithAddr(elfFile, value);
- }
- else if (tag == ElfDynamic.ELF_DT_VERSYM)
- {
- FtraceLogger.finest.log(" * versym = 0x" + Long.toHexString(value));
- ObjectFile.this.dynamicVersym = getElfSectionWithAddr(elfFile, value);
- }
- else if (tag == ElfDynamic.ELF_DT_VERDEF)
- {
- FtraceLogger.finest.log(" * verdef = 0x" + Long.toHexString(value));
- ObjectFile.this.dynamicVerdef = getElfSectionWithAddr(elfFile, value);
- }
- else if (tag == ElfDynamic.ELF_DT_VERDEFNUM)
- {
- FtraceLogger.finest.log(" * verdefnum = " + Long.toString(value));
- assertFitsToInt(value, "Count of VERDEF entries");
- ObjectFile.this.dynamicVerdefCount = (int)value;
- }
- else if (tag == ElfDynamic.ELF_DT_VERNEED)
- {
- FtraceLogger.finest.log(" * verneed = 0x" + Long.toHexString(value));
- ObjectFile.this.dynamicVerneed = getElfSectionWithAddr(elfFile, value);
- }
- else if (tag == ElfDynamic.ELF_DT_VERNEEDNUM)
- {
- FtraceLogger.finest.log(" * verneednum = " + Long.toString(value));
- assertFitsToInt(value, "Count of VERNEED entries");
- ObjectFile.this.dynamicVerneedCount = (int)value;
- }
+ if (tag == ElfDynamic.ELF_DT_STRTAB) {
+ FtraceLogger.finest.log(" * dynamic strtab at 0x" + Long.toHexString(value));
+ ObjectFile.this.dynamicStrtab = getElfSectionWithAddr(elfFile, value);
+ }
+ else if (tag == ElfDynamic.ELF_DT_SONAME) {
+ FtraceLogger.finest.log(" * soname index = 0x" + Long.toHexString(value));
+ assertFitsToInt(value, "SONAME index");
+ locals.dynamicSonameIdx = (int)value;
+ }
+ else if (tag == ElfDynamic.ELF_DT_SYMTAB) {
+ FtraceLogger.finest.log(" * dynamic symtab = 0x" + Long.toHexString(value));
+ ObjectFile.this.dynamicSymtab = getElfSectionWithAddr(elfFile, value);
+ }
+ else if (tag == ElfDynamic.ELF_DT_VERSYM) {
+ FtraceLogger.finest.log(" * versym = 0x" + Long.toHexString(value));
+ ObjectFile.this.dynamicVersym = getElfSectionWithAddr(elfFile, value);
+ }
+ else if (tag == ElfDynamic.ELF_DT_VERDEF) {
+ FtraceLogger.finest.log(" * verdef = 0x" + Long.toHexString(value));
+ ObjectFile.this.dynamicVerdef = getElfSectionWithAddr(elfFile, value);
+ }
+ else if (tag == ElfDynamic.ELF_DT_VERDEFNUM) {
+ FtraceLogger.finest.log(" * verdefnum = " + Long.toString(value));
+ assertFitsToInt(value, "Count of VERDEF entries");
+ ObjectFile.this.dynamicVerdefCount = (int)value;
+ }
+ else if (tag == ElfDynamic.ELF_DT_VERNEED) {
+ FtraceLogger.finest.log(" * verneed = 0x" + Long.toHexString(value));
+ ObjectFile.this.dynamicVerneed = getElfSectionWithAddr(elfFile, value);
+ }
+ else if (tag == ElfDynamic.ELF_DT_VERNEEDNUM) {
+ FtraceLogger.finest.log(" * verneednum = " + Long.toString(value));
+ assertFitsToInt(value, "Count of VERNEED entries");
+ ObjectFile.this.dynamicVerneedCount = (int)value;
+ }
}
});
}
@@ -552,7 +544,7 @@ public class ObjectFile
}
catch (java.io.IOException e) {
FtraceLogger.warning.log(
- "Couldn't get canonical path of ELF interpreter `{0}'.",
+ "Couldn't get canonical path of ELF interpreter",
interppath);
}
}
diff --git a/frysk-sys/frysk/rsl/ChangeLog b/frysk-sys/frysk/rsl/ChangeLog
index 27d3ded..5a20a52 100644
--- a/frysk-sys/frysk/rsl/ChangeLog
+++ b/frysk-sys/frysk/rsl/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-02 Petr Machata <pmachata@redhat.com>
+
+ * Log.java (log(String,long,String,long,String,Object)): New.
+
2008-03-31 Petr Machata <pmachata@redhat.com>
* Log.java (log(String,Object,String,long,String,long)): New.
diff --git a/frysk-sys/frysk/rsl/Log.java b/frysk-sys/frysk/rsl/Log.java
index 1c5d705..fd228c4 100644
--- a/frysk-sys/frysk/rsl/Log.java
+++ b/frysk-sys/frysk/rsl/Log.java
@@ -467,6 +467,11 @@ public final class Log {
return;
prefix().print(p1).print(p2).print(p3).print(p4).print(p5).print(p6).suffix();
}
+ public void log(String p1, long p2, String p3, long p4, String p5, Object p6) {
+ if (!logging)
+ return;
+ prefix().print(p1).print(p2).print(p3).print(p4).print(p5).print(p6).suffix();
+ }
// static 8 parameters
public void log(String p1, int p2, String p3, Object p4, String p5, Object p6, String p7, int p8) {
hooks/post-receive
--
frysk system monitor/debugger
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-04-02 6:10 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-04-02 6:10 [SCM] master: New logging function pmachata
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).