From JTC: Reduce default remote_timeout to two. Flush defunct code.

3 files changed, 26 insertions, 17 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 57a6274..29de17d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+1999-08-23  J.T. Conklin  <jtc@redback.com>
+
+        * top.c (remote_timeout): Change default to 2.  Add comment
+        explaining history of changes to the default value.
+        * remote.c (_initialize_remote): Remove code that adds set/ 
+        show remotetimeout, as that's also done in top.c
+
 1999-10-18  J.T. Conklin  <jtc@redback.com>
 
         * m32r-stub.c, sparcl-stub.c, sparclet-stub.c (handle_exception):
diff --git a/gdb/remote.c b/gdb/remote.c
index a99de23..90c568c 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -245,15 +245,6 @@ static struct target_ops remote_async_ops;
 
 static struct target_ops extended_async_remote_ops;
 
-/* This was 5 seconds, which is a long time to sit and wait.
-   Unless this is going though some terminal server or multiplexer or
-   other form of hairy serial connection, I would think 2 seconds would
-   be plenty.  */
-
-/* Changed to allow option to set timeout value.
-   was static int remote_timeout = 2; */
-extern int remote_timeout;
-
 /* FIXME: cagney/1999-09-23: Even though getpkt was called with
    ``forever'' still use the normal timeout mechanism.  This is
    currently used by the ASYNC code to guarentee that target reads
@@ -5521,13 +5512,6 @@ terminating `#' character and checksum.",
 	   &maintenancelist);
 
   add_show_from_set
-    (add_set_cmd ("remotetimeout", no_class,
-		  var_integer, (char *) &remote_timeout,
-		  "Set timeout value for remote read.\n",
-		  &setlist),
-     &showlist);
-
-  add_show_from_set
     (add_set_cmd ("remotebreak", no_class,
 		  var_boolean, (char *) &remote_break,
 		  "Set whether to send break if interrupted.\n",
diff --git a/gdb/top.c b/gdb/top.c
index 2acbb74..9747d49 100644
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -308,7 +308,25 @@ int baud_rate = -1;
 
 /* Timeout limit for response from target. */
 
-int remote_timeout = 20;	/* Set default to 20 */
+/* The default value has been changed many times over the years.  It 
+   was originally 5 seconds.  But that was thought to be a long time 
+   to sit and wait, so it was changed to 2 seconds.  That was thought
+   to be plenty unless the connection was going through some terminal 
+   server or multiplexer or other form of hairy serial connection.
+
+   In mid-1996, remote_timeout was moved from remote.c to top.c and 
+   it began being used in other remote-* targets.  It appears that the
+   default was changed to 20 seconds at that time, perhaps because the
+   Hitachi E7000 ICE didn't always respond in a timely manner.
+
+   But if 5 seconds is a long time to sit and wait for retransmissions,
+   20 seconds is far worse.  This demonstrates the difficulty of using 
+   a single variable for all protocol timeouts.
+
+   As remote.c is used much more than remote-e7000.c, it was changed 
+   back to 2 seconds in 1999. */
+
+int remote_timeout = 2;
 
 /* Non-zero tells remote* modules to output debugging info.  */