Fix dialyzer spec errors in cxy_ctl and ets_buffer; don't dialyze _SUITE

Author: jaynel

Makefile

@@ -10,6 +10,6 @@ TEST_ERLC_OPTS := -I include -I test/epocxy $(ERLC_OPTS)
 CT_OPTS := -cover test/epocxy.coverspec
 CT_SUITES = ets_buffer cxy_ctl cxy_cache
 
-DIALYZER_OPTS := -I include test/epocxy -Werror_handling -Wrace_conditions -Wunmatched_returns
+DIALYZER_OPTS := -I include -Werror_handling -Wrace_conditions -Wunmatched_returns
 
 include erlang.mk

src/cxy_ctl.erl

@@ -40,7 +40,7 @@
 -type dict_value()     :: any().
 -type dict_entry()     :: {dict_key(), dict_value()}.
 -type dict_prop()      :: dict_key() | dict_entry().
--type dict_props()     :: [dict_prop()].
+-type dict_props()     :: [dict_prop()] | none | all_keys.
 -type dict_prop_vals() :: [{?VALID_DICT_VALUE_MARKER, dict_entry()}].
 
 -spec make_process_dictionary_default_value(Key, Value)
@@ -401,7 +401,7 @@ get_calling_dictionary_values([], Props) -> Props.
 
 
 -spec execute_wrapper(atom(), atom(), list(), atom(), integer(), false | erlang:timestamp(), spawn | inline, dict_prop_vals())
-                     -> true | no_return().
+                     -> any() | no_return().
 
 %% If Start is 'false', we don't want to record elapsed time history...
 execute_wrapper(Mod, Fun, Args, Task_Type, _Max_History, false, Spawn_Or_Inline, Dict_Prop_Pairs) ->

src/ets_buffer.erl

@@ -263,7 +263,7 @@ buffer_data(Name, Loc, Time, Data) ->
               | {buffer_name(), fifo | lifo}]) -> ets_buffer.
 -spec create(buffer_name(), fifo | lifo) -> buffer_name().
 -spec create(buffer_name(), ring, buffer_size()) -> buffer_name().
--spec clear(buffer_name()) -> boolean().
+-spec clear(buffer_name()) -> boolean() | buffer_error().
 -spec delete(buffer_name()) -> boolean().
 
 -spec write(buffer_name(), buffer_data()) -> non_neg_integer() | true | buffer_error().
@@ -419,7 +419,7 @@ clear_high_water(Buffer_Name) when is_atom(Buffer_Name) ->
 -spec list_dedicated(buffer_name()) -> proplists:proplist().
 -spec create_dedicated(buffer_name(), fifo | lifo) -> buffer_name().
 -spec create_dedicated(buffer_name(), ring, buffer_size()) -> buffer_name().
--spec clear_dedicated(buffer_name()) -> boolean().
+-spec clear_dedicated(buffer_name()) -> boolean() | buffer_error().
 -spec delete_dedicated(buffer_name()) -> boolean().
 
 -spec write_dedicated(buffer_name(), any()) -> non_neg_integer() | true | buffer_error().
@@ -429,10 +429,10 @@ clear_high_water(Buffer_Name) when is_atom(Buffer_Name) ->
 -spec read_timestamped_dedicated(buffer_name()) -> [buffer_data_timestamped()] | buffer_error().
 -spec read_timestamped_dedicated(buffer_name(), pos_integer()) -> [buffer_data_timestamped()] | buffer_error().
 -spec read_all_timestamped_dedicated(buffer_name()) -> [buffer_data_timestamped()] | buffer_error().
--spec history_dedicated(buffer_name()) -> [buffer_data()].
--spec history_dedicated(buffer_name(), pos_integer()) -> [buffer_data()].
--spec history_timestamped_dedicated(buffer_name()) -> [buffer_data()].
--spec history_timestamped_dedicated(buffer_name(), pos_integer()) -> [buffer_data()].
+-spec history_dedicated(buffer_name()) -> [buffer_data()] | buffer_error().
+-spec history_dedicated(buffer_name(), pos_integer()) -> [buffer_data()] | buffer_error().
+-spec history_timestamped_dedicated(buffer_name()) -> [buffer_data()] | buffer_error().
+-spec history_timestamped_dedicated(buffer_name(), pos_integer()) -> [buffer_data()] | buffer_error().
 -spec num_entries_dedicated(buffer_name()) -> non_neg_integer() | buffer_error().
 -spec capacity_dedicated(buffer_name()) -> pos_integer() | unlimited | buffer_error().
 -spec clear_high_water_dedicated(buffer_name()) -> true | buffer_error().

