public inbox for frysk-cvs@sourceware.org
help / color / mirror / Atom feed
* [SCM]  master: Use ProcessIdentifier in Status.
@ 2008-02-13 22:00 cagney
  0 siblings, 0 replies; only message in thread
From: cagney @ 2008-02-13 22:00 UTC (permalink / raw)
  To: frysk-cvs

The branch, master has been updated
       via  fab366e5dcc0c0efd89b85a311ecb155d4836e4c (commit)
       via  b1033b17c259b5aa1b63380d443d8199033051d3 (commit)
       via  4c46c30aa76a7bf9d8d0af6c9665c29da2b3d58b (commit)
       via  bc714cb0441fcf9bb4ee940f297d3658163b6ad1 (commit)
       via  74230edcf95530b958c24e489d8fe3b8c4652540 (commit)
      from  aabf0c3969be42e6a4ac995ff36d9d168ee6f54a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit fab366e5dcc0c0efd89b85a311ecb155d4836e4c
Author: Andrew Cagney <cagney@redhat.com>
Date:   Wed Feb 13 17:00:22 2008 -0500

    Use ProcessIdentifier in Status.
    
    frysk-core/frysk/isa/corefiles/ChangeLog
    2008-02-13  Andrew Cagney  <cagney@redhat.com>
    
    	* IA32LinuxElfCorefile.java: Update to match Status.
    	* X8664LinuxElfCorefile.java: Ditto.
    	* PPC64LinuxElfCorefile.java: Ditto.
    	* PPC32LinuxElfCorefile.java: Ditto.
    
    frysk-core/frysk/proc/live/ChangeLog
    2008-02-13  Andrew Cagney  <cagney@redhat.com>
    
    	* LinuxPtraceProc.java: Update to match Status.
    	* LinuxPtraceTaskState.java: Ditto.
    
    frysk-sys/frysk/sys/proc/ChangeLog
    2008-02-13  Andrew Cagney  <cagney@redhat.com>
    
    	* Status.java (getGID(ProcessIdentifier)): Replace getGID(int).
    	(isStopped(ProcessIdentifier)): Replace isStopped(int).
    	(getUID(ProcessIdentifier)): Replace getUID(int).
    	* TestStatus.java: Update.

commit b1033b17c259b5aa1b63380d443d8199033051d3
Author: Andrew Cagney <cagney@redhat.com>
Date:   Wed Feb 13 16:40:58 2008 -0500

    Use ProcessIdentifier in Stat.
    
    frysk-core/frysk/isa/corefiles/ChangeLog
    2008-02-13  Andrew Cagney  <cagney@redhat.com>
    
    	* IA32LinuxElfCorefile.java: Update to match Stat.
    	* X8664LinuxElfCorefile.java: Ditto.
    	* PPC64LinuxElfCorefile.java: Ditto.
    	* PPC32LinuxElfCorefile.java: Ditto.
    
    frysk-core/frysk/proc/live/ChangeLog
    2008-02-13  Andrew Cagney  <cagney@redhat.com>
    
    	* LinuxPtraceTaskState.java: Update to match Stat.
    	* LinuxPtraceProc.java: Ditto.
    
    frysk-core/frysk/testbed/ChangeLog
    2008-02-13  Andrew Cagney  <cagney@redhat.com>
    
    	* TestLib.java: Update to match Scan.
    
    frysk-gui/frysk/gui/monitor/ChangeLog
    2008-02-13  Andrew Cagney  <cagney@redhat.com>
    
    	* ProcWiseDataModel.java: Update to match Scan.
    
    frysk-sys/frysk/sys/proc/ChangeLog
    2008-02-13  Andrew Cagney  <cagney@redhat.com>
    
    	* Stat.java (scan(int)): Replace refresh(int).
    	(scan(int,int)): Replace refreshThread(int,int).
    	(refresh()): Delete.
    	* cni/Stat.cxx: Update.

