* arm-tdep.c: Include "observer.h".

[deliverable/binutils-gdb.git] / gdb / tracepoint.h

diff --git a/gdb/tracepoint.h b/gdb/tracepoint.h
index dd16dcf79029eb8135e4fb6334aa9e5ef4134783..817491807f65b95544c1660d3042ed2d7fd0bf48 100644 (file)
--- a/gdb/tracepoint.h
+++ b/gdb/tracepoint.h
@@ -1,5 +1,5 @@
 /* Data structures associated with tracepoints in GDB.
-   Copyright (C) 1997, 1998, 1999, 2000, 2007, 2008, 2009, 2010
+   Copyright (C) 1997, 1998, 1999, 2000, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
 
    This file is part of GDB.
@@ -24,10 +24,10 @@
 #include "target.h"
 
 /* A trace state variable is a value managed by a target being
-   traced. A trace state variable (or tsv for short) can be accessed
+   traced.  A trace state variable (or tsv for short) can be accessed
    and assigned to by tracepoint actions and conditionals, but is not
    part of the program being traced, and it doesn't have to be
-   collected. Effectively the variables are scratch space for
+   collected.  Effectively the variables are scratch space for
    tracepoints.  */
 
 struct trace_state_variable
@@ -106,6 +106,16 @@ struct trace_status
   /* Unused bytes left in the target's trace buffer.  */
 
   int buffer_free;
+
+  /* 1 if the target will continue tracing after disconnection, else
+     0.  If the target does not report a value, assume 0.  */
+
+  int disconnected_tracing;
+
+  /* 1 if the target is using a circular trace buffer, else 0.  If the
+     target does not report a value, assume 0.  */
+
+  int circular_buffer;
 };
 
 struct trace_status *current_trace_status (void);
@@ -114,11 +124,7 @@ extern char *default_collect;
 
 /* Struct to collect random info about tracepoints on the target.  */
 
-struct uploaded_string
-{
-  char *str;
-  struct uploaded_string *next;
-};
+DEF_VEC_P (char_ptr);
 
 struct uploaded_tp
 {
@@ -129,11 +135,14 @@ struct uploaded_tp
   int step;
   int pass;
   int orig_size;
+
+  /* String that is the encoded form of the tracepoint's condition.  */
   char *cond;
-  int numactions;
-  char *actions[100];
-  int num_step_actions;
-  char *step_actions[100];
+
+  /* Vectors of strings that are the encoded forms of a tracepoint's
+     actions.  */
+  VEC(char_ptr) *actions;
+  VEC(char_ptr) *step_actions;
 
   /* The original string defining the location of the tracepoint.  */
   char *at_string;
@@ -142,7 +151,7 @@ struct uploaded_tp
   char *cond_string;
 
   /* List of original strings defining the tracepoint's actions.  */
-  struct uploaded_string *cmd_strings;
+  VEC(char_ptr) *cmd_strings;
 
   struct uploaded_tp *next;
 };
@@ -158,6 +167,25 @@ struct uploaded_tsv
   struct uploaded_tsv *next;
 };
 
+/* Struct recording info about a target static tracepoint marker.  */
+
+struct static_tracepoint_marker
+{
+  struct gdbarch *gdbarch;
+  CORE_ADDR address;
+
+  /* The string ID of the marker.  */
+  char *str_id;
+
+  /* Extra target reported info associated with the marker.  */
+  char *extra;
+};
+
+extern void parse_static_tracepoint_marker_definition
+  (char *line, char **pp,
+   struct static_tracepoint_marker *marker);
+extern void release_static_tracepoint_marker (struct static_tracepoint_marker *);
+
 /* A hook used to notify the UI of tracepoint operations.  */
 
 extern void (*deprecated_trace_find_hook) (char *arg, int from_tty);
@@ -182,7 +210,8 @@ extern int encode_source_string (int num, ULONGEST addr,
 
 extern void parse_trace_status (char *line, struct trace_status *ts);
 
-extern void parse_tracepoint_definition (char *line, struct uploaded_tp **utpp);
+extern void parse_tracepoint_definition (char *line,
+                                        struct uploaded_tp **utpp);
 extern void parse_tsv_definition (char *line, struct uploaded_tsv **utsvp);
 
 extern struct uploaded_tp *get_uploaded_tp (int num, ULONGEST addr,
@@ -191,7 +220,7 @@ extern struct breakpoint *create_tracepoint_from_upload (struct uploaded_tp *utp
 extern void merge_uploaded_tracepoints (struct uploaded_tp **utpp);
 extern void merge_uploaded_trace_state_variables (struct uploaded_tsv **utsvp);
 
-extern void disconnect_or_stop_tracing (int from_tty);
+extern void disconnect_tracing (int from_tty);
 
 extern void start_tracing (void);
 extern void stop_tracing (void);