Merge pull request #111 from rabbitmq/rabbitmq-server-860

Compile on OTP 19.0

Author: michaelklishin

codegen.py

@@ -95,7 +95,7 @@ def prettyType(typeName, subTypes, typesPerLine = 4):
     sTs = multiLineFormat(subTypes,
                           "( ", " | ", "\n       | ", " )",
                           thingsPerLine = typesPerLine)
-    return "-type(%s ::\n       %s)." % (typeName, sTs)
+    return "-type %s ::\n       %s." % (typeName, sTs)
 
 def printFileHeader():
     print("""%%   Autogenerated code. Do not edit.
@@ -348,26 +348,25 @@ def genAmqpException(c,v,cls):
 
 """)
     print("%% Various types")
-    print("-ifdef(use_specs).")
 
     print("""-export_type([amqp_field_type/0, amqp_property_type/0,
               amqp_table/0, amqp_array/0, amqp_value/0,
               amqp_method_name/0, amqp_method/0, amqp_method_record/0,
               amqp_method_field_name/0, amqp_property_record/0,
               amqp_exception/0, amqp_exception_code/0, amqp_class_id/0]).
 
--type(amqp_field_type() ::
+-type amqp_field_type() ::
       'longstr' | 'signedint' | 'decimal' | 'timestamp' |
       'unsignedbyte' | 'unsignedshort' | 'unsignedint' |
       'table' | 'byte' | 'double' | 'float' | 'long' |
-      'short' | 'bool' | 'binary' | 'void' | 'array').
--type(amqp_property_type() ::
+      'short' | 'bool' | 'binary' | 'void' | 'array'.
+-type amqp_property_type() ::
       'shortstr' | 'longstr' | 'octet' | 'short' | 'long' |
-      'longlong' | 'timestamp' | 'bit' | 'table').
+      'longlong' | 'timestamp' | 'bit' | 'table'.
 
--type(amqp_table() :: [{binary(), amqp_field_type(), amqp_value()}]).
--type(amqp_array() :: [{amqp_field_type(), amqp_value()}]).
--type(amqp_value() :: binary() |    % longstr
+-type amqp_table() :: [{binary(), amqp_field_type(), amqp_value()}].
+-type amqp_array() :: [{amqp_field_type(), amqp_value()}].
+-type amqp_value() :: binary() |    % longstr
                       integer() |   % signedint
                       {non_neg_integer(), non_neg_integer()} | % decimal
                       amqp_table() |
@@ -379,8 +378,7 @@ def genAmqpException(c,v,cls):
                       boolean() |   % bool
                       binary() |    % binary
                       'undefined' | % void
-                      non_neg_integer() % timestamp
-     ).
+                      non_neg_integer(). % timestamp
 """)
 
     print(prettyType("amqp_method_name()",
@@ -410,27 +408,25 @@ def genAmqpException(c,v,cls):
                      ["%i" % ci for ci in classIds]))
     print(prettyType("amqp_class_name()",
                      ["%s" % c.erlangName() for c in spec.allClasses()]))
