Merge branch 'feat/pciutils_get_gpu_speed'

Author: keton

.clang-format

@@ -1,4 +1,4 @@
-BasedOnStyle: GNU
+BasedOnStyle: Microsoft
 
 TabWidth: 4
 IndentWidth: 4
@@ -13,3 +13,5 @@ PenaltyReturnTypeOnItsOwnLine: 1000
 ColumnLimit: 100
 BreakBeforeBraces: Mozilla
 SpaceBeforeParens: Never
+AllowShortEnumsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None

.vscode/launch.json

@@ -8,7 +8,7 @@
             "name": "(Windows) Launch",
             "type": "cppvsdbg",
             "request": "launch",
-            "program": "builddir/src/pciutils_template.exe",
+            "program": "builddir/src/gpu_speed.exe",
             "args": [],
             "stopAtEntry": true,
             "cwd": "${workspaceRoot}",

assets/meson.build

@@ -1,9 +1,6 @@
 
 # download PCI IDs database
-# update-pciids.cmd places output in cwd so we need to copy it into build folder first
-fs = import('fs')
-update_pciids = fs.copyfile('update-pciids.cmd')[0]
-pciids = custom_target('update_pciids', command: update_pciids, output: 'pci.ids.gz')
+pciids = custom_target('update_pciids', command: ['update-pciids.cmd', '@OUTPUT@'], output: 'pci.ids.gz')
 
 windows = import('windows')
 program_rc = windows.compile_resources('program_rc.rc', include_directories:'../src', depends: pciids)

assets/program_icon.ico

@@ -1,6 +1,6 @@
 @set @foo=1 /*
 @echo off
-cscript %0 //E:JScript //Nologo
+cscript %0 //E:JScript //Nologo %1
 goto end
 */;
 
@@ -10,6 +10,10 @@ var adSaveCreateOverWrite = 2;
 var SRC = "http://pci-ids.ucw.cz/v2.2/pci.ids.gz";
 var DEST = "pci.ids.gz";
 
+if(WScript.Arguments.length == 1) {
+	DEST = WScript.Arguments(0)
+}
+
 var XMLHTTP = new ActiveXObject("MSXML2.XMLHTTP");
 XMLHTTP.open("GET", SRC, false);
 XMLHTTP.send();

assets/update-pciids.cmd

