aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2015-03-19 11:09:21 +0100
committerBjörn-Egil Dahlberg <[email protected]>2015-03-19 11:09:21 +0100
commit0d482308c675e537d6876011909d1d77cd83398d (patch)
tree54d65b6104e8ff10beba871cea6cb379549e1453
parent2d002d3f12cdeea8d2cacc5fb1ee70997d7ca0ce (diff)
parent8eee9c1d692a5c9cfebe3ddda1f84ecc529bf7f2 (diff)
downloadotp-0d482308c675e537d6876011909d1d77cd83398d.tar.gz
otp-0d482308c675e537d6876011909d1d77cd83398d.tar.bz2
otp-0d482308c675e537d6876011909d1d77cd83398d.zip
Merge branch 'maint'
-rw-r--r--lib/os_mon/src/cpu_sup.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/os_mon/src/cpu_sup.erl b/lib/os_mon/src/cpu_sup.erl
index 1f088ecbde..66e7973e7e 100644
--- a/lib/os_mon/src/cpu_sup.erl
+++ b/lib/os_mon/src/cpu_sup.erl
@@ -221,7 +221,7 @@ get_uint32_measurement(Request, #internal{port = P, os_type = {unix, sunos}}) ->
port_server_call(P, Request);
get_uint32_measurement(Request, #internal{os_type = {unix, linux}}) ->
{ok,F} = file:open("/proc/loadavg",[read,raw]),
- {ok,D} = file:read(F,24),
+ {ok,D} = file:read_line(F),
ok = file:close(F),
{ok,[Load1,Load5,Load15,_PRun,PTotal],_} = io_lib:fread("~f ~f ~f ~d/~d", D),
case Request of