/* Generic static probe support for GDB.
- Copyright (C) 2012-2016 Free Software Foundation, Inc.
+ Copyright (C) 2012-2017 Free Software Foundation, Inc.
This file is part of GDB.
#include "ax-gdb.h"
#include "location.h"
#include <ctype.h>
+#include <algorithm>
+#include "common/gdb_optional.h"
typedef struct bound_probe bound_probe_s;
DEF_VEC_O (bound_probe_s);
const char *objfile_namestr,
const char *provider,
const char *name,
- struct symtabs_and_lines *result)
+ std::vector<symtab_and_line> *result)
{
struct objfile *objfile;
for (ix = 0; VEC_iterate (probe_p, probes, ix, probe); ix++)
{
- struct symtab_and_line *sal;
-
if (probe_ops != &probe_ops_any && probe->pops != probe_ops)
continue;
if (strcmp (probe->name, name) != 0)
continue;
- ++result->nelts;
- result->sals = XRESIZEVEC (struct symtab_and_line, result->sals,
- result->nelts);
- sal = &result->sals[result->nelts - 1];
-
- init_sal (sal);
+ symtab_and_line sal;
+ sal.pc = get_probe_address (probe, objfile);
+ sal.explicit_pc = 1;
+ sal.section = find_pc_overlay (sal.pc);
+ sal.pspace = search_pspace;
+ sal.probe = probe;
+ sal.objfile = objfile;
- sal->pc = get_probe_address (probe, objfile);
- sal->explicit_pc = 1;
- sal->section = find_pc_overlay (sal->pc);
- sal->pspace = search_pspace;
- sal->probe = probe;
- sal->objfile = objfile;
+ result->push_back (std::move (sal));
}
}
}
/* See definition in probe.h. */
-struct symtabs_and_lines
+std::vector<symtab_and_line>
parse_probes (const struct event_location *location,
struct program_space *search_pspace,
struct linespec_result *canonical)
char *arg_end, *arg;
char *objfile_namestr = NULL, *provider = NULL, *name, *p;
struct cleanup *cleanup;
- struct symtabs_and_lines result;
const struct probe_ops *probe_ops;
const char *arg_start, *cs;
- result.sals = NULL;
- result.nelts = 0;
-
gdb_assert (event_location_type (location) == PROBE_LOCATION);
arg_start = get_probe_location (location);
if (objfile_namestr && *objfile_namestr == '\0')
error (_("invalid objfile name"));
+ std::vector<symtab_and_line> result;
if (search_pspace != NULL)
{
parse_probes_in_pspace (probe_ops, search_pspace, objfile_namestr,
provider, name, &result);
}
- if (result.nelts == 0)
+ if (result.empty ())
{
throw_error (NOT_FOUND_ERROR,
_("No probe matching objfile=`%s', provider=`%s', name=`%s'"),
{
struct objfile *objfile;
VEC (bound_probe_s) *result = NULL;
- struct cleanup *cleanup, *cleanup_temps;
- regex_t obj_pat, prov_pat, probe_pat;
+ struct cleanup *cleanup;
+ gdb::optional<compiled_regex> obj_pat, prov_pat, probe_pat;
cleanup = make_cleanup (VEC_cleanup (bound_probe_s), &result);
- cleanup_temps = make_cleanup (null_cleanup, NULL);
if (provider != NULL)
- compile_rx_or_error (&prov_pat, provider, _("Invalid provider regexp"));
+ prov_pat.emplace (provider, REG_NOSUB, _("Invalid provider regexp"));
if (probe_name != NULL)
- compile_rx_or_error (&probe_pat, probe_name, _("Invalid probe regexp"));
+ probe_pat.emplace (probe_name, REG_NOSUB, _("Invalid probe regexp"));
if (objname != NULL)
- compile_rx_or_error (&obj_pat, objname, _("Invalid object file regexp"));
+ obj_pat.emplace (objname, REG_NOSUB, _("Invalid object file regexp"));
ALL_OBJFILES (objfile)
{
if (objname)
{
- if (regexec (&obj_pat, objfile_name (objfile), 0, NULL, 0) != 0)
+ if (obj_pat->exec (objfile_name (objfile), 0, NULL, 0) != 0)
continue;
}
continue;
if (provider
- && regexec (&prov_pat, probe->provider, 0, NULL, 0) != 0)
+ && prov_pat->exec (probe->provider, 0, NULL, 0) != 0)
continue;
if (probe_name
- && regexec (&probe_pat, probe->name, 0, NULL, 0) != 0)
+ && probe_pat->exec (probe->name, 0, NULL, 0) != 0)
continue;
bound.objfile = objfile;
}
}
- do_cleanups (cleanup_temps);
discard_cleanups (cleanup);
return result;
}
if (val == NULL)
continue;
- size_max = max (strlen (val), size_max);
+ size_max = std::max (strlen (val), size_max);
}
do_cleanups (c2);
}
- ui_out_table_header (current_uiout, size_max, ui_left,
- column->field_name, column->print_name);
+ current_uiout->table_header (size_max, ui_left,
+ column->field_name, column->print_name);
}
do_cleanups (c);
for (ix = 0;
VEC_iterate (info_probe_column_s, headings, ix, column);
++ix)
- ui_out_field_string (current_uiout, column->field_name, _("n/a"));
+ current_uiout->field_string (column->field_name, _("n/a"));
do_cleanups (c);
}
const char *val = VEC_index (const_char_ptr, values, j++);
if (val == NULL)
- ui_out_field_skip (current_uiout, column->field_name);
+ current_uiout->field_skip (column->field_name);
else
- ui_out_field_string (current_uiout, column->field_name, val);
+ current_uiout->field_string (column->field_name, val);
}
do_cleanups (c);
{
const char *probe_type = probe->probe->pops->type_name (probe->probe);
- size_type = max (strlen (probe_type), size_type);
- size_name = max (strlen (probe->probe->name), size_name);
- size_provider = max (strlen (probe->probe->provider), size_provider);
- size_objname = max (strlen (objfile_name (probe->objfile)), size_objname);
+ size_type = std::max (strlen (probe_type), size_type);
+ size_name = std::max (strlen (probe->probe->name), size_name);
+ size_provider = std::max (strlen (probe->probe->provider), size_provider);
+ size_objname = std::max (strlen (objfile_name (probe->objfile)),
+ size_objname);
}
- ui_out_table_header (current_uiout, size_type, ui_left, "type", _("Type"));
- ui_out_table_header (current_uiout, size_provider, ui_left, "provider",
- _("Provider"));
- ui_out_table_header (current_uiout, size_name, ui_left, "name", _("Name"));
- ui_out_table_header (current_uiout, size_addr, ui_left, "addr", _("Where"));
+ current_uiout->table_header (size_type, ui_left, "type", _("Type"));
+ current_uiout->table_header (size_provider, ui_left, "provider",
+ _("Provider"));
+ current_uiout->table_header (size_name, ui_left, "name", _("Name"));
+ current_uiout->table_header (size_addr, ui_left, "addr", _("Where"));
if (pops == NULL)
{
else
gen_ui_out_table_header_info (probes, pops);
- ui_out_table_header (current_uiout, size_objname, ui_left, "object",
- _("Object"));
- ui_out_table_body (current_uiout);
+ current_uiout->table_header (size_objname, ui_left, "object", _("Object"));
+ current_uiout->table_body ();
for (i = 0; VEC_iterate (bound_probe_s, probes, i, probe); ++i)
{
- struct cleanup *inner;
const char *probe_type = probe->probe->pops->type_name (probe->probe);
- inner = make_cleanup_ui_out_tuple_begin_end (current_uiout, "probe");
+ ui_out_emit_tuple tuple_emitter (current_uiout, "probe");
- ui_out_field_string (current_uiout, "type",probe_type);
- ui_out_field_string (current_uiout, "provider", probe->probe->provider);
- ui_out_field_string (current_uiout, "name", probe->probe->name);
- ui_out_field_core_addr (current_uiout, "addr",
- probe->probe->arch,
- get_probe_address (probe->probe, probe->objfile));
+ current_uiout->field_string ("type",probe_type);
+ current_uiout->field_string ("provider", probe->probe->provider);
+ current_uiout->field_string ("name", probe->probe->name);
+ current_uiout->field_core_addr (
+ "addr", probe->probe->arch,
+ get_probe_address (probe->probe, probe->objfile));
if (pops == NULL)
{
else
print_ui_out_info (probe->probe);
- ui_out_field_string (current_uiout, "object",
+ current_uiout->field_string ("object",
objfile_name (probe->objfile));
- ui_out_text (current_uiout, "\n");
-
- do_cleanups (inner);
+ current_uiout->text ("\n");
}
any_found = !VEC_empty (bound_probe_s, probes);
do_cleanups (cleanup);
if (!any_found)
- ui_out_message (current_uiout, 0, _("No probes matched.\n"));
+ current_uiout->message (_("No probes matched.\n"));
}
/* Implementation of the `info probes' command. */
probes = collect_probes (objname, provider, probe_name, NULL);
if (VEC_empty (bound_probe_s, probes))
{
- ui_out_message (current_uiout, 0, _("No probes matched.\n"));
+ current_uiout->message (_("No probes matched.\n"));
do_cleanups (cleanup);
return;
}
if (pops->enable_probe != NULL)
{
pops->enable_probe (probe->probe);
- ui_out_message (current_uiout, 0,
- _("Probe %s:%s enabled.\n"),
- probe->probe->provider, probe->probe->name);
+ current_uiout->message (_("Probe %s:%s enabled.\n"),
+ probe->probe->provider, probe->probe->name);
}
else
- ui_out_message (current_uiout, 0,
- _("Probe %s:%s cannot be enabled.\n"),
- probe->probe->provider, probe->probe->name);
+ current_uiout->message (_("Probe %s:%s cannot be enabled.\n"),
+ probe->probe->provider, probe->probe->name);
}
do_cleanups (cleanup);
probes = collect_probes (objname, provider, probe_name, NULL /* pops */);
if (VEC_empty (bound_probe_s, probes))
{
- ui_out_message (current_uiout, 0, _("No probes matched.\n"));
+ current_uiout->message (_("No probes matched.\n"));
do_cleanups (cleanup);
return;
}
if (pops->disable_probe != NULL)
{
pops->disable_probe (probe->probe);
- ui_out_message (current_uiout, 0,
- _("Probe %s:%s disabled.\n"),
- probe->probe->provider, probe->probe->name);
+ current_uiout->message (_("Probe %s:%s disabled.\n"),
+ probe->probe->provider, probe->probe->name);
}
else
- ui_out_message (current_uiout, 0,
- _("Probe %s:%s cannot be disabled.\n"),
- probe->probe->provider, probe->probe->name);
+ current_uiout->message (_("Probe %s:%s cannot be disabled.\n"),
+ probe->probe->provider, probe->probe->name);
}
do_cleanups (cleanup);