Fix Windows build.

Author: mstange

fxprof-processed-profile/src/markers/dynamic_schema.rs

@@ -145,7 +145,7 @@ pub struct DynamicSchemaMarkerSchema {
     pub table_label: Option<String>,
 
     /// The marker fields. The values are supplied by each marker, in the marker's
-    /// implementations of the `string_field_value` and `number_field_value` trait methods.
+    /// implementations of `push_field_values`.
     pub fields: Vec<DynamicSchemaMarkerField>,
 
     /// Any graph lines / segments created from markers of this type.

fxprof-processed-profile/src/markers/static_schema.rs

@@ -100,8 +100,8 @@ pub trait Marker {
     /// flows ([`FlowId`]). You can use one of those types, or a tuple of them.
     type FieldsType: MarkerFieldsTrait;
 
-    /// The marker fields. The values are supplied by each marker, in the marker's
-    /// implementations of the `string_field_value` and `number_field_value` trait methods.
+    /// The marker fields. The values for the marker fields are returned by the
+    /// marker's implementation of the `field_values` method.
     const FIELDS: Schema<Self::FieldsType>;
 
     /// Any graph lines / segments created from markers of this type.

samply/src/windows/coreclr.rs

@@ -212,6 +212,8 @@ impl Display for GcType {
 pub struct CoreClrGcAllocMarker(StringHandle, f64);
 
 impl Marker for CoreClrGcAllocMarker {
+    type FieldsType = (StringHandle, f64);
+
     const UNIQUE_MARKER_TYPE_NAME: &'static str = "GC Alloc";
 
     const CATEGORY: Category<'static> = CORE_CLR_GC_CATEGORY;
@@ -227,32 +229,26 @@ impl Marker for CoreClrGcAllocMarker {
     const TABLE_LABEL: Option<&'static str> =
         Some("GC Alloc: {marker.data.clrtype} ({marker.data.size} bytes)");
 
-    const FIELDS: &'static [MarkerField] = &[
+    const FIELDS: Schema<Self::FieldsType> = Schema((
         MarkerField::string("clrtype", "CLR Type"),
         MarkerField::bytes("size", "Size"),
-    ];
+    ));
 
     fn name(&self, profile: &mut Profile) -> StringHandle {
         profile.handle_for_string("GC Alloc")
     }
 
-    fn string_field_value(&self, _field_index: u32) -> StringHandle {
-        self.0
-    }
-
-    fn number_field_value(&self, _field_index: u32) -> f64 {
-        self.1
-    }
-
-    fn flow_field_value(&self, _field_index: u32) -> u64 {
-        unreachable!()
+    fn field_values(&self) -> (StringHandle, f64) {
+        (self.0, self.1)
     }
 }
 
 #[derive(Debug, Clone)]
 pub struct CoreClrGcEventMarker(StringHandle, StringHandle);
 
 impl Marker for CoreClrGcEventMarker {
+    type FieldsType = StringHandle;
+
     const UNIQUE_MARKER_TYPE_NAME: &'static str = "GC Event";
 
     const CATEGORY: Category<'static> = CORE_CLR_GC_CATEGORY;
@@ -266,23 +262,15 @@ impl Marker for CoreClrGcEventMarker {
     const TOOLTIP_LABEL: Option<&'static str> = Some("{marker.data.event}");
     const TABLE_LABEL: Option<&'static str> = Some("{marker.name} - {marker.data.event}");
 
-    const FIELDS: &'static [MarkerField] = &[MarkerField::string("event", "Event")];
+    const FIELDS: Schema<Self::FieldsType> = Schema(MarkerField::string("event", "Event"));
 
     fn name(&self, _profile: &mut Profile) -> StringHandle {
         self.0
     }
 
-    fn string_field_value(&self, _field_index: u32) -> StringHandle {
+    fn field_values(&self) -> StringHandle {
         self.1
     }
-
-    fn number_field_value(&self, _field_index: u32) -> f64 {
-        unreachable!()
-    }
-
-    fn flow_field_value(&self, _field_index: u32) -> u64 {
-        unreachable!()
-    }
 }
 
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -722,6 +710,8 @@ pub fn handle_coreclr_event(
 pub struct OtherClrMarker(StringHandle, StringHandle);
 
 impl Marker for OtherClrMarker {
+    type FieldsType = StringHandle;
+
     const UNIQUE_MARKER_TYPE_NAME: &'static str = "OtherClrMarker";
 
     const CATEGORY: Category<'static> = Category("CLR", CategoryColor::Blue);
@@ -731,21 +721,13 @@ impl Marker for OtherClrMarker {
     const TOOLTIP_LABEL: Option<&'static str> = Some("{marker.data.name}");
     const TABLE_LABEL: Option<&'static str> = Some("{marker.name} - {marker.data.name}");
 
-    const FIELDS: &'static [MarkerField] = &[MarkerField::string("name", "Name")];
+    const FIELDS: Schema<Self::FieldsType> = Schema(MarkerField::string("name", "Name"));
 
     fn name(&self, _profile: &mut Profile) -> StringHandle {
         self.0
     }
 
-    fn string_field_value(&self, _field_index: u32) -> StringHandle {
+    fn field_values(&self) -> StringHandle {
         self.1
     }
-
-    fn number_field_value(&self, _field_index: u32) -> f64 {
-        unreachable!()
-    }
-
-    fn flow_field_value(&self, _field_index: u32) -> u64 {
-        unreachable!()
-    }
 }

samply/src/windows/profile_context.rs

@@ -5,8 +5,8 @@ use std::time::Duration;
 use debugid::DebugId;
 use fxprof_processed_profile::{
     Category, CategoryColor, CategoryHandle, CounterHandle, CpuDelta, FrameFlags, LibraryHandle,
-    LibraryInfo, Marker, Marker, MarkerField, MarkerFieldFormat, MarkerHandle, MarkerLocations,
-    MarkerTiming, ProcessHandle, Profile, SamplingInterval, StringHandle, ThreadHandle, Timestamp,
+    LibraryInfo, Marker, MarkerField, MarkerHandle, MarkerLocations, MarkerTiming, ProcessHandle,
+    Profile, SamplingInterval, Schema, StringHandle, ThreadHandle, Timestamp,
 };
 use shlex::Shlex;
 use wholesym::PeCodeId;
@@ -1541,29 +1541,21 @@ impl ProfileContext {
         pub struct VSyncMarker;
 
         impl Marker for VSyncMarker {
+            type FieldsType = ();
+
             const UNIQUE_MARKER_TYPE_NAME: &'static str = "Vsync";
 
             const LOCATIONS: MarkerLocations = MarkerLocations::MARKER_CHART
                 .union(MarkerLocations::MARKER_TABLE)
                 .union(MarkerLocations::TIMELINE_OVERVIEW);
 
-            const FIELDS: &'static [MarkerField] = &[];
+            const FIELDS: Schema<Self::FieldsType> = Schema(());
 
             fn name(&self, profile: &mut Profile) -> StringHandle {
                 profile.handle_for_string("Vsync")
             }
 
-            fn string_field_value(&self, _field_index: u32) -> StringHandle {
-                unreachable!()
-            }
-
-            fn number_field_value(&self, _field_index: u32) -> f64 {
-                unreachable!()
-            }
-
-            fn flow_field_value(&self, _field_index: u32) -> u64 {
-                unreachable!()
-            }
+            fn field_values(&self) {}
         }
 
         let gpu_thread = self.gpu_thread_handle.get_or_insert_with(|| {
@@ -2198,29 +2190,23 @@ pub fn make_thread_label(
 pub struct FreeformMarker(StringHandle, StringHandle);
 
 impl Marker for FreeformMarker {
+    type FieldsType = StringHandle;
+
     const UNIQUE_MARKER_TYPE_NAME: &'static str = "FreeformMarker";
 
     const CHART_LABEL: Option<&'static str> = Some("{marker.data.values}");
     const TOOLTIP_LABEL: Option<&'static str> = Some("{marker.name} - {marker.data.values}");
     const TABLE_LABEL: Option<&'static str> = Some("{marker.name} - {marker.data.values}");
 
-    const FIELDS: &'static [MarkerField] = &[MarkerField::string("values", "Values")];
+    const FIELDS: Schema<Self::FieldsType> = Schema(MarkerField::string("values", "Values"));
 
     fn name(&self, _profile: &mut Profile) -> StringHandle {
         self.0
     }
 
-    fn string_field_value(&self, _field_index: u32) -> StringHandle {
+    fn field_values(&self) -> StringHandle {
         self.1
     }
-
-    fn number_field_value(&self, _field_index: u32) -> f64 {
-        unreachable!()
-    }
-
-    fn flow_field_value(&self, _field_index: u32) -> u64 {
-        unreachable!()
-    }
 }
 
 fn extract_filename(path: &str) -> &str {