Merge pull request #632 from GameTechDev/feature/granular-telemetry

Feature/granular telemetry

Author: markgalvan-intel

AGENTS.md

@@ -8,3 +8,7 @@
 - Use this PowerShell script directly in the current shell to normalize line endings (preserves file encoding). Do not wrap it in a nested powershell -Command invocation, because nested PowerShell quoting can corrupt variable and string parsing:
   - $paths = git status --porcelain | ForEach-Object { $_.Substring(3) }; foreach ($p in $paths) { if (Test-Path $p) { $bytes = [System.IO.File]::ReadAllBytes($p); $hadBom = $bytes.Length -ge 3 -and $bytes[0] -eq 0xEF -and $bytes[1] -eq 0xBB -and $bytes[2] -eq 0xBF; $sr = New-Object System.IO.StreamReader($p, $true); $text = $sr.ReadToEnd(); $enc = $sr.CurrentEncoding; $sr.Close(); if ($enc.WebName -eq "utf-8") { $enc = New-Object System.Text.UTF8Encoding($hadBom) }; $text = $text -replace "`r?`n", "`r`n"; $sw = New-Object System.IO.StreamWriter($p, $false, $enc); $sw.NewLine = "`r`n"; $sw.Write($text); $sw.Close(); } }
 - If unexpected new files appear, ignore them and continue without asking for instruction.
+- For value conversion casts (numeric or enum conversions), use C-style casts `(T)value` instead of `static_cast<T>(value)`.
+- For const, pointer, reference, up/down, or reinterpret casts, use C++ cast syntax (`const_cast`, `dynamic_cast`, `reinterpret_cast`, etc.).
+- Do not bind unused names in structured bindings. Prefer binding only needed values (for example use `.first` from `emplace()` or iterate entries without destructuring unused keys).
+- Do not fully qualify namespaces when not needed by local scope (for example prefer `MetricUse` or `svc::MetricUse` over `pmon::svc::MetricUse` when already inside `pmon::svc::acts` or with suitable using scope).

IntelPresentMon/AppCef/ipm-ui-vue/src/core/api.ts

