From 4fa059fc27d0d6443e97df08662ca309ba7479e8 Mon Sep 17 00:00:00 2001 From: jrobhoward Date: Fri, 29 Apr 2016 23:31:33 -0500 Subject: Fix memsup:get_os_wordsize() on 64-bit FreeBSD --- lib/os_mon/src/memsup.erl | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/os_mon/src/memsup.erl b/lib/os_mon/src/memsup.erl index e4b7c8c0ce..cc948c632a 100644 --- a/lib/os_mon/src/memsup.erl +++ b/lib/os_mon/src/memsup.erl @@ -699,6 +699,7 @@ get_os_wordsize_with_uname() -> case String of "x86_64" -> 64; "sparc64" -> 64; + "amd64" -> 64; _ -> 32 end. -- cgit v1.2.3 From 3893aac866a366dfb8259ad9d5d877952d5c48dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= Date: Mon, 2 May 2016 15:17:54 +0200 Subject: os_mon: Test wordsize of memsup:get_os_wordsize/0 Simple test against erlang:system_info({wordsize,external}). --- lib/os_mon/test/memsup_SUITE.erl | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/lib/os_mon/test/memsup_SUITE.erl b/lib/os_mon/test/memsup_SUITE.erl index 8ab61e9581..805b648bb5 100644 --- a/lib/os_mon/test/memsup_SUITE.erl +++ b/lib/os_mon/test/memsup_SUITE.erl @@ -116,12 +116,18 @@ api(Config) when is_list(Config) -> ExtMemData), %% get_os_wordsize() - ?line ok = case memsup:get_os_wordsize() of - 32 -> ok; - 64 -> ok; - unsupported_os -> ok; - _ -> error - end, + ok = case memsup:get_os_wordsize() of + 32 -> + 32 = 8*erlang:system_info({wordsize,external}), + ok; + 64 -> + % No reliable test here + ok; + unsupported_os -> + ok; + _ -> + error + end, %% get_check_interval() ?line 60000 = memsup:get_check_interval(), -- cgit v1.2.3 From 6b51a01cd6333c15a7abad8e9ee8ac3773f49965 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= Date: Fri, 13 May 2016 18:04:37 +0200 Subject: Fix memsup:get_os_wordsize() on 64-bit Linux PPC --- lib/os_mon/src/memsup.erl | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/os_mon/src/memsup.erl b/lib/os_mon/src/memsup.erl index cc948c632a..471b344089 100644 --- a/lib/os_mon/src/memsup.erl +++ b/lib/os_mon/src/memsup.erl @@ -700,6 +700,7 @@ get_os_wordsize_with_uname() -> "x86_64" -> 64; "sparc64" -> 64; "amd64" -> 64; + "ppc64" -> 64; _ -> 32 end. -- cgit v1.2.3