diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2016-05-16 11:18:46 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2016-05-16 11:18:46 +0200 |
| commit | f4c71989ae8dc3c290e9236f38543bee0a6a8e77 (patch) | |
| tree | e5c85a4d1aaa11dc9d08a3abe034fea150d915bc /lib/os_mon/src/cpu_sup.erl | |
| parent | 49fe4447f0cde4720f88a6fa9f449742a47b778f (diff) | |
| parent | bd78695428545d9c75cd0243fe237b5b28a76512 (diff) | |
| download | otp-f4c71989ae8dc3c290e9236f38543bee0a6a8e77.tar.gz otp-f4c71989ae8dc3c290e9236f38543bee0a6a8e77.tar.bz2 otp-f4c71989ae8dc3c290e9236f38543bee0a6a8e77.zip | |
Merge branch 'mururu/os_mon/cpu-sup-osx/PR-1049/OTP-13597'
* mururu/os_mon/cpu-sup-osx/PR-1049/OTP-13597:
os_mon: Implement cpu_sup:util/0,1 on OSX
Diffstat (limited to 'lib/os_mon/src/cpu_sup.erl')
| -rw-r--r-- | lib/os_mon/src/cpu_sup.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/os_mon/src/cpu_sup.erl b/lib/os_mon/src/cpu_sup.erl index 5eb067a5a3..e758b63d19 100644 --- a/lib/os_mon/src/cpu_sup.erl +++ b/lib/os_mon/src/cpu_sup.erl @@ -162,7 +162,8 @@ handle_call({?util, D, PC}, {Client, _Tag}, #state{os_type = {unix, Flavor}} = State) when Flavor == sunos; Flavor == linux; - Flavor == freebsd -> + Flavor == freebsd; + Flavor == darwin -> case measurement_server_call(State#state.server, {?util, D, PC, Client}) of {error, Reason} -> { reply, |