/* 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, 1988-2012 Free Software Foundation, Inc.
This file is part of GDB.
#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. */
-/* Add a new continuation to the continuation chain, and return the
- previous chain pointer to be passed later to do_continuations or
- discard_continuations. Args are FUNCTION to run the continuation
- up with, and ARG to pass to it. */
-
-static struct continuation *
+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 *old_chain = *pmy_chain;
new->next = *pmy_chain;
new->function = function;
new->free_arg = free_arg;
new->arg = arg;
*pmy_chain = new;
-
- return old_chain;
}
static void
-do_my_continuations (struct continuation **pmy_chain,
- struct continuation *old_chain)
+do_my_continuations_1 (struct continuation **pmy_chain, int err)
{
struct continuation *ptr;
- while ((ptr = *pmy_chain) != old_chain)
+ 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);
}
}
-void
-discard_my_continuations (struct continuation **pmy_chain,
- struct continuation *old_chain)
+static void
+do_my_continuations (struct continuation **list, int err)
+{
+ struct continuation *continuations;
+
+ if (*list == NULL)
+ return;
+
+ /* Copy the list header into another pointer, and set the global
+ list header to null, so that the global list can change as a side
+ effect of invoking the continuations and the processing of the
+ preexisting continuations will not be affected. */
+
+ continuations = *list;
+ *list = NULL;
+
+ /* Work now on the list we have set aside. */
+ do_my_continuations_1 (&continuations, err);
+}
+
+static void
+discard_my_continuations_1 (struct continuation **pmy_chain)
{
struct continuation *ptr;
- while ((ptr = *pmy_chain) != old_chain)
+ while ((ptr = *pmy_chain) != NULL)
{
*pmy_chain = ptr->next;
if (ptr->free_arg)
}
}
-/* 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 *))
+static void
+discard_my_continuations (struct continuation **list)
{
- struct continuation *continuations = thread->continuations;
- make_cleanup_ftype *continuation_hook_fn = continuation_hook;
-
- make_continuation (&continuations,
- continuation_hook_fn,
- args,
- continuation_free_args);
+ struct continuation *continuation_ptr = *list;
- thread->continuations = continuations;
+ discard_my_continuations_1 (list);
+ *list = NULL;
}
/* Add a continuation to the continuation list of INFERIOR. The new
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 ();
- struct continuation *continuations = inf->continuations;
- make_cleanup_ftype *continuation_hook_fn = continuation_hook;
- make_continuation (&continuations,
- continuation_hook_fn,
- args,
- continuation_free_args);
-
- inf->continuations = continuations;
+ 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 continuation *continuations;
struct inferior *inf = current_inferior ();
-
- if (inf->continuations == NULL)
- return;
-
- /* Copy the list header into another pointer, and set the global
- list header to null, so that the global list can change as a side
- effect of invoking the continuations and the processing of the
- preexisting continuations will not be affected. */
-
- continuations = inf->continuations;
- inf->continuations = NULL;
-
- /* Work now on the list we have set aside. */
- do_my_continuations (&continuations, NULL);
+ do_my_continuations (&inf->continuations, err);
}
/* Get rid of all the inferior-wide continuations of INF. */
void
discard_all_inferior_continuations (struct inferior *inf)
{
- struct continuation *continuation_ptr = inf->continuations;
+ discard_my_continuations (&inf->continuations);
+}
- discard_my_continuations (&continuation_ptr, NULL);
- inf->continuations = NULL;
+/* 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,
+ continuation_ftype *hook, void *args,
+ continuation_free_arg_ftype *free_arg)
+{
+ make_continuation (&thread->continuations, hook, args, free_arg);
}
static void
static void
do_all_continuations_ptid (ptid_t ptid,
- struct continuation **continuations_p)
+ struct continuation **continuations_p,
+ int err)
{
struct cleanup *old_chain;
- struct continuation *continuations;
ptid_t current_thread;
if (*continuations_p == NULL)
/* Let the continuation see this thread as selected. */
switch_to_thread (ptid);
- /* Copy the list header into another pointer, and set the global
- list header to null, so that the global list can change as a side
- effect of invoking the continuations and the processing of the
- preexisting continuations will not be affected. */
-
- continuations = *continuations_p;
- *continuations_p = NULL;
-
- /* Work now on the list we have set aside. */
- do_my_continuations (&continuations, NULL);
+ do_my_continuations (continuations_p, err);
do_cleanups (old_chain);
}
static int
do_all_continuations_thread_callback (struct thread_info *thread, void *data)
{
- do_all_continuations_ptid (thread->ptid, &thread->continuations);
+ int err = * (int *) data;
+ do_all_continuations_ptid (thread->ptid, &thread->continuations, err);
return 0;
}
/* Do all continuations of thread THREAD. */
void
-do_all_continuations_thread (struct thread_info *thread)
+do_all_continuations_thread (struct thread_info *thread, int err)
{
- do_all_continuations_thread_callback (thread, NULL);
+ do_all_continuations_thread_callback (thread, &err);
}
/* Do all continuations of all threads. */
void
-do_all_continuations (void)
+do_all_continuations (int err)
{
- iterate_over_threads (do_all_continuations_thread_callback, NULL);
+ iterate_over_threads (do_all_continuations_thread_callback, &err);
}
/* Callback for iterate over threads. */
discard_all_continuations_thread_callback (struct thread_info *thread,
void *data)
{
- struct continuation *continuation_ptr = thread->continuations;
-
- discard_my_continuations (&continuation_ptr, NULL);
- thread->continuations = NULL;
+ discard_my_continuations (&thread->continuations);
return 0;
}
void
add_intermediate_continuation (struct thread_info *thread,
- void (*continuation_hook)
- (void *), void *args,
- void (*continuation_free_args) (void *))
+ continuation_ftype *hook,
+ void *args,
+ continuation_free_arg_ftype *free_arg)
{
- struct continuation *continuations = thread->intermediate_continuations;
- make_cleanup_ftype *continuation_hook_fn = continuation_hook;
-
- make_continuation (&continuations,
- continuation_hook_fn,
- args,
- continuation_free_args);
-
- thread->intermediate_continuations = continuations;
+ make_continuation (&thread->intermediate_continuations, hook,
+ args, free_arg);
}
/* Walk down the cmd_continuation list, and execute all the
do_all_intermediate_continuations_thread_callback (struct thread_info *thread,
void *data)
{
+ int err = * (int *) data;
+
do_all_continuations_ptid (thread->ptid,
- &thread->intermediate_continuations);
+ &thread->intermediate_continuations, err);
return 0;
}
/* Do all intermediate continuations of thread THREAD. */
void
-do_all_intermediate_continuations_thread (struct thread_info *thread)
+do_all_intermediate_continuations_thread (struct thread_info *thread, int err)
{
- do_all_intermediate_continuations_thread_callback (thread, NULL);
+ do_all_intermediate_continuations_thread_callback (thread, &err);
}
/* Do all intermediate continuations of all threads. */
void
-do_all_intermediate_continuations (void)
+do_all_intermediate_continuations (int err)
{
iterate_over_threads (do_all_intermediate_continuations_thread_callback,
- NULL);
+ &err);
}
/* Callback for iterate over threads. */
discard_all_intermediate_continuations_thread_callback (struct thread_info *thread,
void *data)
{
- struct continuation *continuation_ptr = thread->intermediate_continuations;
-
- discard_my_continuations (&continuation_ptr, NULL);
- thread->intermediate_continuations = NULL;
+ discard_my_continuations (&thread->intermediate_continuations);
return 0;
}
projects / deliverable / binutils-gdb.git / blobdiff