2010-04-09 Stan Shebs <stan@codesourcery.com>

	* tracepoint.c (trace_status_mi): Report frames created.

	* gdb.texinfo (gdb/mi Tracepoint Commands) <-trace-status>:
	Describe the `frames-created' field, tweak grammar.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f7ab074..7a42846 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,7 @@
 2010-04-09  Stan Shebs  <stan@codesourcery.com>
 
+       * tracepoint.c (trace_status_mi): Report frames created.
+
        * tracepoint.c (trace_dump_command): Include default-collect
        expressions.
 

diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index 6c0f9ee..e914bf0 100644 (file)
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-09  Stan Shebs  <stan@codesourcery.com>
+
+       * gdb.texinfo (gdb/mi Tracepoint Commands) <-trace-status>:
+       Describe the `frames-created' field, tweak grammar.
+
 2010-04-09  Pedro Alves  <pedro@codesourcery.com>
 
        * gdb.texinfo (gdb/mi Tracepoint Commands) <-trace-status>:

diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index f660959..887547b 100644 (file)
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -26421,13 +26421,16 @@ present iff the @samp{stop-reason} field has the value of
 @samp{passcount}.
 
 @item frames
-This field is an integer number of currently collected frames.  This
-field is optional.
+@itemx frames-created
+The @samp{frames} field is a count of the total number of trace frames
+in the trace buffer, while @samp{frames-created} is the total created
+during the run, including ones that were discarded, such as when a
+circular trace buffer filled up.  Both fields are optional.
 
 @item buffer-size
 @itemx buffer-free
 These fields tell the current size of the tracing buffer and the
-remaining space.  These field is optional.
+remaining space.  These fields are optional.
 
 @item circular
 The value of the circular trace buffer flag.  @code{1} means that the

diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index f5fa8c8..d3160a9 100644 (file)
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -1798,6 +1798,8 @@ trace_status_mi (int on_stop)
 
   if (ts->traceframe_count != -1)
     ui_out_field_int (uiout, "frames", ts->traceframe_count);
+  if (ts->traceframes_created != -1)
+    ui_out_field_int (uiout, "frames-created", ts->traceframes_created);
   if (ts->buffer_size != -1)
     ui_out_field_int (uiout, "buffer-size", ts->buffer_size);
   if (ts->buffer_free != -1)