Feature/new mid

.gitignore

@@ -1,4 +1,4 @@
-## Ignore Visual Studio temporary files, build results, and
+## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 
 # Build results
@@ -22,6 +22,7 @@ PresentMon/nul
 
 # Visual Studio 2015 cache/options directory
 .vs/
+AGENTS.md
 
 # Visual C++ cache files
 ipch/
@@ -68,4 +69,4 @@ PresentMon/ddETWExternalEventsTEMP.BIN
 # Local runsettings files (user-specific test configurations)
 *.local.runsettings
 
-Directory.Build.props
+Directory.Build.props

IntelPresentMon/AppCef/ipm-ui-vue/presets/preset-0.json

@@ -13,7 +13,7 @@
                   "metricId": 3,
                   "arrayIndex": 0,
                   "deviceId": 0,
-                  "statId": 7,
+                  "statId": 0,
                   "desiredUnitId": 0
                },
                "lineColor": {
@@ -217,4 +217,4 @@
          "textSize": 11
       }
    ]
-}
+}

IntelPresentMon/AppCef/ipm-ui-vue/presets/preset-1.json

@@ -13,7 +13,7 @@
                   "metricId": 3,
                   "arrayIndex": 0,
                   "deviceId": 0,
-                  "statId": 7,
+                  "statId": 0,
                   "desiredUnitId": 0
                },
                "lineColor": {
@@ -658,7 +658,7 @@
                   "metricId": 48,
                   "arrayIndex": 0,
                   "deviceId": 0,
-                  "statId": 1,
+                  "statId": 0,
                   "desiredUnitId": 0
                },
                "lineColor": {
@@ -733,4 +733,4 @@
          "textSize": 11
       }
    ]
-}
+}

IntelPresentMon/AppCef/ipm-ui-vue/presets/preset-2.json

@@ -13,7 +13,7 @@
                   "metricId": 3,
                   "arrayIndex": 0,
                   "deviceId": 0,
-                  "statId": 7,
+                  "statId": 0,
                   "desiredUnitId": 0
                },
                "lineColor": {
@@ -398,4 +398,4 @@
          "textSize": 11
       }
    ]
-}
+}

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

@@ -1,4 +1,4 @@
-// Copyright (C) 2022 Intel Corporation
+// Copyright (C) 2022 Intel Corporation
 // SPDX-License-Identifier: MIT
 import { type Metric } from '@/core/metric'
 import { type Stat } from './stat'
