From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6607 invoked by alias); 16 Mar 2012 15:01:55 -0000 Received: (qmail 6279 invoked by uid 22791); 16 Mar 2012 15:01:49 -0000 X-SWARE-Spam-Status: No, hits=-1.3 required=5.0 tests=AWL,BAYES_00,FROM_12LTRDOM X-Spam-Check-By: sourceware.org Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 16 Mar 2012 15:01:26 +0000 Received: from svr-orw-fem-01.mgc.mentorg.com ([147.34.98.93]) by relay1.mentorg.com with esmtp id 1S8Yej-0000LZ-Pt from Yao_Qi@mentor.com for gdb-patches@sourceware.org; Fri, 16 Mar 2012 08:01:25 -0700 Received: from SVR-ORW-FEM-02.mgc.mentorg.com ([147.34.96.206]) by svr-orw-fem-01.mgc.mentorg.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Fri, 16 Mar 2012 08:01:25 -0700 Received: from localhost.localdomain (147.34.91.1) by svr-orw-fem-02.mgc.mentorg.com (147.34.96.168) with Microsoft SMTP Server id 14.1.289.1; Fri, 16 Mar 2012 08:01:23 -0700 From: Yao Qi To: Subject: [PATCH 3/5] s/struct process_info/struct inferior/ Date: Fri, 16 Mar 2012 15:01:00 -0000 Message-ID: <1331909994-9473-4-git-send-email-yao@codesourcery.com> In-Reply-To: <1331909994-9473-1-git-send-email-yao@codesourcery.com> References: <1331909994-9473-1-git-send-email-yao@codesourcery.com> MIME-Version: 1.0 Content-Type: text/plain X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2012-03/txt/msg00616.txt.bz2 ITSET need a type `struct inferior' to represent a process. Its counter part in GDBserver is `struct process_info'. This patch is to rename `struct process_info' to `struct inferior', so that ITSET code in gdb/common can use 'struct inferior' unconditionally. gdb/gdbserver: * inferiors.c (struct process_info): Renamed to struct inferior. * linux-arm-low.c, linux-low.c, linux-low.h: Update usage. * linux-x86-low.c, lynx-low.c, mem-break.c, mem-break.h: Likewise. * nto-low.c, remote-utils.c, server.c, server.h: Likewise. * spu-low.c, target.h, thread-db.c, win32-low.c: Likewise. --- gdb/gdbserver/inferiors.c | 18 ++++++++-------- gdb/gdbserver/linux-arm-low.c | 6 ++-- gdb/gdbserver/linux-low.c | 14 ++++++------ gdb/gdbserver/linux-low.h | 4 +- gdb/gdbserver/linux-x86-low.c | 10 ++++---- gdb/gdbserver/lynx-low.c | 10 ++++---- gdb/gdbserver/mem-break.c | 44 ++++++++++++++++++++-------------------- gdb/gdbserver/mem-break.h | 4 +- gdb/gdbserver/nto-low.c | 2 +- gdb/gdbserver/remote-utils.c | 2 +- gdb/gdbserver/server.c | 18 ++++++++-------- gdb/gdbserver/server.h | 14 ++++++------ gdb/gdbserver/spu-low.c | 6 ++-- gdb/gdbserver/target.h | 2 +- gdb/gdbserver/thread-db.c | 18 ++++++++-------- gdb/gdbserver/win32-low.c | 6 ++-- 16 files changed, 89 insertions(+), 89 deletions(-) diff --git a/gdb/gdbserver/inferiors.c b/gdb/gdbserver/inferiors.c index 2b9169a..1deeceb 100644 --- a/gdb/gdbserver/inferiors.c +++ b/gdb/gdbserver/inferiors.c @@ -239,10 +239,10 @@ clear_inferiors (void) current_inferior = NULL; } -struct process_info * +struct inferior * add_process (int pid, int attached) { - struct process_info *process; + struct inferior *process; process = xcalloc (1, sizeof (*process)); @@ -259,7 +259,7 @@ add_process (int pid, int attached) The caller is responsible for freeing private data first. */ void -remove_process (struct process_info *process) +remove_process (struct inferior *process) { clear_symbol_cache (&process->symbol_cache); free_all_breakpoints (process); @@ -267,10 +267,10 @@ remove_process (struct process_info *process) free (process); } -struct process_info * +struct inferior * find_process_pid (int pid) { - return (struct process_info *) + return (struct inferior *) find_inferior_id (&all_processes, pid_to_ptid (pid)); } @@ -280,7 +280,7 @@ find_process_pid (int pid) static int started_inferior_callback (struct inferior_list_entry *entry, void *args) { - struct process_info *process = (struct process_info *) entry; + struct inferior *process = (struct inferior *) entry; return ! process->attached; } @@ -300,7 +300,7 @@ have_started_inferiors_p (void) static int attached_inferior_callback (struct inferior_list_entry *entry, void *args) { - struct process_info *process = (struct process_info *) entry; + struct inferior *process = (struct inferior *) entry; return process->attached; } @@ -314,14 +314,14 @@ have_attached_inferiors_p (void) != NULL); } -struct process_info * +struct inferior * get_thread_process (struct thread_info *thread) { int pid = ptid_get_pid (thread->entry.id); return find_process_pid (pid); } -struct process_info * +struct inferior * current_process (void) { if (current_inferior == NULL) diff --git a/gdb/gdbserver/linux-arm-low.c b/gdb/gdbserver/linux-arm-low.c index ff2437d..574234f 100644 --- a/gdb/gdbserver/linux-arm-low.c +++ b/gdb/gdbserver/linux-arm-low.c @@ -552,7 +552,7 @@ update_registers_callback (struct inferior_list_entry *entry, void *arg) static int arm_insert_point (char type, CORE_ADDR addr, int len) { - struct process_info *proc = current_process (); + struct inferior *proc = current_process (); struct arm_linux_hw_breakpoint p, *pts; int watch, i, count; @@ -591,7 +591,7 @@ arm_insert_point (char type, CORE_ADDR addr, int len) static int arm_remove_point (char type, CORE_ADDR addr, int len) { - struct process_info *proc = current_process (); + struct inferior *proc = current_process (); struct arm_linux_hw_breakpoint p, *pts; int watch, i, count; @@ -698,7 +698,7 @@ static void arm_prepare_to_resume (struct lwp_info *lwp) { int pid = lwpid_of (lwp); - struct process_info *proc = find_process_pid (pid_of (lwp)); + struct inferior *proc = find_process_pid (pid_of (lwp)); struct arch_process_info *proc_info = proc->private->arch_private; struct arch_lwp_info *lwp_info = lwp->arch_private; int i; diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c index 4f8ec6b..3376b8d 100644 --- a/gdb/gdbserver/linux-low.c +++ b/gdb/gdbserver/linux-low.c @@ -290,10 +290,10 @@ delete_lwp (struct lwp_info *lwp) /* Add a process to the common process list, and set its private data. */ -static struct process_info * +static struct inferior * linux_add_process (int pid, int attached) { - struct process_info *proc; + struct inferior *proc; /* Is this the first process? If so, then set the arch. */ if (all_processes.head == NULL) @@ -951,7 +951,7 @@ kill_one_lwp_callback (struct inferior_list_entry *entry, void *args) static int linux_kill (int pid) { - struct process_info *process; + struct inferior *process; struct lwp_info *lwp; int wstat; int lwpid; @@ -1037,7 +1037,7 @@ linux_detach_one_lwp (struct inferior_list_entry *entry, void *args) static int linux_detach (int pid) { - struct process_info *process; + struct inferior *process; process = find_process_pid (pid); if (process == NULL) @@ -1072,7 +1072,7 @@ static int delete_lwp_callback (struct inferior_list_entry *entry, void *proc) { struct lwp_info *lwp = (struct lwp_info *) entry; - struct process_info *process = proc; + struct inferior *process = proc; if (pid_of (lwp) == pid_of (process)) delete_lwp (lwp); @@ -1081,7 +1081,7 @@ delete_lwp_callback (struct inferior_list_entry *entry, void *proc) } static void -linux_mourn (struct process_info *process) +linux_mourn (struct inferior *process) { struct process_info_private *priv; @@ -4520,7 +4520,7 @@ static void linux_look_up_symbols (void) { #ifdef USE_THREAD_DB - struct process_info *proc = current_process (); + struct inferior *proc = current_process (); if (proc->private->thread_db != NULL) return; diff --git a/gdb/gdbserver/linux-low.h b/gdb/gdbserver/linux-low.h index 677d261..b4af546 100644 --- a/gdb/gdbserver/linux-low.h +++ b/gdb/gdbserver/linux-low.h @@ -279,8 +279,8 @@ void linux_stop_lwp (struct lwp_info *lwp); /* From thread-db.c */ int thread_db_init (int use_events); -void thread_db_detach (struct process_info *); -void thread_db_mourn (struct process_info *); +void thread_db_detach (struct inferior *); +void thread_db_mourn (struct inferior *); int thread_db_handle_monitor_command (char *); int thread_db_get_tls_address (struct thread_info *thread, CORE_ADDR offset, CORE_ADDR load_module, CORE_ADDR *address); diff --git a/gdb/gdbserver/linux-x86-low.c b/gdb/gdbserver/linux-x86-low.c index 58aaf9a..44fd310 100644 --- a/gdb/gdbserver/linux-x86-low.c +++ b/gdb/gdbserver/linux-x86-low.c @@ -553,7 +553,7 @@ i386_dr_low_get_status (void) static int x86_insert_point (char type, CORE_ADDR addr, int len) { - struct process_info *proc = current_process (); + struct inferior *proc = current_process (); switch (type) { case '0': @@ -581,7 +581,7 @@ x86_insert_point (char type, CORE_ADDR addr, int len) static int x86_remove_point (char type, CORE_ADDR addr, int len) { - struct process_info *proc = current_process (); + struct inferior *proc = current_process (); switch (type) { case '0': @@ -609,14 +609,14 @@ x86_remove_point (char type, CORE_ADDR addr, int len) static int x86_stopped_by_watchpoint (void) { - struct process_info *proc = current_process (); + struct inferior *proc = current_process (); return i386_low_stopped_by_watchpoint (&proc->private->arch_private->debug_reg_state); } static CORE_ADDR x86_stopped_data_address (void) { - struct process_info *proc = current_process (); + struct inferior *proc = current_process (); CORE_ADDR addr; if (i386_low_stopped_data_address (&proc->private->arch_private->debug_reg_state, &addr)) @@ -661,7 +661,7 @@ x86_linux_prepare_to_resume (struct lwp_info *lwp) { int i; int pid = ptid_get_pid (ptid); - struct process_info *proc = find_process_pid (pid); + struct inferior *proc = find_process_pid (pid); struct i386_debug_reg_state *state = &proc->private->arch_private->debug_reg_state; diff --git a/gdb/gdbserver/lynx-low.c b/gdb/gdbserver/lynx-low.c index aaed07d..85fc219 100644 --- a/gdb/gdbserver/lynx-low.c +++ b/gdb/gdbserver/lynx-low.c @@ -291,7 +291,7 @@ lynx_ptrace (int request, ptid_t ptid, int addr, int data, int addr2) static int lynx_create_inferior (char *program, char **allargs) { - struct process_info *new_process; + struct inferior *new_process; int pid; lynx_debug ("lynx_create_inferior ()"); @@ -328,7 +328,7 @@ lynx_create_inferior (char *program, char **allargs) static int lynx_attach (unsigned long pid) { - struct process_info *new_process; + struct inferior *new_process; ptid_t ptid = lynx_ptid_build (pid, 0); if (lynx_ptrace (PTRACE_ATTACH, ptid, 0, 0, 0) != 0) @@ -528,7 +528,7 @@ lynx_kill (int pid) { ptid_t ptid = lynx_ptid_build (pid, 0); struct target_waitstatus status; - struct process_info *process; + struct inferior *process; process = find_process_pid (pid); if (process == NULL) @@ -546,7 +546,7 @@ static int lynx_detach (int pid) { ptid_t ptid = lynx_ptid_build (pid, 0); - struct process_info *process; + struct inferior *process; process = find_process_pid (pid); if (process == NULL) @@ -560,7 +560,7 @@ lynx_detach (int pid) /* Implement the mourn target_ops method. */ static void -lynx_mourn (struct process_info *proc) +lynx_mourn (struct inferior *proc) { lynx_clear_inferiors (); } diff --git a/gdb/gdbserver/mem-break.c b/gdb/gdbserver/mem-break.c index 6b6b25c..45adb12 100644 --- a/gdb/gdbserver/mem-break.c +++ b/gdb/gdbserver/mem-break.c @@ -124,7 +124,7 @@ struct breakpoint static struct raw_breakpoint * find_raw_breakpoint_at (CORE_ADDR where) { - struct process_info *proc = current_process (); + struct inferior *proc = current_process (); struct raw_breakpoint *bp; for (bp = proc->raw_breakpoints; bp != NULL; bp = bp->next) @@ -137,7 +137,7 @@ find_raw_breakpoint_at (CORE_ADDR where) static struct raw_breakpoint * set_raw_breakpoint_at (CORE_ADDR where) { - struct process_info *proc = current_process (); + struct inferior *proc = current_process (); struct raw_breakpoint *bp; int err; unsigned char buf[MAX_BREAKPOINT_LEN]; @@ -242,7 +242,7 @@ struct fast_tracepoint_jump static struct fast_tracepoint_jump * find_fast_tracepoint_jump_at (CORE_ADDR where) { - struct process_info *proc = current_process (); + struct inferior *proc = current_process (); struct fast_tracepoint_jump *jp; for (jp = proc->fast_tracepoint_jumps; jp != NULL; jp = jp->next) @@ -265,7 +265,7 @@ delete_fast_tracepoint_jump (struct fast_tracepoint_jump *todel) { struct fast_tracepoint_jump *bp, **bp_link; int ret; - struct process_info *proc = current_process (); + struct inferior *proc = current_process (); bp = proc->fast_tracepoint_jumps; bp_link = &proc->fast_tracepoint_jumps; @@ -333,7 +333,7 @@ struct fast_tracepoint_jump * set_fast_tracepoint_jump (CORE_ADDR where, unsigned char *insn, ULONGEST length) { - struct process_info *proc = current_process (); + struct inferior *proc = current_process (); struct fast_tracepoint_jump *jp; int err; unsigned char *buf; @@ -503,7 +503,7 @@ reinsert_fast_tracepoint_jumps_at (CORE_ADDR where) struct breakpoint * set_breakpoint_at (CORE_ADDR where, int (*handler) (CORE_ADDR)) { - struct process_info *proc = current_process (); + struct inferior *proc = current_process (); struct breakpoint *bp; struct raw_breakpoint *raw; @@ -528,7 +528,7 @@ set_breakpoint_at (CORE_ADDR where, int (*handler) (CORE_ADDR)) } static int -delete_raw_breakpoint (struct process_info *proc, struct raw_breakpoint *todel) +delete_raw_breakpoint (struct inferior *proc, struct raw_breakpoint *todel) { struct raw_breakpoint *bp, **bp_link; int ret; @@ -590,7 +590,7 @@ delete_raw_breakpoint (struct process_info *proc, struct raw_breakpoint *todel) } static int -release_breakpoint (struct process_info *proc, struct breakpoint *bp) +release_breakpoint (struct inferior *proc, struct breakpoint *bp) { int newrefcount; int ret; @@ -611,7 +611,7 @@ release_breakpoint (struct process_info *proc, struct breakpoint *bp) } static int -delete_breakpoint_1 (struct process_info *proc, struct breakpoint *todel) +delete_breakpoint_1 (struct inferior *proc, struct breakpoint *todel) { struct breakpoint *bp, **bp_link; int err; @@ -646,14 +646,14 @@ delete_breakpoint_1 (struct process_info *proc, struct breakpoint *todel) int delete_breakpoint (struct breakpoint *todel) { - struct process_info *proc = current_process (); + struct inferior *proc = current_process (); return delete_breakpoint_1 (proc, todel); } struct breakpoint * find_gdb_breakpoint_at (CORE_ADDR where) { - struct process_info *proc = current_process (); + struct inferior *proc = current_process (); struct breakpoint *bp; for (bp = proc->breakpoints; bp != NULL; bp = bp->next) @@ -856,7 +856,7 @@ set_reinsert_breakpoint (CORE_ADDR stop_at) void delete_reinsert_breakpoints (void) { - struct process_info *proc = current_process (); + struct inferior *proc = current_process (); struct breakpoint *bp, **bp_link; bp = proc->breakpoints; @@ -934,7 +934,7 @@ uninsert_breakpoints_at (CORE_ADDR pc) void uninsert_all_breakpoints (void) { - struct process_info *proc = current_process (); + struct inferior *proc = current_process (); struct raw_breakpoint *bp; for (bp = proc->raw_breakpoints; bp != NULL; bp = bp->next) @@ -984,7 +984,7 @@ reinsert_breakpoints_at (CORE_ADDR pc) void reinsert_all_breakpoints (void) { - struct process_info *proc = current_process (); + struct inferior *proc = current_process (); struct raw_breakpoint *bp; for (bp = proc->raw_breakpoints; bp != NULL; bp = bp->next) @@ -995,7 +995,7 @@ reinsert_all_breakpoints (void) void check_breakpoints (CORE_ADDR stop_pc) { - struct process_info *proc = current_process (); + struct inferior *proc = current_process (); struct breakpoint *bp, **bp_link; bp = proc->breakpoints; @@ -1074,7 +1074,7 @@ validate_inserted_breakpoint (struct raw_breakpoint *bp) static void delete_disabled_breakpoints (void) { - struct process_info *proc = current_process (); + struct inferior *proc = current_process (); struct breakpoint *bp, *next; for (bp = proc->breakpoints; bp != NULL; bp = next) @@ -1095,7 +1095,7 @@ delete_disabled_breakpoints (void) void validate_breakpoints (void) { - struct process_info *proc = current_process (); + struct inferior *proc = current_process (); struct breakpoint *bp; for (bp = proc->breakpoints; bp != NULL; bp = bp->next) @@ -1110,7 +1110,7 @@ validate_breakpoints (void) void check_mem_read (CORE_ADDR mem_addr, unsigned char *buf, int mem_len) { - struct process_info *proc = current_process (); + struct inferior *proc = current_process (); struct raw_breakpoint *bp = proc->raw_breakpoints; struct fast_tracepoint_jump *jp = proc->fast_tracepoint_jumps; CORE_ADDR mem_end = mem_addr + mem_len; @@ -1191,7 +1191,7 @@ void check_mem_write (CORE_ADDR mem_addr, unsigned char *buf, const unsigned char *myaddr, int mem_len) { - struct process_info *proc = current_process (); + struct inferior *proc = current_process (); struct raw_breakpoint *bp = proc->raw_breakpoints; struct fast_tracepoint_jump *jp = proc->fast_tracepoint_jumps; CORE_ADDR mem_end = mem_addr + mem_len; @@ -1279,7 +1279,7 @@ check_mem_write (CORE_ADDR mem_addr, unsigned char *buf, void delete_all_breakpoints (void) { - struct process_info *proc = current_process (); + struct inferior *proc = current_process (); while (proc->breakpoints) delete_breakpoint_1 (proc, proc->breakpoints); @@ -1288,7 +1288,7 @@ delete_all_breakpoints (void) /* Clear the "inserted" flag in all breakpoints. */ void -mark_breakpoints_out (struct process_info *proc) +mark_breakpoints_out (struct inferior *proc) { struct raw_breakpoint *raw_bp; @@ -1300,7 +1300,7 @@ mark_breakpoints_out (struct process_info *proc) inferior. */ void -free_all_breakpoints (struct process_info *proc) +free_all_breakpoints (struct inferior *proc) { mark_breakpoints_out (proc); diff --git a/gdb/gdbserver/mem-break.h b/gdb/gdbserver/mem-break.h index 95b7f9d..5424e44 100644 --- a/gdb/gdbserver/mem-break.h +++ b/gdb/gdbserver/mem-break.h @@ -136,12 +136,12 @@ void delete_all_breakpoints (void); /* Clear the "inserted" flag in all breakpoints of PROC. */ -void mark_breakpoints_out (struct process_info *proc); +void mark_breakpoints_out (struct inferior *proc); /* Delete all breakpoints, but do not try to un-insert them from the inferior. */ -void free_all_breakpoints (struct process_info *proc); +void free_all_breakpoints (struct inferior *proc); /* Check if breakpoints still seem to be inserted in the inferior. */ diff --git a/gdb/gdbserver/nto-low.c b/gdb/gdbserver/nto-low.c index eabee10..9ac9731 100644 --- a/gdb/gdbserver/nto-low.c +++ b/gdb/gdbserver/nto-low.c @@ -407,7 +407,7 @@ nto_detach (int pid) } static void -nto_mourn (struct process_info *process) +nto_mourn (struct inferior *process) { remove_process (process); } diff --git a/gdb/gdbserver/remote-utils.c b/gdb/gdbserver/remote-utils.c index 995e3b1..025643a 100644 --- a/gdb/gdbserver/remote-utils.c +++ b/gdb/gdbserver/remote-utils.c @@ -1588,7 +1588,7 @@ look_up_one_symbol (const char *name, CORE_ADDR *addrp, int may_ask_gdb) char own_buf[266], *p, *q; int len; struct sym_cache *sym; - struct process_info *proc; + struct inferior *proc; proc = current_process (); diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c index c330d17..af6bfcc 100644 --- a/gdb/gdbserver/server.c +++ b/gdb/gdbserver/server.c @@ -1782,12 +1782,12 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p) if (strcmp (own_buf, "qAttached") == 0 || strncmp (own_buf, "qAttached:", sizeof ("qAttached:") - 1) == 0) { - struct process_info *process; + struct inferior *process; if (own_buf[sizeof ("qAttached") - 1]) { int pid = strtoul (own_buf + sizeof ("qAttached:") - 1, NULL, 16); - process = (struct process_info *) + process = (struct inferior *) find_inferior_id (&all_processes, pid_to_ptid (pid)); } else @@ -2350,7 +2350,7 @@ gdb_wants_all_threads_stopped (void) static void gdb_reattached_process (struct inferior_list_entry *entry) { - struct process_info *process = (struct process_info *) entry; + struct inferior *process = (struct inferior *) entry; process->gdb_detached = 0; } @@ -2464,7 +2464,7 @@ first_thread_of (struct inferior_list_entry *entry, void *args) static void kill_inferior_callback (struct inferior_list_entry *entry) { - struct process_info *process = (struct process_info *) entry; + struct inferior *process = (struct inferior *) entry; int pid = ptid_get_pid (process->head.id); kill_inferior (pid); @@ -2479,7 +2479,7 @@ kill_inferior_callback (struct inferior_list_entry *entry) static void detach_or_kill_inferior_callback (struct inferior_list_entry *entry) { - struct process_info *process = (struct process_info *) entry; + struct inferior *process = (struct inferior *) entry; int pid = ptid_get_pid (process->head.id); if (process->attached) @@ -2496,7 +2496,7 @@ detach_or_kill_inferior_callback (struct inferior_list_entry *entry) static void print_started_pid (struct inferior_list_entry *entry) { - struct process_info *process = (struct process_info *) entry; + struct inferior *process = (struct inferior *) entry; if (! process->attached) { @@ -2511,7 +2511,7 @@ print_started_pid (struct inferior_list_entry *entry) static void print_attached_pid (struct inferior_list_entry *entry) { - struct process_info *process = (struct process_info *) entry; + struct inferior *process = (struct inferior *) entry; if (process->attached) { @@ -2953,7 +2953,7 @@ process_serial_event (void) if (tracing && disconnected_tracing) { struct thread_resume resume_info; - struct process_info *process = find_process_pid (pid); + struct inferior *process = find_process_pid (pid); if (process == NULL) { @@ -3386,7 +3386,7 @@ handle_target_event (int err, gdb_client_data client_data) if (last_status.kind != TARGET_WAITKIND_IGNORE) { int pid = ptid_get_pid (last_ptid); - struct process_info *process = find_process_pid (pid); + struct inferior *process = find_process_pid (pid); int forward_event = !gdb_connected () || process->gdb_detached; if (last_status.kind == TARGET_WAITKIND_EXITED diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h index fad58e8..10bfc96 100644 --- a/gdb/gdbserver/server.h +++ b/gdb/gdbserver/server.h @@ -137,7 +137,7 @@ struct inferior_list_entry }; struct thread_info; -struct process_info; +struct inferior; struct regcache; #include "regcache.h" @@ -197,7 +197,7 @@ struct raw_breakpoint; struct fast_tracepoint_jump; struct process_info_private; -struct process_info +struct inferior { struct inferior_list_entry head; @@ -229,8 +229,8 @@ struct process_info thread (current_inferior). It is an error to call this if there is no current thread selected. */ -struct process_info *current_process (void); -struct process_info *get_thread_process (struct thread_info *); +struct inferior *current_process (void); +struct inferior *get_thread_process (struct thread_info *); /* Target-specific functions */ @@ -255,9 +255,9 @@ void remove_inferior (struct inferior_list *list, void remove_thread (struct thread_info *thread); void add_thread (ptid_t ptid, void *target_data); -struct process_info *add_process (int pid, int attached); -void remove_process (struct process_info *process); -struct process_info *find_process_pid (int pid); +struct inferior *add_process (int pid, int attached); +void remove_process (struct inferior *process); +struct inferior *find_process_pid (int pid); int have_started_inferiors_p (void); int have_attached_inferiors_p (void); diff --git a/gdb/gdbserver/spu-low.c b/gdb/gdbserver/spu-low.c index 2a720ae..d9aa56e 100644 --- a/gdb/gdbserver/spu-low.c +++ b/gdb/gdbserver/spu-low.c @@ -322,7 +322,7 @@ static int spu_kill (int pid) { int status, ret; - struct process_info *process = find_process_pid (pid); + struct inferior *process = find_process_pid (pid); if (process == NULL) return -1; @@ -343,7 +343,7 @@ spu_kill (int pid) static int spu_detach (int pid) { - struct process_info *process = find_process_pid (pid); + struct inferior *process = find_process_pid (pid); if (process == NULL) return -1; @@ -355,7 +355,7 @@ spu_detach (int pid) } static void -spu_mourn (struct process_info *process) +spu_mourn (struct inferior *process) { remove_process (process); } diff --git a/gdb/gdbserver/target.h b/gdb/gdbserver/target.h index dcf0230..476b796 100644 --- a/gdb/gdbserver/target.h +++ b/gdb/gdbserver/target.h @@ -142,7 +142,7 @@ struct target_ops /* The inferior process has died. Do what is right. */ - void (*mourn) (struct process_info *proc); + void (*mourn) (struct inferior *proc); /* Wait for inferior PID to exit. */ void (*join) (int pid); diff --git a/gdb/gdbserver/thread-db.c b/gdb/gdbserver/thread-db.c index 795f926..e534ac5 100644 --- a/gdb/gdbserver/thread-db.c +++ b/gdb/gdbserver/thread-db.c @@ -486,7 +486,7 @@ thread_db_get_tls_address (struct thread_info *thread, CORE_ADDR offset, td_err_e err; struct lwp_info *lwp; struct thread_info *saved_inferior; - struct process_info *proc; + struct inferior *proc; struct thread_db *thread_db; proc = get_thread_process (thread); @@ -530,7 +530,7 @@ thread_db_load_search (void) { td_err_e err; struct thread_db *tdb; - struct process_info *proc = current_process (); + struct inferior *proc = current_process (); if (proc->private->thread_db != NULL) fatal ("unexpected: proc->private->thread_db != NULL"); @@ -575,7 +575,7 @@ try_thread_db_load_1 (void *handle) { td_err_e err; struct thread_db *tdb; - struct process_info *proc = current_process (); + struct inferior *proc = current_process (); if (proc->private->thread_db != NULL) fatal ("unexpected: proc->private->thread_db != NULL"); @@ -801,7 +801,7 @@ thread_db_load_search (void) int thread_db_init (int use_events) { - struct process_info *proc = current_process (); + struct inferior *proc = current_process (); /* FIXME drow/2004-10-16: This is the "overall process ID", which GNU/Linux calls tgid, "thread group ID". When we support @@ -844,7 +844,7 @@ any_thread_of (struct inferior_list_entry *entry, void *args) } static void -switch_to_process (struct process_info *proc) +switch_to_process (struct inferior *proc) { int pid = pid_of (proc); @@ -856,7 +856,7 @@ switch_to_process (struct process_info *proc) /* Disconnect from libthread_db and free resources. */ static void -disable_thread_event_reporting (struct process_info *proc) +disable_thread_event_reporting (struct inferior *proc) { struct thread_db *thread_db = proc->private->thread_db; if (thread_db) @@ -888,7 +888,7 @@ disable_thread_event_reporting (struct process_info *proc) } static void -remove_thread_event_breakpoints (struct process_info *proc) +remove_thread_event_breakpoints (struct inferior *proc) { struct thread_db *thread_db = proc->private->thread_db; @@ -906,7 +906,7 @@ remove_thread_event_breakpoints (struct process_info *proc) } void -thread_db_detach (struct process_info *proc) +thread_db_detach (struct inferior *proc) { struct thread_db *thread_db = proc->private->thread_db; @@ -920,7 +920,7 @@ thread_db_detach (struct process_info *proc) /* Disconnect from libthread_db and free resources. */ void -thread_db_mourn (struct process_info *proc) +thread_db_mourn (struct inferior *proc) { struct thread_db *thread_db = proc->private->thread_db; if (thread_db) diff --git a/gdb/gdbserver/win32-low.c b/gdb/gdbserver/win32-low.c index 3e10490..b9b16f3 100644 --- a/gdb/gdbserver/win32-low.c +++ b/gdb/gdbserver/win32-low.c @@ -700,7 +700,7 @@ win32_clear_inferiors (void) static int win32_kill (int pid) { - struct process_info *process; + struct inferior *process; if (current_process_handle == NULL) return -1; @@ -732,7 +732,7 @@ win32_kill (int pid) static int win32_detach (int pid) { - struct process_info *process; + struct inferior *process; winapi_DebugActiveProcessStop DebugActiveProcessStop = NULL; winapi_DebugSetProcessKillOnExit DebugSetProcessKillOnExit = NULL; #ifdef _WIN32_WCE @@ -767,7 +767,7 @@ win32_detach (int pid) } static void -win32_mourn (struct process_info *process) +win32_mourn (struct inferior *process) { remove_process (process); } -- 1.7.0.4