* linux-low.c (linux_wait, linux_resume): Do not handle async I/O.

* remote-utils.c (remote_open): Do not call disable_async_io.
	(block_async_io): Delete.
	(unblock_async_io): Make static.
	(initialize_async_io): New.
	* server.c (handle_v_cont): Handle async I/O here.
	(myresume): Likewise.  Move other common resume tasks here...
	(main): ... from here.  Call initialize_async_io.  Disable async
	I/O before the main loop.
	* server.h (initialize_async_io): Declare.
	(block_async_io, unblock_async_io): Delete prototypes.
	* spu-low.c (spu_resume, spu_wait): Do not handle async I/O here.
This commit is contained in:
Daniel Jacobowitz
2007-12-07 01:41:29 +00:00
parent 542f8b941d
commit a20d5e98e5
6 changed files with 48 additions and 48 deletions

View File

@@ -756,12 +756,14 @@ handle_v_cont (char *own_buf, char *status, int *signal)
cont_thread = -1;
set_desired_inferior (0);
enable_async_io ();
(*the_target->resume) (resume_info);
free (resume_info);
*signal = mywait (status, 1);
prepare_resume_reply (own_buf, *status, *signal);
disable_async_io ();
return;
err:
@@ -798,10 +800,13 @@ handle_v_requests (char *own_buf, char *status, int *signal,
}
void
myresume (int step, int sig)
myresume (int step, int *signalp, char *statusp)
{
struct thread_resume resume_info[2];
int n = 0;
int sig = *signalp;
set_desired_inferior (0);
if (step || sig || (cont_thread != 0 && cont_thread != -1))
{
@@ -817,7 +822,11 @@ myresume (int step, int sig)
resume_info[n].sig = 0;
resume_info[n].leave_stopped = (cont_thread != 0 && cont_thread != -1);
enable_async_io ();
(*the_target->resume) (resume_info);
*signalp = mywait (statusp, 1);
prepare_resume_reply (own_buf, *statusp, *signalp);
disable_async_io ();
}
static int attached;
@@ -895,6 +904,7 @@ main (int argc, char *argv[])
exit (1);
}
initialize_async_io ();
initialize_low ();
own_buf = malloc (PBUFSIZ + 1);
@@ -946,6 +956,7 @@ main (int argc, char *argv[])
restart:
setjmp (toplevel);
disable_async_io ();
while (1)
{
unsigned char sig;
@@ -1073,10 +1084,7 @@ main (int argc, char *argv[])
signal = target_signal_to_host (sig);
else
signal = 0;
set_desired_inferior (0);
myresume (0, signal);
signal = mywait (&status, 1);
prepare_resume_reply (own_buf, status, signal);
myresume (0, &signal, &status);
break;
case 'S':
convert_ascii_to_int (own_buf + 1, &sig, 1);
@@ -1084,22 +1092,15 @@ main (int argc, char *argv[])
signal = target_signal_to_host (sig);
else
signal = 0;
set_desired_inferior (0);
myresume (1, signal);
signal = mywait (&status, 1);
prepare_resume_reply (own_buf, status, signal);
myresume (1, &signal, &status);
break;
case 'c':
set_desired_inferior (0);
myresume (0, 0);
signal = mywait (&status, 1);
prepare_resume_reply (own_buf, status, signal);
signal = 0;
myresume (0, &signal, &status);
break;
case 's':
set_desired_inferior (0);
myresume (1, 0);
signal = mywait (&status, 1);
prepare_resume_reply (own_buf, status, signal);
signal = 0;
myresume (1, &signal, &status);
break;
case 'Z':
{