From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16072 invoked by alias); 27 Dec 2007 18:25:04 -0000 Received: (qmail 16043 invoked by uid 367); 27 Dec 2007 18:25:04 -0000 Date: Thu, 27 Dec 2007 18:25:00 -0000 Message-ID: <20071227182504.16026.qmail@sourceware.org> From: cagney@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Move iterateSyscallByName to SyscallTable. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: f011804026b47ceca7d3298da68ac71152271e18 X-Git-Newrev: 313740045e4275ac1cef9e089e3042cff90d6d0e 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: 2007-q4/txt/msg00628.txt.bz2 The branch, master has been updated via 313740045e4275ac1cef9e089e3042cff90d6d0e (commit) from f011804026b47ceca7d3298da68ac71152271e18 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 313740045e4275ac1cef9e089e3042cff90d6d0e Author: Andrew Cagney Date: Thu Dec 27 13:06:05 2007 -0500 Move iterateSyscallByName to SyscallTable. frysk-core/frysk/proc/ChangeLog 2007-12-27 Andrew Cagney * Syscall.java (iterateSyscallByName(String,Syscall[])): Move to ... * SyscallTable.java (iterateSyscallByName(String,Syscall[])): New. * LinuxX8664Syscall.java: Update. * LinuxPPC32Syscall.java: Update. * LinuxIa32Syscall.java: Update. * LinuxPPC64Syscall.java: Update. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/proc/ChangeLog | 7 +++++++ frysk-core/frysk/proc/LinuxIa32Syscall.java | 7 +++---- frysk-core/frysk/proc/LinuxPPC32Syscall.java | 6 +++--- frysk-core/frysk/proc/LinuxPPC64Syscall.java | 6 +++--- frysk-core/frysk/proc/LinuxX8664Syscall.java | 2 +- frysk-core/frysk/proc/Syscall.java | 15 --------------- frysk-core/frysk/proc/SyscallTable.java | 14 ++++++++++++++ 7 files changed, 31 insertions(+), 26 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/proc/ChangeLog b/frysk-core/frysk/proc/ChangeLog index 14ae7c6..5c8202c 100644 --- a/frysk-core/frysk/proc/ChangeLog +++ b/frysk-core/frysk/proc/ChangeLog @@ -1,5 +1,12 @@ 2007-12-27 Andrew Cagney + * Syscall.java (iterateSyscallByName(String,Syscall[])): Move to ... + * SyscallTable.java (iterateSyscallByName(String,Syscall[])): New. + * LinuxX8664Syscall.java: Update. + * LinuxPPC32Syscall.java: Update. + * LinuxIa32Syscall.java: Update. + * LinuxPPC64Syscall.java: Update. + * Syscall.java (syscallByName(String,Task)): Delete. * TestSyscallRunning.java: Use SyscallTableFactory. * TestTaskSyscallObserver.java: Ditto. diff --git a/frysk-core/frysk/proc/LinuxIa32Syscall.java b/frysk-core/frysk/proc/LinuxIa32Syscall.java index f4c3f7d..121eb00 100644 --- a/frysk-core/frysk/proc/LinuxIa32Syscall.java +++ b/frysk-core/frysk/proc/LinuxIa32Syscall.java @@ -540,15 +540,14 @@ public class LinuxIa32Syscall extends SyscallTable { public Syscall syscallByName(String name) { Syscall syscall; - syscall = Syscall.iterateSyscallByName(name, LinuxIa32Syscall.syscallList); + syscall = iterateSyscallByName(name, LinuxIa32Syscall.syscallList); if (syscall != null) return syscall; - - syscall = Syscall.iterateSyscallByName(name, LinuxIa32Syscall.socketSubcallList); + syscall = iterateSyscallByName(name, LinuxIa32Syscall.socketSubcallList); if (syscall != null) return syscall; - syscall = Syscall.iterateSyscallByName(name, LinuxIa32Syscall.ipcSubcallList); + syscall = iterateSyscallByName(name, LinuxIa32Syscall.ipcSubcallList); if (syscall != null) return syscall; diff --git a/frysk-core/frysk/proc/LinuxPPC32Syscall.java b/frysk-core/frysk/proc/LinuxPPC32Syscall.java index 397a1d1..c467326 100644 --- a/frysk-core/frysk/proc/LinuxPPC32Syscall.java +++ b/frysk-core/frysk/proc/LinuxPPC32Syscall.java @@ -528,13 +528,13 @@ public class LinuxPPC32Syscall extends SyscallTable { public Syscall syscallByName(String name) { Syscall syscall; - syscall = Syscall.iterateSyscallByName(name, LinuxPPC32Syscall.syscallList); + syscall = iterateSyscallByName(name, LinuxPPC32Syscall.syscallList); if (syscall != null) return syscall; - syscall = Syscall.iterateSyscallByName(name, LinuxPPC32Syscall.socketSubcallList); + syscall = iterateSyscallByName(name, LinuxPPC32Syscall.socketSubcallList); if (syscall != null) return syscall; - syscall = Syscall.iterateSyscallByName(name, LinuxPPC32Syscall.ipcSubcallList); + syscall = iterateSyscallByName(name, LinuxPPC32Syscall.ipcSubcallList); if (syscall != null) return syscall; return null; diff --git a/frysk-core/frysk/proc/LinuxPPC64Syscall.java b/frysk-core/frysk/proc/LinuxPPC64Syscall.java index 25b2f4a..f9507c1 100644 --- a/frysk-core/frysk/proc/LinuxPPC64Syscall.java +++ b/frysk-core/frysk/proc/LinuxPPC64Syscall.java @@ -534,13 +534,13 @@ public class LinuxPPC64Syscall extends SyscallTable { public Syscall syscallByName(String name) { Syscall syscall; - syscall = Syscall.iterateSyscallByName(name, LinuxPPC64Syscall.syscallList); + syscall = iterateSyscallByName(name, LinuxPPC64Syscall.syscallList); if (syscall != null) return syscall; - syscall = Syscall.iterateSyscallByName(name, LinuxPPC64Syscall.socketSubcallList); + syscall = iterateSyscallByName(name, LinuxPPC64Syscall.socketSubcallList); if (syscall != null) return syscall; - syscall = Syscall.iterateSyscallByName(name, LinuxPPC64Syscall.ipcSubcallList); + syscall = iterateSyscallByName(name, LinuxPPC64Syscall.ipcSubcallList); if (syscall != null) return syscall; return null; diff --git a/frysk-core/frysk/proc/LinuxX8664Syscall.java b/frysk-core/frysk/proc/LinuxX8664Syscall.java index e80ac40..3f8e825 100644 --- a/frysk-core/frysk/proc/LinuxX8664Syscall.java +++ b/frysk-core/frysk/proc/LinuxX8664Syscall.java @@ -389,6 +389,6 @@ public class LinuxX8664Syscall extends SyscallTable { } public Syscall syscallByName (String name) { - return Syscall.iterateSyscallByName(name, LinuxX8664Syscall.syscallList); + return iterateSyscallByName(name, LinuxX8664Syscall.syscallList); } } diff --git a/frysk-core/frysk/proc/Syscall.java b/frysk-core/frysk/proc/Syscall.java index 409d7ee..c6f26fd 100644 --- a/frysk-core/frysk/proc/Syscall.java +++ b/frysk-core/frysk/proc/Syscall.java @@ -237,21 +237,6 @@ public abstract class Syscall { } /** - * Given a system call's name, this will return the corresponding - * Syscall object. If no predefined system call with that name - * is available, this will return null. - * @param name the name of the system call - * @param syscallList system calls list - * @return the Syscall object, or null - */ - static Syscall iterateSyscallByName (String name, Syscall[] syscallList) { - for (int i = 0; i < syscallList.length; ++i) - if (name.equals(syscallList[i].name)) - return syscallList[i]; - return null; - } - - /** * Given a system call's number, this will return the corresponding * Syscall object. Note that system call numbers are platform * dependent. This will return a Syscall object in all cases; if diff --git a/frysk-core/frysk/proc/SyscallTable.java b/frysk-core/frysk/proc/SyscallTable.java index 4f799ec..cc582b6 100644 --- a/frysk-core/frysk/proc/SyscallTable.java +++ b/frysk-core/frysk/proc/SyscallTable.java @@ -62,4 +62,18 @@ public abstract class SyscallTable { */ public abstract Syscall syscallByName (String Name); + /** + * Given a system call's name, this will return the corresponding + * Syscall object. If no predefined system call with that name is + * available, this will return null. + * @param name the name of the system call + * @param syscallList system calls list + * @return the Syscall object, or null + */ + Syscall iterateSyscallByName (String name, Syscall[] syscallList) { + for (int i = 0; i < syscallList.length; ++i) + if (name.equals(syscallList[i].getName())) + return syscallList[i]; + return null; + } } hooks/post-receive -- frysk system monitor/debugger