@@ -550,14 +550,20 @@ impl SelfProfiler {
550550 pub fn new (
551551 output_directory : & Path ,
552552 crate_name : Option < & str > ,
553- event_filters : & Option < Vec < String > > ,
553+ event_filters : Option < & [ String ] > ,
554+ counter_name : & str ,
554555 ) -> Result < SelfProfiler , Box < dyn Error + Send + Sync > > {
555556 fs:: create_dir_all ( output_directory) ?;
556557
557558 let crate_name = crate_name. unwrap_or ( "unknown-crate" ) ;
558- let filename = format ! ( "{}-{}.rustc_profile" , crate_name, process:: id( ) ) ;
559+ // HACK(eddyb) we need to pad the PID, strange as it may seem, as its
560+ // length can behave as a source of entropy for heap addresses, when
561+ // ASLR is disabled and the heap is otherwise determinic.
562+ let pid: u32 = process:: id ( ) ;
563+ let filename = format ! ( "{}-{:07}.rustc_profile" , crate_name, pid) ;
559564 let path = output_directory. join ( & filename) ;
560- let profiler = Profiler :: new ( & path) ?;
565+ let profiler =
566+ Profiler :: with_counter ( & path, measureme:: counters:: Counter :: by_name ( counter_name) ?) ?;
561567
562568 let query_event_kind = profiler. alloc_string ( "Query" ) ;
563569 let generic_activity_event_kind = profiler. alloc_string ( "GenericActivity" ) ;
@@ -570,7 +576,7 @@ impl SelfProfiler {
570576
571577 let mut event_filter_mask = EventFilter :: empty ( ) ;
572578
573- if let Some ( ref event_filters) = * event_filters {
579+ if let Some ( event_filters) = event_filters {
574580 let mut unknown_events = vec ! [ ] ;
575581 for item in event_filters {
576582 if let Some ( & ( _, mask) ) =
0 commit comments