From 2141524ee4e940c9f026c6cdce76839380048e65 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Tue, 10 Jan 2023 19:11:13 +0530 Subject: [PATCH 01/31] update UI --- ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui b/ui index a955ae39f..a32a5d698 160000 --- a/ui +++ b/ui @@ -1 +1 @@ -Subproject commit a955ae39fa97232131682ad72d866bf3155a0906 +Subproject commit a32a5d69850542ea3da276d78ec9d2264bdcd117 From ffedd39bd89f9b22be2e0318cb51fd8dd672c157 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Wed, 11 Jan 2023 16:46:45 +0530 Subject: [PATCH 02/31] update UI --- ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui b/ui index a32a5d698..86a7f1cda 160000 --- a/ui +++ b/ui @@ -1 +1 @@ -Subproject commit a32a5d69850542ea3da276d78ec9d2264bdcd117 +Subproject commit 86a7f1cdab5c3a9a2cfbd0daecb9f7e1dd06660e From 5182578de3dc16cbc87e392ad82e482f468cd6cf Mon Sep 17 00:00:00 2001 From: Abhinav Date: Wed, 11 Jan 2023 23:01:02 +0530 Subject: [PATCH 03/31] update UI --- ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui b/ui index 86a7f1cda..8d35ee519 160000 --- a/ui +++ b/ui @@ -1 +1 @@ -Subproject commit 86a7f1cdab5c3a9a2cfbd0daecb9f7e1dd06660e +Subproject commit 8d35ee519e1f19d12c38b22b51d2dea03863346a From 97b82c156dd39934f39068dafdb8dbbd6dad3328 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Wed, 11 Jan 2023 23:01:24 +0530 Subject: [PATCH 04/31] v1.6.17-beta.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e1ed6ff2f..e6bd3c583 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ente", "productName": "ente", - "version": "1.6.17-alpha.3", + "version": "1.6.17-beta.1", "private": true, "description": "Desktop client for ente.io", "main": "app/main.js", From 99fc6bd1af887963d478001df4901c38008fcaa0 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Thu, 12 Jan 2023 09:12:47 +0530 Subject: [PATCH 05/31] add process name in spike log --- src/utils/processStats.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/utils/processStats.ts b/src/utils/processStats.ts index 7bf262cd9..64f900d58 100644 --- a/src/utils/processStats.ts +++ b/src/utils/processStats.ts @@ -68,7 +68,7 @@ async function logSpikeMainMemoryUsage() { process.getHeapStatistics() ); - ElectronLog.log('reporting memory usage spike', { + ElectronLog.log('reporting main memory usage spike', { currentProcessMemoryInfo: normalizedCurrentProcessMemoryInfo, previousProcessMemoryInfo: normalizedPreviousProcessMemoryInfo, heapStatistics, @@ -122,7 +122,7 @@ async function logSpikeRendererMemoryUsage() { process.getHeapStatistics() ); - ElectronLog.log('reporting memory usage spike', { + ElectronLog.log('reporting renderer memory usage spike', { currentProcessMemoryInfo: normalizedCurrentProcessMemoryInfo, previousProcessMemoryInfo: normalizedPreviousProcessMemoryInfo, heapStatistics, From c583a3c3fbb0dbb29b6885fda4fac8daf5603135 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Thu, 12 Jan 2023 09:13:07 +0530 Subject: [PATCH 06/31] v1.6.17-beta.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e6bd3c583..3f482bd66 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ente", "productName": "ente", - "version": "1.6.17-beta.1", + "version": "1.6.17-beta.2", "private": true, "description": "Desktop client for ente.io", "main": "app/main.js", From 0ebd43da2de60953fd9a1f3e0d8587ebd9e0a4ed Mon Sep 17 00:00:00 2001 From: Abhinav Date: Thu, 12 Jan 2023 10:24:31 +0530 Subject: [PATCH 07/31] v1.6.17-beta.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3f482bd66..a72e3a320 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ente", "productName": "ente", - "version": "1.6.17-beta.2", + "version": "1.6.17-beta.3", "private": true, "description": "Desktop client for ente.io", "main": "app/main.js", From f2c60381b31854acf47affc1f5c353a6878eeaae Mon Sep 17 00:00:00 2001 From: Abhinav Date: Thu, 12 Jan 2023 12:48:55 +0530 Subject: [PATCH 08/31] update UI --- ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui b/ui index 8d35ee519..b7d8fc630 160000 --- a/ui +++ b/ui @@ -1 +1 @@ -Subproject commit 8d35ee519e1f19d12c38b22b51d2dea03863346a +Subproject commit b7d8fc63017c73447209db3d7a2c4a6acff37183 From db4b1829db89597fa1fa04f1e334b646a705a9c3 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Thu, 12 Jan 2023 13:21:20 +0530 Subject: [PATCH 09/31] fix spike MemoryUsage logging --- src/utils/processStats.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/utils/processStats.ts b/src/utils/processStats.ts index 64f900d58..80e3c404b 100644 --- a/src/utils/processStats.ts +++ b/src/utils/processStats.ts @@ -44,8 +44,8 @@ async function logSpikeMainMemoryUsage() { processMemoryInfo.private ); const previewMemoryUsage = Math.max( - previousMainProcessMemoryInfo.private, - previousMainProcessMemoryInfo.residentSet + previousMainProcessMemoryInfo.residentSet ?? 0, + previousMainProcessMemoryInfo.private ); const isSpiking = currentMemoryUsage - previewMemoryUsage >= @@ -92,9 +92,10 @@ let rendererUsingHighMemory = false; async function logSpikeRendererMemoryUsage() { const processMemoryInfo = await process.getProcessMemoryInfo(); const currentMemoryUsage = Math.max( - processMemoryInfo.residentSet, + processMemoryInfo.residentSet ?? 0, processMemoryInfo.private ); + const previewMemoryUsage = Math.max( previousRendererProcessMemoryInfo.private, previousRendererProcessMemoryInfo.residentSet @@ -110,6 +111,8 @@ async function logSpikeRendererMemoryUsage() { (isHighMemoryUsage && !rendererUsingHighMemory) || (!isHighMemoryUsage && rendererUsingHighMemory); + console.log(convertBytesToHumanReadable(currentMemoryUsage * 1024)); + if (isSpiking || shouldReport) { const normalizedCurrentProcessMemoryInfo = await getNormalizedProcessMemoryInfo(processMemoryInfo); From 2d26d61bade01af95df22944f7198f61adde6dfe Mon Sep 17 00:00:00 2001 From: Abhinav Date: Thu, 12 Jan 2023 13:25:00 +0530 Subject: [PATCH 10/31] update UI --- ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui b/ui index b7d8fc630..c3508053c 160000 --- a/ui +++ b/ui @@ -1 +1 @@ -Subproject commit b7d8fc63017c73447209db3d7a2c4a6acff37183 +Subproject commit c3508053ca0b11341445ae0b38dac9185e1cfab3 From 6ea0dd9ee2524e50deee46bae4545a76b5396852 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Thu, 12 Jan 2023 15:18:34 +0530 Subject: [PATCH 11/31] log currentMemoryUsage each second --- src/utils/processStats.ts | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/utils/processStats.ts b/src/utils/processStats.ts index 80e3c404b..fd4c0cda0 100644 --- a/src/utils/processStats.ts +++ b/src/utils/processStats.ts @@ -40,15 +40,15 @@ let mainProcessUsingHighMemory = false; async function logSpikeMainMemoryUsage() { const processMemoryInfo = await process.getProcessMemoryInfo(); const currentMemoryUsage = Math.max( - processMemoryInfo.residentSet, + processMemoryInfo.residentSet ?? 0, processMemoryInfo.private ); - const previewMemoryUsage = Math.max( + const previousMemoryUsage = Math.max( previousMainProcessMemoryInfo.residentSet ?? 0, previousMainProcessMemoryInfo.private ); const isSpiking = - currentMemoryUsage - previewMemoryUsage >= + currentMemoryUsage - previousMemoryUsage >= MAIN_MEMORY_USAGE_DIFF_IN_KILOBYTES_CONSIDERED_AS_SPIKE; const isHighMemoryUsage = @@ -58,6 +58,10 @@ async function logSpikeMainMemoryUsage() { (isHighMemoryUsage && !mainProcessUsingHighMemory) || (!isHighMemoryUsage && mainProcessUsingHighMemory); + ElectronLog.log( + 'main processMemory', + convertBytesToHumanReadable(currentMemoryUsage * 1024) + ); if (isSpiking || shouldReport) { const normalizedCurrentProcessMemoryInfo = await getNormalizedProcessMemoryInfo(processMemoryInfo); @@ -96,12 +100,12 @@ async function logSpikeRendererMemoryUsage() { processMemoryInfo.private ); - const previewMemoryUsage = Math.max( + const previousMemoryUsage = Math.max( previousRendererProcessMemoryInfo.private, - previousRendererProcessMemoryInfo.residentSet + previousRendererProcessMemoryInfo.residentSet ?? 0 ); const isSpiking = - currentMemoryUsage - previewMemoryUsage >= + currentMemoryUsage - previousMemoryUsage >= RENDERER_MEMORY_USAGE_DIFF_IN_KILOBYTES_CONSIDERED_AS_SPIKE; const isHighMemoryUsage = @@ -111,7 +115,10 @@ async function logSpikeRendererMemoryUsage() { (isHighMemoryUsage && !rendererUsingHighMemory) || (!isHighMemoryUsage && rendererUsingHighMemory); - console.log(convertBytesToHumanReadable(currentMemoryUsage * 1024)); + ElectronLog.log( + 'renderer processMemory', + convertBytesToHumanReadable(currentMemoryUsage * 1024) + ); if (isSpiking || shouldReport) { const normalizedCurrentProcessMemoryInfo = From f919c0e28b8e5a9bd766d0433e3eb18ce1dc51a0 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Thu, 12 Jan 2023 15:31:51 +0530 Subject: [PATCH 12/31] increase main spike and threshold value --- src/utils/processStats.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/utils/processStats.ts b/src/utils/processStats.ts index fd4c0cda0..08cba6dc7 100644 --- a/src/utils/processStats.ts +++ b/src/utils/processStats.ts @@ -5,9 +5,9 @@ const LOGGING_INTERVAL_IN_MICROSECONDS = 30 * 1000; // 30 seconds const SPIKE_DETECTION_INTERVAL_IN_MICROSECONDS = 1 * 1000; // 1 seconds -const MAIN_MEMORY_USAGE_DIFF_IN_KILOBYTES_CONSIDERED_AS_SPIKE = 10 * 1024; // 10 MB +const MAIN_MEMORY_USAGE_DIFF_IN_KILOBYTES_CONSIDERED_AS_SPIKE = 50 * 1024; // 50 MB -const HIGH_MAIN_MEMORY_USAGE_THRESHOLD_IN_KILOBYTES = 100 * 1024; // 100 MB +const HIGH_MAIN_MEMORY_USAGE_THRESHOLD_IN_KILOBYTES = 200 * 1024; // 200 MB const RENDERER_MEMORY_USAGE_DIFF_IN_KILOBYTES_CONSIDERED_AS_SPIKE = 200 * 1024; // 200 MB From 7d8578a7401f44cd8ba1b8dd73cf18018e2cfb60 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Thu, 12 Jan 2023 15:32:59 +0530 Subject: [PATCH 13/31] remove per second logging --- src/utils/processStats.ts | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/utils/processStats.ts b/src/utils/processStats.ts index 08cba6dc7..25710dbd2 100644 --- a/src/utils/processStats.ts +++ b/src/utils/processStats.ts @@ -58,10 +58,6 @@ async function logSpikeMainMemoryUsage() { (isHighMemoryUsage && !mainProcessUsingHighMemory) || (!isHighMemoryUsage && mainProcessUsingHighMemory); - ElectronLog.log( - 'main processMemory', - convertBytesToHumanReadable(currentMemoryUsage * 1024) - ); if (isSpiking || shouldReport) { const normalizedCurrentProcessMemoryInfo = await getNormalizedProcessMemoryInfo(processMemoryInfo); @@ -115,11 +111,6 @@ async function logSpikeRendererMemoryUsage() { (isHighMemoryUsage && !rendererUsingHighMemory) || (!isHighMemoryUsage && rendererUsingHighMemory); - ElectronLog.log( - 'renderer processMemory', - convertBytesToHumanReadable(currentMemoryUsage * 1024) - ); - if (isSpiking || shouldReport) { const normalizedCurrentProcessMemoryInfo = await getNormalizedProcessMemoryInfo(processMemoryInfo); From e530a022d8e769cfe03762d11cfc81cd4cc7cb18 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Thu, 12 Jan 2023 15:36:29 +0530 Subject: [PATCH 14/31] update UI --- ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui b/ui index 8d35ee519..b7d8fc630 160000 --- a/ui +++ b/ui @@ -1 +1 @@ -Subproject commit 8d35ee519e1f19d12c38b22b51d2dea03863346a +Subproject commit b7d8fc63017c73447209db3d7a2c4a6acff37183 From b48d368b637094cf644af82cee2a43b94f67abbc Mon Sep 17 00:00:00 2001 From: Abhinav Date: Thu, 12 Jan 2023 15:37:55 +0530 Subject: [PATCH 15/31] update UI --- ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui b/ui index c3508053c..b7d8fc630 160000 --- a/ui +++ b/ui @@ -1 +1 @@ -Subproject commit c3508053ca0b11341445ae0b38dac9185e1cfab3 +Subproject commit b7d8fc63017c73447209db3d7a2c4a6acff37183 From f78e739ba5c0bd2597900e87e37646cc733b72bf Mon Sep 17 00:00:00 2001 From: Abhinav Date: Thu, 12 Jan 2023 15:47:04 +0530 Subject: [PATCH 16/31] v1.6.17-beta.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a72e3a320..aeef1f4fa 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ente", "productName": "ente", - "version": "1.6.17-beta.3", + "version": "1.6.17-beta.4", "private": true, "description": "Desktop client for ente.io", "main": "app/main.js", From 7fc6c7138af07c50f0a5f4a1ea1a9ccd7a466d3d Mon Sep 17 00:00:00 2001 From: Abhinav Date: Tue, 17 Jan 2023 16:48:03 +0530 Subject: [PATCH 17/31] add cross-env package to set env variable when running yarn script --- package.json | 3 ++- yarn.lock | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index aeef1f4fa..ad066e854 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "start": "concurrently \"yarn start-main\" \"yarn start-renderer\"", "build-renderer": "cd ui && yarn install && yarn build && cd ..", "build": "yarn build-renderer && yarn build-main", - "test-release": "yarn build && electron-builder --config.compression=store" + "test-release": "cross-env IS_TEST_RELEASE=true yarn build && electron-builder --config.compression=store" }, "author": "ente ", "devDependencies": { @@ -83,6 +83,7 @@ "@typescript-eslint/eslint-plugin": "^5.28.0", "@typescript-eslint/parser": "^5.28.0", "concurrently": "^7.0.0", + "cross-env": "^7.0.3", "electron": "^21.2.2", "electron-builder": "^23.0.3", "electron-builder-notarize": "^1.2.0", diff --git a/yarn.lock b/yarn.lock index 8dd73a05c..a406a638e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1199,6 +1199,13 @@ crc@^3.8.0: dependencies: buffer "^5.1.0" +cross-env@^7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf" + integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw== + dependencies: + cross-spawn "^7.0.1" + cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" From 05165c6943be16c2e3258ee89363b8b724d5f672 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Tue, 17 Jan 2023 16:49:11 +0530 Subject: [PATCH 18/31] update UI --- ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui b/ui index b7d8fc630..af70334f9 160000 --- a/ui +++ b/ui @@ -1 +1 @@ -Subproject commit b7d8fc63017c73447209db3d7a2c4a6acff37183 +Subproject commit af70334f9a8288546899ca80cf9632dad3d1596e From ac08b8279a084e35413eda9dc4c5aad73d46890f Mon Sep 17 00:00:00 2001 From: Abhinav Date: Tue, 17 Jan 2023 16:56:26 +0530 Subject: [PATCH 19/31] add log per second --- src/utils/processStats.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/utils/processStats.ts b/src/utils/processStats.ts index 25710dbd2..923e3ea56 100644 --- a/src/utils/processStats.ts +++ b/src/utils/processStats.ts @@ -43,6 +43,11 @@ async function logSpikeMainMemoryUsage() { processMemoryInfo.residentSet ?? 0, processMemoryInfo.private ); + ElectronLog.log( + 'main ProcessMemory', + convertBytesToHumanReadable(currentMemoryUsage) + ); + const previousMemoryUsage = Math.max( previousMainProcessMemoryInfo.residentSet ?? 0, previousMainProcessMemoryInfo.private @@ -95,6 +100,10 @@ async function logSpikeRendererMemoryUsage() { processMemoryInfo.residentSet ?? 0, processMemoryInfo.private ); + ElectronLog.log( + 'renderer ProcessMemory', + convertBytesToHumanReadable(currentMemoryUsage) + ); const previousMemoryUsage = Math.max( previousRendererProcessMemoryInfo.private, From 2a6beae32bb24f9028ba38ca59654fb4b6268b29 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Tue, 17 Jan 2023 17:51:26 +0530 Subject: [PATCH 20/31] fix unit --- src/utils/processStats.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/utils/processStats.ts b/src/utils/processStats.ts index 923e3ea56..1ee83d94f 100644 --- a/src/utils/processStats.ts +++ b/src/utils/processStats.ts @@ -45,7 +45,7 @@ async function logSpikeMainMemoryUsage() { ); ElectronLog.log( 'main ProcessMemory', - convertBytesToHumanReadable(currentMemoryUsage) + convertBytesToHumanReadable(currentMemoryUsage * 1024) ); const previousMemoryUsage = Math.max( @@ -102,7 +102,7 @@ async function logSpikeRendererMemoryUsage() { ); ElectronLog.log( 'renderer ProcessMemory', - convertBytesToHumanReadable(currentMemoryUsage) + convertBytesToHumanReadable(currentMemoryUsage * 1024) ); const previousMemoryUsage = Math.max( From 753b8d178e1e96e3bbab8f3af9d693335d7a7cd7 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Tue, 17 Jan 2023 17:52:31 +0530 Subject: [PATCH 21/31] update UI --- ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui b/ui index af70334f9..22566d98f 160000 --- a/ui +++ b/ui @@ -1 +1 @@ -Subproject commit af70334f9a8288546899ca80cf9632dad3d1596e +Subproject commit 22566d98f869a73d38968244288ecedca30a015a From 63c5965c13d795c98e784817053db01bbb0759bf Mon Sep 17 00:00:00 2001 From: Abhinav Date: Thu, 19 Jan 2023 16:59:47 +0530 Subject: [PATCH 22/31] Revert "add log per second" This reverts commit ac08b8279a084e35413eda9dc4c5aad73d46890f. --- src/utils/processStats.ts | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/utils/processStats.ts b/src/utils/processStats.ts index 1ee83d94f..25710dbd2 100644 --- a/src/utils/processStats.ts +++ b/src/utils/processStats.ts @@ -43,11 +43,6 @@ async function logSpikeMainMemoryUsage() { processMemoryInfo.residentSet ?? 0, processMemoryInfo.private ); - ElectronLog.log( - 'main ProcessMemory', - convertBytesToHumanReadable(currentMemoryUsage * 1024) - ); - const previousMemoryUsage = Math.max( previousMainProcessMemoryInfo.residentSet ?? 0, previousMainProcessMemoryInfo.private @@ -100,10 +95,6 @@ async function logSpikeRendererMemoryUsage() { processMemoryInfo.residentSet ?? 0, processMemoryInfo.private ); - ElectronLog.log( - 'renderer ProcessMemory', - convertBytesToHumanReadable(currentMemoryUsage * 1024) - ); const previousMemoryUsage = Math.max( previousRendererProcessMemoryInfo.private, From 420e8590179dbd6329b3f3a5337bac0c30697fc9 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Wed, 18 Jan 2023 09:33:06 +0530 Subject: [PATCH 23/31] added api to log renderer memory usage --- src/preload.ts | 6 +++++- src/utils/processStats.ts | 13 +++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/preload.ts b/src/preload.ts index 03120429b..26365d881 100644 --- a/src/preload.ts +++ b/src/preload.ts @@ -50,7 +50,10 @@ import { fixHotReloadNext12 } from './utils/preload'; import { isFolder, getDirFiles } from './api/fs'; import { convertHEIC, generateImageThumbnail } from './api/imageProcessor'; import { setupLogging } from './utils/logging'; -import { setupRendererProcessStatsLogger } from './utils/processStats'; +import { + setupRendererProcessStatsLogger, + logRendererProcessMemoryUsage, +} from './utils/processStats'; import { runFFmpegCmd } from './api/ffmpeg'; fixHotReloadNext12(); @@ -105,4 +108,5 @@ windowObject['ElectronAPIs'] = { getAppVersion, runFFmpegCmd, generateImageThumbnail, + logRendererProcessMemoryUsage, }; diff --git a/src/utils/processStats.ts b/src/utils/processStats.ts index 25710dbd2..00b3a71d1 100644 --- a/src/utils/processStats.ts +++ b/src/utils/processStats.ts @@ -169,6 +169,19 @@ export function setupRendererProcessStatsLogger() { 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 ( processMemoryInfo: Electron.ProcessMemoryInfo ) => { From 4bb3a439e831fe23f277bbbf3da276f96bde728f Mon Sep 17 00:00:00 2001 From: Abhinav Date: Thu, 19 Jan 2023 20:56:40 +0530 Subject: [PATCH 24/31] update UI --- ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui b/ui index 22566d98f..934f7be31 160000 --- a/ui +++ b/ui @@ -1 +1 @@ -Subproject commit 22566d98f869a73d38968244288ecedca30a015a +Subproject commit 934f7be3147f6d01fe4b328960132ed68bff3584 From 8c17bc6136b146432ffdb53e06d91d1b57cd55f1 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Thu, 19 Jan 2023 20:57:24 +0530 Subject: [PATCH 25/31] v1.6.17-alpha.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ad066e854..88cff1d23 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ente", "productName": "ente", - "version": "1.6.17-beta.4", + "version": "1.6.17-alpha.6", "private": true, "description": "Desktop client for ente.io", "main": "app/main.js", From 8ebd58881a46dd3f295e78ac4f0625f29b2150ca Mon Sep 17 00:00:00 2001 From: Abhinav Date: Fri, 20 Jan 2023 12:08:58 +0530 Subject: [PATCH 26/31] update UI --- ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui b/ui index 934f7be31..077235be2 160000 --- a/ui +++ b/ui @@ -1 +1 @@ -Subproject commit 934f7be3147f6d01fe4b328960132ed68bff3584 +Subproject commit 077235be27b5cbdc0deb258ba43498b336192d8a From 6e6ade3fc26786cd79ce689fe24d66466911fddb Mon Sep 17 00:00:00 2001 From: Abhinav Date: Fri, 20 Jan 2023 12:12:23 +0530 Subject: [PATCH 27/31] v1.6.17-alpha.7 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 88cff1d23..e4affcee0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ente", "productName": "ente", - "version": "1.6.17-alpha.6", + "version": "1.6.17-alpha.7", "private": true, "description": "Desktop client for ente.io", "main": "app/main.js", From 2932a1903896b52ecf445ac6fecdb4da595df498 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Fri, 20 Jan 2023 14:02:48 +0530 Subject: [PATCH 28/31] v1.6.17-beta.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e4affcee0..e71778eb2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ente", "productName": "ente", - "version": "1.6.17-alpha.7", + "version": "1.6.17-beta.5", "private": true, "description": "Desktop client for ente.io", "main": "app/main.js", From 5876c1e402619e15b6222c254de4b1a50a89aaf6 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Fri, 20 Jan 2023 19:43:30 +0530 Subject: [PATCH 29/31] update UI --- ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui b/ui index 077235be2..094f9d5fd 160000 --- a/ui +++ b/ui @@ -1 +1 @@ -Subproject commit 077235be27b5cbdc0deb258ba43498b336192d8a +Subproject commit 094f9d5fdbdcc7a89deeadc9141fccd23053de0f From d870723b7d6d3c372a98d5fb6c7ad1b8ed6ed29d Mon Sep 17 00:00:00 2001 From: Abhinav Date: Fri, 20 Jan 2023 19:44:02 +0530 Subject: [PATCH 30/31] v1.6.17-beta.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e71778eb2..f4529376b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ente", "productName": "ente", - "version": "1.6.17-beta.5", + "version": "1.6.17-beta.6", "private": true, "description": "Desktop client for ente.io", "main": "app/main.js", From 27bda5449b4a439e15d5a7b180898049365e8b7a Mon Sep 17 00:00:00 2001 From: Abhinav Date: Fri, 20 Jan 2023 19:44:50 +0530 Subject: [PATCH 31/31] v1.6.17 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f4529376b..1d6850775 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ente", "productName": "ente", - "version": "1.6.17-beta.6", + "version": "1.6.17", "private": true, "description": "Desktop client for ente.io", "main": "app/main.js",