From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29455 invoked by alias); 2 Apr 2008 06:10:45 -0000 Received: (qmail 29425 invoked by uid 9697); 2 Apr 2008 06:10:44 -0000 Date: Wed, 02 Apr 2008 06:10:00 -0000 Message-ID: <20080402061044.29410.qmail@sourceware.org> From: pmachata@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: New logging function X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: bcb3fa5fdc4667a15386f1ef9a116753d761fb90 X-Git-Newrev: 72dcfe41b8fc7c1fbc546d25cd5f8ae96353b042 Mailing-List: contact frysk-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-cvs-owner@sourceware.org Reply-To: frysk@sourceware.org X-SW-Source: 2008-q2/txt/msg00014.txt.bz2 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 Date: Wed Apr 2 02:52:22 2008 +0200 New logging function commit 45dcf2b5441cdb686b34af25a6f5a80cb779ea92 Author: Petr Machata 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 + + * Log.java (log(String,long,String,long,String,Object)): New. + 2008-03-31 Petr Machata * 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