ui: tp: switch IMPORT -> INCLUDE PERFETTO MODULE
Change-Id: Id8b948fad7a601cc0a841d3e6cb693155c4e4262
diff --git a/test/trace_processor/diff_tests/chrome/tests_scroll_jank.py b/test/trace_processor/diff_tests/chrome/tests_scroll_jank.py
index a56194a..ef8ec6a 100644
--- a/test/trace_processor/diff_tests/chrome/tests_scroll_jank.py
+++ b/test/trace_processor/diff_tests/chrome/tests_scroll_jank.py
@@ -48,7 +48,7 @@
return DiffTestBlueprint(
trace=DataPath('chrome_input_with_frame_view.pftrace'),
query="""
- SELECT IMPORT('chrome.scroll_jank.scroll_jank_v3');
+ INCLUDE PERFETTO MODULE chrome.scroll_jank.scroll_jank_v3;
SELECT
cause_of_jank,
@@ -63,7 +63,7 @@
return DiffTestBlueprint(
trace=DataPath('chrome_input_with_frame_view.pftrace'),
query="""
- SELECT IMPORT('chrome.scroll_jank.scroll_jank_v3');
+ INCLUDE PERFETTO MODULE chrome.scroll_jank.scroll_jank_v3;
SELECT
delayed_frame_percentage
diff --git a/test/trace_processor/diff_tests/tables/tests.py b/test/trace_processor/diff_tests/tables/tests.py
index 4cf4e55..83775a3 100644
--- a/test/trace_processor/diff_tests/tables/tests.py
+++ b/test/trace_processor/diff_tests/tables/tests.py
@@ -268,7 +268,7 @@
return DiffTestBlueprint(
trace=DataPath('android_monitor_contention_trace.atr'),
query="""
- SELECT import('experimental.thread_state_flattened');
+ INCLUDE PERFETTO MODULE experimental.thread_state_flattened;
select * from experimental_get_flattened_thread_state_aggregated(11155, NULL);
""",
out=Path('thread_state_flattened_aggregated_csv.out'))
@@ -277,7 +277,7 @@
return DiffTestBlueprint(
trace=DataPath('android_monitor_contention_trace.atr'),
query="""
- SELECT import('experimental.thread_state_flattened');
+ INCLUDE PERFETTO MODULE experimental.thread_state_flattened;
select * from experimental_get_flattened_thread_state(11155, NULL);
""",
out=Path('thread_state_flattened_csv.out'))
diff --git a/test/trace_processor/diff_tests/time/tests.py b/test/trace_processor/diff_tests/time/tests.py
index 5731169..ee8771d 100644
--- a/test/trace_processor/diff_tests/time/tests.py
+++ b/test/trace_processor/diff_tests/time/tests.py
@@ -26,7 +26,7 @@
return DiffTestBlueprint(
trace=TextProto(""),
query="""
- SELECT IMPORT('common.timestamps');
+ INCLUDE PERFETTO MODULE common.timestamps;
SELECT ns(4) as result;
""",
out=Csv("""
@@ -38,7 +38,7 @@
return DiffTestBlueprint(
trace=TextProto(""),
query="""
- SELECT IMPORT('common.timestamps');
+ INCLUDE PERFETTO MODULE common.timestamps;
SELECT us(4) as result;
""",
out=Csv("""
@@ -50,7 +50,7 @@
return DiffTestBlueprint(
trace=TextProto(""),
query="""
- SELECT IMPORT('common.timestamps');
+ INCLUDE PERFETTO MODULE common.timestamps;
SELECT ms(4) as result;
""",
out=Csv("""
@@ -62,7 +62,7 @@
return DiffTestBlueprint(
trace=TextProto(""),
query="""
- SELECT IMPORT('common.timestamps');
+ INCLUDE PERFETTO MODULE common.timestamps;
SELECT seconds(4) as result;
""",
out=Csv("""
@@ -74,7 +74,7 @@
return DiffTestBlueprint(
trace=TextProto(""),
query="""
- SELECT IMPORT('common.timestamps');
+ INCLUDE PERFETTO MODULE common.timestamps;
SELECT minutes(1) as result;
""",
out=Csv("""
@@ -86,7 +86,7 @@
return DiffTestBlueprint(
trace=TextProto(""),
query="""
- SELECT IMPORT('common.timestamps');
+ INCLUDE PERFETTO MODULE common.timestamps;
SELECT hours(1) as result;
""",
out=Csv("""
@@ -98,7 +98,7 @@
return DiffTestBlueprint(
trace=TextProto(""),
query="""
- SELECT IMPORT('common.timestamps');
+ INCLUDE PERFETTO MODULE common.timestamps;
SELECT days(1) as result;
""",
out=Csv("""
diff --git a/ui/src/controller/track_decider.ts b/ui/src/controller/track_decider.ts
index e6ae81d..04bac66 100644
--- a/ui/src/controller/track_decider.ts
+++ b/ui/src/controller/track_decider.ts
@@ -234,7 +234,7 @@
async guessCpuSizes(): Promise<Map<number, string>> {
const cpuToSize = new Map<number, string>();
await this.engine.query(`
- SELECT IMPORT('common.cpus');
+ INCLUDE PERFETTO MODULE common.cpus;
`);
const result = await this.engine.query(`
SELECT cpu, GUESS_CPU_SIZE(cpu) as size FROM cpu_counter_track;
diff --git a/ui/src/frontend/chrome_slice_details_tab.ts b/ui/src/frontend/chrome_slice_details_tab.ts
index 965d0b6..93b5e15 100644
--- a/ui/src/frontend/chrome_slice_details_tab.ts
+++ b/ui/src/frontend/chrome_slice_details_tab.ts
@@ -99,7 +99,10 @@
run: (slice: SliceDetails) => {
const engine = getEngine();
if (engine === undefined) return;
- runQuery(`SELECT IMPORT('android.binder'); SELECT IMPORT('android.monitor_contention');`, engine)
+ runQuery(`
+ INCLUDE PERFETTO MODULE android.binder;
+ INCLUDE PERFETTO MODULE android.monitor_contention;
+ `, engine)
.then(
() => addDebugTrack(
engine,
diff --git a/ui/src/frontend/pivot_table_query_generator.ts b/ui/src/frontend/pivot_table_query_generator.ts
index 946f6b9..b59aebe 100644
--- a/ui/src/frontend/pivot_table_query_generator.ts
+++ b/ui/src/frontend/pivot_table_query_generator.ts
@@ -166,7 +166,7 @@
.join(' and\n')}` :
'';
const text = `
- select import('experimental.slices');
+ INCLUDE PERFETTO MODULE experimental.slices;
select
${renderedPivots.concat(aggregations).join(',\n')}
diff --git a/ui/src/frontend/sql_table/state.ts b/ui/src/frontend/sql_table/state.ts
index 95c62f0..806c330 100644
--- a/ui/src/frontend/sql_table/state.ts
+++ b/ui/src/frontend/sql_table/state.ts
@@ -154,7 +154,7 @@
private getSQLImports() {
const tableImports = this.table.imports || [];
return [...tableImports, ...this.additionalImports]
- .map((i) => `SELECT IMPORT("${i}");`)
+ .map((i) => `INCLUDE PERFETTO MODULE ${i};`)
.join('\n');
}
diff --git a/ui/src/frontend/thread_state_tab.ts b/ui/src/frontend/thread_state_tab.ts
index 634a7c2..4e25723 100644
--- a/ui/src/frontend/thread_state_tab.ts
+++ b/ui/src/frontend/thread_state_tab.ts
@@ -291,7 +291,7 @@
), m(Button,
{
label: 'Critical path lite',
- onclick: () => runQuery(`SELECT IMPORT('experimental.thread_executing_span');`, this.engine)
+ onclick: () => runQuery(`INCLUDE PERFETTO MODULE experimental.thread_executing_span;`, this.engine)
.then(() => addDebugTrack(
this.engine,
{
@@ -323,7 +323,7 @@
), m(Button,
{
label: 'Critical path',
- onclick: () => runQuery(`SELECT IMPORT('experimental.thread_executing_span');`, this.engine)
+ onclick: () => runQuery(`INCLUDE PERFETTO MODULE experimental.thread_executing_span;`, this.engine)
.then(() => addDebugTrack(
this.engine,
{
diff --git a/ui/src/plugins/dev.perfetto.AndroidPerf/index.ts b/ui/src/plugins/dev.perfetto.AndroidPerf/index.ts
index 7f8d8b3..17aa796 100644
--- a/ui/src/plugins/dev.perfetto.AndroidPerf/index.ts
+++ b/ui/src/plugins/dev.perfetto.AndroidPerf/index.ts
@@ -26,7 +26,7 @@
id: 'dev.perfetto.AndroidPerf#BinderSystemServerIncoming',
name: 'Run query: system_server incoming binder graph',
callback: () => viewer.tabs.openQuery(
- `SELECT IMPORT('android.binder');
+ `INCLUDE PERFETTO MODULE android.binder;
SELECT * FROM android_binder_incoming_graph((SELECT upid FROM process WHERE name = 'system_server'))`,
'system_server incoming binder graph'),
});
@@ -35,7 +35,7 @@
id: 'dev.perfetto.AndroidPerf#BinderSystemServerOutgoing',
name: 'Run query: system_server outgoing binder graph',
callback: () => viewer.tabs.openQuery(
- `SELECT IMPORT('android.binder');
+ `INCLUDE PERFETTO MODULE android.binder;
SELECT * FROM android_binder_outgoing_graph((SELECT upid FROM process WHERE name = 'system_server'))`,
'system_server outgoing binder graph'),
});
@@ -44,7 +44,7 @@
id: 'dev.perfetto.AndroidPerf#MonitorContentionSystemServer',
name: 'Run query: system_server monitor_contention graph',
callback: () => viewer.tabs.openQuery(
- `SELECT IMPORT('android.monitor_contention');
+ `INCLUDE PERFETTO MODULE android.monitor_contention;
SELECT * FROM android_monitor_contention_graph((SELECT upid FROM process WHERE name = 'system_server'))`,
'system_server monitor_contention graph'),
});
@@ -53,7 +53,7 @@
id: 'dev.perfetto.AndroidPerf#BinderAll',
name: 'Run query: all process binder graph',
callback: () => viewer.tabs.openQuery(
- `SELECT IMPORT('android.binder');
+ `INCLUDE PERFETTO MODULE android.binder;
SELECT * FROM android_binder_graph(-1000, 1000, -1000, 1000)`,
'all process binder graph'),
});
diff --git a/ui/src/tracks/chrome_scroll_jank/event_latency_track.ts b/ui/src/tracks/chrome_scroll_jank/event_latency_track.ts
index 370c754..c69e9a2 100644
--- a/ui/src/tracks/chrome_scroll_jank/event_latency_track.ts
+++ b/ui/src/tracks/chrome_scroll_jank/event_latency_track.ts
@@ -183,7 +183,7 @@
FROM latency_stages ls;`;
await engine.query(
- `SELECT IMPORT('chrome.scroll_jank.scroll_jank_intervals')`);
+ `INCLUDE PERFETTO MODULE chrome.scroll_jank.scroll_jank_intervals`);
await engine.query(tableDefSql);
result.tracksToAdd.push({
diff --git a/ui/src/tracks/chrome_scroll_jank/scroll_jank_v3_track.ts b/ui/src/tracks/chrome_scroll_jank/scroll_jank_v3_track.ts
index a2f83f7..6e554d4 100644
--- a/ui/src/tracks/chrome_scroll_jank/scroll_jank_v3_track.ts
+++ b/ui/src/tracks/chrome_scroll_jank/scroll_jank_v3_track.ts
@@ -134,7 +134,7 @@
};
await engine.query(
- `SELECT IMPORT('chrome.scroll_jank.scroll_jank_intervals')`);
+ `INCLUDE PERFETTO MODULE chrome.scroll_jank.scroll_jank_intervals`);
result.tracksToAdd.push({
id: uuidv4(),
diff --git a/ui/src/tracks/cpu_slices/index.ts b/ui/src/tracks/cpu_slices/index.ts
index 40526a4..6694ccd 100644
--- a/ui/src/tracks/cpu_slices/index.ts
+++ b/ui/src/tracks/cpu_slices/index.ts
@@ -503,7 +503,7 @@
async guessCpuSizes(engine: EngineProxy): Promise<Map<number, string>> {
const cpuToSize = new Map<number, string>();
await engine.query(`
- SELECT IMPORT('common.cpus');
+ INCLUDE PERFETTO MODULE common.cpus;
`);
const result = await engine.query(`
SELECT cpu, GUESS_CPU_SIZE(cpu) as size FROM cpu_counter_track;
diff --git a/ui/src/tracks/screenshots/index.ts b/ui/src/tracks/screenshots/index.ts
index 63ff916..c1eb5ed 100644
--- a/ui/src/tracks/screenshots/index.ts
+++ b/ui/src/tracks/screenshots/index.ts
@@ -68,7 +68,7 @@
tracksToAdd: [],
};
- await engine.query(`SELECT IMPORT('android.screenshots')`);
+ await engine.query(`INCLUDE PERFETTO MODULE android.screenshots`);
result.tracksToAdd.push({
id: uuidv4(),
