-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* tools/tracing/rtla is currently broken in upstream error: 'struct timerlat_top_params' has no member named 'kernel_workload' * reverting to state via git diff
- Loading branch information
1 parent
2d0fddd
commit 064ed32
Showing
1 changed file
with
24 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,3 @@ | ||
commit 827482c38906e8cf5563a522f87d07048055e3ad | ||
Author: nkraetzschmar <[email protected]> | ||
Date: Tue Feb 18 07:36:53 2025 +0100 | ||
|
||
revert tools/tracing/rtla to v6.6.77 | ||
|
||
diff --git a/tools/tracing/rtla/src/osnoise.c b/tools/tracing/rtla/src/osnoise.c | ||
index 699a83f538a8..245e9344932b 100644 | ||
--- a/tools/tracing/rtla/src/osnoise.c | ||
|
@@ -18,7 +12,7 @@ index 699a83f538a8..245e9344932b 100644 | |
context->opt_workload = onoff; | ||
|
||
diff --git a/tools/tracing/rtla/src/timerlat_hist.c b/tools/tracing/rtla/src/timerlat_hist.c | ||
index 1525e88c6cf9..667f12f2d67f 100644 | ||
index a985e5795482..667f12f2d67f 100644 | ||
--- a/tools/tracing/rtla/src/timerlat_hist.c | ||
+++ b/tools/tracing/rtla/src/timerlat_hist.c | ||
@@ -900,15 +900,12 @@ timerlat_hist_apply_config(struct osnoise_tool *tool, struct timerlat_hist_param | ||
|
@@ -43,20 +37,28 @@ index 1525e88c6cf9..667f12f2d67f 100644 | |
} | ||
|
||
return 0; | ||
@@ -949,12 +946,9 @@ static struct osnoise_tool | ||
@@ -949,20 +946,9 @@ static struct osnoise_tool | ||
} | ||
|
||
static int stop_tracing; | ||
-static struct trace_instance *hist_inst = NULL; | ||
static void stop_hist(int sig) | ||
{ | ||
- if (stop_tracing) { | ||
- /* | ||
- * Stop requested twice in a row; abort event processing and | ||
- * exit immediately | ||
- */ | ||
- tracefs_iterate_stop(hist_inst->inst); | ||
- return; | ||
- } | ||
stop_tracing = 1; | ||
- if (hist_inst) | ||
- trace_instance_stop(hist_inst); | ||
} | ||
|
||
/* | ||
@@ -1000,12 +994,6 @@ int timerlat_hist_main(int argc, char *argv[]) | ||
@@ -1008,12 +994,6 @@ int timerlat_hist_main(int argc, char *argv[]) | ||
} | ||
|
||
trace = &tool->trace; | ||
|
@@ -69,7 +71,7 @@ index 1525e88c6cf9..667f12f2d67f 100644 | |
|
||
retval = enable_timerlat(trace); | ||
if (retval) { | ||
@@ -1138,7 +1126,7 @@ int timerlat_hist_main(int argc, char *argv[]) | ||
@@ -1146,7 +1126,7 @@ int timerlat_hist_main(int argc, char *argv[]) | ||
|
||
return_value = 0; | ||
|
||
|
@@ -79,7 +81,7 @@ index 1525e88c6cf9..667f12f2d67f 100644 | |
|
||
if (!params->no_aa) | ||
diff --git a/tools/tracing/rtla/src/timerlat_top.c b/tools/tracing/rtla/src/timerlat_top.c | ||
index 5a33789a375e..0915092057f8 100644 | ||
index 1fed4c8d8520..0915092057f8 100644 | ||
--- a/tools/tracing/rtla/src/timerlat_top.c | ||
+++ b/tools/tracing/rtla/src/timerlat_top.c | ||
@@ -679,15 +679,12 @@ timerlat_top_apply_config(struct osnoise_tool *top, struct timerlat_top_params * | ||
|
@@ -104,20 +106,28 @@ index 5a33789a375e..0915092057f8 100644 | |
} | ||
|
||
return 0; | ||
@@ -728,12 +725,9 @@ static struct osnoise_tool | ||
@@ -728,20 +725,9 @@ static struct osnoise_tool | ||
} | ||
|
||
static int stop_tracing; | ||
-static struct trace_instance *top_inst = NULL; | ||
static void stop_top(int sig) | ||
{ | ||
- if (stop_tracing) { | ||
- /* | ||
- * Stop requested twice in a row; abort event processing and | ||
- * exit immediately | ||
- */ | ||
- tracefs_iterate_stop(top_inst->inst); | ||
- return; | ||
- } | ||
stop_tracing = 1; | ||
- if (top_inst) | ||
- trace_instance_stop(top_inst); | ||
} | ||
|
||
/* | ||
@@ -780,13 +774,6 @@ int timerlat_top_main(int argc, char *argv[]) | ||
@@ -788,13 +774,6 @@ int timerlat_top_main(int argc, char *argv[]) | ||
} | ||
|
||
trace = &top->trace; | ||
|
@@ -131,7 +141,7 @@ index 5a33789a375e..0915092057f8 100644 | |
|
||
retval = enable_timerlat(trace); | ||
if (retval) { | ||
@@ -935,7 +922,7 @@ int timerlat_top_main(int argc, char *argv[]) | ||
@@ -943,7 +922,7 @@ int timerlat_top_main(int argc, char *argv[]) | ||
|
||
return_value = 0; | ||
|
||
|