Uw general improvements

.gitignore

@@ -2,4 +2,7 @@
 deps
 *.o
 *.beam
-*.plt
+*.plt
+_build
+.rebar3
+*.[eh]rl~

examples/gdict/src/gdict.app.src

@@ -0,0 +1,13 @@
+{application, gdict,
+ [
+  {description, ""},
+  {vsn, "1"},
+  {registered, []},
+  {applications, [
+                  kernel,
+                  stdlib,
+		  locks
+                 ]},
+  {mod, []},
+  {env, []}
+ ]}.

examples/src/gdict.erl → examples/gdict/src/gdict.erl

@@ -64,13 +64,13 @@ trace(F) when is_function(F, 0) ->
     F().
 
 new() ->
-    locks_leader:start_link(test_cb, dict:new()).
+    locks_leader:start_link(test_cb, #{}).
 
 new(Name) ->
-    locks_leader:start_link(Name, test_cb, dict:new(), []).
+    locks_leader:start_link(Name, test_cb, #{}, []).
 
 new_opt(Opts) ->
-    locks_leader:start_link(test_cb, dict:new(), Opts).
+    locks_leader:start_link(test_cb, #{}, Opts).
 
 -define(store(Dict,Expr,Legend),
 	locks_leader:leader_call(Dict, {store, fun(D) ->
@@ -84,27 +84,38 @@ new_opt(Opts) ->
 
 %% dict functions that modify state:
 append(Key, Value, Dict) ->
-    ?store(Dict, dict:append(Key,Value,D), append).
+    ?store(Dict, maps_append(Key,Value,D), append).
 append_list(Key, ValList, Dict) ->
-    ?store(Dict, dict:append_list(Key,ValList,D), append_list).
+    ?store(Dict, maps_append_list(Key,ValList,D), append_list).
 erase(Key, Dict) ->
-    ?store(Dict, dict:erase(Key,D), erase).
+    ?store(Dict, maps:remove(Key,D), erase).
 store(Key, Value, Dict) ->
-    ?store(Dict, dict:store(Key,Value,D), store).
+    ?store(Dict, maps:put(Key,Value,D), store).
 update(Key,Function,Dict) ->
-    ?store(Dict, dict:update(Key,Function,D), update).
+    ?store(Dict, maps:update_with(Key,Function,D), update).
 update(Key, Function, Initial, Dict) ->
-    ?store(Dict, dict:update(Key,Function,Initial,D), update).
+    ?store(Dict, maps:update_with(Key,Function,Initial,D), update).
 update_counter(Key, Incr, Dict) ->
-    ?store(Dict, dict:update_counter(Key,Incr,D), update_counter).
+    ?store(Dict, maps_update_counter(Key,Incr,D), update_counter).
 
 %% dict functions that do not modify state (lookup functions)
 %%
-fetch(Key, Dict) ->	 ?lookup(Dict, dict:fetch(Key,D),	fetch).
-fetch_keys(Dict) ->	 ?lookup(Dict, dict:fetch_keys(D),	fetch_keys).
-filter(Pred, Dict) ->	 ?lookup(Dict, dict:filter(Pred,D),	filter).
-find(Key, Dict) ->	 ?lookup(Dict, dict:find(Key,D),	find).
-fold(Fun, Acc0, Dict) -> ?lookup(Dict, dict:fold(Fun,Acc0,D),	fold).
-is_key(Key, Dict) ->	 ?lookup(Dict, dict:is_key(Key,D),	is_key).
-map(Fun, Dict) ->	 ?lookup(Dict, dict:map(Fun,D),		map).
-to_list(Dict) ->	 ?lookup(Dict, dict:to_list(D),		to_list).
+fetch(Key, Dict) ->      ?lookup(Dict, maps:get(Key,D),       fetch).
+fetch_keys(Dict) ->      ?lookup(Dict, maps:keys(D),          fetch_keys).
+filter(Pred, Dict) ->    ?lookup(Dict, maps:filter(Pred,D),   filter).
+find(Key, Dict) ->       ?lookup(Dict, maps:find(Key,D),      find).
+fold(Fun, Acc0, Dict) -> ?lookup(Dict, maps:fold(Fun,Acc0,D), fold).
+is_key(Key, Dict) ->     ?lookup(Dict, maps:is_key(Key,D),    is_key).
+map(Fun, Dict) ->        ?lookup(Dict, maps:map(Fun,D),       map).
+to_list(Dict) ->         ?lookup(Dict, maps:to_list(D),       to_list).
+
+maps_append(Key, Value, D) ->
+    maps_append_list(Key, [Value], D).
+
+maps_append_list(Key, ValList, D) ->
+    L = maps:get(Key, D, []),
+    D#{Key => L ++ ValList}.
+
+maps_update_counter(Key, Incr, D) ->
+    Old = maps:get(Key, D, 0),
+    D#{Key => Old + Incr}.

examples/src/test_cb.erl → examples/gdict/src/test_cb.erl

@@ -149,7 +149,7 @@ merge_dicts(D, I) ->
     lists:foldl(
       fun({C, {true, D2}}, Acc) ->
 	      ?event({merge_got, C, D2}),
-	      dict:merge(fun(_K,V1,_) -> V1 end, Acc, D2);
+              maps:merge(Acc, D2);   %% our content takes priority
 	 ({C, false}, Acc) ->
 	      ?event({merge_got, C, false}),
 	      Acc

include/locks.hrl

@@ -19,18 +19,20 @@
 -type agent()    :: pid().
 -type tid()      :: any().
 
--type lock_id()  :: {oid(), node()}.
+-type lock_id()  :: {oid() | '_', node()}.
 
 -type obj()      :: {oid(), mode()}
 		  | {oid(), mode(), where()}
 		  | {oid(), mode(), where(), req()}.
 
 -type objs()     :: [obj()].
 
--type options() :: [{link, boolean()}
-		    | {client, pid()}
-		    | {abort_on_error, boolean()}
-		    | {abort_on_deadlock, boolean()}].
+-type options() :: [option()].
+-type option() :: {link, boolean()}
+                | {client, pid()}
+                | {abort_on_error, boolean()}
+                | {await_nodes, boolean()}
+                | {abort_on_deadlock, boolean()}.
 
 -type deadlocks() :: [lock_id()].
 
@@ -60,7 +62,7 @@
 	  version = 1    :: integer()     | '_',
 	  pid = self()   :: pid()         | '_',
 	  queue = []     :: [#r{} | #w{}] | '_',
-	  watchers = [] :: [pid()]
+	  watchers = [] :: [pid()] | '_'
          }).
 
 -record(locks_info, {

rebar.config

@@ -25,8 +25,7 @@
                                  {app_default, "http://www.erlang.org/doc/man"},
                                  {doc_path, []},
                                  {top_level_readme,
-                                  {"./README.md","https://github.com/uwiger/locks"}}]}]}
-
+                                  {"./README.md","https://github.com/uwiger/locks"}}]}
+                   ]},
+            {test, [{project_app_dirs, [".", "examples/gdict"]}]}
            ]}.
