2002-11-04 Elena Zannoni <ezannoni@redhat.com>

	* interps.h (struct gdb_interpreter_procs): Remove do_one_event_proc.
	(interp_do_one_event_ftype): Delete.
	* interps.c (gdb_new_interpreter): Remove setup of do_one_event
	procedure.
	(interpreter_do_one_event): Delete.
	* event-loop.c (start_event_loop): Remove no-op call to
	interpreter_do_one_event.
	* cli/cli-interps.c: (cli_interpreter_do_one_event): Delete.

2002-11-04  Elena Zannoni  <ezannoni@redhat.com>

	* mi-interp.c (mi_interpreter_do_one_event): Remove.

7 files changed, 17 insertions, 46 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index dbb0c5e7ef2..443b3f43f77 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,16 @@
 2002-11-04  Elena Zannoni  <ezannoni@redhat.com>
 
+	* interps.h (struct gdb_interpreter_procs): Remove do_one_event_proc.
+	(interp_do_one_event_ftype): Delete.
+	* interps.c (gdb_new_interpreter): Remove setup of do_one_event
+	procedure.
+	(interpreter_do_one_event): Delete.
+	* event-loop.c (start_event_loop): Remove no-op call to
+	interpreter_do_one_event.
+	* cli/cli-interps.c: (cli_interpreter_do_one_event): Delete.
+	
+2002-11-04  Elena Zannoni  <ezannoni@redhat.com>
+
         * Makefile.in (mi-main.o, mi-cmd-break.o, event-loop.o): Update
         dependencies on interps.h.
 
diff --git a/gdb/cli/cli-interp.c b/gdb/cli/cli-interp.c
index 15cfb540991..d22e228c893 100644
--- a/gdb/cli/cli-interp.c
+++ b/gdb/cli/cli-interp.c
@@ -29,7 +29,6 @@
 
 static int cli_interpreter_init (void *data);
 static int cli_interpreter_resume (void *data);
-static int cli_interpreter_do_one_event (void *data);
 static int cli_interpreter_suspend (void *data);
 static int cli_interpreter_delete (void *data);
 static int cli_interpreter_exec (void *data, char *command_str);
@@ -66,12 +65,6 @@ cli_interpreter_resume (void *data)
 }
 
 static int
