tracepoints. */
struct trace_state_variable
- {
- /* The variable's name. The user has to prefix with a dollar sign,
- but we don't store that internally. */
- const char *name;
+{
+ trace_state_variable (std::string &&name_, int number_)
+ : name (name_), number (number_)
+ {}
+
+ /* The variable's name. The user has to prefix with a dollar sign,
+ but we don't store that internally. */
+ std::string name;
- /* An id number assigned by GDB, and transmitted to targets. */
- int number;
+ /* An id number assigned by GDB, and transmitted to targets. */
+ int number = 0;
- /* The initial value of a variable is a 64-bit signed integer. */
- LONGEST initial_value;
+ /* The initial value of a variable is a 64-bit signed integer. */
+ LONGEST initial_value = 0;
- /* 1 if the value is known, else 0. The value is known during a
- trace run, or in tfind mode if the variable was collected into
- the current trace frame. */
- int value_known;
+ /* 1 if the value is known, else 0. The value is known during a
+ trace run, or in tfind mode if the variable was collected into
+ the current trace frame. */
+ int value_known = 0;
- /* The value of a variable is a 64-bit signed integer. */
- LONGEST value;
+ /* The value of a variable is a 64-bit signed integer. */
+ LONGEST value = 0;
- /* This is true for variables that are predefined and built into
- the target. */
- int builtin;
- };
+ /* This is true for variables that are predefined and built into
+ the target. */
+ int builtin = 0;
+ };
/* The trace status encompasses various info about the general state
of the tracing run. */
struct uploaded_tp
{
- int number;
- enum bptype type;
- ULONGEST addr;
- int enabled;
- int step;
- int pass;
- int orig_size;
+ int number = 0;
+ enum bptype type = bp_none;
+ ULONGEST addr = 0;
+ int enabled = 0;
+ int step = 0;
+ int pass = 0;
+ int orig_size = 0;
/* String that is the encoded form of the tracepoint's condition. */
- char *cond;
+ char *cond = nullptr;
/* Vectors of strings that are the encoded forms of a tracepoint's
actions. */
- VEC(char_ptr) *actions;
- VEC(char_ptr) *step_actions;
+ std::vector<char *> actions;
+ std::vector<char *> step_actions;
/* The original string defining the location of the tracepoint. */
- char *at_string;
+ char *at_string = nullptr;
/* The original string defining the tracepoint's condition. */
- char *cond_string;
+ char *cond_string = nullptr;
/* List of original strings defining the tracepoint's actions. */
- VEC(char_ptr) *cmd_strings;
+ std::vector<char *> cmd_strings;
/* The tracepoint's current hit count. */
- int hit_count;
+ int hit_count = 0;
/* The tracepoint's current traceframe usage. */
- ULONGEST traceframe_usage;
+ ULONGEST traceframe_usage = 0;
- struct uploaded_tp *next;
+ struct uploaded_tp *next = nullptr;
};
/* Struct recording info about trace state variables on the target. */
etc.). */
extern void set_current_traceframe (int num);
-struct cleanup *make_cleanup_restore_current_traceframe (void);
+struct scoped_restore_current_traceframe
+{
+ scoped_restore_current_traceframe ();
+
+ ~scoped_restore_current_traceframe ()
+ {
+ set_current_traceframe (m_traceframe_number);
+ }
+
+ DISABLE_COPY_AND_ASSIGN (scoped_restore_current_traceframe);
+
+private:
+
+ /* The traceframe we were inspecting. */
+ int m_traceframe_number;
+};
void free_actions (struct breakpoint *);