test/epocxy/cxy_ctl_SUITE.erl

@@ -152,7 +152,7 @@ check_maybe_execute_task(_Config) ->
     true = ?TM:init(Limits),
     Ets_Table = ets:new(check_maybe_execute_task, [public, named_table]),
 
-    try
+    _ = try
         %% Over max should refuse to run...
         {max_pids, 0} = ?TM:maybe_execute_task(Overmax_Type, ets, insert_new, [Ets_Table, {joe, 5}]),
         erlang:yield(),
@@ -228,7 +228,7 @@ check_maybe_execute_pid_link(_Config) ->
 
     %% When inline, update our process dictionary...
     Old_Joe = erase(joe),
-    try
+    _ = try
         {max_pids, 0} = ?TM:maybe_execute_pid_link(Overmax_Type, erlang, put, [joe, 5]),
         erlang:yield(),
         undefined = get(joe),
@@ -245,7 +245,7 @@ check_maybe_execute_pid_link(_Config) ->
     %% When spawned, it affects a new process dictionary, not ours.
     Self = self(),
     Old_Joe = erase(joe),
-    try
+    _ = try
         undefined = get(joe),
         New_Pid = ?TM:maybe_execute_pid_link(Spawn_Type, ?MODULE, put_pdict, [joe, 5]),
         false = (New_Pid =:= Self),
@@ -274,7 +274,7 @@ check_execute_pid_monitor(_Config) ->
 
     %% When inline, update our process dictionary...
     Old_Joe = erase(joe),
-    try
+    _ = try
         {inline, undefined} = ?TM:execute_pid_monitor(Inline_Type, erlang, put, [joe, 5]),
         5 = get(joe),
         {inline, 5} = ?TM:execute_pid_monitor(Inline_Type, erlang, put, [joe, 7]),
@@ -285,7 +285,7 @@ check_execute_pid_monitor(_Config) ->
     %% When spawned, it affects a new process dictionary, not ours.
     Self = self(),
     Old_Joe = erase(joe),
-    try
+    _ = try
         undefined = get(joe),
         {New_Pid, _Monitor_Ref} = ?TM:execute_pid_monitor(Spawn_Type, ?MODULE, put_pdict, [joe, 5]),
         false = (New_Pid =:= self()),
@@ -309,7 +309,7 @@ check_maybe_execute_pid_monitor(_Config) ->
 
     %% When inline, update our process dictionary...
     Old_Joe = erase(joe),
-    try
+    _ = try
         {max_pids, 0} = ?TM:maybe_execute_pid_monitor(Overmax_Type, erlang, put, [joe, 5]),
         erlang:yield(),
         undefined = get(joe),
@@ -326,7 +326,7 @@ check_maybe_execute_pid_monitor(_Config) ->
     %% When spawned, it affects a new process dictionary, not ours.
     Self = self(),
     Old_Joe = erase(joe),
-    try
+    _ = try
         undefined = get(joe),
         {New_Pid, _Monitor_Ref} = ?TM:maybe_execute_pid_monitor(Spawn_Type, ?MODULE, put_pdict, [joe, 5]),
         false = (New_Pid =:= Self),
@@ -386,10 +386,10 @@ get_pdict() ->
 
 filter_pdict() -> [{K, V} || {{cxy_ctl, K}, V} <- get()].
 
--spec fetch_ages() -> proplists:proplist().
+-spec fetch_ages() -> pdict_timeout | {get_dict, pid(), proplists:proplist()}.
 fetch_ages() -> get_pdict().
 
--spec fetch_ets_ages(any()) -> proplists:proplist().
+-spec fetch_ets_ages(atom() | ets:tid()) -> ok.
 fetch_ets_ages(Ets_Table) ->
     Vals = [{K, V} || {{cxy_ctl, K}, V} <- get()],
     ets:insert(Ets_Table, {results, Vals}),
@@ -407,7 +407,7 @@ check_copying_dict(_Config) ->
     put({cxy_ctl, sam},  7),
     Stable_Pre_Call_Dict = filter_pdict(),
 
-    try
+    _ = try
         Self = self(),
         Ets_Table = ets:new(execute_task, [public, named_table]),
         Joe = ?TM:make_process_dictionary_default_value({cxy_ctl, joe}, 8),