Merge branch 'master' of http://192.168.0.88:53000/SisMaker/eGbh

src/gen_apu.erl

@@ -61,7 +61,7 @@
 	| {'via', RegMod :: module(), ViaName :: term()}.
 
 -type startOpt() ::
-	daemon |
+	notDaemon |
 	{'timeout', Time :: timeout()} |
 	{'spawn_opt', [proc_lib:spawn_option()]} |
 	enterLoopOpt().
@@ -222,7 +222,7 @@ init_it(Starter, self, ServerRef, Module, Args, Options) ->
 init_it(Starter, Parent, ServerRef, Module, Args, Options) ->
 	Name = gen:name(ServerRef),
 	Debug = gen:debug_options(Name, Options),
-	GbhOpts = #gbhOpts{daemon = lists:member(daemon, Options)},
+	GbhOpts = #gbhOpts{daemon = not lists:member(notDaemon, Options)},
 	HibernateAfterTimeout = gen:hibernate_after(Options),
 
 	case doModuleInit(Module, Args) of
@@ -279,7 +279,7 @@ enter_loop(Module, State, Opts, ServerName, Actions) ->
 	Name = gen:get_proc_name(ServerName),
 	Parent = gen:get_parent(),
 	Debug = gen:debug_options(Name, Opts),
-	GbhOpts = #gbhOpts{daemon = lists:member(daemon, Opts)},
+	GbhOpts = #gbhOpts{daemon = not lists:member(notDaemon, Opts)},
 	HibernateAfterTimeout = gen:hibernate_after(Opts),
 	loopEntry(Parent, Name, Module, GbhOpts, HibernateAfterTimeout, Debug, #{}, State, listify(Actions)).
 

src/gen_ipc.erl

@@ -382,7 +382,7 @@ init_it(Starter, self, ServerRef, Module, Args, Opts) ->
 init_it(Starter, Parent, ServerRef, Module, Args, Opts) ->
    Name = gen:name(ServerRef),
    Debug = gen:debug_options(Name, Opts),
-   GbhOpts = #gbhOpts{daemon = lists:member(daemon, Opts)},
+   GbhOpts = #gbhOpts{daemon = not lists:member(notDaemon, Opts)},
    HibernateAfterTimeout = gen:hibernate_after(Opts),
    case doModuleInit(Module, Args) of
       {ok, State} ->
@@ -436,7 +436,7 @@ enter_loop(Module, Status, State, Opts, ServerName, Actions) ->
    Parent = gen:get_parent(),
    Name = gen:get_proc_name(ServerName),
    Debug = gen:debug_options(Name, Opts),
-   GbhOpts = #gbhOpts{daemon = lists:member(daemon, Opts)},
+   GbhOpts = #gbhOpts{daemon = not lists:member(notDaemon, Opts)},
    HibernateAfterTimeout = gen:hibernate_after(Opts),
    loopEntry(Parent, Debug, Module, Name, GbhOpts, HibernateAfterTimeout, Status, State, Actions).
 

src/gen_mpp.erl

@@ -214,7 +214,7 @@ init_it(Starter, self, ServerRef, Module, Args, Options) ->
 init_it(Starter, Parent, ServerRef, Module, Args, Options) ->
    Name = gen:name(ServerRef),
    Debug = gen:debug_options(Name, Options),
-   GbhOpts = #gbhOpts{daemon = lists:member(daemon, Options)},
+   GbhOpts = #gbhOpts{daemon = not lists:member(notDaemon, Options)},
    HibernateAfterTimeout = gen:hibernate_after(Options),
 
    case doModuleInit(Module, Args) of
@@ -271,7 +271,7 @@ enter_loop(Module, State, Opts, ServerName, Actions) ->
    Name = gen:get_proc_name(ServerName),
    Parent = gen:get_parent(),
    Debug = gen:debug_options(Name, Opts),
-   GbhOpts = #gbhOpts{daemon = lists:member(daemon, Opts)},
+   GbhOpts = #gbhOpts{daemon = not lists:member(notDaemon, Opts)},
    HibernateAfterTimeout = gen:hibernate_after(Opts),
    loopEntry(Parent, Name, Module, GbhOpts, HibernateAfterTimeout, Debug, #{}, State, listify(Actions)).
 

src/gen_srv.erl

@@ -218,7 +218,7 @@ init_it(Starter, self, ServerRef, Module, Args, Options) ->
 init_it(Starter, Parent, ServerRef, Module, Args, Options) ->
    Name = gen:name(ServerRef),
    Debug = gen:debug_options(Name, Options),
-   GbhOpts = #gbhOpts{daemon = lists:member(daemon, Options)},
+   GbhOpts = #gbhOpts{daemon = not lists:member(notDaemon, Options)},
    HibernateAfterTimeout = gen:hibernate_after(Options),
 
    case doModuleInit(Module, Args) of
@@ -274,7 +274,7 @@ enter_loop(Module, State, Opts, ServerName, Actions) ->
    Name = gen:get_proc_name(ServerName),
    Parent = gen:get_parent(),
    Debug = gen:debug_options(Name, Opts),
-   GbhOpts = #gbhOpts{daemon = lists:member(daemon, Opts)},
+   GbhOpts = #gbhOpts{daemon = not lists:member(notDaemon, Opts)},
    HibernateAfterTimeout = gen:hibernate_after(Opts),
    loopEntry(Parent, Name, Module, GbhOpts, HibernateAfterTimeout, Debug, #{}, State, listify(Actions)).