commit 4c46c30aa76a7bf9d8d0af6c9665c29da2b3d58b
Author: Andrew Cagney <cagney@redhat.com>
Date:   Wed Feb 13 16:19:38 2008 -0500

    Use ProcessIdentifier in ProcBuilder.
    
    frysk-core/frysk/proc/live/ChangeLog
    2008-02-13  Andrew Cagney  <cagney@redhat.com>
    
    	* LinuxPtraceProc.java: Update to match ProcBuilder.
    
    frysk-sys/frysk/sys/proc/ChangeLog
    2008-02-13  Andrew Cagney  <cagney@redhat.com>
    
    	* ProcBuilder.java (construct(int)): Make private.

commit bc714cb0441fcf9bb4ee940f297d3658163b6ad1
Author: Andrew Cagney <cagney@redhat.com>
Date:   Wed Feb 13 16:11:55 2008 -0500

    Use ProcessIdentifier in MapsBuilder.
    
    frysk-core/frysk/ftrace/ChangeLog
    2008-02-13  Andrew Cagney  <cagney@redhat.com>
    
    	* MemoryMapping.java: Update to match MapsBuilder.
    
    frysk-core/frysk/isa/corefiles/ChangeLog
    2008-02-13  Andrew Cagney  <cagney@redhat.com>
    
    	* LinuxElfCorefile.java: Update to match MapsBuilder.
    
    frysk-core/frysk/proc/ChangeLog
    2008-02-13  Andrew Cagney  <cagney@redhat.com>
    
    	* TestMapGet.java: Update to match MapsBuilder.
    
    frysk-core/frysk/proc/live/ChangeLog
    2008-02-13  Andrew Cagney  <cagney@redhat.com>
    
    	* LinuxPtraceProc.java: Update to match MapsBuilder.
    
    frysk-sys/frysk/sys/proc/ChangeLog
    2008-02-13  Andrew Cagney  <cagney@redhat.com>
    
    	* MapsBuilder.java (construct(ProcessIdentifier)): New.
    	(construct(int)): Make private.

commit 74230edcf95530b958c24e489d8fe3b8c4652540
Author: Andrew Cagney <cagney@redhat.com>
Date:   Wed Feb 13 15:59:39 2008 -0500

    Use ProcessIdentifier in Mem.
    
    frysk-sys/frysk/sys/proc/ChangeLog
    2008-02-13  Andrew Cagney  <cagney@redhat.com>
    
    	* Mem.java (Mem(int)): Delete.

-----------------------------------------------------------------------

Summary of changes:
 frysk-core/frysk/ftrace/ChangeLog                  |    4 +
 frysk-core/frysk/ftrace/MemoryMapping.java         |    6 +-
 frysk-core/frysk/isa/corefiles/ChangeLog           |   12 +++
 .../frysk/isa/corefiles/IA32LinuxElfCorefile.java  |   11 +--
 .../frysk/isa/corefiles/LinuxElfCorefile.java      |   79 ++++++++++----------
 .../frysk/isa/corefiles/PPC32LinuxElfCorefile.java |   11 +--
 .../frysk/isa/corefiles/PPC64LinuxElfCorefile.java |   12 +--
 .../frysk/isa/corefiles/X8664LinuxElfCorefile.java |   11 +--
 frysk-core/frysk/proc/ChangeLog                    |    2 +
 frysk-core/frysk/proc/TestMapGet.java              |    5 +-
 frysk-core/frysk/proc/live/ChangeLog               |   10 +++
 frysk-core/frysk/proc/live/LinuxPtraceProc.java    |   11 +--
 .../frysk/proc/live/LinuxPtraceTaskState.java      |   10 +-
 frysk-core/frysk/testbed/ChangeLog                 |    2 +
 frysk-core/frysk/testbed/TestLib.java              |    3 +-
 frysk-gui/frysk/gui/monitor/ChangeLog              |    2 +
 frysk-gui/frysk/gui/monitor/ProcWiseDataModel.java |    5 +-
 frysk-sys/frysk/sys/proc/ChangeLog                 |   17 ++++
 frysk-sys/frysk/sys/proc/MapsBuilder.java          |   15 ++--
 frysk-sys/frysk/sys/proc/Mem.java                  |    9 +--
 frysk-sys/frysk/sys/proc/ProcBuilder.java          |   14 ++--
 frysk-sys/frysk/sys/proc/Stat.java                 |   21 +----
 frysk-sys/frysk/sys/proc/Status.java               |   77 +++++++++-----------
 frysk-sys/frysk/sys/proc/TestStatus.java           |    6 +-
 frysk-sys/frysk/sys/proc/cni/Stat.cxx              |   18 ++---
 25 files changed, 195 insertions(+), 178 deletions(-)

