summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandru Scvortov <alexandru@rabbitmq.com>2011-08-08 10:41:11 +0100
committerAlexandru Scvortov <alexandru@rabbitmq.com>2011-08-08 10:41:11 +0100
commitddc942910cc8c90b7254c32497b280aa8471a974 (patch)
treef8b576ec796bccf9429ba78aeb1f9b5e4f3d06c7
parente5780f47681a7cb82c1562fb507f8b6a9fa8013f (diff)
downloadrabbitmq-server-ddc942910cc8c90b7254c32497b280aa8471a974.tar.gz
more specs
The specs in msg_store_ets_index, msg_store_gc, msg_store_index, net, networking, node_monitor, prelaunch, queue_collector, queue_index, reader, registry, restartable_sup, router, sasl_report_file_h, ssl, trace, upgrade, upgrade_functions, version, vhost, writer, tcp_acceptor, tcp_acceptor_sup, tcp_listener, tcp_listener_sup, vm_memory_monitor, worker_pool, worker_pool_sup, worker_pool_worker, misc, types are up to date. That should be the last of the specs.
-rw-r--r--src/rabbit_networking.erl3
-rw-r--r--src/rabbit_node_monitor.erl1
-rw-r--r--src/rabbit_reader.erl4
-rw-r--r--src/rabbit_restartable_sup.erl10
-rw-r--r--src/tcp_acceptor_sup.erl8
-rw-r--r--src/tcp_listener.erl8
-rw-r--r--src/tcp_listener_sup.erl15
-rw-r--r--src/worker_pool.erl1
-rw-r--r--src/worker_pool_sup.erl4
9 files changed, 52 insertions, 2 deletions
diff --git a/src/rabbit_networking.erl b/src/rabbit_networking.erl
index fb767a4c..db6e9310 100644
--- a/src/rabbit_networking.erl
+++ b/src/rabbit_networking.erl
@@ -72,6 +72,9 @@
-spec(on_node_down/1 :: (node()) -> 'ok').
-spec(check_tcp_listener_address/2 :: (atom(), listener_config())
-> [{inet:ip_address(), ip_port(), family(), atom()}]).
+-spec(ensure_ssl/0 :: () -> rabbit_types:infos()).
+-spec(ssl_transform_fun/1 ::
+ (rabbit_types:infos()) -> rabbit_types:ok_or_error(#ssl_socket{})).
-spec(boot/0 :: () -> 'ok').
-spec(start_client/1 ::
diff --git a/src/rabbit_node_monitor.erl b/src/rabbit_node_monitor.erl
index 1f30a2fc..281830c7 100644
--- a/src/rabbit_node_monitor.erl
+++ b/src/rabbit_node_monitor.erl
@@ -31,6 +31,7 @@
-ifdef(use_specs).
+-spec(start_link/0 :: () -> rabbit_types:ok_pid_or_error()).
-spec(rabbit_running_on/1 :: (node()) -> 'ok').
-spec(notify_cluster/0 :: () -> 'ok').
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl
index f2ea3cec..95327246 100644
--- a/src/rabbit_reader.erl
+++ b/src/rabbit_reader.erl
@@ -63,6 +63,8 @@
-ifdef(use_specs).
+-type(frame() :: [binary()]).
+
-spec(start_link/3 :: (pid(), pid(), rabbit_heartbeat:start_heartbeat_fun()) ->
rabbit_types:ok(pid())).
-spec(info_keys/0 :: () -> rabbit_types:info_keys()).
@@ -88,6 +90,8 @@
-spec(system_continue/3 :: (_,_,#v1{}) -> any()).
-spec(system_terminate/4 :: (_,_,_,_) -> none()).
+-spec(process_channel_frame/5 :: (frame(), pid(), non_neg_integer(), pid(), tuple()) -> tuple()).
+
-endif.
%%--------------------------------------------------------------------------
diff --git a/src/rabbit_restartable_sup.erl b/src/rabbit_restartable_sup.erl
index 0491244b..cda3ccbe 100644
--- a/src/rabbit_restartable_sup.erl
+++ b/src/rabbit_restartable_sup.erl
@@ -24,6 +24,16 @@
-include("rabbit.hrl").
+%%----------------------------------------------------------------------------
+
+-ifdef(use_specs).
+
+-spec(start_link/2 :: (atom(), mfa()) -> rabbit_types:ok_pid_or_error()).
+
+-endif.
+
+%%----------------------------------------------------------------------------
+
start_link(Name, {_M, _F, _A} = Fun) ->
supervisor:start_link({local, Name}, ?MODULE, [Fun]).
diff --git a/src/tcp_acceptor_sup.erl b/src/tcp_acceptor_sup.erl
index bf0eacd1..4c835598 100644
--- a/src/tcp_acceptor_sup.erl
+++ b/src/tcp_acceptor_sup.erl
@@ -22,6 +22,14 @@
-export([init/1]).
+%%----------------------------------------------------------------------------
+
+-ifdef(use_specs).
+-spec(start_link/2 :: (atom(), mfa()) -> rabbit_types:ok_pid_or_error()).
+-endif.
+
+%%----------------------------------------------------------------------------
+
start_link(Name, Callback) ->
supervisor:start_link({local,Name}, ?MODULE, Callback).
diff --git a/src/tcp_listener.erl b/src/tcp_listener.erl
index cd646969..ad2a0d02 100644
--- a/src/tcp_listener.erl
+++ b/src/tcp_listener.erl
@@ -25,6 +25,14 @@
-record(state, {sock, on_startup, on_shutdown, label}).
+%%----------------------------------------------------------------------------
+
+-ifdef(use_specs).
+-spec(start_link/8 ::
+ (gen_tcp:ip_address(), integer(), rabbit_types:infos(), integer(),
+ atom(), mfa(), mfa(), string()) -> rabbit_types:ok_pid_or_error()).
+-endif.
+
%%--------------------------------------------------------------------
start_link(IPAddress, Port, SocketOpts,
diff --git a/src/tcp_listener_sup.erl b/src/tcp_listener_sup.erl
index 58c2f30c..5bff5c27 100644
--- a/src/tcp_listener_sup.erl
+++ b/src/tcp_listener_sup.erl
@@ -22,6 +22,21 @@
-export([init/1]).
+%%----------------------------------------------------------------------------
+
+-ifdef(use_specs).
+
+-spec(start_link/7 ::
+ (gen_tcp:ip_address(), integer(), rabbit_types:infos(), mfa(), mfa(),
+ mfa(), string()) -> rabbit_types:ok_pid_or_error()).
+-spec(start_link/8 ::
+ (gen_tcp:ip_address(), integer(), rabbit_types:infos(), mfa(), mfa(),
+ mfa(), integer(), string()) -> rabbit_types:ok_pid_or_error()).
+
+-endif.
+
+%%----------------------------------------------------------------------------
+
start_link(IPAddress, Port, SocketOpts, OnStartup, OnShutdown,
AcceptCallback, Label) ->
start_link(IPAddress, Port, SocketOpts, OnStartup, OnShutdown,
diff --git a/src/worker_pool.erl b/src/worker_pool.erl
index e4f260cc..456ff39f 100644
--- a/src/worker_pool.erl
+++ b/src/worker_pool.erl
@@ -41,6 +41,7 @@
-spec(submit/1 :: (fun (() -> A) | {atom(), atom(), [any()]}) -> A).
-spec(submit_async/1 ::
(fun (() -> any()) | {atom(), atom(), [any()]}) -> 'ok').
+-spec(idle/1 :: (any()) -> 'ok').
-endif.
diff --git a/src/worker_pool_sup.erl b/src/worker_pool_sup.erl
index 28c1adc6..d37c3a0f 100644
--- a/src/worker_pool_sup.erl
+++ b/src/worker_pool_sup.erl
@@ -26,8 +26,8 @@
-ifdef(use_specs).
--spec(start_link/0 :: () -> {'ok', pid()} | {'error', any()}).
--spec(start_link/1 :: (non_neg_integer()) -> {'ok', pid()} | {'error', any()}).
+-spec(start_link/0 :: () -> rabbit_types:ok_pid_or_error()).
+-spec(start_link/1 :: (non_neg_integer()) -> rabbit_types:ok_pid_or_error()).
-endif.