-
-{ct_opts, [{dir, ["test", "examples/src"]}]}.

rebar.config.script

@@ -0,0 +1,8 @@
+%% -*- mode:erlang; erlang-indent-level:4; indent-tabs-mode:nil -*-
+case os:getenv("LOCKS_DEBUG") of
+    false ->
+        CONFIG;
+    S when S =/= "false" ->
+        io:fwrite("Enabling runtime debugging~n", []),
+        [{erl_opts, [{d,'LOCKS_DEBUG'}]} | CONFIG]
+end.

rebar.lock

@@ -0,0 +1,6 @@
+{"1.1.0",
+[{<<"plain_fsm">>,{pkg,<<"plain_fsm">>,<<"1.4.1">>},0}]}.
+[
+{pkg_hash,[
+ {<<"plain_fsm">>, <<"47E9BF6AC9322FC7586FB6DF8DE7198391E93764571C75165F2C45B27ACDE1D0">>}]}
+].

src/locks.erl

@@ -39,6 +39,7 @@
     lock_nowait/4,
     lock_objects/2,       %% (Agent, Objects)
     await_all_locks/1,    %% (Agent)
+    transaction_status/1, %% (Agent)
     watch/2,              %% (OID, Nodes)
     unwatch/2,            %% (OID, Nodes)
     watchers/1,           %% (OID)
@@ -191,6 +192,24 @@ lock_objects(Agent, Objects) ->
 await_all_locks(Agent) ->
     locks_agent:await_all_locks(Agent).
 
+%% @doc Inquire about the current status of the transaction.
+%% Return values:
+%% <dl>
+%% <dt>`no_locks'</dt>
+%%   <dd>No locks have been requested</dd>
+%% <dt>`{have_all_locks, Deadlocks}'</dt>
+%%   <dd>All requested locks have been claimed, `Deadlocks' indicates whether
+%%       any deadlocks were resolved in the process.</dd>
+%% <dt>`waiting'</dt>
+%%   <dd>Still waiting for some locks.</dd>
+%% <dt>`{cannot_serve, Objs}'</dt>
+%%   <dd>Some lock requests cannot be served, e.g. because some nodes are
+%%       unavailable.</dd>
+%% </dl>
+%% @end
+transaction_status(Agent) ->
+    locks_agent:transaction_status(Agent).
+
 -spec watch(oid(), [node()]) -> ok.
 %% @doc Subscribe to lock state changes.
 %%