@@ -54,11 +54,13 @@ export class Api {
     static async loadEnvVars(): Promise<EnvVars> {
         return await this.invokeEndpointFuture('loadEnvVars', {});
     }
-    static async introspect(): Promise<{metrics: Metric[], stats: Stat[], units: Unit[]}> {
+    static async introspect(): Promise<{metrics: Metric[], stats: Stat[], units: Unit[], systemDeviceId: number, defaultAdapterId: number}> {
         const introData = await this.invokeEndpointFuture('Introspect', {});
-        if (!Array.isArray(introData.metrics) || !Array.isArray(introData.stats) || !Array.isArray(introData.units)) {
+        if (!Array.isArray(introData.metrics) || !Array.isArray(introData.stats) ||
+            !Array.isArray(introData.units) || typeof introData.systemDeviceId !== 'number' ||
+            typeof introData.defaultAdapterId !== 'number') {
             console.log("error intro call");
-            throw new Error('Bad (non-array) member type returned from introspect');
+            throw new Error('Bad member type returned from introspect');
         }
         return introData;
     }
@@ -152,4 +154,4 @@ export class Api {
     static registerStalePidHandler(callback: () => void) {
         this.core.registerSignalHandler('stalePid', callback);
     }
-}
+}

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

@@ -1,4 +1,4 @@
-// Copyright (C) 2022 Intel Corporation
+// Copyright (C) 2022 Intel Corporation
 // SPDX-License-Identifier: MIT
 export interface Metric {
     id: number,
@@ -12,4 +12,4 @@ export interface Metric {
     // not used yet in frontend -> backend fills in selected adapter id IF metric is not universal
     availableDeviceIds: number[],
     numeric: boolean,
-}
+}

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

@@ -1,4 +1,4 @@
-import { ref, computed } from 'vue';
+import { ref, computed } from 'vue';
 import { defineStore } from 'pinia';
 import { Api } from '@/core/api';
 import type { Metric } from '@/core/metric';
@@ -11,6 +11,8 @@ export const useIntrospectionStore = defineStore('introspection', () => {
   const metrics = ref<Metric[]>([]);
   const stats = ref<Stat[]>([]);
   const units = ref<Unit[]>([]);
+  const systemDeviceId = ref<number>(0);
+  const defaultAdapterId = ref<number>(0);
 
   // === Computed ===
   const metricOptions = computed<MetricOption[]>(() => {
@@ -25,11 +27,13 @@ export const useIntrospectionStore = defineStore('introspection', () => {
 
   // === Actions ===
   async function load() {
-    if (metrics.value.length === 0) {
+    if (metrics.value.length === 0 || systemDeviceId.value === 0 || defaultAdapterId.value === 0) {
       const intro = await Api.introspect();
       metrics.value = intro.metrics;
       stats.value = intro.stats;
       units.value = intro.units;
+      systemDeviceId.value = intro.systemDeviceId;
+      defaultAdapterId.value = intro.defaultAdapterId;
     }
   }
 
@@ -38,7 +42,9 @@ export const useIntrospectionStore = defineStore('introspection', () => {
     metrics,
     stats,
     units,
+    systemDeviceId,
+    defaultAdapterId,
     metricOptions,
     load
   };
-});
+});

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

@@ -1,4 +1,4 @@
-// Copyright (C) 2022 Intel Corporation
+// Copyright (C) 2022 Intel Corporation
 // SPDX-License-Identifier: MIT
 import { ref, computed } from 'vue';
 import { defineStore } from 'pinia';
@@ -114,8 +114,11 @@ export const usePreferencesStore = defineStore('preferences', () => {
   }
 
   async function pushSpecification() {
+    await intro.load();
     // we need to get a non-proxy object for the  call
     const widgets = deepToRaw(loadout.widgets);
+    const systemDeviceId = intro.systemDeviceId;
+    const defaultAdapterId = intro.defaultAdapterId;
     for (const widget of widgets) {
       // Filter out the widgetMetrics that do not meet the condition, modify those that do
       widget.metrics = widget.metrics.filter(widgetMetric => {
@@ -128,13 +131,18 @@ export const usePreferencesStore = defineStore('preferences', () => {
         widgetMetric.metric.deviceId = 0; // establish universal device id
         // Check whether metric is a gpu metric, then we need non-universal device id
         if (!metric.availableDeviceIds.includes(0)) {
-          // if no specific adapter id set, assume adapter id = 1 is active
-          const adapterId = preferences.value.adapterId !== null ? preferences.value.adapterId : 1;
-          // Set adapter id for this query element to the active one if available
-          if (metric.availableDeviceIds.includes(adapterId)) {
-            widgetMetric.metric.deviceId = adapterId;
-          } else { // if active adapter id is not available drop this widgetMetric
-            return false;
+          // if this is a system metric, deviceId needs to be set to fixed id
+          if (metric.availableDeviceIds.includes(systemDeviceId)) {
+            widgetMetric.metric.deviceId = systemDeviceId;
+          }
+          else {
+            const adapterId = preferences.value.adapterId !== null ? preferences.value.adapterId : defaultAdapterId;
+            // Set adapter id for this query element to the active one if available
+            if (adapterId !== 0 && metric.availableDeviceIds.includes(adapterId)) {
+              widgetMetric.metric.deviceId = adapterId;
+            } else { // if active adapter id is not available drop this widgetMetric
+              return false;
+            }
           }
         }
         // Fill out the unit
@@ -178,4 +186,4 @@ export const usePreferencesStore = defineStore('preferences', () => {
     initPreferences,
     resetPreferences
   };
-});
+});

IntelPresentMon/AppCef/source/util/KernelActionRegistration.cpp

@@ -1,4 +1,4 @@
-#include "IpcInvocationManager.h"
+#include "IpcInvocationManager.h"
 #include "../../../KernelProcess/kact/AllActions.h"
 namespace p2c::client::util::kact {
 	template<class A>
@@ -9,7 +9,6 @@ namespace p2c::client::util::kact {
 	IpcActionRegistrator<kproc::kact::EnumerateAdapters> reg_ibind_EnumerateAdapters_;
 	IpcActionRegistrator<kproc::kact::Introspect> reg_ibind_Introspect_;
 	IpcActionRegistrator<kproc::kact::PushSpecification> reg_ibind_PushSpecification_;
-	IpcActionRegistrator<kproc::kact::SetAdapter> reg_ibind_SetAdapter_;
 	IpcActionRegistrator<kproc::kact::SetCapture> reg_ibind_SetCapture_;
 	IpcActionRegistrator<kproc::kact::BindHotkey> reg_ibind_BindHotkey_;
 	IpcActionRegistrator<kproc::kact::ClearHotkey> reg_ibind_ClearHotkey_;

IntelPresentMon/AppCef/source/winmain.cpp

@@ -194,7 +194,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
     }
 
     // name this process / thread
-    log::IdentificationTable::AddThisProcess(opt.cefType.AsOptional().value_or("main-client"));
+    log::IdentificationTable::AddThisProcess("cef-" + opt.cefType.AsOptional().value_or("mclient"));
     log::IdentificationTable::AddThisThread("main");
 
     // initialize the logging system