First 500 lines of diff:
diff --git a/frysk-core/frysk/ftrace/ChangeLog b/frysk-core/frysk/ftrace/ChangeLog
index 5d04a0a..785925b 100644
--- a/frysk-core/frysk/ftrace/ChangeLog
+++ b/frysk-core/frysk/ftrace/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-13  Andrew Cagney  <cagney@redhat.com>
+
+	* MemoryMapping.java: Update to match MapsBuilder.
+
 2008-02-12  Andrew Cagney  <cagney@redhat.com>
 
 	* TestLtrace.java: Update to match frysk.testbed.
diff --git a/frysk-core/frysk/ftrace/MemoryMapping.java b/frysk-core/frysk/ftrace/MemoryMapping.java
index 5742d6a..664b670 100644
--- a/frysk-core/frysk/ftrace/MemoryMapping.java
+++ b/frysk-core/frysk/ftrace/MemoryMapping.java
@@ -1,6 +1,6 @@
 // This file is part of the program FRYSK.
 //
-// Copyright 2007, Red Hat Inc.
+// Copyright 2007, 2008, Red Hat Inc.
 //
 // FRYSK is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
@@ -45,7 +45,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-
+import frysk.sys.ProcessIdentifierFactory;
 import frysk.sys.proc.MapsBuilder;
 
 class MemoryMapping
@@ -181,7 +181,7 @@ class MemoryMapping
     }
 
     MyMapsBuilder builder = new MyMapsBuilder();
-    builder.construct(pid);
+    builder.construct(ProcessIdentifierFactory.create(pid));
     return builder.mappings;
   }
 }
diff --git a/frysk-core/frysk/isa/corefiles/ChangeLog b/frysk-core/frysk/isa/corefiles/ChangeLog
index 1689d3e..da92ce7 100644
--- a/frysk-core/frysk/isa/corefiles/ChangeLog
+++ b/frysk-core/frysk/isa/corefiles/ChangeLog
@@ -1,5 +1,17 @@
 2008-02-13  Andrew Cagney  <cagney@redhat.com>
 
+	* IA32LinuxElfCorefile.java: Update to match Status.
+	* X8664LinuxElfCorefile.java: Ditto.
+	* PPC64LinuxElfCorefile.java: Ditto.
+	* PPC32LinuxElfCorefile.java: Ditto.
+	
+	* IA32LinuxElfCorefile.java: Update to match Stat.
+	* X8664LinuxElfCorefile.java: Ditto.
+	* PPC64LinuxElfCorefile.java: Ditto.
+	* PPC32LinuxElfCorefile.java: Ditto.
+
+	* LinuxElfCorefile.java: Update to match MapsBuilder.
+
 	* IA32LinuxElfCorefile.java: Update to match CmdLineBuilder.
 	* X8664LinuxElfCorefile.java: Ditto.
 	* PPC64LinuxElfCorefile.java: Ditto.
