@@ -267,66 +267,6 @@ fn get_self_profile_delta(
267267 } )
268268}
269269
270- fn sort_self_profile (
271- profile : & mut self_profile:: SelfProfile ,
272- base_profile_delta : & mut Option < self_profile:: SelfProfileDelta > ,
273- sort_idx : i32 ,
274- ) {
275- let qd = & mut profile. query_data ;
276- let qd_deltas = base_profile_delta. as_mut ( ) . map ( |bpd| & mut bpd. query_data ) ;
277- let mut indices: Vec < _ > = ( 0 ..qd. len ( ) ) . collect ( ) ;
278-
279- match sort_idx. abs ( ) {
280- 1 => indices. sort_by_key ( |& i| qd[ i] . label ) ,
281- 2 => indices. sort_by_key ( |& i| qd[ i] . self_time ) ,
282- 3 => indices. sort_by_key ( |& i| qd[ i] . number_of_cache_misses ) ,
283- 4 => indices. sort_by_key ( |& i| qd[ i] . number_of_cache_hits ) ,
284- 5 => indices. sort_by_key ( |& i| qd[ i] . invocation_count ) ,
285- 6 => indices. sort_by_key ( |& i| qd[ i] . blocked_time ) ,
286- 7 => indices. sort_by_key ( |& i| qd[ i] . incremental_load_time ) ,
287- 9 => indices. sort_by_key ( |& i| {
288- // convert to displayed percentage
289- ( ( qd[ i] . number_of_cache_hits as f64 / qd[ i] . invocation_count as f64 ) * 10_000.0 ) as u64
290- } ) ,
291- 10 => indices. sort_by ( |& a, & b| {
292- qd[ a]
293- . percent_total_time
294- . partial_cmp ( & qd[ b] . percent_total_time )
295- . unwrap ( )
296- } ) ,
297- 11 => {
298- if let Some ( ref deltas) = qd_deltas {
299- indices. sort_by_key ( |& i| deltas[ i] . self_time ) ;
300- }
301- }
302- 12 => {
303- if let Some ( ref deltas) = qd_deltas {
304- indices. sort_by_key ( |& i| deltas[ i] . invocation_count ) ;
305- }
306- }
307- 13 => {
308- if let Some ( ref deltas) = qd_deltas {
309- indices. sort_by_key ( |& i| deltas[ i] . incremental_load_time ) ;
310- }
311- }
312- _ => return ,
313- }
314-
315- profile. query_data = if sort_idx < 0 {
316- indices. iter ( ) . map ( |& i| qd[ i] . clone ( ) ) . rev ( ) . collect ( )
317- } else {
318- indices. iter ( ) . map ( |& i| qd[ i] . clone ( ) ) . collect ( )
319- } ;
320-
321- if let Some ( deltas) = qd_deltas {
322- base_profile_delta. as_mut ( ) . unwrap ( ) . query_data = if sort_idx < 0 {
323- indices. iter ( ) . map ( |& i| deltas[ i] . clone ( ) ) . rev ( ) . collect ( )
324- } else {
325- indices. iter ( ) . map ( |& i| deltas[ i] . clone ( ) ) . collect ( )
326- } ;
327- }
328- }
329-
330270pub async fn handle_self_profile_raw_download (
331271 body : self_profile_raw:: Request ,
332272 ctxt : & SiteCtxt ,
@@ -516,12 +456,6 @@ pub async fn handle_self_profile(
516456 . map_err ( |e| format ! ( "invalid run name: {:?}" , e) ) ?;
517457 let index = ctxt. index . load ( ) ;
518458
519- let sort_idx = body
520- . sort_idx
521- . parse :: < i32 > ( )
522- . ok ( )
523- . ok_or ( "sort_idx needs to be i32" . to_string ( ) ) ?;
524-
525459 let query = selector:: CompileBenchmarkQuery :: default ( )
526460 . benchmark ( selector:: Selector :: One ( bench_name. to_string ( ) ) )
527461 . profile ( selector:: Selector :: One ( profile. parse ( ) . unwrap ( ) ) )
@@ -573,13 +507,12 @@ pub async fn handle_self_profile(
573507 base_self_profile. as_ref ( ) . map ( |p| & p. profile ) ,
574508 ) ;
575509
576- let mut base_profile_delta = get_self_profile_delta (
510+ let base_profile_delta = get_self_profile_delta (
577511 & self_profile. profile ,
578512 base_self_profile. as_ref ( ) . map ( |p| & p. profile ) ,
579513 & self_profile. profiling_data ,
580514 base_self_profile. as_ref ( ) . map ( |p| & p. profiling_data ) ,
581515 ) ;
582- sort_self_profile ( & mut self_profile. profile , & mut base_profile_delta, sort_idx) ;
583516
584517 Ok ( self_profile:: Response {
585518 base_profile_delta,
0 commit comments