This commit is contained in:
2026-03-13 23:24:17 +08:00
parent 518de24414
commit b507c5701a
6 changed files with 72 additions and 2 deletions

View File

@@ -1 +1 @@
2026-03-13 19:25:57 2026-03-13 23:19:58

View File

@@ -1 +1 @@
8041376 518de24

View File

@@ -61,6 +61,10 @@ namespace CMLeonOS.Gui
ProcessManager.AddProcess(windowManager, new Sound.SoundService()).Start(); ProcessManager.AddProcess(windowManager, new Sound.SoundService()).Start();
ProcessManager.AddProcess(windowManager, new MemService()).Start();
Logger.Logger.Instance.Info("Gui", "Memory management service started");
Console.WriteLine("Starting lock screen..."); Console.WriteLine("Starting lock screen...");
ProcessManager.AddProcess(windowManager, new ShellComponents.Lock()).Start(); ProcessManager.AddProcess(windowManager, new ShellComponents.Lock()).Start();

View File

@@ -20,6 +20,7 @@ using CMLeonOS;
using CMLeonOS.Gui.ShellComponents; using CMLeonOS.Gui.ShellComponents;
using CMLeonOS.Settings; using CMLeonOS.Settings;
using CMLeonOS.Driver; using CMLeonOS.Driver;
using CMLeonOS.Logger;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing; using System.Drawing;
@@ -183,12 +184,17 @@ namespace CMLeonOS.Gui
Windows.Add(window); Windows.Add(window);
Logger.Logger.Instance.Debug("WindowManager", $"Added window: {window.GetType().Name}");
UpdateDock(); UpdateDock();
} }
internal void RemoveWindow(Window window, bool rerender = true) internal void RemoveWindow(Window window, bool rerender = true)
{ {
Windows.Remove(window); Windows.Remove(window);
Logger.Logger.Instance.Debug("WindowManager", $"Removed window: {window.GetType().Name}");
for (int i = Windows.Count - 1; i >= 0; i--) for (int i = Windows.Count - 1; i >= 0; i--)
{ {
if (i >= Windows.Count) continue; if (i >= Windows.Count) continue;
@@ -387,22 +393,30 @@ namespace CMLeonOS.Gui
{ {
base.Start(); base.Start();
Logger.Logger.Instance.Info("WindowManager", "Starting WindowManager service");
SettingsService settingsService = ProcessManager.GetProcess<SettingsService>(); SettingsService settingsService = ProcessManager.GetProcess<SettingsService>();
ScreenWidth = (uint)settingsService.Mode.Width; ScreenWidth = (uint)settingsService.Mode.Width;
ScreenHeight = (uint)settingsService.Mode.Height; ScreenHeight = (uint)settingsService.Mode.Height;
bytesPerPixel = 4; bytesPerPixel = 4;
Logger.Logger.Instance.Info("WindowManager", $"Screen resolution: {ScreenWidth}x{ScreenHeight}");
SetupDriver(); SetupDriver();
SetupMouse(); SetupMouse();
SetupWallpaper(); SetupWallpaper();
RenderWallpaper(); RenderWallpaper();
Logger.Logger.Instance.Info("WindowManager", "Driver, mouse, and wallpaper initialized");
fpsCounter = new Window(this, (int)(ScreenWidth) - 64, (int)(ScreenHeight - 16), 64, 16); fpsCounter = new Window(this, (int)(ScreenWidth) - 64, (int)(ScreenHeight - 16), 64, 16);
if (SettingsManager.GUI_ShowFps) if (SettingsManager.GUI_ShowFps)
{ {
AddWindow(fpsCounter); AddWindow(fpsCounter);
} }
Logger.Logger.Instance.Success("WindowManager", "WindowManager started successfully");
} }
public override void Run() public override void Run()

42
System/MemService.cs Normal file
View File

@@ -0,0 +1,42 @@
// The CMLeonOS Project (https://github.com/Leonmmcoset/CMLeonOS)
// Copyright (C) 2025-present LeonOS 2 Developer Team
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>.
using CMLeonOS.Logger;
namespace CMLeonOS
{
internal class MemService : Process
{
internal MemService() : base("MemService", ProcessType.Service)
{
Critical = true;
}
int ticks = 0;
public override void Run()
{
if (ticks == 5)
{
ticks = 0;
Cosmos.Core.Memory.Heap.Collect();
ProcessManager.Sweep();
Logger.Logger.Instance.Debug("MemService", "Memory garbage collection and process sweep completed");
}
ticks++;
}
}
}

View File

@@ -15,6 +15,7 @@
// along with this program. If not, see <https://www.gnu.org/licenses/>. // along with this program. If not, see <https://www.gnu.org/licenses/>.
using System.Collections.Generic; using System.Collections.Generic;
using CMLeonOS.Logger;
namespace CMLeonOS namespace CMLeonOS
{ {
@@ -43,18 +44,27 @@ namespace CMLeonOS
Processes.Add(process); Processes.Add(process);
Logger.Logger.Instance.Debug("ProcessManager", $"Added process: {process.Name} (ID: {process.Id})");
return process; return process;
} }
public static void Sweep() public static void Sweep()
{ {
int removedCount = 0;
for (int i = Processes.Count - 1; i >= 0; i--) for (int i = Processes.Count - 1; i >= 0; i--)
{ {
if (!Processes[i].IsRunning) if (!Processes[i].IsRunning)
{ {
Processes.Remove(Processes[i]); Processes.Remove(Processes[i]);
removedCount++;
} }
} }
if (removedCount > 0)
{
Logger.Logger.Instance.Debug("ProcessManager", $"Swept {removedCount} stopped processes");
}
} }
public static void Yield() public static void Yield()