Merge pull request #230 from feng19/new_sup2_state

fix supervisor2's state for get {badrecord,state} error when release upgrade

Author: michaelklishin

Makefile

@@ -58,6 +58,12 @@ ifeq ($(call compare_version,$(ERTS_VER),$(tls_atom_version_MAX_ERTS_VER),<),tru
 RMQ_ERLC_OPTS += -Ddefine_tls_atom_version
 endif
 
+# supervisor's state change from erts-7.0(18)
+new_sup2_state_MAX_ERTS_VER = 7.0
+ifeq ($(call compare_version,$(ERTS_VER),$(new_sup2_state_MAX_ERTS_VER),>),true)
+RMQ_ERLC_OPTS += -Ddefine_new_sup2_state
+endif
+
 # For src/*_compat.erl modules, we don't want to set -Werror because for
 # instance, warnings about removed functions (e.g. ssl:connection_info/1
 # in Erlang 20) can't be turned off.

src/supervisor2.erl

@@ -118,6 +118,7 @@
 
 -include("include/old_builtin_types.hrl").
 
+-ifndef(define_new_sup2_state).
 -record(state, {name,
 		strategy               :: strategy(),
 		children = []          :: [child_rec()],
@@ -127,6 +128,18 @@
 		restarts = [],
 	        module,
 	        args}).
+-else.
+-record(state, {name,
+		strategy               :: strategy(),
+		children = []          :: [child_rec()],
+		dynamics               :: ?DICT_TYPE() | ?SET_TYPE(),
+		intensity              :: non_neg_integer(),
+		period                 :: pos_integer(),
+		restarts = [],
+		dynamic_restarts = 0   :: non_neg_integer(),
+	        module,
+	        args}).
+-endif.
 -type state() :: #state{}.
 
 -define(is_simple(State), State#state.strategy =:= simple_one_for_one).