-cli_interpreter_do_one_event (void *data)
-{
-  return 1;
-}
-
-static int
 cli_interpreter_suspend (void *data)
 {
   gdb_disable_readline ();
@@ -141,7 +134,6 @@ _initialize_cli_interp (void)
   struct gdb_interpreter_procs procs = {
     cli_interpreter_init,	/* init_proc */
     cli_interpreter_resume,	/* resume_proc */
-    cli_interpreter_do_one_event, /* do_one_event_proc */
     cli_interpreter_suspend,	/* suspend_proc */
     cli_interpreter_delete,	/* delete_proc */
     cli_interpreter_exec,	/* exec_proc */
diff --git a/gdb/event-loop.c b/gdb/event-loop.c
index aa0b46f3a5f..a20533d526a 100644
--- a/gdb/event-loop.c
+++ b/gdb/event-loop.c
@@ -1,5 +1,5 @@
 /* Event loop machinery for GDB, the GNU debugger.
-   Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
    Written by Elena Zannoni <ezannoni@cygnus.com> of Cygnus Solutions.
 
    This file is part of GDB.
@@ -393,18 +393,12 @@ start_event_loop (void)
      longer any event sources registered. */
   while (1)
     {
-      int gdb_result, interp_result;
+      int gdb_result;
 
       gdb_result = catch_errors (gdb_do_one_event, 0, "", RETURN_MASK_ALL);
       if (gdb_result < 0)
 	break;
 
-      interp_result = catch_errors (interpreter_do_one_event, 0, "", RETURN_MASK_ALL);
-      if (interp_result < 0)
-        {
-          /* FIXME - kill the interpreter */
-        }
-
       /* If we long-jumped out of do_one_event, we probably
          didn't get around to resetting the prompt, which leaves
          readline in a messed-up state. Reset it here. */
diff --git a/gdb/interps.c b/gdb/interps.c
index cbbcdeb5de2..bf60bbbe33b 100644
--- a/gdb/interps.c
+++ b/gdb/interps.c
@@ -28,14 +28,6 @@
    I did this because it seems to me many interpreters won't want to use
    the readline command interface, and it is probably simpler to just let
    them take over the input in their resume proc.  
-
-   2) The event loop insertion is probably wrong.  I just inserted a 
-   do_one_event alongside gdb's do_one_event.  This probably will lead
-   to one or the other event loop getting starved.  It would be better
-   to provide conversion functions for the gdb file handlers, and when
-   an interpreter starts up, it grabs all the gdb created file handlers
-   and inserts them into its select.  This is more complicated, however,
-   and I have run out of time for now.
 */
 
 #include "defs.h"
@@ -107,7 +99,6 @@ gdb_new_interpreter (char *name,
   new_interp->quiet_p = 0;
   new_interp->procs.init_proc = procs->init_proc;
   new_interp->procs.resume_proc = procs->resume_proc;
-  new_interp->procs.do_one_event_proc = procs->do_one_event_proc;
   new_interp->procs.suspend_proc = procs->suspend_proc;
   new_interp->procs.delete_proc = procs->delete_proc;
   new_interp->procs.exec_proc = procs->exec_proc;
@@ -432,16 +423,6 @@ gdb_interpreter_get_data (struct gdb_interpreter *interp)
   return current_interpreter->data;
 }
 
-int
-interpreter_do_one_event ()
-{
-  if (current_interpreter->procs.do_one_event_proc == NULL)
-    return 0;
-
-  return current_interpreter->procs.do_one_event_proc (current_interpreter->
-						       data);
-}
-
 /* A convenience routine that nulls out all the
    common command hooks.  Use it when removing your interpreter in its 
    suspend proc. */
diff --git a/gdb/interps.h b/gdb/interps.h
index 297bed1c5c7..9d92c2c8fbc 100644
--- a/gdb/interps.h
+++ b/gdb/interps.h
@@ -24,7 +24,6 @@
 
 typedef int (*interp_init_ftype) (void *data);
 typedef int (*interp_resume_ftype) (void *data);
-typedef int (*interp_do_one_event_ftype) (void *data);
 typedef int (*interp_suspend_ftype) (void *data);
 typedef int (*interp_delete_ftype) (void *data);
 typedef int (*interp_prompt_ftype) (void *data, char *new_prompt);
@@ -37,7 +36,6 @@ struct gdb_interpreter_procs
 {
   interp_init_ftype init_proc;
   interp_resume_ftype resume_proc;
-  interp_do_one_event_ftype do_one_event_proc;
   interp_suspend_ftype suspend_proc;
   interp_delete_ftype delete_proc;
   interp_exec_ftype exec_proc;
@@ -64,7 +62,6 @@ extern struct gdb_interpreter_procs *gdb_interpreter_get_procs (struct
 								gdb_interpreter
 								*interp);
 extern void *gdb_interpreter_get_data (struct gdb_interpreter *interp);
-extern int interpreter_do_one_event ();
 
 void clear_interpreter_hooks ();
 
diff --git a/gdb/mi/ChangeLog b/gdb/mi/ChangeLog
index f87fe1c5168..3854913615d 100644
--- a/gdb/mi/ChangeLog
+++ b/gdb/mi/ChangeLog
@@ -1,5 +1,9 @@
 2002-11-04  Elena Zannoni  <ezannoni@redhat.com>
 
+	* mi-interp.c (mi_interpreter_do_one_event): Remove.
+
+2002-11-04  Elena Zannoni  <ezannoni@redhat.com>
+
 	* mi-cmd-break.c (mi_cmd_break_insert): Initialize old_hooks.
 	(mi_cmd_break_insert, mi_cmd_break_watch, mi_cmd_break_insert):
 	Increment MI version number.
diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c
index 044bc2ed6f1..1cce419b5c7 100644
--- a/gdb/mi/mi-interp.c
+++ b/gdb/mi/mi-interp.c
@@ -46,7 +46,6 @@ struct gdb_interpreter *mi_interp;
 /* These are the interpreter setup, etc. functions for the MI interpreter */
 static int mi_interpreter_init (void *data);
 static int mi_interpreter_resume (void *data);
-static int mi_interpreter_do_one_event (void *data);
 static int mi_interpreter_suspend (void *data);
 static int mi_interpreter_delete (void *data);
 static int mi_interpreter_exec (void *data, char *command);
@@ -187,12 +186,6 @@ mi_interpreter_prompt (void *data, char *new_prompt)
   return 1;
 }
 
-static int
-mi_do_one_event (void *data)
-{
-  return 1;
-}
-
 static void
 mi_interpreter_exec_continuation (struct continuation_arg *arg)
 {
@@ -430,7 +423,6 @@ _initialize_mi_interp (void)
     {
       mi_interpreter_init,	/* init_proc */
       mi_interpreter_resume,	/* resume_proc */
-      NULL,			/* do_one_event_proc */
       mi_interpreter_suspend,	/* suspend_proc */
       mi_interpreter_delete,	/* delete_proc */
       mi_interpreter_exec,	/* exec_proc */