Zizibob/Relaunch-Process
1
0
Fork 0
mirror of https://github.com/SlothDpal/Relaunch-Process.git synced 2026-02-22 17:27:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4 from SlothDpal/cpuCounter

Browse Source 
Cpu counter
This commit is contained in:
Vladimir
2024-05-29 20:44:15 +04:00
committed by GitHub
parent 8726d20908 dcec7f33e9
commit 6767ddc1bf
5 changed files with 95 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
Form1.Designer.cs generated
View File

@@ -54,6 +54,8 @@ namespace Process_Auto_Relaunch
this.myBackgroundWorker = new System.ComponentModel.BackgroundWorker();
this.groupBoxHistory = new System.Windows.Forms.GroupBox();
this.richTextBoxHistory = new System.Windows.Forms.RichTextBox();
this.statusStrip1 = new System.Windows.Forms.StatusStrip();
this.processInformationLabel = new System.Windows.Forms.ToolStripStatusLabel();
this.groupBoxActions.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit();
this.groupBoxProgramStart.SuspendLayout();
@@ -61,6 +63,7 @@ namespace Process_Auto_Relaunch
this.groupBoxEnabled.SuspendLayout();
this.groupBoxStatus.SuspendLayout();
this.groupBoxHistory.SuspendLayout();
this.statusStrip1.SuspendLayout();
this.SuspendLayout();
//
// groupBoxActions
@@ -76,7 +79,7 @@ namespace Process_Auto_Relaunch
this.groupBoxActions.Margin = new System.Windows.Forms.Padding(4);
this.groupBoxActions.Name = "groupBoxActions";
this.groupBoxActions.Padding = new System.Windows.Forms.Padding(4);
this.groupBoxActions.Size = new System.Drawing.Size(383, 111);
this.groupBoxActions.Size = new System.Drawing.Size(382, 111);
this.groupBoxActions.TabIndex = 0;
this.groupBoxActions.TabStop = false;
this.groupBoxActions.Text = "Действие после отсутствия процесса";
@@ -180,7 +183,7 @@ namespace Process_Auto_Relaunch
this.groupBoxProgramStart.Margin = new System.Windows.Forms.Padding(4);
this.groupBoxProgramStart.Name = "groupBoxProgramStart";
this.groupBoxProgramStart.Padding = new System.Windows.Forms.Padding(4);
this.groupBoxProgramStart.Size = new System.Drawing.Size(383, 139);
this.groupBoxProgramStart.Size = new System.Drawing.Size(382, 139);
this.groupBoxProgramStart.TabIndex = 6;
this.groupBoxProgramStart.TabStop = false;
this.groupBoxProgramStart.Text = "Запуск программы";
@@ -225,7 +228,7 @@ namespace Process_Auto_Relaunch
this.groupBoxProcessName.Margin = new System.Windows.Forms.Padding(4);
this.groupBoxProcessName.Name = "groupBoxProcessName";
this.groupBoxProcessName.Padding = new System.Windows.Forms.Padding(4);
this.groupBoxProcessName.Size = new System.Drawing.Size(383, 62);
this.groupBoxProcessName.Size = new System.Drawing.Size(382, 62);
this.groupBoxProcessName.TabIndex = 8;
this.groupBoxProcessName.TabStop = false;
this.groupBoxProcessName.Text = "Название наблюдаемого процесса (без расширения)";
@@ -238,7 +241,7 @@ namespace Process_Auto_Relaunch
this.textBoxProcessName.Location = new System.Drawing.Point(7, 25);
this.textBoxProcessName.Margin = new System.Windows.Forms.Padding(4);
this.textBoxProcessName.Name = "textBoxProcessName";
this.textBoxProcessName.Size = new System.Drawing.Size(368, 22);
this.textBoxProcessName.Size = new System.Drawing.Size(367, 22);
this.textBoxProcessName.TabIndex = 3;
this.textBoxProcessName.Text = global::RelaunchProcess.Properties.Settings.Default.processName;
//
@@ -255,7 +258,7 @@ namespace Process_Auto_Relaunch
this.groupBoxEnabled.Margin = new System.Windows.Forms.Padding(4);
this.groupBoxEnabled.Name = "groupBoxEnabled";
this.groupBoxEnabled.Padding = new System.Windows.Forms.Padding(4);
this.groupBoxEnabled.Size = new System.Drawing.Size(383, 89);
this.groupBoxEnabled.Size = new System.Drawing.Size(382, 89);
this.groupBoxEnabled.TabIndex = 9;
this.groupBoxEnabled.TabStop = false;
this.groupBoxEnabled.Text = "Состояние";
@@ -324,7 +327,7 @@ namespace Process_Auto_Relaunch
this.groupBoxStatus.Margin = new System.Windows.Forms.Padding(4);
this.groupBoxStatus.Name = "groupBoxStatus";
this.groupBoxStatus.Padding = new System.Windows.Forms.Padding(4);
this.groupBoxStatus.Size = new System.Drawing.Size(383, 64);
this.groupBoxStatus.Size = new System.Drawing.Size(382, 64);
this.groupBoxStatus.TabIndex = 10;
this.groupBoxStatus.TabStop = false;
this.groupBoxStatus.Text = "Текущий статус";
@@ -352,7 +355,7 @@ namespace Process_Auto_Relaunch
this.groupBoxHistory.Controls.Add(this.richTextBoxHistory);
this.groupBoxHistory.Location = new System.Drawing.Point(13, 514);
this.groupBoxHistory.Name = "groupBoxHistory";
this.groupBoxHistory.Size = new System.Drawing.Size(383, 132);
this.groupBoxHistory.Size = new System.Drawing.Size(382, 148);
this.groupBoxHistory.TabIndex = 11;
this.groupBoxHistory.TabStop = false;
this.groupBoxHistory.Text = "История запусков";
@@ -361,18 +364,35 @@ namespace Process_Auto_Relaunch
//
this.richTextBoxHistory.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.richTextBoxHistory.Location = new System.Drawing.Point(0, 21);
this.richTextBoxHistory.Location = new System.Drawing.Point(7, 21);
this.richTextBoxHistory.Name = "richTextBoxHistory";
this.richTextBoxHistory.ReadOnly = true;
this.richTextBoxHistory.Size = new System.Drawing.Size(383, 111);
this.richTextBoxHistory.Size = new System.Drawing.Size(369, 120);
this.richTextBoxHistory.TabIndex = 0;
this.richTextBoxHistory.Text = "";
//
// statusStrip1
//
this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.processInformationLabel});
this.statusStrip1.Location = new System.Drawing.Point(0, 665);
this.statusStrip1.Name = "statusStrip1";
this.statusStrip1.Size = new System.Drawing.Size(420, 22);
this.statusStrip1.TabIndex = 12;
this.statusStrip1.Text = "statusStrip1";
//
// processInformationLabel
//
this.processInformationLabel.Name = "processInformationLabel";
this.processInformationLabel.Size = new System.Drawing.Size(16, 17);
this.processInformationLabel.Text = " ";
//
// Form1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(421, 658);
this.ClientSize = new System.Drawing.Size(420, 687);
this.Controls.Add(this.statusStrip1);
this.Controls.Add(this.groupBoxHistory);
this.Controls.Add(this.groupBoxStatus);
this.Controls.Add(this.groupBoxEnabled);
@@ -400,7 +420,10 @@ namespace Process_Auto_Relaunch
this.groupBoxStatus.ResumeLayout(false);
this.groupBoxStatus.PerformLayout();
this.groupBoxHistory.ResumeLayout(false);
this.statusStrip1.ResumeLayout(false);
this.statusStrip1.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
}
@@ -429,5 +452,7 @@ namespace Process_Auto_Relaunch
private GroupBox groupBoxHistory;
private RichTextBox richTextBoxHistory;
private Button btnShowDiscordSettings;
private StatusStrip statusStrip1;
private ToolStripStatusLabel processInformationLabel;
}
}

