Remove addDebugXTrack() methods from extensions as these are no longer needed
diff --git a/ui/src/components/details/thread_slice_details_tab.ts b/ui/src/components/details/thread_slice_details_tab.ts index f8dde43..14572f0 100644 --- a/ui/src/components/details/thread_slice_details_tab.ts +++ b/ui/src/components/details/thread_slice_details_tab.ts
@@ -43,6 +43,7 @@ import {TraceImpl} from '../../core/trace_impl'; import {renderSliceArguments} from './slice_args'; import {openTableExplorer} from '../table_explorer'; +import {addDebugSliceTrack} from '../tracks/debug_tracks'; interface ContextMenuItem { name: string; @@ -146,46 +147,44 @@ INCLUDE PERFETTO MODULE android.monitor_contention;`, ) .then(() => - extensions.addDebugSliceTrack({ + addDebugSliceTrack({ trace, data: { sqlSource: ` - WITH merged AS ( - SELECT s.ts, s.dur, tx.aidl_name AS name, 0 AS depth - FROM android_binder_txns tx - JOIN slice s - ON tx.binder_txn_id = s.id - JOIN thread_track - ON s.track_id = thread_track.id - JOIN thread - USING (utid) - JOIN process - USING (upid) - WHERE pid = ${getPidFromSlice(slice)} - AND tid = ${getTidFromSlice(slice)} - AND aidl_name IS NOT NULL - UNION ALL - SELECT - s.ts, - s.dur, - short_blocked_method || ' -> ' || blocking_thread_name || ':' || short_blocking_method AS name, - 1 AS depth - FROM android_binder_txns tx - JOIN android_monitor_contention m - ON m.binder_reply_tid = tx.server_tid AND m.binder_reply_ts = tx.server_ts - JOIN slice s - ON tx.binder_txn_id = s.id - JOIN thread_track - ON s.track_id = thread_track.id - JOIN thread ON thread.utid = thread_track.utid - JOIN process ON process.upid = thread.upid - WHERE process.pid = ${getPidFromSlice(slice)} - AND thread.tid = ${getTidFromSlice( - slice, - )} - AND short_blocked_method IS NOT NULL - ORDER BY depth - ) SELECT ts, dur, name FROM merged`, + WITH merged AS ( + SELECT s.ts, s.dur, tx.aidl_name AS name, 0 AS depth + FROM android_binder_txns tx + JOIN slice s + ON tx.binder_txn_id = s.id + JOIN thread_track + ON s.track_id = thread_track.id + JOIN thread + USING (utid) + JOIN process + USING (upid) + WHERE pid = ${getPidFromSlice(slice)} + AND tid = ${getTidFromSlice(slice)} + AND aidl_name IS NOT NULL + UNION ALL + SELECT + s.ts, + s.dur, + short_blocked_method || ' -> ' || blocking_thread_name || ':' || short_blocking_method AS name, + 1 AS depth + FROM android_binder_txns tx + JOIN android_monitor_contention m + ON m.binder_reply_tid = tx.server_tid AND m.binder_reply_ts = tx.server_ts + JOIN slice s + ON tx.binder_txn_id = s.id + JOIN thread_track + ON s.track_id = thread_track.id + JOIN thread ON thread.utid = thread_track.utid + JOIN process ON process.upid = thread.upid + WHERE process.pid = ${getPidFromSlice(slice)} + AND thread.tid = ${getTidFromSlice(slice)} + AND short_blocked_method IS NOT NULL + ORDER BY depth + ) SELECT ts, dur, name FROM merged`, }, title: `Binder names (${getProcessNameFromSlice( slice,
diff --git a/ui/src/components/extensions.ts b/ui/src/components/extensions.ts index 30a39ea..60415c5 100644 --- a/ui/src/components/extensions.ts +++ b/ui/src/components/extensions.ts
@@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -import {type addDebugSliceTrack} from './tracks/debug_tracks'; -import {type addDebugCounterTrack} from './tracks/debug_tracks'; import {type addVisualizedArgTracks} from './tracks/visualized_args_tracks'; import {type addQueryResultsTab} from './query_table/query_result_tab'; @@ -28,8 +26,6 @@ // these extension points there instead export interface ExtensionApi { - addDebugSliceTrack: typeof addDebugSliceTrack; - addDebugCounterTrack: typeof addDebugCounterTrack; addVisualizedArgTracks: typeof addVisualizedArgTracks; addQueryResultsTab: typeof addQueryResultsTab; }
diff --git a/ui/src/frontend/index.ts b/ui/src/frontend/index.ts index 2228cba..e87c307 100644 --- a/ui/src/frontend/index.ts +++ b/ui/src/frontend/index.ts
@@ -47,10 +47,6 @@ import {IdleDetectorWindow} from './idle_detector_interface'; import {AppImpl} from '../core/app_impl'; import {configureExtensions} from '../components/extensions'; -import { - addDebugCounterTrack, - addDebugSliceTrack, -} from '../components/tracks/debug_tracks'; import {addVisualizedArgTracks} from '../components/tracks/visualized_args_tracks'; import {addQueryResultsTab} from '../components/query_table/query_result_tab'; import {assetSrc, initAssets} from '../base/assets'; @@ -551,8 +547,6 @@ // comment in sql_table_tab_interface.ts. Remove once we add an extension // point for context menus. configureExtensions({ - addDebugCounterTrack, - addDebugSliceTrack, addVisualizedArgTracks, addQueryResultsTab, });