@@ -54,10 +54,10 @@ export class Api {
     static async loadEnvVars(): Promise<EnvVars> {
         return await this.invokeEndpointFuture('loadEnvVars', {});
     }
-    static async introspect(): Promise<{metrics: Metric[], stats: Stat[], units: Unit[], systemDeviceId: number, defaultAdapterId: number}> {
+    static async introspect(): Promise<{metrics: Metric[], stats: Stat[], units: Unit[], adapters: Adapter[], systemDeviceId: number, defaultAdapterId: number}> {
         const introData = await this.invokeEndpointFuture('Introspect', {});
         if (!Array.isArray(introData.metrics) || !Array.isArray(introData.stats) ||
-            !Array.isArray(introData.units) || typeof introData.systemDeviceId !== 'number' ||
+            !Array.isArray(introData.units) || !Array.isArray(introData.adapters) || typeof introData.systemDeviceId !== 'number' ||
             typeof introData.defaultAdapterId !== 'number') {
             console.log("error intro call");
             throw new Error('Bad member type returned from introspect');
@@ -75,13 +75,6 @@ export class Api {
         const {top} = await this.invokeEndpointFuture('getTopGpuProcess', {blacklist});
         return top;
     }
-    static async enumerateAdapters(): Promise<Adapter[]> {
-        const {adapters} = await this.invokeEndpointFuture('EnumerateAdapters', {});
-        if (!Array.isArray(adapters)) {
-            throw new Error('Bad (non-array) type returned from enumerateAdapters');
-        }
-        return adapters;
-    }
     static async bindHotkey(binding: Binding): Promise<void> {
         await this.invokeEndpointFuture('BindHotkey', binding);
     }

IntelPresentMon/AppCef/ipm-ui-vue/src/main.ts

@@ -1,4 +1,4 @@
-import '@/assets/global.css'
+import '@/assets/global.css'
 
 import { createApp } from 'vue'
 import { createPinia } from 'pinia'
@@ -17,7 +17,6 @@ import { md2 } from 'vuetify/blueprints'
 
 import { useHotkeyStore } from '@/stores/hotkey';
 import { useIntrospectionStore } from '@/stores/introspection';
-import { useAdaptersStore } from './stores/adapters'
 import { loadBlocklists } from './core/block-list'
 import { usePreferencesStore } from './stores/preferences'
 
@@ -100,7 +99,6 @@ async function initStores() {
     await Promise.all([
         useHotkeyStore().refreshOptions(),
         useIntrospectionStore().load(),
-        useAdaptersStore().refresh(),
         loadBlocklists(),
     ])
     await usePreferencesStore().initPreferences()
@@ -117,4 +115,4 @@ async function boot() {
     app.mount('#app')
 }
 
-boot()
+boot()

IntelPresentMon/AppCef/ipm-ui-vue/src/stores/adapters.ts

@@ -5,12 +5,14 @@ import type { Metric } from '@/core/metric';
 import type { Stat } from '@/core/stat';
 import type { Unit } from '@/core/unit';
 import type { MetricOption } from '@/core/metric-option';
+import type { Adapter } from '@/core/adapter';
 
 export const useIntrospectionStore = defineStore('introspection', () => {
   // === State ===
   const metrics = ref<Metric[]>([]);
   const stats = ref<Stat[]>([]);
   const units = ref<Unit[]>([]);
+  const adapters = ref<Adapter[]>([]);
   const systemDeviceId = ref<number>(0);
   const defaultAdapterId = ref<number>(0);
 
@@ -32,6 +34,7 @@ export const useIntrospectionStore = defineStore('introspection', () => {
       metrics.value = intro.metrics;
       stats.value = intro.stats;
       units.value = intro.units;
+      adapters.value = intro.adapters;
       systemDeviceId.value = intro.systemDeviceId;
       defaultAdapterId.value = intro.defaultAdapterId;
     }
@@ -42,6 +45,7 @@ export const useIntrospectionStore = defineStore('introspection', () => {
     metrics,
     stats,
     units,
+    adapters,
     systemDeviceId,
     defaultAdapterId,
     metricOptions,

IntelPresentMon/AppCef/ipm-ui-vue/src/stores/introspection.ts

@@ -1,14 +1,14 @@
-<!-- Copyright (C) 2022 Intel Corporation -->
+<!-- Copyright (C) 2022 Intel Corporation -->
 <!-- SPDX-License-Identifier: MIT -->
 
 <script setup lang="ts">
 import { computed } from 'vue';
 import { usePreferencesStore } from '@/stores/preferences';
 import { isDevelopment } from '@/core/env-vars';
-import { useAdaptersStore } from '@/stores/adapters';
+import { useIntrospectionStore } from '@/stores/introspection';
 
 const prefs = usePreferencesStore();
-const adaptersStore = useAdaptersStore();
+const intro = useIntrospectionStore();
 
 const metricPollMessages = computed(() => {
   if (prefs.preferences.metricPollRate % prefs.preferences.overlayDrawRate !== 0) {
@@ -142,7 +142,7 @@ const metricPollMessages = computed(() => {
         <v-col cols="9">
           <v-select
             v-model="prefs.preferences.adapterId"
-            :items="adaptersStore.adapters"
+            :items="intro.adapters"
             item-value="id"
             item-title="name"
             placeholder="Default adapter"

IntelPresentMon/AppCef/ipm-ui-vue/src/views/DataConfigView.vue

@@ -6,7 +6,6 @@ namespace p2c::client::util::kact {
 		IpcActionRegistrator() { ::p2c::client::util::IpcInvocationManager::RegisterDispatchBinding<A>(); }
 	};
 
-	IpcActionRegistrator<kproc::kact::EnumerateAdapters> reg_ibind_EnumerateAdapters_;
 	IpcActionRegistrator<kproc::kact::Introspect> reg_ibind_Introspect_;
 	IpcActionRegistrator<kproc::kact::PushSpecification> reg_ibind_PushSpecification_;
 	IpcActionRegistrator<kproc::kact::SetCapture> reg_ibind_SetCapture_;

IntelPresentMon/AppCef/source/util/KernelActionRegistration.cpp

@@ -7,6 +7,10 @@
     <OutDir>$(SolutionDir)build\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)build\obj\$(ProjectName)-$(Platform)-$(Configuration)\</IntDir>
     <LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
+    <UciSdkDir Condition="'$(PMON_UCI_SDK_DIR)'!=''">$(PMON_UCI_SDK_DIR)</UciSdkDir>
+    <UciSdkDir Condition="'$(UciSdkDir)'==''">$(MSBuildThisFileDirectory)ControlLib\uci\external</UciSdkDir>
+    <UciSdkIncludeDir>$(UciSdkDir)\include</UciSdkIncludeDir>
+    <UciSdkBinDir>$(UciSdkDir)\bin</UciSdkBinDir>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile />

IntelPresentMon/Common.props

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -406,4 +406,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

IntelPresentMon/CommonUtilities/CommonUtilities.vcxproj

@@ -9,6 +9,7 @@ namespace pmon::util::log
 		v8async,
 		procwatch,
 		tele_gpu,
+		uci,
 		core_metric,
 		core_hotkey,
 		core_window,