-    print("-endif. % use_specs")
 
     print("""
 %% Method signatures
--ifdef(use_specs).
--spec(version/0 :: () -> {non_neg_integer(), non_neg_integer(), non_neg_integer()}).
--spec(lookup_method_name/1 :: (amqp_method()) -> amqp_method_name()).
--spec(lookup_class_name/1 :: (amqp_class_id()) -> amqp_class_name()).
--spec(method_id/1 :: (amqp_method_name()) -> amqp_method()).
--spec(method_has_content/1 :: (amqp_method_name()) -> boolean()).
--spec(is_method_synchronous/1 :: (amqp_method_record()) -> boolean()).
--spec(method_record/1 :: (amqp_method_name()) -> amqp_method_record()).
--spec(method_fieldnames/1 :: (amqp_method_name()) -> [amqp_method_field_name()]).
--spec(decode_method_fields/2 ::
-        (amqp_method_name(), binary()) -> amqp_method_record() | rabbit_types:connection_exit()).
--spec(decode_properties/2 :: (non_neg_integer(), binary()) -> amqp_property_record()).
--spec(encode_method_fields/1 :: (amqp_method_record()) -> binary()).
--spec(encode_properties/1 :: (amqp_property_record()) -> binary()).
--spec(lookup_amqp_exception/1 :: (amqp_exception()) -> {boolean(), amqp_exception_code(), binary()}).
--spec(amqp_exception/1 :: (amqp_exception_code()) -> amqp_exception()).
--endif. % use_specs
+-spec version() -> {non_neg_integer(), non_neg_integer(), non_neg_integer()}.
+-spec lookup_method_name(amqp_method()) -> amqp_method_name().
+-spec lookup_class_name(amqp_class_id()) -> amqp_class_name().
+-spec method_id(amqp_method_name()) -> amqp_method().
+-spec method_has_content(amqp_method_name()) -> boolean().
+-spec is_method_synchronous(amqp_method_record()) -> boolean().
+-spec method_record(amqp_method_name()) -> amqp_method_record().
+-spec method_fieldnames(amqp_method_name()) -> [amqp_method_field_name()].
+-spec decode_method_fields(amqp_method_name(), binary()) ->
+          amqp_method_record() | rabbit_types:connection_exit().
+-spec decode_properties(non_neg_integer(), binary()) -> amqp_property_record().
+-spec encode_method_fields(amqp_method_record()) -> binary().
+-spec encode_properties(amqp_property_record()) -> binary().
+-spec lookup_amqp_exception(amqp_exception()) ->
+          {boolean(), amqp_exception_code(), binary()}.
+-spec amqp_exception(amqp_exception_code()) -> amqp_exception().
 
 bitvalue(true) -> 1;
 bitvalue(false) -> 0;

include/rabbit_msg_store.hrl

@@ -16,10 +16,6 @@
 
 -include("rabbit.hrl").
 
--ifdef(use_specs).
-
 -type(msg() :: any()).
 
--endif.
-
 -record(msg_location, {msg_id, ref_count, file, offset, total_size}).

src/app_utils.erl

@@ -19,8 +19,6 @@
          stop_applications/1, stop_applications/2, app_dependency_order/2,
          app_dependencies/1]).
 
--ifdef(use_specs).
-
 -type error_handler() :: fun((atom(), any()) -> 'ok').
 
 -spec load_applications([atom()])                   -> 'ok'.
@@ -31,8 +29,6 @@
 -spec app_dependency_order([atom()], boolean())     -> [digraph:vertex()].
 -spec app_dependencies(atom())                      -> [atom()].
 
--endif.
-
 %%---------------------------------------------------------------------------
 %% Public API
 

src/credit_flow.erl

@@ -65,22 +65,19 @@
 
 %%----------------------------------------------------------------------------
 
--ifdef(use_specs).
-
 -export_type([bump_msg/0]).
 
 -opaque(bump_msg() :: {pid(), non_neg_integer()}).
 -type(credit_spec() :: {non_neg_integer(), non_neg_integer()}).
 
--spec(send/1 :: (pid()) -> 'ok').
--spec(send/2 :: (pid(), credit_spec()) -> 'ok').
--spec(ack/1 :: (pid()) -> 'ok').
--spec(ack/2 :: (pid(), credit_spec()) -> 'ok').
--spec(handle_bump_msg/1 :: (bump_msg()) -> 'ok').
--spec(blocked/0 :: () -> boolean()).
--spec(peer_down/1 :: (pid()) -> 'ok').
-
--endif.
+-spec send
+        (pid()) -> 'ok';
+        (credit_spec()) -> 'ok'.
+-spec ack(pid()) -> 'ok'.
+-spec ack(pid(), credit_spec()) -> 'ok'.
+-spec handle_bump_msg(bump_msg()) -> 'ok'.
+-spec blocked() -> boolean().
+-spec peer_down(pid()) -> 'ok'.
 
 %%----------------------------------------------------------------------------
 

src/gen_server2.erl

@@ -220,21 +220,18 @@
 -record(gs2_state, {parent, name, state, mod, time,
                     timeout_state, queue, debug, prioritisers}).
 
--ifdef(use_specs).
-
 %%%=========================================================================
 %%%  Specs. These exist only to shut up dialyzer's warnings
 %%%=========================================================================
 
--type(gs2_state() :: #gs2_state{}).
+-type gs2_state() :: #gs2_state{}.
 
--spec(handle_common_termination/3 ::
-        (any(), atom(), gs2_state()) -> no_return()).
--spec(hibernate/1 :: (gs2_state()) -> no_return()).
--spec(pre_hibernate/1 :: (gs2_state()) -> no_return()).
--spec(system_terminate/4 :: (_, _, _, gs2_state()) -> no_return()).
+-spec handle_common_termination(any(), atom(), gs2_state()) -> no_return().
+-spec hibernate(gs2_state()) -> no_return().
+-spec pre_hibernate(gs2_state()) -> no_return().
+-spec system_terminate(_, _, _, gs2_state()) -> no_return().
 
--type(millis() :: non_neg_integer()).
+-type millis() :: non_neg_integer().
 
 %%%=========================================================================
 %%%  API
@@ -276,18 +273,6 @@
 %% for handle_pre_hibernate/1 and handle_post_hibernate/1 will result
 %% in warnings (the same applied for the behaviour_info before).
 
--else.
-
--export([behaviour_info/1]).
-
-behaviour_info(callbacks) ->
-    [{init,1},{handle_call,3},{handle_cast,2},{handle_info,2},
-     {terminate,2},{code_change,3}];
-behaviour_info(_Other) ->
-    undefined.
-
--endif.
-
 %%%  -----------------------------------------------------------------
 %%% Starts a generic server.
 %%% start(Mod, Args, Options)
@@ -625,9 +610,7 @@ extend_backoff(undefined) ->
     undefined;
 extend_backoff({backoff, InitialTimeout, MinimumTimeout, DesiredHibPeriod}) ->
     {backoff, InitialTimeout, MinimumTimeout, DesiredHibPeriod,
-      {erlang:phash2([node()]),
-       time_compat:monotonic_time(),
-       time_compat:unique_integer()}}.
+      rand_compat:seed(exsplus)}.
 
 %%%========================================================================
 %%% Internal functions
@@ -767,7 +750,7 @@ adjust_timeout_state(SleptAt, AwokeAt, {backoff, CurrentTO, MinimumTO,
             true -> lists:max([MinimumTO, CurrentTO div 2]);
             false -> CurrentTO
         end,
-    {Extra, RandomState1} = random:uniform_s(Base, RandomState),
+    {Extra, RandomState1} = rand_compat:uniform_s(Base, RandomState),
     CurrentTO1 = Base + Extra,
     {backoff, CurrentTO1, MinimumTO, DesiredHibPeriod, RandomState1}.
 

src/mirrored_supervisor.erl

@@ -151,10 +151,6 @@
                 initial_childspecs,
                 child_order}).
 
-%%----------------------------------------------------------------------------
-
--ifdef(use_specs).
-
 %%--------------------------------------------------------------------------
 %% Callback behaviour
 %%--------------------------------------------------------------------------
@@ -200,15 +196,6 @@
 -spec create_tables() -> Result when
       Result :: 'ok'.
 
--else.
-
--export([behaviour_info/1]).
-
-behaviour_info(callbacks) -> [{init,1}];
-behaviour_info(_Other)    -> undefined.
-
--endif.
-
 %%----------------------------------------------------------------------------
 
 start_link(Group, TxFun, Mod, Args) ->

src/pmon.erl

@@ -36,8 +36,6 @@
 
 -record(state, {dict, module}).
 
--ifdef(use_specs).
-
 %%----------------------------------------------------------------------------
 
 -export_type([?MODULE/0]).
@@ -47,17 +45,15 @@
 
 -type(item()         :: pid() | {atom(), node()}).
 
--spec(new/0          :: () -> ?MODULE()).
--spec(new/1          :: ('erlang' | 'delegate') -> ?MODULE()).
--spec(monitor/2      :: (item(), ?MODULE()) -> ?MODULE()).
--spec(monitor_all/2  :: ([item()], ?MODULE()) -> ?MODULE()).
--spec(demonitor/2    :: (item(), ?MODULE()) -> ?MODULE()).
--spec(is_monitored/2 :: (item(), ?MODULE()) -> boolean()).
--spec(erase/2        :: (item(), ?MODULE()) -> ?MODULE()).
--spec(monitored/1    :: (?MODULE()) -> [item()]).
--spec(is_empty/1     :: (?MODULE()) -> boolean()).
-
--endif.
+-spec new() -> ?MODULE().
+-spec new('erlang' | 'delegate') -> ?MODULE().
+-spec monitor(item(), ?MODULE()) -> ?MODULE().
+-spec monitor_all([item()], ?MODULE()) -> ?MODULE().
+-spec demonitor(item(), ?MODULE()) -> ?MODULE().
+-spec is_monitored(item(), ?MODULE()) -> boolean().
+-spec erase(item(), ?MODULE()) -> ?MODULE().
+-spec monitored(?MODULE()) -> [item()].
+-spec is_empty(?MODULE()) -> boolean().
 
 new() -> new(erlang).
 

src/priority_queue.erl

@@ -45,32 +45,28 @@
 
 %%----------------------------------------------------------------------------
 
--ifdef(use_specs).
-
 -export_type([q/0]).
 
 -type(q() :: pqueue()).
 -type(priority() :: integer() | 'infinity').
 -type(squeue() :: {queue, [any()], [any()], non_neg_integer()}).
 -type(pqueue() ::  squeue() | {pqueue, [{priority(), squeue()}]}).
 
--spec(new/0 :: () -> pqueue()).
--spec(is_queue/1 :: (any()) -> boolean()).
--spec(is_empty/1 :: (pqueue()) -> boolean()).
--spec(len/1 :: (pqueue()) -> non_neg_integer()).
--spec(to_list/1 :: (pqueue()) -> [{priority(), any()}]).
--spec(from_list/1 :: ([{priority(), any()}]) -> pqueue()).
--spec(in/2 :: (any(), pqueue()) -> pqueue()).
--spec(in/3 :: (any(), priority(), pqueue()) -> pqueue()).
--spec(out/1 :: (pqueue()) -> {empty | {value, any()}, pqueue()}).
--spec(out_p/1 :: (pqueue()) -> {empty | {value, any(), priority()}, pqueue()}).
--spec(join/2 :: (pqueue(), pqueue()) -> pqueue()).
--spec(filter/2 :: (fun ((any()) -> boolean()), pqueue()) -> pqueue()).
--spec(fold/3 ::
-        (fun ((any(), priority(), A) -> A), A, pqueue()) -> A).
--spec(highest/1 :: (pqueue()) -> priority() | 'empty').
-
--endif.
+-spec new() -> pqueue().
+-spec is_queue(any()) -> boolean().
+-spec is_empty(pqueue()) -> boolean().
+-spec len(pqueue()) -> non_neg_integer().
+-spec to_list(pqueue()) -> [{priority(), any()}].
+-spec from_list([{priority(), any()}]) -> pqueue().
+-spec in(any(), pqueue()) -> pqueue().
+-spec in(any(), priority(), pqueue()) -> pqueue().
+-spec out(pqueue()) -> {empty | {value, any()}, pqueue()}.
+-spec out_p(pqueue()) -> {empty | {value, any(), priority()}, pqueue()}.
+-spec join(pqueue(), pqueue()) -> pqueue().
+-spec filter(fun ((any()) -> boolean()), pqueue()) -> pqueue().
+-spec fold
+        (fun ((any(), priority(), A) -> A), A, pqueue()) -> A.
+-spec highest(pqueue()) -> priority() | 'empty'.
 
 %%----------------------------------------------------------------------------