rawhide_k/ryzen-smu-cli
1
0
Fork 0
mirror of https://github.com/rawhide-kobayashi/ryzen-smu-cli.git synced 2025-04-16 12:51:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

Added exit codes and stderr output

Browse Source
This commit is contained in:
sp00n 2025-04-02 04:11:24 +02:00
parent fe26e9dc75
commit 298526378c
2 changed files with 79 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
ryzen-smu-cli/Program.cs
View File

@ -14,7 +14,7 @@ namespace ryzen_smu_cli
{ {
if (!IsAdministrator()) if (!IsAdministrator())
{ {
Console.WriteLine("This application must be run as an administrator."); Console.Error.WriteLine("This application must be run as an administrator.");
Environment.Exit(1); Environment.Exit(1);
} }
@ -24,9 +24,9 @@ namespace ryzen_smu_cli
} }
catch (Exception ex) catch (Exception ex)
{ {
Console.WriteLine($"Error: {ex.Message}"); Console.Error.WriteLine($"Error: {ex.Message}");
Console.WriteLine("If the previous message was unclear, for some reason, ZenStates-Core failed to initialize an instance of the CPU control object."); Console.Error.WriteLine("If the previous message was unclear, for some reason, ZenStates-Core failed to initialize an instance of the CPU control object.");
Environment.Exit(1); Environment.Exit(2);
} }
mappedCores = MapLogicalCoresToPhysical(); mappedCores = MapLogicalCoresToPhysical();
@ -47,7 +47,7 @@ namespace ryzen_smu_cli
{ {
if (!IsAdministrator()) if (!IsAdministrator())
{ {
Console.WriteLine("This application must be run as an administrator."); Console.Error.WriteLine("This application must be run as an administrator.");
Environment.Exit(1); Environment.Exit(1);
} }
@ -237,16 +237,30 @@ namespace ryzen_smu_cli
private static void ApplyPBOOffset(string offsetArgs) private static void ApplyPBOOffset(string offsetArgs)
{ {
// This checks if the current SKU has a known register for writing PBO offsets // This checks if the current SKU has a known register for writing PBO offsets
if (ryzen.smu.Rsmu.SMU_MSG_SetDldoPsmMargin != 0) if (ryzen.smu.Rsmu.SMU_MSG_SetDldoPsmMargin == 0)
{ {
Console.Error.WriteLine("You have attempted to enable PBO offsets on a CPU that does not support them.");
Environment.Exit(3);
}
string validArgFormat = @"^(-?\d{1,2}(,-?\d{1,2})*|\d{1,2}:-?\d{1,2}(,\d{1,2}:-?\d{1,2})*)$"; string validArgFormat = @"^(-?\d{1,2}(,-?\d{1,2})*|\d{1,2}:-?\d{1,2}(,\d{1,2}:-?\d{1,2})*)$";
if (Regex.IsMatch(offsetArgs, validArgFormat)) if (!Regex.IsMatch(offsetArgs, validArgFormat))
{ {
Console.Error.WriteLine("Malformed input format for offsets. Please check and try again.");
Environment.Exit(4);
}
string[] arg = offsetArgs.Split(','); string[] arg = offsetArgs.Split(',');
if (arg.Length <= mappedCores.Count) if (arg.Length > mappedCores.Count)
{ {
Console.Error.WriteLine("Specified a greater number of offsets than logical cores active in the system. Please check and try again.");
Environment.Exit(5);
}
for (int i = 0; i < arg.Length; i++) for (int i = 0; i < arg.Length; i++)
{ {
// Magic numbers from SMUDebugTool // Magic numbers from SMUDebugTool
@ -273,20 +287,12 @@ namespace ryzen_smu_cli
catch (KeyNotFoundException) catch (KeyNotFoundException)
{ {
Console.WriteLine($"Tried to set an offset on logical core {Convert.ToInt32(arg[i].Split(':')[0])}, but there are only {mappedCores.Count} (zero-indexed, as a reminder) logical cores active in the system."); Console.Error.WriteLine($"Tried to set an offset on logical core {Convert.ToInt32(arg[i].Split(':')[0])}, but there are only {mappedCores.Count} (zero-indexed, as a reminder) logical cores active in the system.");
Environment.Exit(6);
} }
} }
} }
else Console.WriteLine("Specified a greater number of offsets than logical cores active in the system. Please check and try again.");
}
else Console.WriteLine("Malformed input format for offsets. Please check and try again.");
}
else Console.WriteLine("You have attempted to enable PBO offsets on a CPU that does not support them.");
}
private static void ApplyDisableCores(string coreArgs = "Enable") private static void ApplyDisableCores(string coreArgs = "Enable")
{ {
if (!wmiPopulated) PopulateWmiFunctions(); if (!wmiPopulated) PopulateWmiFunctions();
@ -297,8 +303,11 @@ namespace ryzen_smu_cli
var cmdItem = availableCommands.FirstOrDefault(item => item.text.Contains("Software Downcore Config")); var cmdItem = availableCommands.FirstOrDefault(item => item.text.Contains("Software Downcore Config"));
if (cmdItem != null) if ( cmdItem == null ) {
{ Console.Error.WriteLine("Something has gone terribly wrong, the downcore config option is not present.");
Environment.Exit(7);
}
for (int i = 0; i < ccds.Length; i++) for (int i = 0; i < ccds.Length; i++)
{ {
if (coreArgs != "Enable") if (coreArgs != "Enable")
@ -322,12 +331,6 @@ namespace ryzen_smu_cli
} }
} }
else
{
Console.WriteLine("Something has gone terribly wrong, the downcore config option is not present.");
}
}
private static bool IsAdministrator() private static bool IsAdministrator()
{ {
using (WindowsIdentity identity = WindowsIdentity.GetCurrent()) using (WindowsIdentity identity = WindowsIdentity.GetCurrent())

2
ryzen-smu-cli/ryzen-smu-cli.csproj
View File

@ -6,7 +6,7 @@
<RootNamespace>ryzen_smu_cli</RootNamespace> <RootNamespace>ryzen_smu_cli</RootNamespace>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<Version>0.1.1</Version> <Version>0.1.2</Version>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>