@@ -1,4 +1,4 @@
-project('pciutils_template', ['c','cpp'],
+project('gpu_speed', ['c','cpp'],
   version : run_command('git', 'describe', '--tags', check: true).stdout().strip().replace('v',''),
   default_options : ['warning_level=3', 'c_std=c17', 'cpp_std=c++20'])
 

meson.build

@@ -0,0 +1,67 @@
+#include <fcntl.h>
+#include <io.h>
+#include <stdio.h>
+#include <windows.h>
+
+#include "console.h"
+
+static bool attached_console = false;
+static bool allocated_console = false;
+
+void console_init(void)
+{
+	attached_console = AttachConsole(ATTACH_PARENT_PROCESS);
+	if(!attached_console) {
+		allocated_console = AllocConsole();
+	}
+
+	// don't mess with file handles in case of console application
+	if(!attached_console && !allocated_console) {
+		return;
+	}
+
+	FILE *dummy = NULL;
+	freopen_s(&dummy, "CONOUT$", "wt", stdout);
+	freopen_s(&dummy, "CONOUT$", "wt", stderr);
+	freopen_s(&dummy, "CONIN$", "r", stdin);
+
+	// clear command prompt that was printed into the first line
+	if(attached_console) {
+		printf("\33[2K\r");
+	}
+}
+
+void console_free(void)
+{
+	// send fake enter code to unblock command line after exit
+	if(attached_console) {
+		SendMessage(GetConsoleWindow(), WM_CHAR, VK_RETURN, 0);
+	}
+
+	if(attached_console || allocated_console) {
+		FreeConsole();
+	}
+}
+
+// returns true if current console is attached to parent terminal window
+bool console_is_attached(void)
+{
+	return attached_console;
+}
+
+// returns true if separate console window has been allocated
+bool console_is_allocated(void)
+{
+	return allocated_console;
+}
+
+// blocks till any key is pressed
+void console_wait_anykey(void)
+{
+	DWORD cc;
+	INPUT_RECORD irec;
+	while(ReadConsoleInput(GetStdHandle(STD_INPUT_HANDLE), &irec, 1, &cc)) {
+		if(irec.EventType == KEY_EVENT && ((irec.Event).KeyEvent).bKeyDown)
+			break;
+	}
+}

src/console.c

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stdbool.h>
+
+void console_init(void);
+void console_free(void);
+
+// returns true if current console is attached to parent terminal window
+bool console_is_attached(void);
+
+// returns true if separate console window has been allocated
+bool console_is_allocated(void);
+
+// blocks till any key is pressed
+void console_wait_anykey(void);

src/console.h

@@ -1,49 +1,119 @@
+#include <math.h>
+#include <stdbool.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <windows.h>
 
-#include "pci.h"
-#include "rc_manager.h"
+#include "console.h"
+#include "pcie_speed.h"
+#include "toast.h"
 
-/*
- *	The PCI Library -- Example of use (simplistic lister of PCI devices)
- *
- *	Written by Martin Mares and put to public domain. You can do
- *	with it anything you want, but I don't give you any warranty.
- */
-static int pcilib_main(void)
+#define PCI_CLASS_VGA			   "0300"
+#define PCI_FILTER_STR			   "::" PCI_CLASS_VGA
+
+#define TOAST_SLEEP_MS			   (60 * 1000)
+
+#define COMMAND_QUIET			   L"--quiet"
+#define COMMAND_QUIET_SHORT		   L"-q"
+#define COMMAND_ALWAYS_TOAST	   L"--always"
+#define COMMAND_ALWAYS_TOAST_SHORT L"-a"
+
+static int check_gpu_speed(bool *const toast_shown, const bool always_show_toast)
 {
-	struct pci_access *pacc;
-	struct pci_dev *dev;
-	unsigned int c;
-	char namebuf[1024], *name;
-
-	pacc = pci_alloc(); /* Get the pci_access structure */
-	/* Set all options you want -- here we stick with the defaults */
-	pci_init(pacc);								   /* Initialize the PCI library */
-	pci_scan_bus(pacc);							   /* We want to get the list of devices */
-	for(dev = pacc->devices; dev; dev = dev->next) /* Iterate over all devices */
-	{
-		pci_fill_info(dev, PCI_FILL_IDENT | PCI_FILL_BASES
-							   | PCI_FILL_CLASS);  /* Fill in header info we need */
-		c = pci_read_byte(dev, PCI_INTERRUPT_PIN); /* Read config register directly */
-		printf("%04x:%02x:%02x.%d vendor=%04x device=%04x class=%04x irq=%d (pin %d) base0=%lx",
-			   dev->domain, dev->bus, dev->dev, dev->func, dev->vendor_id, dev->device_id,
-			   dev->device_class, dev->irq, c, (long)dev->base_addr[0]);
-
-		/* Look up and print the full name of the device */
-		name = pci_lookup_name(pacc, namebuf, sizeof(namebuf), PCI_LOOKUP_DEVICE, dev->vendor_id,
-							   dev->device_id);
-		printf(" (%s)\n", name);
-	}
-	pci_cleanup(pacc); /* Close everything */
-	return 0;
+	struct pcie_speed_data pci = {0};
+
+	if(pcie_speed_get(PCI_FILTER_STR, &pci) != EXIT_SUCCESS) {
+		fprintf(stderr, "Failed to get PCIe device data\n");
+		return EXIT_FAILURE;
+	}
+
+	for(size_t i = 0; i < pci.len; i++) {
+
+		struct pcie_speed_entry *entry = &pci.data[i];
+
+		printf("%s\n", entry->name);
+		printf("\tLnkCap:\tMaximum Link Speed %s, Maximum Link Width x%d\n",
+			   pcie_speed_to_str(entry->lnk_cap_speed), entry->lnk_cap_width);
+		printf("\tLnkSta:\tNegotiated Link Speed %s, Negotiated Link Width x%d\n",
+			   pcie_speed_to_str(entry->lnk_sta_speed), entry->lnk_sta_width);
+		printf("\tLnkCap2: Supported Link Speed: 2.5GT/s - %s\n",
+			   pcie_speed_to_str(entry->lnk_cap2_speed));
+		printf("\tLnkCtl2: Target Link Speed: %s\n", pcie_speed_to_str(entry->lnk_ctl2_speed));
+
+		// device is operating at suboptimal speed
+		if((entry->lnk_cap_speed < entry->lnk_cap2_speed) ||
+		   (entry->lnk_sta_speed < entry->lnk_cap2_speed) || always_show_toast) {
+			char buff[1024] = {0};
+			snprintf(buff, sizeof(buff), "PCIe speed %s instead of %s",
+					 pcie_speed_to_str(min(entry->lnk_cap_speed, entry->lnk_sta_speed)),
+					 pcie_speed_to_str(entry->lnk_cap2_speed));
+
+			toast_show("GPU Speed error", entry->name, buff, TOAST_SLEEP_MS);
+
+			*toast_shown = true;
+
+			printf("Warning: device is operating at suboptimal speed %s instead of %s\n",
+				   pcie_speed_to_str(min(entry->lnk_cap_speed, entry->lnk_sta_speed)),
+				   pcie_speed_to_str(entry->lnk_cap2_speed));
+		}
+	}
+
+	pcie_speed_data_free(&pci);
+
+	return EXIT_SUCCESS;
 }
 
-int main(void)
+int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PWSTR pCmdLine, int nCmdShow)
 {
-	// unpack all required resources
-	if(rc_manager_init() == 0) {
-		// do something useful with pcilib
-		return pcilib_main();
+	UNREFERENCED_PARAMETER(hInstance);
+	UNREFERENCED_PARAMETER(hPrevInstance);
+	UNREFERENCED_PARAMETER(nCmdShow);
+
+	int ret = EXIT_SUCCESS;
+	bool toast_shown = false;
+	bool always_show_toast = false;
+	bool hide_console = false;
+
+	int argc = 0;
+	LPWSTR *argv = CommandLineToArgvW(pCmdLine, &argc);
+
+	for(int i = 0; i < argc; i++) {
+		if(!wcscmp(COMMAND_QUIET, argv[i]) || !wcscmp(COMMAND_QUIET_SHORT, argv[i])) {
+			hide_console = true;
+		} else if(!wcscmp(COMMAND_ALWAYS_TOAST, argv[i]) ||
+				  !wcscmp(COMMAND_ALWAYS_TOAST_SHORT, argv[i])) {
+			always_show_toast = true;
+		}
+	}
+
+	console_init();
+
+	if(hide_console && console_is_allocated()) {
+		ShowWindow(GetConsoleWindow(), SW_HIDE);
+	}
+
+	if(toast_init() != TOAST_RESULT_SUCCESS) {
+		fprintf(stderr, "Failed to initialize toast\n");
+		ret = EXIT_FAILURE;
+		goto exit;
 	}
-	return 1;
+
+	if(check_gpu_speed(&toast_shown, always_show_toast) != EXIT_SUCCESS) {
+		ret = EXIT_FAILURE;
+		goto exit;
+	}
+
+	if(!toast_shown && !hide_console && console_is_allocated()) {
+		printf("Press any key...\n");
+		console_wait_anykey();
+	}
+
+	if(toast_shown) {
+		Sleep(TOAST_SLEEP_MS);
+	}
+
+exit:
+
+	console_free();
+	return ret;
 }

src/main.c

@@ -1,15 +1,33 @@
 src_files = [
     'main.c',
 	'rc_manager.c',
+	'pcie_speed.c',
+	'console.c',
+	'toast.cpp',
     program_rc,
 ]
 
 inc_dirs = include_directories('.')
 
 pciutils_dep = dependency('pciutils', required: true)
 
+# add WinToast library
+cmake   = import('cmake')
+wintoast_var = cmake.subproject_options()
+wintoast_var.add_cmake_defines({'WINTOASTLIB_BUILD_EXAMPLES': false})
+wintoast_var.add_cmake_defines({'WINTOASTLIB_QT_ENABLED': false})
+wintoast_var.set_override_option('warning_level', '2')
+
+if get_option('buildtype') == 'release'
+	wintoast_var.add_cmake_defines({'CMAKE_BUILD_TYPE': 'release'})
+endif
+
+wintoast_pro = cmake.subproject('wintoast', options: wintoast_var, required: true)
+wintoast_dep = wintoast_pro.dependency('WinToast')
+
 deps = [
 	pciutils_dep,
+	wintoast_dep,
 ]
 
 # run executable as administrator
@@ -18,4 +36,4 @@ link_args = [
 	'/MANIFESTUAC:level=\'requireAdministrator\'',
 ]
 
-executable(meson.project_name(), src_files, include_directories: inc_dirs, dependencies: deps, win_subsystem:'console', link_args: link_args)
+executable(meson.project_name(), src_files, include_directories: inc_dirs, dependencies: deps, win_subsystem:'windows', link_args: link_args)