* Insight remote output doesn't output to console window immediately
@ 2000-04-13 14:46 Jonathan Larmour
2000-04-13 16:53 ` Andrew Cagney
0 siblings, 1 reply; 9+ messages in thread
From: Jonathan Larmour @ 2000-04-13 14:46 UTC (permalink / raw)
To: insight, gdb
[ Sent to gdb and insight lists since ]
I've found a problem in insight that is surprisingly old - I can't imagine
how it's lived so long actually: output from a remote target doesn't get
sent to the console window as it arrives. Instead it is buffered up.
I believe the problem is because of Cagney's change to remote.c on July 2nd
1999 which changed remote_console_output to operate on the gdb_stdtarg
stream rather than gdb_stdout. But, in main.c, gdb_stdtarg is #defined to
gdb_stderr. Which means that it matches the following code in
gdbtk/generic/gdbtk-hooks.c in gdbtk_fputs():
if (result_ptr != NULL)
{
if (result_ptr->flags & GDBTK_TO_RESULT)
...
else if (stream == gdb_stderr || result_ptr->flags &
GDBTK_ERROR_ONLY)
{
if (result_ptr->flags & GDBTK_ERROR_STARTED)
Tcl_AppendToObj (result_ptr->obj_ptr, (char *) ptr, -1);
else
{
Tcl_SetStringObj (result_ptr->obj_ptr, (char *) ptr, -1);
result_ptr->flags |= GDBTK_ERROR_STARTED;
}
i.e. it is appended to result_ptr, rather than calling gdbtk_tcl_fputs to
display it in the console window.
The only thing I'm wondering about is the fix. We could #define gdb_stdtarg
to gdb_stdout instead. Or we could add a hook with set_ui_file_flush() so
that the "gdb_flush (gdb_stdtarg);" at the end of remote_console_output()
would do the right thing. I simply don't know which is the more correct fix
before I implement it, although I suspect the latter.
Let me know - I'd like to sort this out soon because it affects Insight 5
(?) as well. Ta,
Jifl
--
Red Hat, 35 Cambridge Place, Cambridge, UK. CB2 1NS Tel: +44 (1223) 728762
"Plan to be spontaneous tomorrow." || These opinions are all my own fault
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: Insight remote output doesn't output to console window immediately
2000-04-13 14:46 Insight remote output doesn't output to console window immediately Jonathan Larmour
@ 2000-04-13 16:53 ` Andrew Cagney
2000-04-13 16:56 ` James Ingham
2000-04-13 18:36 ` Jonathan Larmour
0 siblings, 2 replies; 9+ messages in thread
From: Andrew Cagney @ 2000-04-13 16:53 UTC (permalink / raw)
To: Jonathan Larmour; +Cc: insight, gdb
Jonathan Larmour wrote:
>
> [ Sent to gdb and insight lists since ]
>
> I've found a problem in insight that is surprisingly old - I can't imagine
> how it's lived so long actually: output from a remote target doesn't get
> sent to the console window as it arrives. Instead it is buffered up.
>
> I believe the problem is because of Cagney's change to remote.c on July 2nd
> 1999 which changed remote_console_output to operate on the gdb_stdtarg
> stream rather than gdb_stdout. But, in main.c, gdb_stdtarg is #defined to
> gdb_stderr. Which means that it matches the following code in
> gdbtk/generic/gdbtk-hooks.c in gdbtk_fputs():
Yes, most likely :-(
> if (result_ptr != NULL)
> {
> if (result_ptr->flags & GDBTK_TO_RESULT)
> ...
> else if (stream == gdb_stderr || result_ptr->flags &
> GDBTK_ERROR_ONLY)
> {
> if (result_ptr->flags & GDBTK_ERROR_STARTED)
> Tcl_AppendToObj (result_ptr->obj_ptr, (char *) ptr, -1);
> else
> {
> Tcl_SetStringObj (result_ptr->obj_ptr, (char *) ptr, -1);
> result_ptr->flags |= GDBTK_ERROR_STARTED;
> }
>
> i.e. it is appended to result_ptr, rather than calling gdbtk_tcl_fputs to
> display it in the console window.
>
> The only thing I'm wondering about is the fix. We could #define gdb_stdtarg
> to gdb_stdout instead. Or we could add a hook with set_ui_file_flush() so
> that the "gdb_flush (gdb_stdtarg);" at the end of remote_console_output()
> would do the right thing. I simply don't know which is the more correct fix
> before I implement it, although I suspect the latter.
There is no need for another hook. Even the existing hooks
(gdbtk_fputs() and gdbtk_flush()) can, in theory, deleted. To see how
it should work, check the MI (mi/mi-main.c) - it maintains a separate
stream.
(BTW, sending the output gdb_stdout is wrong in CLI mode. gdb_stdout is
paged. Having ``more ....'' appear part way through target output in
CLI mode is only a little less frustrating than delayed output in GUI
mode :-)
As for a quick hack?
My first guess is to, when the GUI is enabled (ie not CLI mode),
re-route gdb_stdtarg to gdb_stdout. That might be suitable for the
branch. However, the trunk, needs to start taking advantage of ``struct
ui_out''.
Andrew
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: Insight remote output doesn't output to console window immediately
2000-04-13 16:53 ` Andrew Cagney
@ 2000-04-13 16:56 ` James Ingham
2000-04-13 18:36 ` Jonathan Larmour
1 sibling, 0 replies; 9+ messages in thread
From: James Ingham @ 2000-04-13 16:56 UTC (permalink / raw)
To: Andrew Cagney; +Cc: Jonathan Larmour, insight, gdb
Andrew,
>
>
> As for a quick hack?
>
> My first guess is to, when the GUI is enabled (ie not CLI mode),
> re-route gdb_stdtarg to gdb_stdout. That might be suitable for the
> branch. However, the trunk, needs to start taking advantage of ``struct
> ui_out''.
>
Yup, this is pretty high on the to-do list, pretty close after
rewriting the source window code so it is maintainable, and figuring
out how to handle hangs in target communication more gracefully.
Jim
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: Insight remote output doesn't output to console window immediately
2000-04-13 16:53 ` Andrew Cagney
2000-04-13 16:56 ` James Ingham
@ 2000-04-13 18:36 ` Jonathan Larmour
2000-04-13 18:54 ` James Ingham
1 sibling, 1 reply; 9+ messages in thread
From: Jonathan Larmour @ 2000-04-13 18:36 UTC (permalink / raw)
To: Andrew Cagney; +Cc: insight, gdb-patches
Andrew Cagney wrote:
>
> There is no need for another hook. Even the existing hooks
> (gdbtk_fputs() and gdbtk_flush()) can, in theory, deleted. To see how
> it should work, check the MI (mi/mi-main.c) - it maintains a separate
> stream.
I thought I'd have a look at seeing if I could do this. But it's well
beyond me (for my spare time anyway), sorry.
> As for a quick hack?
>
> My first guess is to, when the GUI is enabled (ie not CLI mode),
> re-route gdb_stdtarg to gdb_stdout. That might be suitable for the
> branch. However, the trunk, needs to start taking advantage of ``struct
> ui_out''.
That's easy enough - see attached. I recommend it go in the trunk as well
for now unless someone is going to start implementing ui_out for gdbtk RSN.
Should I check this in to the trunk and the branch then?
BTW, have you noticed that there's a ChangeLog-gdbtk in both gdbtk/ and
gdbtk/generic, as well as a ChangeLog in gdbtk/library? Is it deliberate?
Jifl
2000-04-14 Jonathan Larmour <jlarmour@redhat.co.uk>
* gdbtk.c (gdbtk_init): For now, reset gdb_stdtarg to gdb_stdout
when using gdbtk.
--
Red Hat, 35 Cambridge Place, Cambridge, UK. CB2 1NS Tel: +44 (1223) 728762
"Plan to be spontaneous tomorrow." || These opinions are all my own fault
Index: gdbtk/generic/gdbtk.c
===================================================================
RCS file: /cvs/src/src/gdb/gdbtk/generic/gdbtk.c,v
retrieving revision 1.1.1.1
diff -u -5 -p -r1.1.1.1 gdbtk.c
--- gdbtk/generic/gdbtk.c 2000/02/07 00:19:42 1.1.1.1
+++ gdbtk/generic/gdbtk.c 2000/04/14 01:29:28
@@ -528,10 +528,14 @@ gdbtk_find_main";
/* fputs_unfiltered_hook = NULL; *//* Force errors to stdout/stderr */
fputs_unfiltered_hook = gdbtk_fputs;
+ /* set gdb_stdtarg for now until gdbtk is changed to use struct ui_out. */
+
+ gdb_stdtarg = gdb_stdout;
+
if (Tcl_GlobalEval (gdbtk_interp, (char *) script) != TCL_OK)
{
char *msg;
/* Force errorInfo to be set up propertly. */
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: Insight remote output doesn't output to console window immediately
2000-04-13 18:36 ` Jonathan Larmour
@ 2000-04-13 18:54 ` James Ingham
2000-04-13 19:49 ` Jonathan Larmour
0 siblings, 1 reply; 9+ messages in thread
From: James Ingham @ 2000-04-13 18:54 UTC (permalink / raw)
To: Jonathan Larmour; +Cc: Andrew Cagney, insight, gdb-patches
Jonathan,
Okay, check this in.
As for the Changelog-gdbtk's. They should be changed to just
ChangeLog - the gdbtk is historic; the C-code files used to live at
the top level, but since Insight couldn't be included in the FSF gdb
releases, we had to have separate ChangeLogs...
The top level ChangeLog-gdbtk does have one or two entries, but I
don't expect that it will really be that useful. But it does no harm.
I do think it is a good idea to have separate ChangeLog's in the
library & generic dirs, since the changes in the generic directory are
all to the gdb<->tcl interface, whereas the library code is pretty
much all the GUI code. So keeping them separate it a bit useful.
Jim
> Andrew Cagney wrote:
> >
> > There is no need for another hook. Even the existing hooks
> > (gdbtk_fputs() and gdbtk_flush()) can, in theory, deleted. To see how
> > it should work, check the MI (mi/mi-main.c) - it maintains a separate
> > stream.
>
> I thought I'd have a look at seeing if I could do this. But it's well
> beyond me (for my spare time anyway), sorry.
>
> > As for a quick hack?
> >
> > My first guess is to, when the GUI is enabled (ie not CLI mode),
> > re-route gdb_stdtarg to gdb_stdout. That might be suitable for the
> > branch. However, the trunk, needs to start taking advantage of ``struct
> > ui_out''.
>
> That's easy enough - see attached. I recommend it go in the trunk as well
> for now unless someone is going to start implementing ui_out for gdbtk RSN.
> Should I check this in to the trunk and the branch then?
>
> BTW, have you noticed that there's a ChangeLog-gdbtk in both gdbtk/ and
> gdbtk/generic, as well as a ChangeLog in gdbtk/library? Is it deliberate?
>
> Jifl
>
> 2000-04-14 Jonathan Larmour <jlarmour@redhat.co.uk>
>
> * gdbtk.c (gdbtk_init): For now, reset gdb_stdtarg to gdb_stdout
> when using gdbtk.
>
> --
> Red Hat, 35 Cambridge Place, Cambridge, UK. CB2 1NS Tel: +44 (1223) 728762
> "Plan to be spontaneous tomorrow." || These opinions are all my own faultIndex: gdbtk/generic/gdbtk.c
> ===================================================================
> RCS file: /cvs/src/src/gdb/gdbtk/generic/gdbtk.c,v
> retrieving revision 1.1.1.1
> diff -u -5 -p -r1.1.1.1 gdbtk.c
> --- gdbtk/generic/gdbtk.c 2000/02/07 00:19:42 1.1.1.1
> +++ gdbtk/generic/gdbtk.c 2000/04/14 01:29:28
> @@ -528,10 +528,14 @@ gdbtk_find_main";
>
> /* fputs_unfiltered_hook = NULL; *//* Force errors to stdout/stderr */
>
> fputs_unfiltered_hook = gdbtk_fputs;
>
> + /* set gdb_stdtarg for now until gdbtk is changed to use struct ui_out. */
> +
> + gdb_stdtarg = gdb_stdout;
> +
> if (Tcl_GlobalEval (gdbtk_interp, (char *) script) != TCL_OK)
> {
> char *msg;
>
> /* Force errorInfo to be set up propertly. */
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: Insight remote output doesn't output to console window immediately
2000-04-13 18:54 ` James Ingham
@ 2000-04-13 19:49 ` Jonathan Larmour
2000-04-14 8:53 ` James Ingham
0 siblings, 1 reply; 9+ messages in thread
From: Jonathan Larmour @ 2000-04-13 19:49 UTC (permalink / raw)
To: James Ingham; +Cc: Andrew Cagney, insight, gdb-patches
James Ingham wrote:
>
> Okay, check this in.
Trunk, branch or both?
> As for the Changelog-gdbtk's. They should be changed to just
> ChangeLog - the gdbtk is historic; the C-code files used to live at
> the top level, but since Insight couldn't be included in the FSF gdb
> releases, we had to have separate ChangeLogs...
Would you like me to rename those two then? Obviously not forgetting to
remove all the change-log-default-name emacs variables. That would be trunk
only of course.
Jifl
--
Red Hat, 35 Cambridge Place, Cambridge, UK. CB2 1NS Tel: +44 (1223) 728762
"Plan to be spontaneous tomorrow." || These opinions are all my own fault
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: Insight remote output doesn't output to console window immediately
2000-04-13 19:49 ` Jonathan Larmour
@ 2000-04-14 8:53 ` James Ingham
2000-04-17 13:07 ` Jonathan Larmour
0 siblings, 1 reply; 9+ messages in thread
From: James Ingham @ 2000-04-14 8:53 UTC (permalink / raw)
To: Jonathan Larmour; +Cc: James Ingham, Andrew Cagney, insight, gdb-patches
Jonathan,
> James Ingham wrote:
> >
> > Okay, check this in.
>
> Trunk, branch or both?
Both. Maybe add a FIXME to the comment, since I often grep for FIXME
when I am trying to figure out what I should do next (though as I
said, this one is already on the short list.)
>
> > As for the Changelog-gdbtk's. They should be changed to just
> > ChangeLog - the gdbtk is historic; the C-code files used to live at
> > the top level, but since Insight couldn't be included in the FSF gdb
> > releases, we had to have separate ChangeLogs...
>
> Would you like me to rename those two then? Obviously not forgetting to
> remove all the change-log-default-name emacs variables. That would be trunk
> only of course.
That would be lovely, thanks.
Jim
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: Insight remote output doesn't output to console window immediately
2000-04-14 8:53 ` James Ingham
@ 2000-04-17 13:07 ` Jonathan Larmour
2000-04-17 13:15 ` James Ingham
0 siblings, 1 reply; 9+ messages in thread
From: Jonathan Larmour @ 2000-04-17 13:07 UTC (permalink / raw)
To: James Ingham; +Cc: insight, gdb-patches
James Ingham wrote:
>
> Jonathan,
>
> > James Ingham wrote:
> > >
> > > Okay, check this in.
> >
> > Trunk, branch or both?
>
> Both. Maybe add a FIXME to the comment, since I often grep for FIXME
> when I am trying to figure out what I should do next (though as I
> said, this one is already on the short list.)
I've added a FIXME comment now.
> >
> > > As for the Changelog-gdbtk's. They should be changed to just
> > > ChangeLog - the gdbtk is historic; the C-code files used to live at
> > > the top level, but since Insight couldn't be included in the FSF gdb
> > > releases, we had to have separate ChangeLogs...
> >
> > Would you like me to rename those two then? Obviously not forgetting to
> > remove all the change-log-default-name emacs variables. That would be trunk
> > only of course.
>
> That would be lovely, thanks.
I'll check in the attached patch to the trunk only once you say so. I added
ChangeLog entries:
2000-04-17 Jonathan Larmour <jlarmour@redhat.co.uk>
* ChangeLog-gdbtk: Renamed to ChangeLog
* ChangeLog: New file
* README.GDBTK: No need for changelog-default-name hint for Emacs
now
generic/ChangeLog
2000-04-17 Jonathan Larmour <jlarmour@redhat.co.uk>
* ChangeLog-gdbtk: Renamed to ChangeLog
* ChangeLog: New file
* gdbtk-cmds.c, gdbtk-hooks.c, gdbtk-variable.c, gdbtk-varobj.c,
gdbtk-wrapper.h, gdbtk-wrapper.c, gdbtk.h, gdbtk.c: No need for
changelog-default-name hint for Emacs now
I was tempted to just go ahead check this in, but I'm erring on the side of
caution.
Jifl
--
Red Hat, 35 Cambridge Place, Cambridge, UK. CB2 1NS Tel: +44 (1223) 728762
"Plan to be spontaneous tomorrow." || These opinions are all my own fault
cvs server: ChangeLog is a new entry, no comparison available
cvs server: ChangeLog-gdbtk was removed, no comparison available
Index: README.GDBTK
===================================================================
RCS file: /cvs/src/src/gdb/gdbtk/README.GDBTK,v
retrieving revision 1.1.1.1
diff -u -5 -p -r1.1.1.1 README.GDBTK
--- README.GDBTK 2000/02/07 00:19:42 1.1.1.1
+++ README.GDBTK 2000/04/17 20:05:43
@@ -396,8 +396,5 @@ m68k-hp-hpux9.00:
.
.
.
-/* Local variables: */
-/* change-log-default-name: "ChangeLog-gdbtk" */
-/* End: */
cvs server: generic/ChangeLog is a new entry, no comparison available
cvs server: generic/ChangeLog-gdbtk was removed, no comparison available
Index: generic/gdbtk-cmds.c
===================================================================
RCS file: /cvs/src/src/gdb/gdbtk/generic/gdbtk-cmds.c,v
retrieving revision 1.6
diff -u -5 -p -r1.6 gdbtk-cmds.c
--- generic/gdbtk-cmds.c 2000/04/03 21:29:00 1.6
+++ generic/gdbtk-cmds.c 2000/04/17 20:05:45
@@ -4698,10 +4698,6 @@ setup_architecture_data ()
{
/* don't trust REGISTER_BYTES to be zero. */
old_regs = xmalloc (REGISTER_BYTES + 1);
memset (old_regs, 0, REGISTER_BYTES + 1);
}
-\f
-/* Local variables: */
-/* change-log-default-name: "ChangeLog-gdbtk" */
-/* End: */
Index: generic/gdbtk-hooks.c
===================================================================
RCS file: /cvs/src/src/gdb/gdbtk/generic/gdbtk-hooks.c,v
retrieving revision 1.3
diff -u -5 -p -r1.3 gdbtk-hooks.c
--- generic/gdbtk-hooks.c 2000/04/03 21:29:00 1.3
+++ generic/gdbtk-hooks.c 2000/04/17 20:05:45
@@ -905,8 +905,6 @@ gdbtk_detach ()
if (Tcl_Eval (gdbtk_interp, "gdbtk_detached") != TCL_OK)
{
report_error ();
}
}
-/* Local variables: */
-/* change-log-default-name: "ChangeLog-gdbtk" */
-/* End: */
+
Index: generic/gdbtk-variable.c
===================================================================
RCS file: /cvs/src/src/gdb/gdbtk/generic/gdbtk-variable.c,v
retrieving revision 1.1.1.1
diff -u -5 -p -r1.1.1.1 gdbtk-variable.c
--- generic/gdbtk-variable.c 2000/02/07 00:19:42 1.1.1.1
+++ generic/gdbtk-variable.c 2000/04/17 20:05:46
@@ -2409,9 +2409,6 @@ java_value_of_variable (var, obj)
gdb_variable *var;
Tcl_Obj **obj;
{
return cplus_value_of_variable (var, obj);
}
-\f
-/* Local variables: */
-/* change-log-default-name: "ChangeLog-gdbtk" */
-/* End: */
+
Index: generic/gdbtk-varobj.c
===================================================================
RCS file: /cvs/src/src/gdb/gdbtk/generic/gdbtk-varobj.c,v
retrieving revision 1.2
diff -u -5 -p -r1.2 gdbtk-varobj.c
--- generic/gdbtk-varobj.c 2000/03/13 21:51:45 1.2
+++ generic/gdbtk-varobj.c 2000/04/17 20:05:46
@@ -627,9 +627,6 @@ uninstall_variable (interp, varname)
Tcl_Interp *interp;
char *varname;
{
Tcl_DeleteCommand (interp, varname);
}
-\f
-/* Local variables: */
-/* change-log-default-name: "ChangeLog-gdbtk" */
-/* End: */
+
Index: generic/gdbtk-wrapper.c
===================================================================
RCS file: /cvs/src/src/gdb/gdbtk/generic/gdbtk-wrapper.c,v
retrieving revision 1.2
diff -u -5 -p -r1.2 gdbtk-wrapper.c
--- generic/gdbtk-wrapper.c 2000/02/24 03:11:47 1.2
+++ generic/gdbtk-wrapper.c 2000/04/17 20:05:46
@@ -826,11 +826,6 @@ wrap_get_current_frame (char *opaque_arg
struct gdb_wrapper_arguments **args = (struct gdb_wrapper_arguments **) opaque_arg;
(*args)->result = (char *) get_current_frame ();
return 1;
}
-\f
-
-/* Local variables: */
-/* change-log-default-name: "ChangeLog-gdbtk" */
-/* End: */
Index: generic/gdbtk-wrapper.h
===================================================================
RCS file: /cvs/src/src/gdb/gdbtk/generic/gdbtk-wrapper.h,v
retrieving revision 1.2
diff -u -5 -p -r1.2 gdbtk-wrapper.h
--- generic/gdbtk-wrapper.h 2000/02/24 03:11:47 1.2
+++ generic/gdbtk-wrapper.h 2000/04/17 20:05:46
@@ -73,9 +73,6 @@ extern gdb_result GDB_get_next_frame PAR
extern gdb_result GDB_find_relative_frame PARAMS ((struct frame_info *fi,
int *start,
struct frame_info **result));
extern gdb_result GDB_get_current_frame PARAMS ((struct frame_info **result));
#endif /* GDBTK_WRAPPER_H */
-\f
-/* Local variables: */
-/* change-log-default-name: "ChangeLog-gdbtk" */
-/* End: */
+
Index: generic/gdbtk.c
===================================================================
RCS file: /cvs/src/src/gdb/gdbtk/generic/gdbtk.c,v
retrieving revision 1.2
diff -u -5 -p -r1.2 gdbtk.c
--- generic/gdbtk.c 2000/04/14 08:04:46 1.2
+++ generic/gdbtk.c 2000/04/17 20:05:46
@@ -528,11 +528,12 @@ gdbtk_find_main";
/* fputs_unfiltered_hook = NULL; *//* Force errors to stdout/stderr */
fputs_unfiltered_hook = gdbtk_fputs;
- /* set gdb_stdtarg for now until gdbtk is changed to use struct ui_out. */
+ /* FIXME: set gdb_stdtarg for now until gdbtk is changed to use
+ struct ui_out. */
gdb_stdtarg = gdb_stdout;
if (Tcl_GlobalEval (gdbtk_interp, (char *) script) != TCL_OK)
{
@@ -653,9 +654,6 @@ tk_command (cmd, from_tty)
printf_unfiltered ("%s\n", result);
do_cleanups (old_chain);
}
-\f
-/* Local variables: */
-/* change-log-default-name: "ChangeLog-gdbtk" */
-/* End: */
+
Index: generic/gdbtk.h
===================================================================
RCS file: /cvs/src/src/gdb/gdbtk/generic/gdbtk.h,v
retrieving revision 1.2
diff -u -5 -p -r1.2 gdbtk.h
--- generic/gdbtk.h 2000/04/03 21:29:00 1.2
+++ generic/gdbtk.h 2000/04/17 20:05:46
@@ -178,9 +178,5 @@ extern void
/* gdbtk_add_hooks - add all the hooks to gdb. This will get called
by the startup code to fill in the hooks needed by core gdb. */
extern void gdbtk_add_hooks (void);
-\f
-/* Local variables: */
-/* change-log-default-name: "ChangeLog-gdbtk" */
-/* End: */
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: Insight remote output doesn't output to console window immediately
2000-04-17 13:07 ` Jonathan Larmour
@ 2000-04-17 13:15 ` James Ingham
0 siblings, 0 replies; 9+ messages in thread
From: James Ingham @ 2000-04-17 13:15 UTC (permalink / raw)
To: Jonathan Larmour; +Cc: James Ingham, insight, gdb-patches
Jonathan,
This looks fine to me. Check it in.
Jim
> James Ingham wrote:
> >
> > Jonathan,
> >
> > > James Ingham wrote:
> > > >
> > > > Okay, check this in.
> > >
> > > Trunk, branch or both?
> >
> > Both. Maybe add a FIXME to the comment, since I often grep for FIXME
> > when I am trying to figure out what I should do next (though as I
> > said, this one is already on the short list.)
>
> I've added a FIXME comment now.
>
> > >
> > > > As for the Changelog-gdbtk's. They should be changed to just
> > > > ChangeLog - the gdbtk is historic; the C-code files used to live at
> > > > the top level, but since Insight couldn't be included in the FSF gdb
> > > > releases, we had to have separate ChangeLogs...
> > >
> > > Would you like me to rename those two then? Obviously not forgetting to
> > > remove all the change-log-default-name emacs variables. That would be trunk
> > > only of course.
> >
> > That would be lovely, thanks.
>
> I'll check in the attached patch to the trunk only once you say so. I added
> ChangeLog entries:
>
> 2000-04-17 Jonathan Larmour <jlarmour@redhat.co.uk>
>
> * ChangeLog-gdbtk: Renamed to ChangeLog
> * ChangeLog: New file
> * README.GDBTK: No need for changelog-default-name hint for Emacs
> now
>
> generic/ChangeLog
> 2000-04-17 Jonathan Larmour <jlarmour@redhat.co.uk>
>
> * ChangeLog-gdbtk: Renamed to ChangeLog
> * ChangeLog: New file
> * gdbtk-cmds.c, gdbtk-hooks.c, gdbtk-variable.c, gdbtk-varobj.c,
> gdbtk-wrapper.h, gdbtk-wrapper.c, gdbtk.h, gdbtk.c: No need for
> changelog-default-name hint for Emacs now
>
> I was tempted to just go ahead check this in, but I'm erring on the side of
> caution.
>
> Jifl
> --
> Red Hat, 35 Cambridge Place, Cambridge, UK. CB2 1NS Tel: +44 (1223) 728762
> "Plan to be spontaneous tomorrow." || These opinions are all my own faultcvs server: ChangeLog is a new entry, no comparison available
> cvs server: ChangeLog-gdbtk was removed, no comparison available
> Index: README.GDBTK
> ===================================================================
> RCS file: /cvs/src/src/gdb/gdbtk/README.GDBTK,v
> retrieving revision 1.1.1.1
> diff -u -5 -p -r1.1.1.1 README.GDBTK
> --- README.GDBTK 2000/02/07 00:19:42 1.1.1.1
> +++ README.GDBTK 2000/04/17 20:05:43
> @@ -396,8 +396,5 @@ m68k-hp-hpux9.00:
> .
> .
> .
>
>
> -/* Local variables: */
> -/* change-log-default-name: "ChangeLog-gdbtk" */
> -/* End: */
> cvs server: generic/ChangeLog is a new entry, no comparison available
> cvs server: generic/ChangeLog-gdbtk was removed, no comparison available
> Index: generic/gdbtk-cmds.c
> ===================================================================
> RCS file: /cvs/src/src/gdb/gdbtk/generic/gdbtk-cmds.c,v
> retrieving revision 1.6
> diff -u -5 -p -r1.6 gdbtk-cmds.c
> --- generic/gdbtk-cmds.c 2000/04/03 21:29:00 1.6
> +++ generic/gdbtk-cmds.c 2000/04/17 20:05:45
> @@ -4698,10 +4698,6 @@ setup_architecture_data ()
> {
> /* don't trust REGISTER_BYTES to be zero. */
> old_regs = xmalloc (REGISTER_BYTES + 1);
> memset (old_regs, 0, REGISTER_BYTES + 1);
> }
> -\f
>
> -/* Local variables: */
> -/* change-log-default-name: "ChangeLog-gdbtk" */
> -/* End: */
> Index: generic/gdbtk-hooks.c
> ===================================================================
> RCS file: /cvs/src/src/gdb/gdbtk/generic/gdbtk-hooks.c,v
> retrieving revision 1.3
> diff -u -5 -p -r1.3 gdbtk-hooks.c
> --- generic/gdbtk-hooks.c 2000/04/03 21:29:00 1.3
> +++ generic/gdbtk-hooks.c 2000/04/17 20:05:45
> @@ -905,8 +905,6 @@ gdbtk_detach ()
> if (Tcl_Eval (gdbtk_interp, "gdbtk_detached") != TCL_OK)
> {
> report_error ();
> }
> }
> -/* Local variables: */
> -/* change-log-default-name: "ChangeLog-gdbtk" */
> -/* End: */
> +
> Index: generic/gdbtk-variable.c
> ===================================================================
> RCS file: /cvs/src/src/gdb/gdbtk/generic/gdbtk-variable.c,v
> retrieving revision 1.1.1.1
> diff -u -5 -p -r1.1.1.1 gdbtk-variable.c
> --- generic/gdbtk-variable.c 2000/02/07 00:19:42 1.1.1.1
> +++ generic/gdbtk-variable.c 2000/04/17 20:05:46
> @@ -2409,9 +2409,6 @@ java_value_of_variable (var, obj)
> gdb_variable *var;
> Tcl_Obj **obj;
> {
> return cplus_value_of_variable (var, obj);
> }
> -\f
> -/* Local variables: */
> -/* change-log-default-name: "ChangeLog-gdbtk" */
> -/* End: */
> +
> Index: generic/gdbtk-varobj.c
> ===================================================================
> RCS file: /cvs/src/src/gdb/gdbtk/generic/gdbtk-varobj.c,v
> retrieving revision 1.2
> diff -u -5 -p -r1.2 gdbtk-varobj.c
> --- generic/gdbtk-varobj.c 2000/03/13 21:51:45 1.2
> +++ generic/gdbtk-varobj.c 2000/04/17 20:05:46
> @@ -627,9 +627,6 @@ uninstall_variable (interp, varname)
> Tcl_Interp *interp;
> char *varname;
> {
> Tcl_DeleteCommand (interp, varname);
> }
> -\f
> -/* Local variables: */
> -/* change-log-default-name: "ChangeLog-gdbtk" */
> -/* End: */
> +
> Index: generic/gdbtk-wrapper.c
> ===================================================================
> RCS file: /cvs/src/src/gdb/gdbtk/generic/gdbtk-wrapper.c,v
> retrieving revision 1.2
> diff -u -5 -p -r1.2 gdbtk-wrapper.c
> --- generic/gdbtk-wrapper.c 2000/02/24 03:11:47 1.2
> +++ generic/gdbtk-wrapper.c 2000/04/17 20:05:46
> @@ -826,11 +826,6 @@ wrap_get_current_frame (char *opaque_arg
> struct gdb_wrapper_arguments **args = (struct gdb_wrapper_arguments **) opaque_arg;
>
> (*args)->result = (char *) get_current_frame ();
> return 1;
> }
> -\f
>
> -
> -/* Local variables: */
> -/* change-log-default-name: "ChangeLog-gdbtk" */
> -/* End: */
> Index: generic/gdbtk-wrapper.h
> ===================================================================
> RCS file: /cvs/src/src/gdb/gdbtk/generic/gdbtk-wrapper.h,v
> retrieving revision 1.2
> diff -u -5 -p -r1.2 gdbtk-wrapper.h
> --- generic/gdbtk-wrapper.h 2000/02/24 03:11:47 1.2
> +++ generic/gdbtk-wrapper.h 2000/04/17 20:05:46
> @@ -73,9 +73,6 @@ extern gdb_result GDB_get_next_frame PAR
> extern gdb_result GDB_find_relative_frame PARAMS ((struct frame_info *fi,
> int *start,
> struct frame_info **result));
> extern gdb_result GDB_get_current_frame PARAMS ((struct frame_info **result));
> #endif /* GDBTK_WRAPPER_H */
> -\f
> -/* Local variables: */
> -/* change-log-default-name: "ChangeLog-gdbtk" */
> -/* End: */
> +
> Index: generic/gdbtk.c
> ===================================================================
> RCS file: /cvs/src/src/gdb/gdbtk/generic/gdbtk.c,v
> retrieving revision 1.2
> diff -u -5 -p -r1.2 gdbtk.c
> --- generic/gdbtk.c 2000/04/14 08:04:46 1.2
> +++ generic/gdbtk.c 2000/04/17 20:05:46
> @@ -528,11 +528,12 @@ gdbtk_find_main";
>
> /* fputs_unfiltered_hook = NULL; *//* Force errors to stdout/stderr */
>
> fputs_unfiltered_hook = gdbtk_fputs;
>
> - /* set gdb_stdtarg for now until gdbtk is changed to use struct ui_out. */
> + /* FIXME: set gdb_stdtarg for now until gdbtk is changed to use
> + struct ui_out. */
>
> gdb_stdtarg = gdb_stdout;
>
> if (Tcl_GlobalEval (gdbtk_interp, (char *) script) != TCL_OK)
> {
> @@ -653,9 +654,6 @@ tk_command (cmd, from_tty)
>
> printf_unfiltered ("%s\n", result);
>
> do_cleanups (old_chain);
> }
> -\f
> -/* Local variables: */
> -/* change-log-default-name: "ChangeLog-gdbtk" */
> -/* End: */
> +
> Index: generic/gdbtk.h
> ===================================================================
> RCS file: /cvs/src/src/gdb/gdbtk/generic/gdbtk.h,v
> retrieving revision 1.2
> diff -u -5 -p -r1.2 gdbtk.h
> --- generic/gdbtk.h 2000/04/03 21:29:00 1.2
> +++ generic/gdbtk.h 2000/04/17 20:05:46
> @@ -178,9 +178,5 @@ extern void
>
> /* gdbtk_add_hooks - add all the hooks to gdb. This will get called
> by the startup code to fill in the hooks needed by core gdb. */
> extern void gdbtk_add_hooks (void);
>
> -\f
> -/* Local variables: */
> -/* change-log-default-name: "ChangeLog-gdbtk" */
> -/* End: */
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2000-04-17 13:15 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2000-04-13 14:46 Insight remote output doesn't output to console window immediately Jonathan Larmour
2000-04-13 16:53 ` Andrew Cagney
2000-04-13 16:56 ` James Ingham
2000-04-13 18:36 ` Jonathan Larmour
2000-04-13 18:54 ` James Ingham
2000-04-13 19:49 ` Jonathan Larmour
2000-04-14 8:53 ` James Ingham
2000-04-17 13:07 ` Jonathan Larmour
2000-04-17 13:15 ` James Ingham
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).