Skip to content

Commit b7cbd44

Browse files
Merge pull request #2392 from fenollp/nohipe
drop deprecated HiPE compilation
2 parents 1c0cab5 + a514c24 commit b7cbd44

File tree

7 files changed

+3
-253
lines changed

7 files changed

+3
-253
lines changed

Makefile

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -64,24 +64,6 @@ define PROJECT_ENV
6464
{exit_on_close, false}
6565
]},
6666
{halt_on_upgrade_failure, true},
67-
{hipe_compile, false},
68-
%% see bug 24513 [in legacy Bugzilla] for how this list was created
69-
{hipe_modules,
70-
[rabbit_reader, rabbit_channel, gen_server2, rabbit_exchange,
71-
rabbit_command_assembler, rabbit_framing_amqp_0_9_1, rabbit_basic,
72-
rabbit_event, lists, queue, priority_queue, rabbit_router,
73-
rabbit_trace, rabbit_misc, rabbit_binary_parser,
74-
rabbit_exchange_type_direct, rabbit_guid, rabbit_net,
75-
rabbit_amqqueue_process, rabbit_variable_queue,
76-
rabbit_binary_generator, rabbit_writer, delegate, gb_sets, lqueue,
77-
sets, orddict, rabbit_amqqueue, rabbit_limiter, gb_trees,
78-
rabbit_queue_index, rabbit_exchange_decorator, gen, dict, ordsets,
79-
file_handle_cache, rabbit_msg_store, array,
80-
rabbit_msg_store_ets_index, rabbit_msg_file,
81-
rabbit_exchange_type_fanout, rabbit_exchange_type_topic, mnesia,
82-
mnesia_lib, rpc, mnesia_tm, qlc, sofs, proplists, credit_flow,
83-
pmon, ssl_connection, tls_connection, ssl_record, tls_record,
84-
gen_fsm, ssl]},
8567
{ssl_apps, [asn1, crypto, public_key, ssl]},
8668
%% see rabbitmq-server#114
8769
{mirroring_flow_control, true},

docs/rabbitmq.conf.example

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -463,12 +463,6 @@
463463
## NB: Change these only if you understand what you are doing!
464464
##
465465

466-
## Explicitly enable/disable hipe compilation. This option is deprecated
467-
## because HiPE supported has been
468-
## effectively discontinued in Erlang 22.
469-
##
470-
# hipe_compile = false
471-
472466
## Timeout used when waiting for Mnesia tables in a cluster to
473467
## become available.
474468
##

docs/rabbitmqctl.8

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2084,29 +2084,6 @@ to the connected client:
20842084
.Pp
20852085
Evaluates an Erlang expression on the target node
20862086
.\" ------------------------------------------------------------------
2087-
.It Cm hipe_compile Ar directory
2088-
.Pp
2089-
Performs HiPE-compilation and caches resulting
2090-
.Pa .beam Ns -files in the given directory.
2091-
.Pp
2092-
Parent directories are created if necessary.
2093-
Any existing
2094-
.Pa .beam
2095-
files from the directory are automatically deleted prior to compilation.
2096-
.Pp
2097-
To use this precompiled files, you should set
2098-
.Ev RABBITMQ_SERVER_CODE_PATH
2099-
environment variable to directory specified in
2100-
.Cm hipe_compile
2101-
invocation.
2102-
.Pp
2103-
For example, to HiPE-compile modules and store them to
2104-
.Pa /tmp/rabbit-hipe/ebin
2105-
directory:
2106-
.sp
2107-
.Dl rabbitmqctl hipe_compile /tmp/rabbit-hipe/ebin
2108-
.El
2109-
.\" ------------------------------------------------------------------
21102087
.\" ## Queue Operations
21112088
.\" ------------------------------------------------------------------
21122089
.Ss Queue Operations

priv/schema/rabbit.schema

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1070,6 +1070,8 @@ end}.
10701070
%% Explicitly enable/disable hipe compilation.
10711071
%%
10721072
%% {hipe_compile, true},
1073+
%%
1074+
%% DEPRECATED: this is a no-op and is kept only to allow old configs.
10731075

10741076
{mapping, "hipe_compile", "rabbit.hipe_compile",
10751077
[{datatype, {enum, [true, false]}}]}.

src/rabbit.erl

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -353,15 +353,7 @@ run_prelaunch_second_phase() ->
353353
%% 3. Logging.
354354
ok = rabbit_prelaunch_logging:setup(Context),
355355

356-
case IsInitialPass of
357-
true ->
358-
%% 4. HiPE compilation.
359-
ok = rabbit_prelaunch_hipe:setup(Context);
360-
false ->
361-
ok
362-
end,
363-
364-
%% 5. Clustering.
356+
%% 4. Clustering.
365357
ok = rabbit_prelaunch_cluster:setup(Context),
366358

367359
%% Start Mnesia now that everything is ready.

src/rabbit_hipe.erl

Lines changed: 0 additions & 171 deletions
This file was deleted.

src/rabbit_prelaunch_hipe.erl

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)