diff options
| -rw-r--r-- | gdb/gdbserver/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/gdbserver/tracepoint.c | 17 |
2 files changed, 20 insertions, 4 deletions
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 54348e5..f0651aa 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,10 @@ +2013-09-02 Pedro Alves <palves@redhat.com> + + * tracepoint.c (TRACEFRAME_EOB_MARKER_SIZE): New macro. + (init_trace_buffer): Ensure at least TRACEFRAME_EOB_MARKER_SIZE is + allocated. + (trace_buffer_alloc): Use TRACEFRAME_EOB_MARKER_SIZE. + 2013-09-02 Pierre Muller <muller@sourceware.org> * win32-low.c (child_xfer_memory): Check if ReadProcessMemory diff --git a/gdb/gdbserver/tracepoint.c b/gdb/gdbserver/tracepoint.c index 5c0dec7..1327845 100644 --- a/gdb/gdbserver/tracepoint.c +++ b/gdb/gdbserver/tracepoint.c @@ -982,6 +982,10 @@ struct traceframe } ATTR_PACKED; +/* The size of the EOB marker, in bytes. A traceframe with zeroed + fields (and no data) marks the end of trace data. */ +#define TRACEFRAME_EOB_MARKER_SIZE offsetof (struct traceframe, data) + /* The traceframe to be used as the source of data to send back to GDB. A value of -1 means to get data from the live program. */ @@ -1487,12 +1491,17 @@ clear_inferior_trace_buffer (void) static void init_trace_buffer (LONGEST bufsize) { + size_t alloc_size; + trace_buffer_size = bufsize; - /* If we already have a trace buffer, try realloc'ing. */ - trace_buffer_lo = xrealloc (trace_buffer_lo, bufsize); + /* Make sure to internally allocate at least space for the EOB + marker. */ + alloc_size = (bufsize < TRACEFRAME_EOB_MARKER_SIZE + ? TRACEFRAME_EOB_MARKER_SIZE : bufsize); + trace_buffer_lo = xrealloc (trace_buffer_lo, alloc_size); - trace_buffer_hi = trace_buffer_lo + bufsize; + trace_buffer_hi = trace_buffer_lo + trace_buffer_size; clear_trace_buffer (); } @@ -1532,7 +1541,7 @@ trace_buffer_alloc (size_t amt) (long) amt, (long) sizeof (struct traceframe)); /* Account for the EOB marker. */ - amt += sizeof (struct traceframe); + amt += TRACEFRAME_EOB_MARKER_SIZE; #ifdef IN_PROCESS_AGENT again: |