← Back to branch summary

~clint-fewbar/ubuntu/precise/erlang/merge-15b

« back to all changes in this revision

Viewing changes to lib/kernel/src/application_controller.erl

  • Committer: Package Import Robot
  • Author(s): Sergei Golovan
  • Date: 2011-12-15 19:20:10 UTC
  • mfrom: (1.1.18) (3.5.15 sid)
  • mto: (3.5.16 sid)
  • mto: This revision was merged to the branch mainline in revision 33.
  • Revision ID: package-import@ubuntu.com-20111215192010-jnxcfe3tbrpp0big
Tags: 1:15.b-dfsg-1
* New upstream release.
* Upload to experimental because this release breaks external drivers
  API along with ABI, so several applications are to be fixed.
* Removed SSL patch because the old SSL implementation is removed from
  the upstream distribution.
* Removed never used patch which added native code to erlang beam files.
* Removed the erlang-docbuilder binary package because the docbuilder
  application was dropped by upstream.
* Documented dropping ${erlang-docbuilder:Depends} substvar in
  erlang-depends(1) manpage.
* Made erlang-base and erlang-base-hipe provide virtual package
  erlang-abi-15.b (the number means the first erlang version, which
  provides current ABI).

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/kernel/src/application_controller.erl
1
1
%%
2
2
%% %CopyrightBegin%
3
3
%%
4
 
%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
 
4
%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
5
5
%%
6
6
%% The contents of this file are subject to the Erlang Public License,
7
7
%% Version 1.1, (the "License"); you may not use this file except in
1180
1180
        _ ->
1181
1181
            ok
1182
1182
    end,
 
1183
    ShutdownTimeout =
 
1184
        case application:get_env(kernel, shutdown_timeout) of
 
1185
            undefined -> infinity;
 
1186
            {ok,T} -> T
 
1187
        end,
1183
1188
    foreach(fun({_AppName, Id}) when is_pid(Id) -> 
 
1189
                    Ref = erlang:monitor(process, Id),
 
1190
                    unlink(Id),
1184
1191
                    exit(Id, shutdown),
1185
1192
                    receive
 
1193
                        %% Proc died before link
1186
1194
                        {'EXIT', Id, _} -> ok
 
1195
                    after 0 ->
 
1196
                            receive
 
1197
                                {'DOWN', Ref, process, Id, _} -> ok
 
1198
                            after ShutdownTimeout ->
 
1199
                                    exit(Id, kill),
 
1200
                                    receive
 
1201
                                        {'DOWN', Ref, process, Id, _} -> ok
 
1202
                                    end
 
1203
                            end
1187
1204
                    end;
1188
1205
               (_) -> ok
1189
1206
            end,