Merge pull request #135 from ente-io/add-memory-usage-logging-api
Add memory usage logging api
This commit is contained in:
commit
1d086e8e3b
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"name": "ente",
|
"name": "ente",
|
||||||
"productName": "ente",
|
"productName": "ente",
|
||||||
"version": "1.6.17-beta.4",
|
"version": "1.6.17-beta.5",
|
||||||
"private": true,
|
"private": true,
|
||||||
"description": "Desktop client for ente.io",
|
"description": "Desktop client for ente.io",
|
||||||
"main": "app/main.js",
|
"main": "app/main.js",
|
||||||
|
|
|
@ -50,7 +50,10 @@ import { fixHotReloadNext12 } from './utils/preload';
|
||||||
import { isFolder, getDirFiles } from './api/fs';
|
import { isFolder, getDirFiles } from './api/fs';
|
||||||
import { convertHEIC, generateImageThumbnail } from './api/imageProcessor';
|
import { convertHEIC, generateImageThumbnail } from './api/imageProcessor';
|
||||||
import { setupLogging } from './utils/logging';
|
import { setupLogging } from './utils/logging';
|
||||||
import { setupRendererProcessStatsLogger } from './utils/processStats';
|
import {
|
||||||
|
setupRendererProcessStatsLogger,
|
||||||
|
logRendererProcessMemoryUsage,
|
||||||
|
} from './utils/processStats';
|
||||||
import { runFFmpegCmd } from './api/ffmpeg';
|
import { runFFmpegCmd } from './api/ffmpeg';
|
||||||
|
|
||||||
fixHotReloadNext12();
|
fixHotReloadNext12();
|
||||||
|
@ -105,4 +108,5 @@ windowObject['ElectronAPIs'] = {
|
||||||
getAppVersion,
|
getAppVersion,
|
||||||
runFFmpegCmd,
|
runFFmpegCmd,
|
||||||
generateImageThumbnail,
|
generateImageThumbnail,
|
||||||
|
logRendererProcessMemoryUsage,
|
||||||
};
|
};
|
||||||
|
|
|
@ -169,6 +169,19 @@ export function setupRendererProcessStatsLogger() {
|
||||||
setInterval(logRendererProcessStats, LOGGING_INTERVAL_IN_MICROSECONDS);
|
setInterval(logRendererProcessStats, LOGGING_INTERVAL_IN_MICROSECONDS);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function logRendererProcessMemoryUsage(message: string) {
|
||||||
|
const processMemoryInfo = await process.getProcessMemoryInfo();
|
||||||
|
const processMemory = Math.max(
|
||||||
|
processMemoryInfo.private,
|
||||||
|
processMemoryInfo.residentSet ?? 0
|
||||||
|
);
|
||||||
|
ElectronLog.log(
|
||||||
|
'renderer ProcessMemory',
|
||||||
|
message,
|
||||||
|
convertBytesToHumanReadable(processMemory * 1024)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
const getNormalizedProcessMemoryInfo = async (
|
const getNormalizedProcessMemoryInfo = async (
|
||||||
processMemoryInfo: Electron.ProcessMemoryInfo
|
processMemoryInfo: Electron.ProcessMemoryInfo
|
||||||
) => {
|
) => {
|
||||||
|
|
2
ui
2
ui
|
@ -1 +1 @@
|
||||||
Subproject commit 22566d98f869a73d38968244288ecedca30a015a
|
Subproject commit 077235be27b5cbdc0deb258ba43498b336192d8a
|
Loading…
Reference in a new issue