Rename

11 files changed, 26 insertions, 26 deletions

diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl
index 2c2b747f..dd3d09d5 100644
--- a/src/rabbit_amqqueue_process.erl
+++ b/src/rabbit_amqqueue_process.erl
@@ -124,7 +124,7 @@ info_keys() -> ?INFO_KEYS.
 
 init(Q) ->
     process_flag(trap_exit, true),
-    rabbit_misc:store_identity(queue, Q#amqqueue.name),
+    rabbit_misc:store_proc_name(queue, Q#amqqueue.name),
     {ok, init_state(Q#amqqueue{pid = self()}), hibernate,
      {backoff, ?HIBERNATE_AFTER_MIN, ?HIBERNATE_AFTER_MIN, ?DESIRED_HIBERNATE}}.
 
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl
index 00ff1f43..ace9d112 100644
--- a/src/rabbit_channel.erl
+++ b/src/rabbit_channel.erl
@@ -195,7 +195,7 @@ init([Channel, ReaderPid, WriterPid, ConnPid, ConnName, Protocol, User, VHost,
       Capabilities, CollectorPid, LimiterPid]) ->
     process_flag(trap_exit, true),
     ok = pg_local:join(rabbit_channels, self()),
-    rabbit_misc:store_identity(channel, {ConnName, Channel}),
+    rabbit_misc:store_proc_name(channel, {ConnName, Channel}),
     State = #ch{state                   = starting,
                 protocol                = Protocol,
                 channel                 = Channel,
diff --git a/src/rabbit_connection_helper_sup.erl b/src/rabbit_connection_helper_sup.erl
index a9578748..f268d8d6 100644
--- a/src/rabbit_connection_helper_sup.erl
+++ b/src/rabbit_connection_helper_sup.erl
@@ -31,7 +31,7 @@
 -ifdef(use_specs).
 -spec(start_link/0 :: () -> rabbit_types:ok_pid_or_error()).
 -spec(start_channel_sup_sup/1 :: (pid()) -> rabbit_types:ok_pid_or_error()).
--spec(start_queue_collector/2 :: (pid(), rabbit_types:identity()) ->
+-spec(start_queue_collector/2 :: (pid(), rabbit_types:proc_name()) ->
                                       rabbit_types:ok_pid_or_error()).
 -endif.
 
diff --git a/src/rabbit_heartbeat.erl b/src/rabbit_heartbeat.erl
index cbe446c2..ff9de67a 100644
--- a/src/rabbit_heartbeat.erl
+++ b/src/rabbit_heartbeat.erl
@@ -40,16 +40,16 @@
          non_neg_integer(), heartbeat_callback()) -> heartbeaters()).
 
 -spec(start/7 ::
-        (pid(), rabbit_net:socket(), rabbit_types:identity(),
+        (pid(), rabbit_net:socket(), rabbit_types:proc_name(),
          non_neg_integer(), heartbeat_callback(),
          non_neg_integer(), heartbeat_callback()) -> heartbeaters()).
 
 -spec(start_heartbeat_sender/4 ::
         (rabbit_net:socket(), non_neg_integer(), heartbeat_callback(),
-         rabbit_types:type_identity()) -> rabbit_types:ok(pid())).
+         rabbit_types:proc_type_and_name()) -> rabbit_types:ok(pid())).
 -spec(start_heartbeat_receiver/4 ::
         (rabbit_net:socket(), non_neg_integer(), heartbeat_callback(),
-         rabbit_types:type_identity()) -> rabbit_types:ok(pid())).
+         rabbit_types:proc_type_and_name()) -> rabbit_types:ok(pid())).
 
 -spec(pause_monitor/1 :: (heartbeaters()) -> 'ok').
 -spec(resume_monitor/1 :: (heartbeaters()) -> 'ok').
@@ -121,7 +121,7 @@ start_heartbeater(TimeoutSec, SupPid, Sock, TimeoutFun, Name, Callback,
 heartbeater(Params, Identity) ->
     Deb = sys:debug_options([]),
     {ok, proc_lib:spawn_link(fun () ->
-                                     rabbit_misc:store_identity(Identity),
+                                     rabbit_misc:store_proc_name(Identity),
                                      heartbeater(Params, Deb, {0, 0})
                              end)}.
 
diff --git a/src/rabbit_limiter.erl b/src/rabbit_limiter.erl
index bce3f531..359e9261 100644
--- a/src/rabbit_limiter.erl
+++ b/src/rabbit_limiter.erl
@@ -145,7 +145,7 @@
 -type(qstate() :: #qstate{pid :: pid(),
                           state :: 'dormant' | 'active' | 'suspended'}).
 
--spec(start_link/1 :: (rabbit_types:identity()) ->
+-spec(start_link/1 :: (rabbit_types:proc_name()) ->
                            rabbit_types:ok_pid_or_error()).
 -spec(new/1 :: (pid()) -> lstate()).
 
@@ -323,7 +323,7 @@ update_credit(CTag, Credit, Drain, Credits) ->
 %%----------------------------------------------------------------------------
 
 init([Identity]) ->
-    rabbit_misc:store_identity(limiter, Identity),
+    rabbit_misc:store_proc_name(limiter, Identity),
     {ok, #lim{}}.
 
 prioritise_call(get_prefetch_limit, _From, _Len, _State) -> 9;
diff --git a/src/rabbit_mirror_queue_slave.erl b/src/rabbit_mirror_queue_slave.erl
index b1d334a9..9a7509c4 100644
--- a/src/rabbit_mirror_queue_slave.erl
+++ b/src/rabbit_mirror_queue_slave.erl
@@ -79,7 +79,7 @@ set_maximum_since_use(QPid, Age) ->
 info(QPid) -> gen_server2:call(QPid, info, infinity).
 
 init(Q) ->
-    rabbit_misc:store_identity(queue_slave, Q#amqqueue.name),
+    rabbit_misc:store_proc_name(queue_slave, Q#amqqueue.name),
     {ok, {not_started, Q}, hibernate,
      {backoff, ?HIBERNATE_AFTER_MIN, ?HIBERNATE_AFTER_MIN,
       ?DESIRED_HIBERNATE}}.
@@ -617,7 +617,7 @@ promote_me(From, #state { q                   = Q = #amqqueue { name = QName },
     KS1 = lists:foldl(fun (ChPid0, KS0) ->
                               pmon:demonitor(ChPid0, KS0)
                       end, KS, AwaitGmDown),
-    rabbit_misc:store_identity(queue, QName),
+    rabbit_misc:store_proc_name(queue, QName),
     rabbit_amqqueue_process:init_with_backing_queue_state(
       Q1, rabbit_mirror_queue_master, MasterState, RateTRef, Deliveries, KS1,
       MTC).
diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl
index 8244ea3f..5caa340e 100644
--- a/src/rabbit_misc.erl
+++ b/src/rabbit_misc.erl
@@ -70,7 +70,7 @@
 -export([interval_operation/4]).
 -export([ensure_timer/4, stop_timer/2]).
 -export([get_parent/0]).
--export([store_identity/1, store_identity/2]).
+-export([store_proc_name/1, store_proc_name/2]).
 
 %% Horrible macro to use in guards
 -define(IS_BENIGN_EXIT(R),
@@ -249,8 +249,8 @@
 -spec(ensure_timer/4 :: (A, non_neg_integer(), non_neg_integer(), any()) -> A).
 -spec(stop_timer/2 :: (A, non_neg_integer()) -> A).
 -spec(get_parent/0 :: () -> pid()).
--spec(store_identity/2 :: (atom(), rabbit_types:identity()) -> ok).
--spec(store_identity/1 :: (rabbit_types:type_identity()) -> ok).
+-spec(store_proc_name/2 :: (atom(), rabbit_types:proc_name()) -> ok).
+-spec(store_proc_name/1 :: (rabbit_types:proc_type_and_name()) -> ok).
 -endif.
 
 %%----------------------------------------------------------------------------
@@ -1085,8 +1085,8 @@ stop_timer(State, Idx) ->
                      end
     end.
 
-store_identity(Type, Identity) -> store_identity({Type, Identity}).
-store_identity(TypeIdentity)   -> put(rabbit_process_name, TypeIdentity).
+store_proc_name(Type, Identity) -> store_proc_name({Type, Identity}).
+store_proc_name(TypeIdentity)   -> put(process_name, TypeIdentity).
 
 %% -------------------------------------------------------------------------
 %% Begin copypasta from gen_server2.erl
diff --git a/src/rabbit_queue_collector.erl b/src/rabbit_queue_collector.erl
index 629c2bb2..73ef0eb2 100644
--- a/src/rabbit_queue_collector.erl
+++ b/src/rabbit_queue_collector.erl
@@ -31,7 +31,7 @@
 
 -ifdef(use_specs).
 
--spec(start_link/1 :: (rabbit_types:identity()) ->
+-spec(start_link/1 :: (rabbit_types:proc_name()) ->
                            rabbit_types:ok_pid_or_error()).
 -spec(register/2 :: (pid(), pid()) -> 'ok').
 -spec(delete_all/1 :: (pid()) -> 'ok').
@@ -52,7 +52,7 @@ delete_all(CollectorPid) ->
 %%----------------------------------------------------------------------------
 
 init([Identity]) ->
-    rabbit_misc:store_identity(queue_collector, Identity),
+    rabbit_misc:store_proc_name(queue_collector, Identity),
     {ok, #state{monitors = pmon:new(), delete_from = undefined}}.
 
 %%--------------------------------------------------------------------------
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl
index 4f058034..e5c8964c 100644
--- a/src/rabbit_reader.erl
+++ b/src/rabbit_reader.erl
@@ -212,7 +212,7 @@ start_connection(Parent, HelperSup, Deb, Sock, SockTransform) ->
     erlang:send_after(?HANDSHAKE_TIMEOUT * 1000, self(), handshake_timeout),
     {PeerHost, PeerPort, Host, Port} =
         socket_op(Sock, fun (S) -> rabbit_net:socket_ends(S, inbound) end),
-    rabbit_misc:store_identity(reader, list_to_binary(Name)),
+    rabbit_misc:store_proc_name(reader, list_to_binary(Name)),
     State = #v1{parent              = Parent,
                 sock                = ClientSock,
                 connection          = #connection{
diff --git a/src/rabbit_types.erl b/src/rabbit_types.erl
index 37d4acf3..0edebff1 100644
--- a/src/rabbit_types.erl
+++ b/src/rabbit_types.erl
@@ -30,8 +30,8 @@
               connection/0, protocol/0, user/0, internal_user/0,
               username/0, password/0, password_hash/0,
               ok/1, error/1, ok_or_error/1, ok_or_error2/2, ok_pid_or_error/0,
-              channel_exit/0, connection_exit/0, mfargs/0, identity/0,
-              type_identity/0]).
+              channel_exit/0, connection_exit/0, mfargs/0, proc_name/0,
+              proc_type_and_name/0]).
 
 -type(maybe(T) :: T | 'none').
 -type(vhost() :: binary()).
@@ -157,7 +157,7 @@
 
 -type(mfargs() :: {atom(), atom(), [any()]}).
 
--type(identity() :: term()).
--type(type_identity() :: {atom(), identity()}).
+-type(proc_name() :: term()).
+-type(proc_type_and_name() :: {atom(), proc_name()}).
 
 -endif. % use_specs
diff --git a/src/rabbit_writer.erl b/src/rabbit_writer.erl
index 433bac24..b1d4c5bd 100644
--- a/src/rabbit_writer.erl
+++ b/src/rabbit_writer.erl
@@ -52,12 +52,12 @@
 -spec(start/7 ::
         (rabbit_net:socket(), rabbit_channel:channel_number(),
          non_neg_integer(), rabbit_types:protocol(), pid(),
-         rabbit_types:identity(), boolean())
+         rabbit_types:proc_name(), boolean())
         -> rabbit_types:ok(pid())).
 -spec(start_link/7 ::
         (rabbit_net:socket(), rabbit_channel:channel_number(),
          non_neg_integer(), rabbit_types:protocol(), pid(),
-         rabbit_types:identity(), boolean())
+         rabbit_types:proc_name(), boolean())
         -> rabbit_types:ok(pid())).
 
 -spec(system_code_change/4 :: (_,_,_,_) -> {'ok',_}).
@@ -142,7 +142,7 @@ system_code_change(Misc, _Module, _OldVsn, _Extra) ->
 
 enter_mainloop(Identity, State) ->
     Deb = sys:debug_options([]),
-    rabbit_misc:store_identity(writer, Identity),
+    rabbit_misc:store_proc_name(writer, Identity),
     mainloop(Deb, State).
 
 mainloop(Deb, State) ->