X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fcontinuations.c;h=1feee32ebaa7631ac0eae23196d31ca36bbeeed1;hb=48c410fb70fe09c036e27092880db687e5c2fb0b;hp=2601a2347c4a79856ad8a2578a895c696ebca0e7;hpb=af1e9a32aae3e5c088e3fb661a17c763edb80291;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/continuations.c b/gdb/continuations.c index 2601a2347c..1feee32eba 100644 --- a/gdb/continuations.c +++ b/gdb/continuations.c @@ -1,8 +1,6 @@ /* Continuations for GDB, the GNU debugger. - Copyright (C) 1986, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, - 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, - 2009, 2010, 2011 Free Software Foundation, Inc. + Copyright (C) 1986-2019 Free Software Foundation, Inc. This file is part of GDB. @@ -22,44 +20,43 @@ #include "defs.h" #include "gdbthread.h" #include "inferior.h" +#include "continuations.h" struct continuation { struct continuation *next; - void (*function) (void *); - void (*free_arg) (void *); + continuation_ftype *function; + continuation_free_arg_ftype *free_arg; void *arg; }; -typedef void (make_continuation_ftype) (void *); - /* Add a new continuation to the continuation chain. Args are FUNCTION to run the continuation up with, and ARG to pass to it. */ static void make_continuation (struct continuation **pmy_chain, - make_continuation_ftype *function, + continuation_ftype *function, void *arg, void (*free_arg) (void *)) { - struct continuation *new = XNEW (struct continuation); + struct continuation *newobj = XNEW (struct continuation); - new->next = *pmy_chain; - new->function = function; - new->free_arg = free_arg; - new->arg = arg; - *pmy_chain = new; + newobj->next = *pmy_chain; + newobj->function = function; + newobj->free_arg = free_arg; + newobj->arg = arg; + *pmy_chain = newobj; } static void -do_my_continuations_1 (struct continuation **pmy_chain) +do_my_continuations_1 (struct continuation **pmy_chain, int err) { struct continuation *ptr; while ((ptr = *pmy_chain) != NULL) { *pmy_chain = ptr->next; /* Do this first in case of recursion. */ - (*ptr->function) (ptr->arg); + (*ptr->function) (ptr->arg, err); if (ptr->free_arg) (*ptr->free_arg) (ptr->arg); xfree (ptr); @@ -67,7 +64,7 @@ do_my_continuations_1 (struct continuation **pmy_chain) } static void -do_my_continuations (struct continuation **list) +do_my_continuations (struct continuation **list, int err) { struct continuation *continuations; @@ -83,7 +80,7 @@ do_my_continuations (struct continuation **list) *list = NULL; /* Work now on the list we have set aside. */ - do_my_continuations_1 (&continuations); + do_my_continuations_1 (&continuations, err); } static void @@ -103,8 +100,6 @@ discard_my_continuations_1 (struct continuation **pmy_chain) static void discard_my_continuations (struct continuation **list) { - struct continuation *continuation_ptr = *list; - discard_my_continuations_1 (list); *list = NULL; } @@ -113,22 +108,21 @@ discard_my_continuations (struct continuation **list) continuation will be added at the front. */ void -add_inferior_continuation (void (*continuation_hook) (void *), void *args, - void (*continuation_free_args) (void *)) +add_inferior_continuation (continuation_ftype *hook, void *args, + continuation_free_arg_ftype *free_arg) { struct inferior *inf = current_inferior (); - make_continuation (&inf->continuations, continuation_hook, - args, continuation_free_args); + make_continuation (&inf->continuations, hook, args, free_arg); } /* Do all continuations of the current inferior. */ void -do_all_inferior_continuations (void) +do_all_inferior_continuations (int err) { struct inferior *inf = current_inferior (); - do_my_continuations (&inf->continuations); + do_my_continuations (&inf->continuations, err); } /* Get rid of all the inferior-wide continuations of INF. */ @@ -138,190 +132,3 @@ discard_all_inferior_continuations (struct inferior *inf) { discard_my_continuations (&inf->continuations); } - -/* Add a continuation to the continuation list of THREAD. The new - continuation will be added at the front. */ - -void -add_continuation (struct thread_info *thread, - void (*continuation_hook) (void *), void *args, - void (*continuation_free_args) (void *)) -{ - make_continuation (&thread->continuations, continuation_hook, - args, continuation_free_args); -} - -static void -restore_thread_cleanup (void *arg) -{ - ptid_t *ptid_p = arg; - - switch_to_thread (*ptid_p); -} - -/* Walk down the continuation list of PTID, and execute all the - continuations. There is a problem though. In some cases new - continuations may be added while we are in the middle of this loop. - If this happens they will be added in the front, and done before we - have a chance of exhausting those that were already there. We need - to then save the beginning of the list in a pointer and do the - continuations from there on, instead of using the global beginning - of list as our iteration pointer. */ - -static void -do_all_continuations_ptid (ptid_t ptid, - struct continuation **continuations_p) -{ - struct cleanup *old_chain; - ptid_t current_thread; - - if (*continuations_p == NULL) - return; - - current_thread = inferior_ptid; - - /* Restore selected thread on exit. Don't try to restore the frame - as well, because: - - - When running continuations, the selected frame is always #0. - - - The continuations may trigger symbol file loads, which may - change the frame layout (frame ids change), which would trigger - a warning if we used make_cleanup_restore_current_thread. */ - - old_chain = make_cleanup (restore_thread_cleanup, ¤t_thread); - - /* Let the continuation see this thread as selected. */ - switch_to_thread (ptid); - - do_my_continuations (continuations_p); - - do_cleanups (old_chain); -} - -/* Callback for iterate over threads. */ - -static int -do_all_continuations_thread_callback (struct thread_info *thread, void *data) -{ - do_all_continuations_ptid (thread->ptid, &thread->continuations); - return 0; -} - -/* Do all continuations of thread THREAD. */ - -void -do_all_continuations_thread (struct thread_info *thread) -{ - do_all_continuations_thread_callback (thread, NULL); -} - -/* Do all continuations of all threads. */ - -void -do_all_continuations (void) -{ - iterate_over_threads (do_all_continuations_thread_callback, NULL); -} - -/* Callback for iterate over threads. */ - -static int -discard_all_continuations_thread_callback (struct thread_info *thread, - void *data) -{ - discard_my_continuations (&thread->continuations); - return 0; -} - -/* Get rid of all the continuations of THREAD. */ - -void -discard_all_continuations_thread (struct thread_info *thread) -{ - discard_all_continuations_thread_callback (thread, NULL); -} - -/* Get rid of all the continuations of all threads. */ - -void -discard_all_continuations (void) -{ - iterate_over_threads (discard_all_continuations_thread_callback, NULL); -} - - -/* Add a continuation to the intermediate continuation list of THREAD. - The new continuation will be added at the front. */ - -void -add_intermediate_continuation (struct thread_info *thread, - void (*continuation_hook) - (void *), void *args, - void (*continuation_free_args) (void *)) -{ - make_continuation (&thread->intermediate_continuations, continuation_hook, - args, continuation_free_args); -} - -/* Walk down the cmd_continuation list, and execute all the - continuations. There is a problem though. In some cases new - continuations may be added while we are in the middle of this - loop. If this happens they will be added in the front, and done - before we have a chance of exhausting those that were already - there. We need to then save the beginning of the list in a pointer - and do the continuations from there on, instead of using the - global beginning of list as our iteration pointer. */ - -static int -do_all_intermediate_continuations_thread_callback (struct thread_info *thread, - void *data) -{ - do_all_continuations_ptid (thread->ptid, - &thread->intermediate_continuations); - return 0; -} - -/* Do all intermediate continuations of thread THREAD. */ - -void -do_all_intermediate_continuations_thread (struct thread_info *thread) -{ - do_all_intermediate_continuations_thread_callback (thread, NULL); -} - -/* Do all intermediate continuations of all threads. */ - -void -do_all_intermediate_continuations (void) -{ - iterate_over_threads (do_all_intermediate_continuations_thread_callback, - NULL); -} - -/* Callback for iterate over threads. */ - -static int -discard_all_intermediate_continuations_thread_callback (struct thread_info *thread, - void *data) -{ - discard_my_continuations (&thread->intermediate_continuations); - return 0; -} - -/* Get rid of all the intermediate continuations of THREAD. */ - -void -discard_all_intermediate_continuations_thread (struct thread_info *thread) -{ - discard_all_intermediate_continuations_thread_callback (thread, NULL); -} - -/* Get rid of all the intermediate continuations of all threads. */ - -void -discard_all_intermediate_continuations (void) -{ - iterate_over_threads (discard_all_intermediate_continuations_thread_callback, - NULL); -}