Commit 67e50ce0 authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo

perf scripting: Add perf_session to scripting_context

This is preparation for allowing a script to set the itrace options
for the session if they have not already been set.
Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: https://lore.kernel.org/r/20210530192308.7382-5-adrian.hunter@intel.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent cac30400
...@@ -4017,7 +4017,7 @@ int cmd_script(int argc, const char **argv) ...@@ -4017,7 +4017,7 @@ int cmd_script(int argc, const char **argv)
} }
if (script_name) { if (script_name) {
err = scripting_ops->start_script(script_name, argc, argv); err = scripting_ops->start_script(script_name, argc, argv, session);
if (err) if (err)
goto out_delete; goto out_delete;
pr_debug("perf script started with script %s\n\n", script_name); pr_debug("perf script started with script %s\n\n", script_name);
......
...@@ -473,11 +473,14 @@ static void run_start_sub(void) ...@@ -473,11 +473,14 @@ static void run_start_sub(void)
/* /*
* Start trace script * Start trace script
*/ */
static int perl_start_script(const char *script, int argc, const char **argv) static int perl_start_script(const char *script, int argc, const char **argv,
struct perf_session *session)
{ {
const char **command_line; const char **command_line;
int i, err = 0; int i, err = 0;
scripting_context->session = session;
command_line = malloc((argc + 2) * sizeof(const char *)); command_line = malloc((argc + 2) * sizeof(const char *));
command_line[0] = ""; command_line[0] = "";
command_line[1] = script; command_line[1] = script;
......
...@@ -1746,7 +1746,8 @@ static void _free_command_line(wchar_t **command_line, int num) ...@@ -1746,7 +1746,8 @@ static void _free_command_line(wchar_t **command_line, int num)
/* /*
* Start trace script * Start trace script
*/ */
static int python_start_script(const char *script, int argc, const char **argv) static int python_start_script(const char *script, int argc, const char **argv,
struct perf_session *session)
{ {
struct tables *tables = &tables_global; struct tables *tables = &tables_global;
#if PY_MAJOR_VERSION < 3 #if PY_MAJOR_VERSION < 3
...@@ -1762,6 +1763,7 @@ static int python_start_script(const char *script, int argc, const char **argv) ...@@ -1762,6 +1763,7 @@ static int python_start_script(const char *script, int argc, const char **argv)
int i, err = 0; int i, err = 0;
FILE *fp; FILE *fp;
scripting_context->session = session;
#if PY_MAJOR_VERSION < 3 #if PY_MAJOR_VERSION < 3
command_line = malloc((argc + 1) * sizeof(const char *)); command_line = malloc((argc + 1) * sizeof(const char *));
command_line[0] = script; command_line[0] = script;
......
...@@ -66,7 +66,8 @@ static void print_python_unsupported_msg(void) ...@@ -66,7 +66,8 @@ static void print_python_unsupported_msg(void)
static int python_start_script_unsupported(const char *script __maybe_unused, static int python_start_script_unsupported(const char *script __maybe_unused,
int argc __maybe_unused, int argc __maybe_unused,
const char **argv __maybe_unused) const char **argv __maybe_unused,
struct perf_session *session __maybe_unused)
{ {
print_python_unsupported_msg(); print_python_unsupported_msg();
...@@ -131,7 +132,8 @@ static void print_perl_unsupported_msg(void) ...@@ -131,7 +132,8 @@ static void print_perl_unsupported_msg(void)
static int perl_start_script_unsupported(const char *script __maybe_unused, static int perl_start_script_unsupported(const char *script __maybe_unused,
int argc __maybe_unused, int argc __maybe_unused,
const char **argv __maybe_unused) const char **argv __maybe_unused,
struct perf_session *session __maybe_unused)
{ {
print_perl_unsupported_msg(); print_perl_unsupported_msg();
......
...@@ -73,7 +73,8 @@ struct perf_stat_config; ...@@ -73,7 +73,8 @@ struct perf_stat_config;
struct scripting_ops { struct scripting_ops {
const char *name; const char *name;
const char *dirname; /* For script path .../scripts/<dirname>/... */ const char *dirname; /* For script path .../scripts/<dirname>/... */
int (*start_script) (const char *script, int argc, const char **argv); int (*start_script)(const char *script, int argc, const char **argv,
struct perf_session *session);
int (*flush_script) (void); int (*flush_script) (void);
int (*stop_script) (void); int (*stop_script) (void);
void (*process_event) (union perf_event *event, void (*process_event) (union perf_event *event,
...@@ -107,6 +108,7 @@ struct scripting_context { ...@@ -107,6 +108,7 @@ struct scripting_context {
struct evsel *evsel; struct evsel *evsel;
struct addr_location *al; struct addr_location *al;
struct addr_location *addr_al; struct addr_location *addr_al;
struct perf_session *session;
}; };
void scripting_context__update(struct scripting_context *scripting_context, void scripting_context__update(struct scripting_context *scripting_context,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment