From 74755d8d18aa1769840b0914fe73e9c5c4b3219b Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Thu, 24 Jan 2013 14:34:56 +0100
Subject: Remove upgrade code not needed after application restart

Which will be the case with R16B in this case.
---
 lib/diameter/src/base/diameter_reg.erl      |  9 +--------
 lib/diameter/src/base/diameter_service.erl  | 26 ++++----------------------
 lib/diameter/src/base/diameter_watchdog.erl |  9 +--------
 lib/diameter/src/transport/diameter_tcp.erl |  2 --
 4 files changed, 6 insertions(+), 40 deletions(-)

diff --git a/lib/diameter/src/base/diameter_reg.erl b/lib/diameter/src/base/diameter_reg.erl
index 619b12ecad..ac58e4bf5b 100644
--- a/lib/diameter/src/base/diameter_reg.erl
+++ b/lib/diameter/src/base/diameter_reg.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -208,10 +208,6 @@ init(_) ->
 %% # handle_call/3
 %% ----------------------------------------------------------
 
-handle_call(Req, From, S)
-  when not is_record(S, state) ->
-    handle_call(Req, From, upgrade(S));
-
 handle_call({add, Fun, Key, Pid}, _, S) ->
     B = Fun(?TABLE, {Key, Pid}),
     monitor(B andalso no_monitor(Pid), Pid),
@@ -281,9 +277,6 @@ code_change(_OldVsn, State, _Extra) ->
 
 %% ===========================================================================
 
-upgrade(S) ->
-    #state{} = list_to_tuple(tuple_to_list(S) ++ [[]]).
-
 monitor(true, Pid) ->
     ets:insert(?TABLE, ?MONITOR(Pid, erlang:monitor(process, Pid)));
 monitor(false, _) ->
diff --git a/lib/diameter/src/base/diameter_service.erl b/lib/diameter/src/base/diameter_service.erl
index d2a416166f..4e6cb3cd79 100644
--- a/lib/diameter/src/base/diameter_service.erl
+++ b/lib/diameter/src/base/diameter_service.erl
@@ -151,7 +151,7 @@
          ref  :: match(reference()),  %% key into diameter_config
          options :: match([diameter:transport_opt()]),%% from start_transport
          op_state = {?STATE_DOWN, ?WD_INITIAL}
-                 :: match(op_state() | {op_state(), wd_state()}),
+                 :: match({op_state(), wd_state()}),
          started = now(),      %% at process start
          conn = false :: match(boolean() | pid())}).
                       %% true at accepted, pid() at connection_up or reopen
@@ -742,11 +742,8 @@ shutdown(Who, Reason, T) ->
                                 [],
                                 T)).
 
-shutdown(conn = Who, #peer{op_state = {OS,_}} = P, Reason, Acc) ->
-    shutdown(Who, P#peer{op_state = OS}, Reason, Acc);
-
 shutdown(conn,
-         #peer{pid = Pid, op_state = ?STATE_UP, conn = TPid},
+         #peer{pid = Pid, op_state = {?STATE_UP, _}, conn = TPid},
          Reason,
          Acc) ->
     TPid ! {shutdown, Pid, Reason},
@@ -962,14 +959,7 @@ accepted(Pid, _TPid, #state{peerT = PeerT} = S) ->
 
 fetch(Tid, Key) ->
     [T] = ets:lookup(Tid, Key),
-    case T of
-        #peer{op_state = ?STATE_UP} = P ->
-            P#peer{op_state = {?STATE_UP, ?WD_OKAY}};
-        #peer{op_state = ?STATE_DOWN} = P ->
-            P#peer{op_state = {?STATE_DOWN, ?WD_DOWN}};
-        _ ->
-            T
-    end.
+    T.
 
 %%% ---------------------------------------------------------------------------
 %%% # connection_up/3
@@ -3173,10 +3163,9 @@ peer_acc(ConnT, Acc, #peer{pid = Pid,
                            type = Type,
                            ref = Ref,
                            options = Opts,
-                           op_state = OS,
+                           op_state = {_, WS},
                            started = T,
                            conn = TPid}) ->
-    WS = wd_state(OS),
     dict:append(Ref,
                 [{type, Type},
                  {options, Opts},
@@ -3210,13 +3199,6 @@ config_acc({Ref, T, Opts}, Dict)
 config_acc(_, Dict) ->
     Dict.
 
-wd_state({_,S}) ->
-    S;
-wd_state(?STATE_UP) ->
-    ?WD_OKAY;
-wd_state(?STATE_DOWN) ->
-    ?WD_DOWN.
-
 info_conn([#conn{pid = Pid, apps = SApps, caps = Caps, started = T}]) ->
     [{peer, {Pid, T}},
      {apps, SApps},
diff --git a/lib/diameter/src/base/diameter_watchdog.erl b/lib/diameter/src/base/diameter_watchdog.erl
index a5429c967c..ad4a142f76 100644
--- a/lib/diameter/src/base/diameter_watchdog.erl
+++ b/lib/diameter/src/base/diameter_watchdog.erl
@@ -157,14 +157,7 @@ handle_info(T, #watchdog{} = State) ->
             ?LOG(stop, T),
             event(State, State#watchdog{status = down}),
             {stop, {shutdown, T}, State}
-    end;
-
-handle_info(T, S) ->
-    handle_info(T, upgrade(S)).
-
-upgrade(S) ->
-    #watchdog{} = list_to_tuple(tuple_to_list(S)
-                                ++ [?NOMASK, {nodes, true}, false]).
+    end.
 
 event(#watchdog{status = T}, #watchdog{status = T}) ->
     ok;
diff --git a/lib/diameter/src/transport/diameter_tcp.erl b/lib/diameter/src/transport/diameter_tcp.erl
index 7ec7b1c5e7..596e582ab0 100644
--- a/lib/diameter/src/transport/diameter_tcp.erl
+++ b/lib/diameter/src/transport/diameter_tcp.erl
@@ -368,8 +368,6 @@ handle_info(T, #monitor{} = S) ->
 %% # code_change/3
 %% ---------------------------------------------------------------------------
 
-code_change(_, {transport, _, _, _, _} = S, _) ->
-    {ok, #transport{} = list_to_tuple(tuple_to_list(S) ++ [false])};
 code_change(_, State, _) ->
     {ok, State}.
 
-- 
cgit v1.2.3