From c40e8d098f78cbf1a144823b6cf8989b27702f50 Mon Sep 17 00:00:00 2001
From: Kostis Sagonas <kostis@cs.ntua.gr>
Date: Sat, 6 Feb 2010 03:05:13 +0200
Subject: os_mon: Modernize types and specs

---
 lib/os_mon/src/cpu_sup.erl | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

(limited to 'lib/os_mon')

diff --git a/lib/os_mon/src/cpu_sup.erl b/lib/os_mon/src/cpu_sup.erl
index 742e20b1fa..de25438326 100644
--- a/lib/os_mon/src/cpu_sup.erl
+++ b/lib/os_mon/src/cpu_sup.erl
@@ -65,15 +65,10 @@
 %% Contract specifications 
 %%----------------------------------------------------------------------
 
--type(util_cpus() :: 'all' | integer() | [integer()]).
--type(util_state() :: 
-	'user' | 
-	'nice_user' | 
-	'kernel' |
-	'wait' |
-	'idle').
--type(util_value() :: {util_state(), float()} | float()).
--type(util_desc() :: {util_cpus(), util_value(), util_value(), []}).
+-type util_cpus() :: 'all' | integer() | [integer()].
+-type util_state() :: 'user' | 'nice_user' | 'kernel' | 'wait' | 'idle'.
+-type util_value() :: {util_state(), float()} | float().
+-type util_desc() :: {util_cpus(), util_value(), util_value(), []}.
 
 %%----------------------------------------------------------------------
 %% Exported functions
@@ -88,28 +83,28 @@ start_link() ->
 stop() ->
     gen_server:call(cpu_sup, ?quit, infinity).
 
--spec(nprocs/0 :: () -> integer() | {'error', any()}).
+-spec nprocs() -> integer() | {'error', any()}.
 
 nprocs() ->
     os_mon:call(cpu_sup, ?nprocs, infinity).
 
--spec(avg1/0 :: () -> integer() | {'error', any()}).
+-spec avg1() -> integer() | {'error', any()}.
 
 avg1() ->
     os_mon:call(cpu_sup, ?avg1, infinity).
 
--spec(avg5/0 :: () -> integer() | {'error', any()}).
+-spec avg5() -> integer() | {'error', any()}.
 
 avg5() ->
     os_mon:call(cpu_sup, ?avg5, infinity).
 
--spec(avg15/0 :: () -> integer() | {'error', any()}).
+-spec avg15() -> integer() | {'error', any()}.
 
 avg15() ->
     os_mon:call(cpu_sup, ?avg15, infinity).
 
--spec(util/1 :: ([ 'detailed' | 'per_cpu']) -> 
-	util_desc() | [util_desc()] | {'error', any()}).
+-spec util(['detailed' | 'per_cpu']) ->
+	util_desc() | [util_desc()] | {'error', any()}.
 
 util(Args) when is_list (Args) ->
    % Get arguments
@@ -126,7 +121,7 @@ util(Args) when is_list (Args) ->
 util(_) ->
     erlang:error(badarg).
 
--spec(util/0 :: () -> float()).
+-spec util() -> float().
 
 util() ->
     case util([]) of
-- 
cgit v1.2.3