Skip to content

tweak(core): use si for process data #1027

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
million1156 wants to merge 11 commits into
base: develop
Choose a base branch
from
Open

tweak(core): use si for process data #1027

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5043484
tweak(core): use get-wmi for memory usage
million1156 Jan 17, 2025
2b1c362
fix(core): use powershell instead of command prompt
million1156 Jan 17, 2025
bc08812
fix(core): revert change for security reasons
million1156 Jan 17, 2025
f381c92
wip: commit changes
million1156 Jan 17, 2025
3e8690b
fix: remove debug thing
million1156 Jan 23, 2025
eb26d14
remove useless file
million1156 Jan 23, 2025
4617b80
move branch to develop
million1156 Jan 23, 2025
7060a72
Merge branch 'develop'
million1156 Jan 23, 2025
9493cee
fix: replace dep
million1156 Jan 23, 2025
0e8f6d9
fix: use si for process information instead
million1156 Jan 23, 2025
cbf939a
oops, forgot that linux exists
million1156 Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions core/modules/Metrics/svRuntime/perfUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import pidusage from 'pidusage';
import si from 'systeminformation';
import { cloneDeep } from 'lodash-es';
import type { SvRtPerfCountsType } from "./perfSchemas";
import got from '@lib/got';
import { parseRawPerf } from './perfParser';
import { PERF_DATA_BUCKET_COUNT } from './config';
import { txEnv } from '@core/globalData';


//Consts
const perfDataRawThreadsTemplate: SvRtPerfCountsType = {
svSync: {
Expand Down Expand Up @@ -108,14 +107,15 @@ export const fetchRawPerfData = async (fxServerHost: string) => {

/**
* Get the fxserver memory usage
* FIXME: migrate to use gwmi on windows by default
*/
export const fetchFxsMemory = async (fxsPid?: number) => {
if (!fxsPid) return;
try {
const pidUsage = await pidusage(fxsPid);
const memoryMb = pidUsage.memory / 1024 / 1024;
const totalMem = (await si.mem()).total
const pidUsage = (await si.processLoad("fxServer"))[0].mem /* Limitations only allow us to use process names to get memory */
const memoryMb = (totalMem * (pidUsage / 100)) / (1024 * 1024);
return parseFloat((memoryMb).toFixed(2));

} catch (error) {
if ((error as any).code = 'ENOENT') {
console.error('Failed to get processes tree usage data.');
Expand Down