Merge pull request #314 from egertak/return_pid_from_enforce_once

Changes from Leapsight project

Author: cmeiklejohn

src/lasp_distribution_backend.erl

@@ -243,7 +243,7 @@ thread(Module, Function, Args) ->
 
 %% @doc Enforce a invariant once over a monotonic condition.
 %%
--spec enforce_once(id(), threshold(), function()) -> ok.
+-spec enforce_once(id(), threshold(), function()) -> {ok, pid()}.
 enforce_once(Id, Threshold, EnforceFun) ->
     gen_server:call(?MODULE, {enforce_once, Id, Threshold, EnforceFun}, infinity).
 
@@ -627,9 +627,9 @@ handle_call({enforce_once, Id, Threshold, EnforceFun},
             #state{store=Store}=State) ->
     lasp_marathon_simulations:log_message_queue_size("enforce_once"),
 
-    {ok, _Pid} = ?CORE:enforce_once(Id, Threshold, EnforceFun, Store),
+    {ok, Pid} = ?CORE:enforce_once(Id, Threshold, EnforceFun, Store),
 
-    {reply, ok, State};
+    {reply, {ok, Pid}, State};
 
 %% Spawn a function.
 handle_call({thread, Module, Function, Args},

test/lasp_SUITE.erl

@@ -852,7 +852,7 @@ counter_enforce_once_test(Config) ->
     lager:info("Adding invariant on node: ~p!", [Node]),
 
     case rpc:call(Node, lasp, enforce_once, [Id, Threshold, EnforceFun]) of
-        ok ->
+        {ok, _Pid} ->
             lager:info("Invariant configured!");
         Error ->
             lager:info("Invariant can't be configured: ~p", [Error]),
@@ -913,7 +913,7 @@ counter_strict_enforce_once_test(Config) ->
             lager:info("Adding invariant on node: ~p!", [Node]),
 
             case rpc:call(Node, lasp, enforce_once, [Id, Threshold, EnforceFun]) of
-                ok ->
+                {ok, _Pid} ->
                     lager:info("Invariant configured!");
                 Error ->
                     lager:info("Invariant can't be configured: ~p", [Error]),
@@ -973,7 +973,7 @@ awset_enforce_once_test(Config) ->
     lager:info("Adding invariant on node: ~p!", [Node]),
 
     case rpc:call(Node, lasp, enforce_once, [Id, Threshold, EnforceFun]) of
-        ok ->
+        {ok, _Pid} ->
             lager:info("Invariant configured!");
         Error ->
             lager:info("Invariant can't be configured: ~p", [Error]),
@@ -1027,7 +1027,7 @@ awset_strict_enforce_once_test(Config) ->
     lager:info("Adding invariant on node: ~p!", [Node]),
 
     case rpc:call(Node, lasp, enforce_once, [Id, Threshold, EnforceFun]) of
-        ok ->
+        {ok, _Pid} ->
             lager:info("Invariant configured!");
         Error ->
             lager:info("Invariant can't be configured: ~p", [Error]),
@@ -1081,7 +1081,7 @@ orset_enforce_once_test(Config) ->
     lager:info("Adding invariant on node: ~p!", [Node]),
 
     case rpc:call(Node, lasp, enforce_once, [Id, Threshold, EnforceFun]) of
-        ok ->
+        {ok, _Pid} ->
             lager:info("Invariant configured!");
         Error ->
             lager:info("Invariant can't be configured: ~p", [Error]),
@@ -1135,7 +1135,7 @@ orset_strict_enforce_once_test(Config) ->
     lager:info("Adding invariant on node: ~p!", [Node]),
 
     case rpc:call(Node, lasp, enforce_once, [Id, Threshold, EnforceFun]) of
-        ok ->
+        {ok, _Pid} ->
             lager:info("Invariant configured!");
         Error ->
             lager:info("Invariant can't be configured: ~p", [Error]),