diff --git a/frysk-core/frysk/isa/corefiles/IA32LinuxElfCorefile.java b/frysk-core/frysk/isa/corefiles/IA32LinuxElfCorefile.java
index 0c59815..fd2fe28 100644
--- a/frysk-core/frysk/isa/corefiles/IA32LinuxElfCorefile.java
+++ b/frysk-core/frysk/isa/corefiles/IA32LinuxElfCorefile.java
@@ -97,9 +97,7 @@ public class IA32LinuxElfCorefile extends LinuxElfCorefile {
 	int pid = process.getPid();
 
 	ElfPrpsinfo prpsInfo = new ElfPrpsinfo(this.size);
-	Stat processStat = new Stat();
-
-	processStat.refresh(pid);
+	Stat processStat = new Stat().scan(ProcessIdentifierFactory.create(pid));
 
 	// Set state and name.
 	prpsInfo.setPrState(processStat.state);
@@ -122,8 +120,8 @@ public class IA32LinuxElfCorefile extends LinuxElfCorefile {
 
 	// Set rest of prpsinfo
 	prpsInfo.setPrFlag(processStat.flags);
-	prpsInfo.setPrUid(Status.getUID(pid));
-	prpsInfo.setPrGid(Status.getGID(pid));
+	prpsInfo.setPrUid(Status.getUID(ProcessIdentifierFactory.create(pid)));
+	prpsInfo.setPrGid(Status.getGID(ProcessIdentifierFactory.create(pid)));
 
 	prpsInfo.setPrPid(pid);
 	prpsInfo.setPrPpid(processStat.ppid.intValue());
@@ -168,8 +166,7 @@ public class IA32LinuxElfCorefile extends LinuxElfCorefile {
 
         ElfPrstatus prStatus = new ElfPrstatus(this.size);
 
-	Stat processStat = new Stat();
-	processStat.refresh(task.getTid());
+	Stat processStat = new Stat().scan(ProcessIdentifierFactory.create(task.getTid()));
 
 	// Set initial prstatus data
 	prStatus.setPrPid(task.getTid());
diff --git a/frysk-core/frysk/isa/corefiles/LinuxElfCorefile.java b/frysk-core/frysk/isa/corefiles/LinuxElfCorefile.java
index 5be0c33..4eb8d03 100644
--- a/frysk-core/frysk/isa/corefiles/LinuxElfCorefile.java
+++ b/frysk-core/frysk/isa/corefiles/LinuxElfCorefile.java
@@ -1,44 +1,45 @@
-//This file is part of the program FRYSK.
-
-//Copyright 2007, Red Hat Inc.
-
-//FRYSK is free software; you can redistribute it and/or modify it
-//under the terms of the GNU General Public License as published by
-//the Free Software Foundation; version 2 of the License.
-
-//FRYSK is distributed in the hope that it will be useful, but
-//WITHOUT ANY WARRANTY; without even the implied warranty of
-//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-//General Public License for more details.
-
-//You should have received a copy of the GNU General Public License
-//along with FRYSK; if not, write to the Free Software Foundation,
-//Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
-//In addition, as a special exception, Red Hat, Inc. gives You the
-//additional right to link the code of FRYSK with code not covered
-//under the GNU General Public License ("Non-GPL Code") and to
-//distribute linked combinations including the two, subject to the
-//limitations in this paragraph. Non-GPL Code permitted under this
-//exception must only link to the code of FRYSK through those well
-//defined interfaces identified in the file named EXCEPTION found in
-//the source code files (the "Approved Interfaces"). The files of
-//Non-GPL Code may instantiate templates or use macros or inline
-//functions from the Approved Interfaces without causing the
-//resulting work to be covered by the GNU General Public
-//License. Only Red Hat, Inc. may make changes or additions to the
-//list of Approved Interfaces. You must obey the GNU General Public
-//License in all respects for all of the FRYSK code and other code
-//used in conjunction with FRYSK except the Non-GPL Code covered by
-//this exception. If you modify this file, you may extend this
-//exception to your version of the file, but you are not obligated to
-//do so. If you do not wish to provide this exception without
-//modification, you must delete this exception statement from your
-//version and license this file solely under the GPL without
-//exception.
+// This file is part of the program FRYSK.
+//
+// Copyright 2007, 2008, Red Hat Inc.
+//
+// FRYSK is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by
+// the Free Software Foundation; version 2 of the License.
+//
+// FRYSK is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with FRYSK; if not, write to the Free Software Foundation,
+// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+//
+// In addition, as a special exception, Red Hat, Inc. gives You the
+// additional right to link the code of FRYSK with code not covered
+// under the GNU General Public License ("Non-GPL Code") and to
+// distribute linked combinations including the two, subject to the
+// limitations in this paragraph. Non-GPL Code permitted under this
+// exception must only link to the code of FRYSK through those well
+// defined interfaces identified in the file named EXCEPTION found in
+// the source code files (the "Approved Interfaces"). The files of
+// Non-GPL Code may instantiate templates or use macros or inline
+// functions from the Approved Interfaces without causing the
+// resulting work to be covered by the GNU General Public
+// License. Only Red Hat, Inc. may make changes or additions to the
+// list of Approved Interfaces. You must obey the GNU General Public
+// License in all respects for all of the FRYSK code and other code
+// used in conjunction with FRYSK except the Non-GPL Code covered by
+// this exception. If you modify this file, you may extend this
+// exception to your version of the file, but you are not obligated to
+// do so. If you do not wish to provide this exception without
+// modification, you must delete this exception statement from your
+// version and license this file solely under the GPL without
+// exception.
 
 package frysk.isa.corefiles;
 
+import frysk.sys.ProcessIdentifierFactory;
 import inua.eio.ByteOrder;
 import frysk.isa.ISA;
 import java.util.ArrayList;
@@ -160,7 +161,7 @@ public abstract class LinuxElfCorefile {
 	
 	// Build, and write out memory segments to sections
 	final CoreMapsBuilder builder = new CoreMapsBuilder();
-	builder.construct(this.process.getMainTask().getTid());
+	builder.construct(ProcessIdentifierFactory.create(this.process.getMainTask().getTid()));
 
 	// Write elf file
 	final long i = linuxElfCorefileImage.update(ElfCommand.ELF_C_WRITE);
diff --git a/frysk-core/frysk/isa/corefiles/PPC32LinuxElfCorefile.java b/frysk-core/frysk/isa/corefiles/PPC32LinuxElfCorefile.java
index c8ac77b..93cc4e0 100644
--- a/frysk-core/frysk/isa/corefiles/PPC32LinuxElfCorefile.java
+++ b/frysk-core/frysk/isa/corefiles/PPC32LinuxElfCorefile.java
@@ -102,9 +102,7 @@ public class PPC32LinuxElfCorefile extends LinuxElfCorefile {
 	int pid = process.getPid();
 
 	ElfPrpsinfo prpsInfo = new ElfPrpsinfo(this.size);
-	Stat processStat = new Stat();
-
-	processStat.refresh(pid);
+	Stat processStat = new Stat().scan(ProcessIdentifierFactory.create(pid));
 
 	// Set state and name.
 	prpsInfo.setPrState(processStat.state);
@@ -127,8 +125,8 @@ public class PPC32LinuxElfCorefile extends LinuxElfCorefile {
 
 	// Set rest of prpsinfo
 	prpsInfo.setPrFlag(processStat.flags);
-	prpsInfo.setPrUid(Status.getUID(pid));
-	prpsInfo.setPrGid(Status.getGID(pid));
+	prpsInfo.setPrUid(Status.getUID(ProcessIdentifierFactory.create(pid)));
+	prpsInfo.setPrGid(Status.getGID(ProcessIdentifierFactory.create(pid)));
 
 	prpsInfo.setPrPid(pid);
 	prpsInfo.setPrPpid(processStat.ppid.intValue());
@@ -173,8 +171,7 @@ public class PPC32LinuxElfCorefile extends LinuxElfCorefile {
 
 	ElfPrstatus prStatus = new ElfPrstatus(this.size);
 
-	Stat processStat = new Stat();
-	processStat.refresh(task.getTid());
+	Stat processStat = new Stat().scan(ProcessIdentifierFactory.create(task.getTid()));
 
 	// Set initial prstatus data
 	prStatus.setPrPid(task.getTid());
diff --git a/frysk-core/frysk/isa/corefiles/PPC64LinuxElfCorefile.java b/frysk-core/frysk/isa/corefiles/PPC64LinuxElfCorefile.java
index 4c5eb7e..7fc9005 100644
--- a/frysk-core/frysk/isa/corefiles/PPC64LinuxElfCorefile.java
+++ b/frysk-core/frysk/isa/corefiles/PPC64LinuxElfCorefile.java
@@ -101,9 +101,7 @@ public class PPC64LinuxElfCorefile extends LinuxElfCorefile {
 	int pid = process.getPid();
 
 	ElfPrpsinfo prpsInfo = new ElfPrpsinfo(this.size);
-	Stat processStat = new Stat();
-
-	processStat.refresh(pid);
+	Stat processStat = new Stat().scan(ProcessIdentifierFactory.create(pid));
 
 	// Set state and name.
 	prpsInfo.setPrState(processStat.state);
@@ -126,8 +124,8 @@ public class PPC64LinuxElfCorefile extends LinuxElfCorefile {
 
 	// Set rest of prpsinfo
 	prpsInfo.setPrFlag(processStat.flags);
-	prpsInfo.setPrUid(Status.getUID(pid));
-	prpsInfo.setPrGid(Status.getGID(pid));
+	prpsInfo.setPrUid(Status.getUID(ProcessIdentifierFactory.create(pid)));
+	prpsInfo.setPrGid(Status.getGID(ProcessIdentifierFactory.create(pid)));
 
 	prpsInfo.setPrPid(pid);
 	prpsInfo.setPrPpid(processStat.ppid.intValue());
@@ -172,8 +170,8 @@ public class PPC64LinuxElfCorefile extends LinuxElfCorefile {
 
 	ElfPrstatus prStatus = new ElfPrstatus(this.size);
 
-	Stat processStat = new Stat();
-	processStat.refresh(task.getTid());
+	Stat processStat = new Stat().scan(ProcessIdentifierFactory.create(task.getTid()));
+
 
 	// Set initial prstatus data
 	prStatus.setPrPid(task.getTid());
diff --git a/frysk-core/frysk/isa/corefiles/X8664LinuxElfCorefile.java b/frysk-core/frysk/isa/corefiles/X8664LinuxElfCorefile.java
index 3200ec9..6197f31 100644
--- a/frysk-core/frysk/isa/corefiles/X8664LinuxElfCorefile.java
+++ b/frysk-core/frysk/isa/corefiles/X8664LinuxElfCorefile.java
@@ -97,9 +97,7 @@ public class X8664LinuxElfCorefile extends LinuxElfCorefile {
 	int pid = process.getPid();
 
 	ElfPrpsinfo prpsInfo = new ElfPrpsinfo(this.size);
-	Stat processStat = new Stat();
-
-	processStat.refresh(pid);
+	Stat processStat = new Stat().scan(ProcessIdentifierFactory.create(pid));
 
 	// Set state and name.
 	prpsInfo.setPrState(processStat.state);
@@ -122,8 +120,8 @@ public class X8664LinuxElfCorefile extends LinuxElfCorefile {
 
 	// Set rest of prpsinfo
 	prpsInfo.setPrFlag(processStat.flags);
-	prpsInfo.setPrUid(Status.getUID(pid));
-	prpsInfo.setPrGid(Status.getGID(pid));
+	prpsInfo.setPrUid(Status.getUID(ProcessIdentifierFactory.create(pid)));
+	prpsInfo.setPrGid(Status.getGID(ProcessIdentifierFactory.create(pid)));
 
 	prpsInfo.setPrPid(pid);
 	prpsInfo.setPrPpid(processStat.ppid.intValue());
@@ -168,8 +166,7 @@ public class X8664LinuxElfCorefile extends LinuxElfCorefile {
 
 	ElfPrstatus prStatus = new ElfPrstatus(this.size);
 
-	Stat processStat = new Stat();
-	processStat.refresh(task.getTid());
+	Stat processStat = new Stat().scan(ProcessIdentifierFactory.create(task.getTid()));
 
 	// Set initial prstatus data
 	prStatus.setPrPid(task.getTid());
diff --git a/frysk-core/frysk/proc/ChangeLog b/frysk-core/frysk/proc/ChangeLog
index b4d272c..6879721 100644
--- a/frysk-core/frysk/proc/ChangeLog
+++ b/frysk-core/frysk/proc/ChangeLog
@@ -1,5 +1,7 @@
 2008-02-13  Andrew Cagney  <cagney@redhat.com>
 
+	* TestMapGet.java: Update to match MapsBuilder.
+
 	* Proc.java: Update to match frysk.sys.Signal.
 	* TestSyscallSignal.java: Ditto.
 	* TestProcTasksObserver.java: Ditto.
diff --git a/frysk-core/frysk/proc/TestMapGet.java b/frysk-core/frysk/proc/TestMapGet.java
index 0ebb43d..a09f507 100644
--- a/frysk-core/frysk/proc/TestMapGet.java
+++ b/frysk-core/frysk/proc/TestMapGet.java
@@ -1,6 +1,6 @@
 // This file is part of the program FRYSK.
 //
-// Copyright 2007 Red Hat Inc.
+// Copyright 2007, 2008 Red Hat Inc.
 //
 // FRYSK is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
@@ -40,6 +40,7 @@
 
 package frysk.proc;
 
+import frysk.sys.ProcessIdentifierFactory;
 import frysk.sys.proc.MapsBuilder;
 import frysk.testbed.TestLib;
 import frysk.testbed.SlaveOffspring;
@@ -118,7 +119,7 @@ public class TestMapGet
 
 
     TestBuildMaps liveMap = new TestBuildMaps();
-    liveMap.construct(ackProc.getPid());
+    liveMap.construct(ProcessIdentifierFactory.create(ackProc.getPid()));
   }
 
 
diff --git a/frysk-core/frysk/proc/live/ChangeLog b/frysk-core/frysk/proc/live/ChangeLog
index 4445f71..2a3989f 100644
--- a/frysk-core/frysk/proc/live/ChangeLog
+++ b/frysk-core/frysk/proc/live/ChangeLog
@@ -1,5 +1,15 @@
 2008-02-13  Andrew Cagney  <cagney@redhat.com>
 
+	* LinuxPtraceProc.java: Update to match Status.
+	* LinuxPtraceTaskState.java: Ditto.
+	
+	* LinuxPtraceTaskState.java: Update to match Stat.
+	* LinuxPtraceProc.java: Ditto.
+	
+	* LinuxPtraceProc.java: Update to match ProcBuilder.
+
+	* LinuxPtraceProc.java: Update to match MapsBuilder.
+	
 	* LinuxPtraceProc.java: Update to match Exe.
 
 	* LinuxPtraceProc.java: Update to match CmdLineBuilder.
diff --git a/frysk-core/frysk/proc/live/LinuxPtraceProc.java b/frysk-core/frysk/proc/live/LinuxPtraceProc.java
index a616729..5cb5e57 100644
--- a/frysk-core/frysk/proc/live/LinuxPtraceProc.java
+++ b/frysk-core/frysk/proc/live/LinuxPtraceProc.java
@@ -149,7 +149,7 @@ public class LinuxPtraceProc extends LiveProc {
 	}
 	
 	BuildMaps constructedMaps = new BuildMaps();
-	constructedMaps.construct(getPid());
+	constructedMaps.construct(ProcessIdentifierFactory.create(getPid()));
 	MemoryMap arrayMaps[] = new MemoryMap[constructedMaps.mapsList.size()];
 	constructedMaps.mapsList.toArray(arrayMaps);
 	this.maps = arrayMaps;
@@ -176,11 +176,11 @@ public class LinuxPtraceProc extends LiveProc {
     }
 
     public int getUID() {
-	return Status.getUID (getPid ());
+	return Status.getUID(ProcessIdentifierFactory.create(getPid()));
     }
 
     public int getGID() {
-	return Status.getGID(getPid());
+	return Status.getGID(ProcessIdentifierFactory.create(getPid()));
     }
 
     /**
@@ -223,8 +223,7 @@ public class LinuxPtraceProc extends LiveProc {
     public Stat getStat ()
     {
 	if (stat == null) {
-	    stat = new Stat ();
-	    stat.refresh (getPid());
+	    stat = new Stat().scan(ProcessIdentifierFactory.create(getPid()));
 	}
 	return stat;
     }
@@ -262,7 +261,7 @@ public class LinuxPtraceProc extends LiveProc {
 	    }
 	}
 	TidBuilder tasks = new TidBuilder ();
-	tasks.construct (getPid());
+	tasks.construct(ProcessIdentifierFactory.create(getPid()));
 	// Tell each task that no longer exists that it has been
 	// removed.
 	for (Iterator i = tasks.removed.values().iterator(); i.hasNext();) {
diff --git a/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java b/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java
index 08dd7a2..ff60e45 100644
--- a/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java
+++ b/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java
@@ -182,7 +182,7 @@ class LinuxPtraceTaskState extends State {
 		    logger.log(Level.FINE, "{0} handleAttach\n", task); 
 		    task.sendAttach();
 		    if (task.getProc().getMainTask() == task
-			&& Status.isStopped(task.getTid())) {
+			&& Status.isStopped(task.tid)) {
 			// The attach has been initiated on the main
 			// task of the process; the process state
 			// should transition to (T) TRACED.  If it is
@@ -864,11 +864,11 @@ class LinuxPtraceTaskState extends State {
 	LinuxPtraceTaskState handleExecedEvent(LinuxPtraceTask task) {
 	    logger.log(Level.FINE, "{0} handleExecedEvent\n", task); 
 	    // Remove all tasks, retaining just this one.
-	    ((LinuxPtraceProc)task.getProc()).retain (task);
-	    ((LinuxPtraceProc)task.getProc()).getStat().refresh();
+	    ((LinuxPtraceProc)task.getProc()).retain(task);
+	    ((LinuxPtraceProc)task.getProc()).getStat().scan(task.tid);
 
-	    // All breakpoints have been erased.  We need to explicitly
-	    // tell those attached to the current Task.
+	    // All breakpoints have been erased.  We need to
+	    // explicitly tell those attached to the current Task.
 	    ((LinuxPtraceProc)task.getProc()).breakpoints.removeAllCodeObservers();
 	    Iterator it = task.codeObservers.iterator();
 	    while (it.hasNext())
diff --git a/frysk-core/frysk/testbed/ChangeLog b/frysk-core/frysk/testbed/ChangeLog
index 8bf9cc9..f0da174 100644
--- a/frysk-core/frysk/testbed/ChangeLog
+++ b/frysk-core/frysk/testbed/ChangeLog
@@ -1,5 +1,7 @@
 2008-02-13  Andrew Cagney  <cagney@redhat.com>
 
+	* TestLib.java: Update to match Scan.
+
 	* LegacyOffspring.java: Update to match frysk.sys.Wait.
 	* SlaveOffspring.java: Ditto.
 
diff --git a/frysk-core/frysk/testbed/TestLib.java b/frysk-core/frysk/testbed/TestLib.java
index 1cae424..97772bc 100644
--- a/frysk-core/frysk/testbed/TestLib.java
+++ b/frysk-core/frysk/testbed/TestLib.java
@@ -117,8 +117,7 @@ public class TestLib extends TestCase {
 	// is sufficient. Would need a very very long running system
 	// for that to not be the case.
 
-	Stat stat = new Stat();
-	stat.refresh(proc.getPid());
+	Stat stat = new Stat().scan(ProcessIdentifierFactory.create(proc.getPid()));
 
 	if (stat.ppid.intValue() == pid) {
 	    fine.log("isChildOf proc is child");
diff --git a/frysk-gui/frysk/gui/monitor/ChangeLog b/frysk-gui/frysk/gui/monitor/ChangeLog
index a8309a3..65919d1 100644
--- a/frysk-gui/frysk/gui/monitor/ChangeLog
+++ b/frysk-gui/frysk/gui/monitor/ChangeLog
@@ -1,5 +1,7 @@
 2008-02-13  Andrew Cagney  <cagney@redhat.com>
 
+	* ProcWiseDataModel.java: Update to match Scan.
+
 	* MainWindow.java: Update to match frysk.sys.Signal.
 
 2008-01-25  Andrew Cagney  <cagney@redhat.com>
diff --git a/frysk-gui/frysk/gui/monitor/ProcWiseDataModel.java b/frysk-gui/frysk/gui/monitor/ProcWiseDataModel.java
index d68b956..dee2016 100644
--- a/frysk-gui/frysk/gui/monitor/ProcWiseDataModel.java
+++ b/frysk-gui/frysk/gui/monitor/ProcWiseDataModel.java
@@ -1,6 +1,6 @@
 // This file is part of the program FRYSK.
 //
-// Copyright 2005, Red Hat Inc.
+// Copyright 2005, 2008, Red Hat Inc.
 //
 // FRYSK is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
@@ -40,6 +40,7 @@
 
 package frysk.gui.monitor;
 
+import frysk.sys.ProcessIdentifierFactory;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.Observable;


hooks/post-receive
--
frysk system monitor/debugger


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2008-02-13 22:00 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-02-13 22:00 [SCM] master: Use ProcessIdentifier in Status cagney

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).