36
Form1.cs
View File

@@ -31,6 +31,9 @@ namespace Process_Auto_Relaunch
private readonly UpdateLogDelegate updateLogDelegate;
private DiscordWebhook dwhHook;
private DiscordMessage dwhMessage;
private Process WatchedProcess;
private double cpuLastTime = 0;
private Stopwatch cpuMeasureTimer;
public Form1()
{
@@ -40,17 +43,7 @@ namespace Process_Auto_Relaunch
this.updateLogDelegate += this.HistoryLog;
myBackgroundWorker.WorkerSupportsCancellation = true;
dwhHook = new DiscordWebhook();
/*if ( Uri.IsWellFormedUriString(Settings.Default.dwhURL,UriKind.Absolute) && Settings.Default.dwhEnabled && Settings.Default.dwhURL!="")
{
dwhHook.Url = Settings.Default.dwhURL;
}
else if (Settings.Default.dwhEnabled) {
Debug.WriteLine($"Ошибка в URL веб-хука ({Settings.Default.dwhURL}). Вывод в Discord отключен.");
HistoryLog($"Ошибка в URL веб-хука ({Settings.Default.dwhURL}). Вывод в Discord отключен.");
Settings.Default.dwhEnabled = false;
Settings.Default.Save();
}*/
cpuMeasureTimer = new Stopwatch();
}
/// <summary>
@@ -248,6 +241,7 @@ namespace Process_Auto_Relaunch
private void Form1_FormClosing(object sender, FormClosingEventArgs e)
{
Settings.Default.Save();
Status("Приложение закрыто.", NotifyLevel.logAlways);
}
private bool ProcessByNameIsRuning(string name)
@@ -258,9 +252,11 @@ namespace Process_Auto_Relaunch
{
Debug.WriteLine($"Found proces: {process.ProcessName}. Session Id: {process.SessionId}. Current Session Id: {sessionid}");
if (process.SessionId == sessionid)
{
WatchedProcess = process;
return true;
}
}
Debug.WriteLine($"Process {name} for current session id {sessionid} not found");
return false;
}
@@ -275,8 +271,10 @@ namespace Process_Auto_Relaunch
}
}
WatchedProcess=Process.Start(path, args);
cpuLastTime = 0;
cpuMeasureTimer.Start();
Status("Процесс был запущен.", NotifyLevel.logAlways);
Process.Start(path, args);
}
private void BackgroundWorkerDoWork(object sender, System.ComponentModel.DoWorkEventArgs e)
@@ -288,12 +286,21 @@ namespace Process_Auto_Relaunch
{
if (ProcessByNameIsRuning(textBoxProcessName.Text))
{
Status($"Процесс уже запущен",NotifyLevel.logUpdateStatus);
cpuMeasureTimer.Stop();
double cpuTotalTime = WatchedProcess.TotalProcessorTime.TotalMilliseconds - cpuLastTime;
cpuLastTime = WatchedProcess.TotalProcessorTime.TotalMilliseconds;
double cpuPercent = cpuTotalTime * 100 / (Environment.ProcessorCount * cpuMeasureTimer.ElapsedMilliseconds);
string ProcessAnswer = (WatchedProcess.Responding)?"Активен":"Неактивен";
cpuMeasureTimer.Reset();
cpuMeasureTimer.Start();
Status($"Процесс уже запущен.",NotifyLevel.logUpdateStatus);
processInformationLabel.Text = $"Интерфейс: {ProcessAnswer}. ЦПУ: {cpuPercent:f2}% {cpuTotalTime:f2}мсек";
if (i < (int)numericUpDown1.Value) SendDiscordMessage($"Процесс {textBoxProcessName.Text} запущен.",NotifyLevel.logDiscord);
i = (int)numericUpDown1.Value;
}
else
{
processInformationLabel.Text = "";
if (radioButtonRestartTimer.Checked)
{
if (i==(int)numericUpDown1.Value) Status($"Процесс {textBoxProcessName.Text} не найден. Запуск через {i} сек",NotifyLevel.logDiscord);
@@ -315,6 +322,7 @@ namespace Process_Auto_Relaunch
if (worker.CancellationPending)
{
e.Cancel = true;
processInformationLabel.Text = "";
}
}

3
Form1.resx
View File

@@ -120,6 +120,9 @@
<metadata name="myBackgroundWorker.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>190, 17</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>40</value>
</metadata>

48
Process Auto Relaunch.csproj
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
@@ -29,25 +29,6 @@
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<StartupObject>RelaunchProcess.Program</StartupObject>
</PropertyGroup>
@@ -62,6 +43,26 @@
<PlatformTarget>x64</PlatformTarget>
<OutputPath>bin\x64\Release\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="CSharpDiscordWebhook, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -149,7 +150,10 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>rem copy $(ProjectDir)\CSharpDiscordWebhook\CSharpDiscordWebhook\$(OutDir)\* $(TargetDir)
rem copy $(ProjectDir)\CSharpDiscordWebhook\CSharpDiscordWebhook\$(OutDir)\* $(ProjectDir)</PreBuildEvent>
<PreBuildEvent>
</PreBuildEvent>
</PropertyGroup>
<PropertyGroup>
<PostBuildEvent>powershell.exe Compress-Archive -Path '$(TargetDir)*' -DestinationPath '$(TargetDir)..\..\$(TargetName)-$(PlatformName)-$(ConfigurationName)' -Force</PostBuildEvent>
</PropertyGroup>
</Project>

20
Process Auto Relaunch.sln
View File

@@ -1,4 +1,3 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.9.34622.214
@@ -7,26 +6,25 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Process Auto Relaunch", "Pr
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
DebugFULL|Any CPU = DebugFULL|Any CPU
Debug|x86 = Debug|x86
DebugFULL|x64 = DebugFULL|x64
Release|Any CPU = Release|Any CPU
DebugFULL|x86 = DebugFULL|x86
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{B48F106C-F4E2-4BFB-9BAA-42FC13C03FDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B48F106C-F4E2-4BFB-9BAA-42FC13C03FDD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B48F106C-F4E2-4BFB-9BAA-42FC13C03FDD}.Debug|x64.ActiveCfg = Debug|x64
{B48F106C-F4E2-4BFB-9BAA-42FC13C03FDD}.Debug|x64.Build.0 = Debug|x64
{B48F106C-F4E2-4BFB-9BAA-42FC13C03FDD}.DebugFULL|Any CPU.ActiveCfg = Debug|Any CPU
{B48F106C-F4E2-4BFB-9BAA-42FC13C03FDD}.DebugFULL|Any CPU.Build.0 = Debug|Any CPU
{B48F106C-F4E2-4BFB-9BAA-42FC13C03FDD}.Debug|x86.ActiveCfg = Debug|x86
{B48F106C-F4E2-4BFB-9BAA-42FC13C03FDD}.Debug|x86.Build.0 = Debug|x86
{B48F106C-F4E2-4BFB-9BAA-42FC13C03FDD}.DebugFULL|x64.ActiveCfg = Debug|x64
{B48F106C-F4E2-4BFB-9BAA-42FC13C03FDD}.DebugFULL|x64.Build.0 = Debug|x64
{B48F106C-F4E2-4BFB-9BAA-42FC13C03FDD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B48F106C-F4E2-4BFB-9BAA-42FC13C03FDD}.Release|Any CPU.Build.0 = Release|Any CPU
{B48F106C-F4E2-4BFB-9BAA-42FC13C03FDD}.DebugFULL|x86.ActiveCfg = Debug|x86
{B48F106C-F4E2-4BFB-9BAA-42FC13C03FDD}.DebugFULL|x86.Build.0 = Debug|x86
{B48F106C-F4E2-4BFB-9BAA-42FC13C03FDD}.Release|x64.ActiveCfg = Release|x64
{B48F106C-F4E2-4BFB-9BAA-42FC13C03FDD}.Release|x64.Build.0 = Release|x64
{B48F106C-F4E2-4BFB-9BAA-42FC13C03FDD}.Release|x86.ActiveCfg = Release|x86
{B48F106C-F4E2-4BFB-9BAA-42FC13C03FDD}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE