* dummy-frame.c (dummy_frame): Replace regcache member with
caller_state.
(dummy_frame_push): Replace caller_regcache arg with caller_state.
All callers updated.
(remove_dummy_frame,pop_dummy_frame,lookup_dummy_frame): New fns.
(dummy_frame_pop): Rewrite. Verify requested frame is in the
dummy frame stack. Restore program state.
(cleanup_dummy_frames): Rewrite.
(dummy_frame_sniffer): Update. Make static.
* dummy-frame.h (regcache,frame_info): Delete forward decls.
(inferior_thread_state): New forward decl.
(dummy_frame_push): Update prototype.
* frame.c (frame_pop): dummy_frame_pop now does all the work for
DUMMY_FRAMEs.
* infcall.c (breakpoint_auto_delete_contents): Delete.
(get_function_name,run_inferior_call): New fns.
(call_function_by_hand): Simplify by moving some code to
get_function_name, run_inferior_call. Inferior function call wrapped
in TRY_CATCH so there's less need for cleanups and all exits from
proceed are handled similarily. Detect program exit.
Detect program stopping in a different thread.
Make error messages more consistent.
* inferior.h (inferior_thread_state): Declare (opaque type).
(save_inferior_thread_state,restore_inferior_thread_state,
make_cleanup_restore_inferior_thread_state,
discard_inferior_thread_state, get_inferior_thread_state_regcache):
Declare.
(save_inferior_status): Update prototype.
* infrun.c: (normal_stop): When stopped for the completion of an
inferior function call, verify the expected stack frame kind.
(inferior_thread_state): New struct.
(save_inferior_thread_state,restore_inferior_thread_state,
do_restore_inferior_thread_state_cleanup,
make_cleanup_restore_inferior_thread_state,
discard_inferior_thread_state,
get_inferior_thread_state_regcache): New functions.
(inferior_status): Move stop_signal, stop_pc, registers to
inferior_thread_state. Remove restore_stack_info.
(save_inferior_status): Remove arg restore_stack_info.
All callers updated. Remove saving of state now saved by
save_inferior_thread_state.
(restore_inferior_status): Remove restoration of state now done by
restore_inferior_thread_state.
(discard_inferior_status): Remove freeing of registers, now done by
discard_inferior_thread_state.
* gdb.base/break.exp: Update expected gdb output.
* gdb.base/sepdebug.exp: Ditto.
* gdb.mi/mi-syn-frame.exp: Ditto.
* gdb.mi/mi2-syn-frame.exp: Ditto.
* gdb.base/call-signal-resume.exp: New file.
* gdb.base/call-signals.c: New file.
* gdb.base/unwindonsignal.exp: New file.
* gdb.base/unwindonsignal.c: New file.
* gdb.threads/interrupted-hand-call.exp: New file.
* gdb.threads/interrupted-hand-call.c: New file.
* gdb.threads/thread-unwindonsignal.exp: New file.
2009-01-19 19:05:01 +00:00
|
|
|
/* Test case for hand function calls interrupted by a signal in another thread.
|
|
|
|
|
2014-01-01 03:54:24 +00:00
|
|
|
Copyright 2008-2014 Free Software Foundation, Inc.
|
* dummy-frame.c (dummy_frame): Replace regcache member with
caller_state.
(dummy_frame_push): Replace caller_regcache arg with caller_state.
All callers updated.
(remove_dummy_frame,pop_dummy_frame,lookup_dummy_frame): New fns.
(dummy_frame_pop): Rewrite. Verify requested frame is in the
dummy frame stack. Restore program state.
(cleanup_dummy_frames): Rewrite.
(dummy_frame_sniffer): Update. Make static.
* dummy-frame.h (regcache,frame_info): Delete forward decls.
(inferior_thread_state): New forward decl.
(dummy_frame_push): Update prototype.
* frame.c (frame_pop): dummy_frame_pop now does all the work for
DUMMY_FRAMEs.
* infcall.c (breakpoint_auto_delete_contents): Delete.
(get_function_name,run_inferior_call): New fns.
(call_function_by_hand): Simplify by moving some code to
get_function_name, run_inferior_call. Inferior function call wrapped
in TRY_CATCH so there's less need for cleanups and all exits from
proceed are handled similarily. Detect program exit.
Detect program stopping in a different thread.
Make error messages more consistent.
* inferior.h (inferior_thread_state): Declare (opaque type).
(save_inferior_thread_state,restore_inferior_thread_state,
make_cleanup_restore_inferior_thread_state,
discard_inferior_thread_state, get_inferior_thread_state_regcache):
Declare.
(save_inferior_status): Update prototype.
* infrun.c: (normal_stop): When stopped for the completion of an
inferior function call, verify the expected stack frame kind.
(inferior_thread_state): New struct.
(save_inferior_thread_state,restore_inferior_thread_state,
do_restore_inferior_thread_state_cleanup,
make_cleanup_restore_inferior_thread_state,
discard_inferior_thread_state,
get_inferior_thread_state_regcache): New functions.
(inferior_status): Move stop_signal, stop_pc, registers to
inferior_thread_state. Remove restore_stack_info.
(save_inferior_status): Remove arg restore_stack_info.
All callers updated. Remove saving of state now saved by
save_inferior_thread_state.
(restore_inferior_status): Remove restoration of state now done by
restore_inferior_thread_state.
(discard_inferior_status): Remove freeing of registers, now done by
discard_inferior_thread_state.
* gdb.base/break.exp: Update expected gdb output.
* gdb.base/sepdebug.exp: Ditto.
* gdb.mi/mi-syn-frame.exp: Ditto.
* gdb.mi/mi2-syn-frame.exp: Ditto.
* gdb.base/call-signal-resume.exp: New file.
* gdb.base/call-signals.c: New file.
* gdb.base/unwindonsignal.exp: New file.
* gdb.base/unwindonsignal.c: New file.
* gdb.threads/interrupted-hand-call.exp: New file.
* gdb.threads/interrupted-hand-call.c: New file.
* gdb.threads/thread-unwindonsignal.exp: New file.
2009-01-19 19:05:01 +00:00
|
|
|
|
|
|
|
This file is part of GDB.
|
|
|
|
|
|
|
|
This program 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; either version 3 of the License, or
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
This program 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 this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
|
|
|
|
#include <pthread.h>
|
|
|
|
#include <signal.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <time.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
|
|
|
|
#ifndef NR_THREADS
|
|
|
|
#define NR_THREADS 4
|
|
|
|
#endif
|
|
|
|
|
|
|
|
pthread_t threads[NR_THREADS];
|
|
|
|
|
|
|
|
/* Number of threads currently running. */
|
|
|
|
int thread_count;
|
|
|
|
|
|
|
|
pthread_mutex_t thread_count_mutex;
|
|
|
|
|
|
|
|
pthread_cond_t thread_count_condvar;
|
|
|
|
|
|
|
|
sig_atomic_t sigabrt_received;
|
|
|
|
|
|
|
|
void
|
|
|
|
incr_thread_count (void)
|
|
|
|
{
|
|
|
|
pthread_mutex_lock (&thread_count_mutex);
|
|
|
|
++thread_count;
|
|
|
|
if (thread_count == NR_THREADS)
|
|
|
|
pthread_cond_signal (&thread_count_condvar);
|
|
|
|
pthread_mutex_unlock (&thread_count_mutex);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
cond_wait (pthread_cond_t *cond, pthread_mutex_t *mut)
|
|
|
|
{
|
|
|
|
pthread_mutex_lock (mut);
|
|
|
|
pthread_cond_wait (cond, mut);
|
|
|
|
pthread_mutex_unlock (mut);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
noreturn (void)
|
|
|
|
{
|
|
|
|
pthread_mutex_t mut;
|
|
|
|
pthread_cond_t cond;
|
|
|
|
|
|
|
|
pthread_mutex_init (&mut, NULL);
|
|
|
|
pthread_cond_init (&cond, NULL);
|
|
|
|
|
|
|
|
/* Wait for a condition that will never be signaled, so we effectively
|
|
|
|
block the thread here. */
|
|
|
|
cond_wait (&cond, &mut);
|
|
|
|
}
|
|
|
|
|
|
|
|
void *
|
|
|
|
thread_entry (void *unused)
|
|
|
|
{
|
|
|
|
incr_thread_count ();
|
|
|
|
noreturn ();
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
sigabrt_handler (int signo)
|
|
|
|
{
|
|
|
|
sigabrt_received = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Helper to test a hand-call being "interrupted" by a signal on another
|
|
|
|
thread. */
|
|
|
|
|
|
|
|
void
|
|
|
|
hand_call_with_signal (void)
|
|
|
|
{
|
|
|
|
const struct timespec ts = { 0, 10000000 }; /* 0.01 sec */
|
|
|
|
|
|
|
|
sigabrt_received = 0;
|
|
|
|
pthread_kill (threads[0], SIGABRT);
|
|
|
|
while (! sigabrt_received)
|
|
|
|
nanosleep (&ts, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Wait until all threads are running. */
|
|
|
|
|
|
|
|
void
|
|
|
|
wait_all_threads_running (void)
|
|
|
|
{
|
|
|
|
pthread_mutex_lock (&thread_count_mutex);
|
|
|
|
if (thread_count == NR_THREADS)
|
|
|
|
{
|
|
|
|
pthread_mutex_unlock (&thread_count_mutex);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
pthread_cond_wait (&thread_count_condvar, &thread_count_mutex);
|
|
|
|
if (thread_count == NR_THREADS)
|
|
|
|
{
|
|
|
|
pthread_mutex_unlock (&thread_count_mutex);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
pthread_mutex_unlock (&thread_count_mutex);
|
|
|
|
printf ("failed waiting for all threads to start\n");
|
|
|
|
abort ();
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Called when all threads are running.
|
|
|
|
Easy place for a breakpoint. */
|
|
|
|
|
|
|
|
void
|
|
|
|
all_threads_running (void)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
main (void)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
signal (SIGABRT, sigabrt_handler);
|
|
|
|
|
|
|
|
pthread_mutex_init (&thread_count_mutex, NULL);
|
|
|
|
pthread_cond_init (&thread_count_condvar, NULL);
|
|
|
|
|
|
|
|
for (i = 0; i < NR_THREADS; ++i)
|
|
|
|
pthread_create (&threads[i], NULL, thread_entry, NULL);
|
|
|
|
|
|
|
|
wait_all_threads_running ();
|
|
|
|
all_threads_running ();
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|