luo980/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ibmi: set the amount of memory in use to zero

Browse Source 
On IBMi PASE, the amount of memory in use includes storage used for
memory and disks. So we hard-code the amount of memory in use to zero
on IBMi, based on discussion in nodejs/node#32043.

PR-URL: https://github.com/libuv/libuv/pull/2732
Refs: https://github.com/nodejs/node/pull/32043
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
This commit is contained in:
Xu Meng 2020-03-10 11:00:00 +01:00 committed by Ben Noordhuis
parent 70469dcaa6
commit af7143b6f2
2 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/unix/ibmi.c
View File

@ -225,22 +225,7 @@ uint64_t uv_get_free_memory(void) {
if (get_ibmi_system_status(&rcvr)) if (get_ibmi_system_status(&rcvr))
return 0; return 0;
/* The amount of main storage, in kilobytes, in the system. */ return (uint64_t)rcvr.main_storage_size * 1024ULL;
uint64_t main_storage_size = rcvr.main_storage_size;
/* The current amount of storage in use for temporary objects.
* in millions (M) of bytes.
*/
uint64_t current_unprotected_storage_used =
rcvr.current_unprotected_storage_used * 1024ULL;
/* Current unprotected storage includes the storage used for memory
* and disks so it is possible to exceed the amount of main storage.
*/
if (main_storage_size <= current_unprotected_storage_used)
return 0ULL;
return (main_storage_size - current_unprotected_storage_used) * 1024ULL;
} }

11
test/test-get-memory.c
View File

@ -32,14 +32,13 @@ TEST_IMPL(get_memory) {
(unsigned long long) total_mem, (unsigned long long) total_mem,
(unsigned long long) constrained_mem); (unsigned long long) constrained_mem);
/* On IBMi PASE, the amount of memory in use includes storage used for
* memory and disks so it is possible to exceed the amount of main storage.
*/
#ifndef __PASE__
ASSERT(free_mem > 0); ASSERT(free_mem > 0);
#endif
ASSERT(total_mem > 0); ASSERT(total_mem > 0);
/* On IBMi PASE, the amount of memory in use is always zero. */
#ifdef __PASE__
ASSERT(total_mem == free_mem);
#else
ASSERT(total_mem > free_mem); ASSERT(total_mem > free_mem);
#endif
return 0; return 0;
} }