From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5427 invoked by alias); 15 Feb 2008 12:40:22 -0000 Received: (qmail 5400 invoked by uid 9514); 15 Feb 2008 12:40:20 -0000 Date: Fri, 15 Feb 2008 12:40:00 -0000 Message-ID: <20080215124020.5385.qmail@sourceware.org> From: pmuldoon@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: 2008-02-15 Phil Muldoon X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: c05c28a8eda20f36704d128303028154ba0b417f X-Git-Newrev: e16ca9dec6f5594d605d923d7d1f8a0235a916e3 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-q1/txt/msg00216.txt.bz2 The branch, master has been updated via e16ca9dec6f5594d605d923d7d1f8a0235a916e3 (commit) from c05c28a8eda20f36704d128303028154ba0b417f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit e16ca9dec6f5594d605d923d7d1f8a0235a916e3 Author: Phil Muldoon Date: Fri Feb 15 12:40:08 2008 +0000 2008-02-15 Phil Muldoon * PPC64LinuxElfCorefile.java (writeNotePrpsinfo): Fix zombie field population. Correctly output "nice" values. * PPC32LinuxElfCorefile.java: Ditto. * IA32LinuxElfCorefile.java: Ditto. * X8664LinuxElfCorefie.java: Ditto. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/isa/corefiles/ChangeLog | 8 ++++++++ .../frysk/isa/corefiles/IA32LinuxElfCorefile.java | 17 +++++++---------- .../frysk/isa/corefiles/PPC32LinuxElfCorefile.java | 20 +++++++++----------- .../frysk/isa/corefiles/PPC64LinuxElfCorefile.java | 19 ++++++++----------- .../frysk/isa/corefiles/X8664LinuxElfCorefile.java | 19 +++++++------------ 5 files changed, 39 insertions(+), 44 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/isa/corefiles/ChangeLog b/frysk-core/frysk/isa/corefiles/ChangeLog index ec9ac97..1ba5a85 100644 --- a/frysk-core/frysk/isa/corefiles/ChangeLog +++ b/frysk-core/frysk/isa/corefiles/ChangeLog @@ -1,3 +1,11 @@ +2008-02-15 Phil Muldoon + + * PPC64LinuxElfCorefile.java (writeNotePrpsinfo): Fix + zombie field population. Correctly output "nice" values. + * PPC32LinuxElfCorefile.java: Ditto. + * IA32LinuxElfCorefile.java: Ditto. + * X8664LinuxElfCorefie.java: Ditto. + 2008-02-14 Andrew Cagney * IA32LinuxElfCorefile.java: Update to match Stat.numThreads. diff --git a/frysk-core/frysk/isa/corefiles/IA32LinuxElfCorefile.java b/frysk-core/frysk/isa/corefiles/IA32LinuxElfCorefile.java index 0090778..3c48481 100644 --- a/frysk-core/frysk/isa/corefiles/IA32LinuxElfCorefile.java +++ b/frysk-core/frysk/isa/corefiles/IA32LinuxElfCorefile.java @@ -102,19 +102,16 @@ public class IA32LinuxElfCorefile extends LinuxElfCorefile { prpsInfo.setPrState(processStat.state); prpsInfo.setPrSname(processStat.state); - String midStr = null; - // Transform processStat.numThreads(int) into char. - if ((processStat.numThreads >= 0) && (processStat.numThreads < 10)) { - midStr = String.valueOf(processStat.numThreads); - prpsInfo.setPrZomb(midStr.charAt(0)); - } + // If state = Z then set zombie flag + if (processStat.state == 'Z') + prpsInfo.setPrZomb((char)1); + else + prpsInfo.setPrZomb((char)0); - if ((processStat.nice >= 0) && (processStat.nice < 10)) { - midStr = String.valueOf(processStat.nice); - prpsInfo.setPrNice(midStr.charAt(0)); - } + String midStr = String.valueOf(processStat.nice); + prpsInfo.setPrNice(midStr.charAt(0)); // Set rest of prpsinfo prpsInfo.setPrFlag(processStat.flags); diff --git a/frysk-core/frysk/isa/corefiles/PPC32LinuxElfCorefile.java b/frysk-core/frysk/isa/corefiles/PPC32LinuxElfCorefile.java index 51177fd..d964c26 100644 --- a/frysk-core/frysk/isa/corefiles/PPC32LinuxElfCorefile.java +++ b/frysk-core/frysk/isa/corefiles/PPC32LinuxElfCorefile.java @@ -1,6 +1,6 @@ // This file is part of the program FRYSK. // -// Copyright 2006, 2007, IBM Corp. +// Copyright 2006, 2007, 2008, IBM Corp. // Copyright 2007, 2008, Red Hat Inc. // // Contributed by @@ -107,19 +107,17 @@ public class PPC32LinuxElfCorefile extends LinuxElfCorefile { prpsInfo.setPrState(processStat.state); prpsInfo.setPrSname(processStat.state); - String midStr = null; - // Transform processStat.zero(int) into char. - if ((processStat.numThreads >= 0) && (processStat.numThreads < 10)) { - midStr = String.valueOf(processStat.numThreads); - prpsInfo.setPrZomb(midStr.charAt(0)); - } + // If state = Z then set zombie flag + if (processStat.state == 'Z') + prpsInfo.setPrZomb((char)1); + else + prpsInfo.setPrZomb((char)0); - if ((processStat.nice >= 0) && (processStat.nice < 10)) { - midStr = String.valueOf(processStat.nice); - prpsInfo.setPrNice(midStr.charAt(0)); - } + String midStr = String.valueOf(processStat.nice); + prpsInfo.setPrNice(midStr.charAt(0)); + // Set rest of prpsinfo prpsInfo.setPrFlag(processStat.flags); diff --git a/frysk-core/frysk/isa/corefiles/PPC64LinuxElfCorefile.java b/frysk-core/frysk/isa/corefiles/PPC64LinuxElfCorefile.java index 913f060..9838802 100644 --- a/frysk-core/frysk/isa/corefiles/PPC64LinuxElfCorefile.java +++ b/frysk-core/frysk/isa/corefiles/PPC64LinuxElfCorefile.java @@ -1,6 +1,6 @@ // This file is part of the program FRYSK. // -// Copyright 2006, 2007, IBM Corp. +// Copyright 2006, 2007, 2008, IBM Corp. // Copyright 2007, 2008, Red Hat Inc. // // Contributed by @@ -106,19 +106,16 @@ public class PPC64LinuxElfCorefile extends LinuxElfCorefile { prpsInfo.setPrState(processStat.state); prpsInfo.setPrSname(processStat.state); - String midStr = null; + // If state = Z then set zombie flag + if (processStat.state == 'Z') + prpsInfo.setPrZomb((char)1); + else + prpsInfo.setPrZomb((char)0); - // Transform processStat.zero(int) into char. - if ((processStat.numThreads >= 0) && (processStat.numThreads < 10)) { - midStr = String.valueOf(processStat.numThreads); - prpsInfo.setPrZomb(midStr.charAt(0)); - } - if ((processStat.nice >= 0) && (processStat.nice < 10)) { - midStr = String.valueOf(processStat.nice); + String midStr = String.valueOf(processStat.nice); + prpsInfo.setPrNice(midStr.charAt(0)); - prpsInfo.setPrNice(midStr.charAt(0)); - } // Set rest of prpsinfo prpsInfo.setPrFlag(processStat.flags); diff --git a/frysk-core/frysk/isa/corefiles/X8664LinuxElfCorefile.java b/frysk-core/frysk/isa/corefiles/X8664LinuxElfCorefile.java index ca78a28..d0d3d70 100644 --- a/frysk-core/frysk/isa/corefiles/X8664LinuxElfCorefile.java +++ b/frysk-core/frysk/isa/corefiles/X8664LinuxElfCorefile.java @@ -102,20 +102,15 @@ public class X8664LinuxElfCorefile extends LinuxElfCorefile { prpsInfo.setPrState(processStat.state); prpsInfo.setPrSname(processStat.state); - String midStr = null; + // If state = Z then set zombie flag + if (processStat.state == 'Z') + prpsInfo.setPrZomb((char)1); + else + prpsInfo.setPrZomb((char)0); - // Transform processStat.zero(int) into char. - if ((processStat.numThreads >= 0) && (processStat.numThreads < 10)) { - midStr = String.valueOf(processStat.numThreads); - prpsInfo.setPrZomb(midStr.charAt(0)); - } - - if ((processStat.nice >= 0) && (processStat.nice < 10)) { - midStr = String.valueOf(processStat.nice); - - prpsInfo.setPrNice(midStr.charAt(0)); - } + String midStr = String.valueOf(processStat.nice); + prpsInfo.setPrNice(midStr.charAt(0)); // Set rest of prpsinfo prpsInfo.setPrFlag(processStat.flags); hooks/post-receive -- frysk system monitor/debugger