separate sampling stream

argonne-lcf · Oct 18, 2024 · d549063 · d549063
1 parent 50a28e6
commit d549063
Show file tree

Hide file tree

Showing 4 changed files with 198 additions and 186 deletions.
diff --git a/utils/xprof_utils.hpp b/utils/xprof_utils.hpp
@@ -73,8 +73,8 @@ typedef std::tuple<hostname_t, process_id_t, thread_id_t, thapi_device_id, thapi
 typedef std::tuple<hostname_t, process_id_t, thapi_device_id> hp_device_t;
 typedef std::tuple<hostname_t,  thapi_device_id> h_device_t;
 typedef std::tuple<hostname_t, process_id_t, thapi_device_id, thapi_device_id> hp_dsd_t;
-typedef std::tuple<hostname_t, process_id_t, thapi_device_id, thapi_telemetry_handle, thapi_domain_idx> hp_ddomain_t;
-typedef std::tuple<hostname_t, process_id_t, thapi_device_id, thapi_telemetry_handle, thapi_sdevice_idx, bool> hp_dfsdev_t;
+typedef std::tuple<hostname_t, thapi_device_id, thapi_telemetry_handle, thapi_domain_idx> h_ddomain_t;
+typedef std::tuple<hostname_t, thapi_device_id, thapi_telemetry_handle, thapi_sdevice_idx, bool> h_dfsdev_t;
 typedef std::tuple<long, long> sd_t;
 typedef std::tuple<thread_id_t, thapi_function_name, long> tfn_ts_t;
 typedef std::tuple<thapi_function_name, long> fn_ts_t;

diff --git a/xprof/btx_interval_model.yaml b/xprof/btx_interval_model.yaml
@@ -93,7 +93,21 @@
               :field_class:
                 :type: string
                 :cast_type: const char*
-      - :name: lttng:frequency 
+  - :name: interval_sampling
+    :event_common_context_field_class:
+      :type: structure
+      :members:
+        - :name: hostname
+          :field_class:
+            :type: string
+            :cast_type: const char*
+        - :name: ts
+          :field_class:
+            :type: integer_signed
+            :field_value_range: 64
+            :cast_type: int64_t
+    :event_classes:
+      - :name: sampling:frequency
         :payload_field_class:
           :type: structure
           :members:
@@ -122,7 +136,7 @@
                 :type: integer_unsigned
                 :field_value_range: 64
                 :cast_type: uint64_t
-      - :name: lttng:power 
+      - :name: sampling:power
         :payload_field_class:
           :type: structure
           :members:
@@ -151,7 +165,7 @@
                 :type: integer_unsigned
                 :field_value_range: 64
                 :cast_type: uint64_t
-      - :name: lttng:computeEU
+      - :name: sampling:computeEU
         :payload_field_class:
           :type: structure
           :members:
@@ -179,7 +193,7 @@
               :field_class:
                 :type: single
                 :cast_type: float
-      - :name: lttng:copyEU
+      - :name: sampling:copyEU
         :payload_field_class:
           :type: structure
           :members:
@@ -207,7 +221,7 @@
               :field_class:
                 :type: single
                 :cast_type: float
-      - :name: lttng:fabricPort
+      - :name: sampling:fabricPort
         :payload_field_class:
           :type: structure
           :members:
@@ -257,7 +271,7 @@
               :field_class:
                 :type: double
                 :cast_type: float
-      - :name: lttng:memModule
+      - :name: sampling:memModule
         :payload_field_class:
           :type: structure
           :members: