KolibriOS/kolibrios
13
14
Fork 12
Code Issues 113 Pull Requests 16 Actions Projects 1 Releases Wiki Activity

SysMon: Fixed ghost threads filtering and removed trailing whitespaces

Browse Source
This commit is contained in:
Taldariner
2025-02-06 16:37:50 +02:00
parent d235c8914c
commit f366d6d925
1 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
programs/cmm/sysmon/sysmon.c
View File

@@ -38,16 +38,16 @@
#define BOTPANEL_H 36 #define BOTPANEL_H 36
#ifdef LANG_RUS #ifdef LANG_RUS
#define T_APP_TITLE "<22><><EFBFBD>⥬<EFBFBD><E2A5AC><EFBFBD> <20><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 1.42" #define T_APP_TITLE "<22><><EFBFBD>⥬<EFBFBD><E2A5AC> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 1.42"
#define T_SHOW_SYSTEM "<22><><EFBFBD>⥬<EFBFBD><E2A5AC><EFBFBD>" #define T_SHOW_SYSTEM "<22><><EFBFBD>⥬<EFBFBD><E2A5AC>"
#define T_DETAILS "<22><><EFBFBD>஡<EFBFBD><E0AEA1><EFBFBD>" #define T_DETAILS "<22><><EFBFBD>஡<EFBFBD><E0AEA1><EFBFBD>"
#define T_PROC_KILL "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" #define T_PROC_KILL "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
#define T_PROC_INFO "<22><><EFBFBD><EFBFBD>" #define T_PROC_INFO "<22><><EFBFBD>"
#define T_PROC_HEADER "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><> <20><> %" #define T_PROC_HEADER "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><> <20><> %"
#define T_CPU_LOAD "<22><><EFBFBD><EFBFBD>㧪<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %i%% " #define T_CPU_LOAD "<22><><EFBFBD><EFBFBD>㧪<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %i%% "
#define T_RAM_USAGE "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>: %i <20><> ᢮<><E1A2AE><EFBFBD><EFBFBD><EFBFBD> <20><> %i <20><>" #define T_RAM_USAGE "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>: %i <20><> ᢮<><E1A2AE><EFBFBD><EFBFBD><EFBFBD> <20><> %i <20><>"
#define T_RD_USAGE "<22><><EFBFBD>⥬<EFBFBD><E2A5AC><EFBFBD> <20><EFBFBD><EFBFBD><EFBFBD>: %i <20><> ᢮<><E1A2AE><EFBFBD><EFBFBD><EFBFBD> <20><> 1.4 <20><>" #define T_RD_USAGE "<22><><EFBFBD>⥬<EFBFBD><E2A5AC> <EFBFBD><EFBFBD><EFBFBD>: %i <20><> ᢮<><E1A2AE><EFBFBD><EFBFBD><EFBFBD> <20><> 1.4 <20><>"
#define T_TMP_USAGE "TMP%i <20><><EFBFBD><EFBFBD>: %i <20><> ᢮<><E1A2AE><EFBFBD><EFBFBD><EFBFBD> <20><> %i <20><>" #define T_TMP_USAGE "TMP%i <20><><EFBFBD>: %i <20><> ᢮<><E1A2AE><EFBFBD><EFBFBD><EFBFBD> <20><> %i <20><>"
#else #else
#define T_APP_TITLE "System Monitor 1.42" #define T_APP_TITLE "System Monitor 1.42"
#define T_SHOW_SYSTEM "System" #define T_SHOW_SYSTEM "System"
@@ -228,19 +228,17 @@ void Processes__GetProcessList()
for (i=0; i<MAX_PROCESS_COUNT; i++) for (i=0; i<MAX_PROCESS_COUNT; i++)
{ {
GetProcessInfo(#Process, i); GetProcessInfo(#Process, i);
if (Process.name) if (Process.status_slot != TSTATE_FREE)
{
if (show_system.checked==false)
{ {
for (j=0; j<11; j++) if (Process.name[j]!=' ') {
if (show_system.checked==false) {
//do not show system process //do not show system process
if (Process.name[0]=='@') break; if (Process.name[0]=='@') continue;
if (!strcmp(#Process.name, "IDLE")) break; if (!strcmp(#Process.name, "IDLE")) continue;
if (!strcmp(#Process.name, "OS")) break; if (!strcmp(#Process.name, "OS")) continue;
} }
proc_list[select_list.count] = i; proc_list[select_list.count] = i;
select_list.count++; select_list.count++;
break;
}
} }
} }
} }
@@ -265,6 +263,7 @@ void SelectList_DrawLine(dword i)
DrawBar(select_list.x, posy, select_list.w, select_list.item_h, bg_color); DrawBar(select_list.x, posy, select_list.w, select_list.item_h, bg_color);
WriteText(GAP+5, posy+select_list.text_y, 0x90, 0, #Process.name); WriteText(GAP+5, posy+select_list.text_y, 0x90, 0, #Process.name);
// WriteNumber(GAP+95, posy+select_list.text_y, 0x90, 0x444444, 0x80020000, Process.status_slot);
if (Process.use_memory < 3670016000) if (Process.use_memory < 3670016000)
{ {