Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve usage of Tasks #1111

Merged
merged 4 commits into from
Jan 17, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/credo/check.ex
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,8 @@ defmodule Credo.Check do
source_files
|> Task.async_stream(fn source -> run_on_source_file(exec, source, params) end,
max_concurrency: exec.max_concurrent_check_runs,
timeout: :infinity
timeout: :infinity,
ordered: false
)
|> Stream.run()

Expand Down
8 changes: 4 additions & 4 deletions lib/credo/check/consistency/collector.ex
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,8 @@ defmodule Credo.Check.Consistency.Collector do
) do
frequencies_per_source_file =
source_files
|> Enum.map(&Task.async(fn -> {&1, collector.collect_matches(&1, params)} end))
|> Enum.map(&Task.await(&1, :infinity))
|> Task.async_stream(&{&1, collector.collect_matches(&1, params)}, timeout: :infinity, ordered: false)
|> Enum.map(fn {:ok, frequencies} -> frequencies end)

frequencies = total_frequencies(frequencies_per_source_file)

Expand All @@ -167,8 +167,8 @@ defmodule Credo.Check.Consistency.Collector do
result =
frequencies_per_source_file
|> source_files_with_issues(most_frequent_match)
|> Enum.map(&Task.async(fn -> issue_formatter.(most_frequent_match, &1, params) end))
|> Enum.flat_map(&Task.await(&1, :infinity))
|> Task.async_stream(&issue_formatter.(most_frequent_match, &1, params), timeout: :infinity, ordered: false)
|> Enum.flat_map(fn {:ok, issue} -> issue end)

result
else
Expand Down
20 changes: 7 additions & 13 deletions lib/credo/check/design/duplicated_code.ex
Original file line number Diff line number Diff line change
Expand Up @@ -54,18 +54,12 @@
defp append_issues_via_issue_service(found_hashes, source_files, nodes_threshold, params, exec)
when is_map(found_hashes) do
found_hashes
|> Enum.map(
&Task.async(fn ->
do_append_issues_via_issue_service(
&1,
source_files,
nodes_threshold,
params,
exec
)
end)
|> Task.async_stream(
&do_append_issues_via_issue_service(&1, source_files, nodes_threshold, params, exec),
timeout: :infinity,
ordered: false
)
|> Enum.map(&Task.await(&1, :infinity))
|> Stream.run()
end

defp do_append_issues_via_issue_service(
Expand All @@ -89,7 +83,7 @@
issue = issue_for(issue_meta, this_node, other_nodes, nodes_threshold, params)

if issue do
Credo.Execution.ExecutionIssues.append(exec, source_file, issue)

Check warning on line 86 in lib/credo/check/design/duplicated_code.ex

View workflow job for this annotation

GitHub Actions / [26.1/1.15.7] CI Tests on Credo [OTP/Elixir]

Nested modules could be aliased at the top of the invoking module.

Check warning on line 86 in lib/credo/check/design/duplicated_code.ex

View workflow job for this annotation

GitHub Actions / [24.3/1.14.5] CI Tests on Credo [OTP/Elixir]

Nested modules could be aliased at the top of the invoking module.

Check warning on line 86 in lib/credo/check/design/duplicated_code.ex

View workflow job for this annotation

GitHub Actions / [26.2/1.16.0] CI Tests on Credo [OTP/Elixir]

Nested modules could be aliased at the top of the invoking module.

Check warning on line 86 in lib/credo/check/design/duplicated_code.ex

View workflow job for this annotation

GitHub Actions / [24.3/1.13.4] CI Tests on Credo [OTP/Elixir]

Nested modules could be aliased at the top of the invoking module.

Check warning on line 86 in lib/credo/check/design/duplicated_code.ex

View workflow job for this annotation

GitHub Actions / [25.3/1.15.7] CI Tests on Credo [OTP/Elixir]

Nested modules could be aliased at the top of the invoking module.

Check warning on line 86 in lib/credo/check/design/duplicated_code.ex

View workflow job for this annotation

GitHub Actions / [25.3/1.13.4] CI Tests on Credo [OTP/Elixir]

Nested modules could be aliased at the top of the invoking module.

Check warning on line 86 in lib/credo/check/design/duplicated_code.ex

View workflow job for this annotation

GitHub Actions / [24.3/1.12.3] CI Tests on Credo [OTP/Elixir]

Nested modules could be aliased at the top of the invoking module.

Check warning on line 86 in lib/credo/check/design/duplicated_code.ex

View workflow job for this annotation

GitHub Actions / [23.3/1.13.4] CI Tests on Credo [OTP/Elixir]

Nested modules could be aliased at the top of the invoking module.

Check warning on line 86 in lib/credo/check/design/duplicated_code.ex

View workflow job for this annotation

GitHub Actions / [23.3/1.14.5] CI Tests on Credo [OTP/Elixir]

Nested modules could be aliased at the top of the invoking module.

Check warning on line 86 in lib/credo/check/design/duplicated_code.ex

View workflow job for this annotation

GitHub Actions / Compatibility: Windows

Nested modules could be aliased at the top of the invoking module.

Check warning on line 86 in lib/credo/check/design/duplicated_code.ex

View workflow job for this annotation

GitHub Actions / [23.3/1.12.3] CI Tests on Credo [OTP/Elixir]

Nested modules could be aliased at the top of the invoking module.

Check warning on line 86 in lib/credo/check/design/duplicated_code.ex

View workflow job for this annotation

GitHub Actions / Elixir 1.15.7 OTP 26.1

Nested modules could be aliased at the top of the invoking module.

Check warning on line 86 in lib/credo/check/design/duplicated_code.ex

View workflow job for this annotation

GitHub Actions / Elixir 1.15.7 OTP 25.3

Nested modules could be aliased at the top of the invoking module.

Check warning on line 86 in lib/credo/check/design/duplicated_code.ex

View workflow job for this annotation

GitHub Actions / Elixir 1.13.4 OTP 25.3

Nested modules could be aliased at the top of the invoking module.

Check warning on line 86 in lib/credo/check/design/duplicated_code.ex

View workflow job for this annotation

GitHub Actions / Elixir 1.13.4 OTP 24.3

Nested modules could be aliased at the top of the invoking module.

Check warning on line 86 in lib/credo/check/design/duplicated_code.ex

View workflow job for this annotation

GitHub Actions / Elixir 1.14.5 OTP 24.3

Nested modules could be aliased at the top of the invoking module.

Check warning on line 86 in lib/credo/check/design/duplicated_code.ex

View workflow job for this annotation

GitHub Actions / Elixir 1.16.0 OTP 26.2

Nested modules could be aliased at the top of the invoking module.

Check warning on line 86 in lib/credo/check/design/duplicated_code.ex

View workflow job for this annotation

GitHub Actions / Elixir 1.12.3 OTP 24.3

Nested modules could be aliased at the top of the invoking module.

Check warning on line 86 in lib/credo/check/design/duplicated_code.ex

View workflow job for this annotation

GitHub Actions / Elixir 1.14.5 OTP 23.3

Nested modules could be aliased at the top of the invoking module.

Check warning on line 86 in lib/credo/check/design/duplicated_code.ex

View workflow job for this annotation

GitHub Actions / Elixir 1.13.4 OTP 23.3

Nested modules could be aliased at the top of the invoking module.

Check warning on line 86 in lib/credo/check/design/duplicated_code.ex

View workflow job for this annotation

GitHub Actions / Elixir 1.12.3 OTP 23.3

Nested modules could be aliased at the top of the invoking module.

Check warning on line 86 in lib/credo/check/design/duplicated_code.ex

View workflow job for this annotation

GitHub Actions / Compile & Run

Nested modules could be aliased at the top of the invoking module.
end
end

Expand All @@ -97,8 +91,8 @@
chunked_nodes =
source_files
|> Enum.chunk_every(30)
novaugust marked this conversation as resolved.
Show resolved Hide resolved
|> Enum.map(&Task.async(fn -> calculate_hashes_for_chunk(&1, mass_threshold) end))
|> Enum.map(&Task.await(&1, :infinity))
|> Task.async_stream(&calculate_hashes_for_chunk(&1, mass_threshold), timeout: :infinity, ordered: false)
|> Enum.map(fn {:ok, hashes} -> hashes end)

nodes =
Enum.reduce(chunked_nodes, %{}, fn current_hashes, existing_hashes ->
Expand Down
7 changes: 1 addition & 6 deletions lib/credo/check/runner.ex
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,7 @@ defmodule Credo.Check.Runner do
|> fix_deprecated_notation_for_checks_without_params()

check_tuples
|> Task.async_stream(
fn check_tuple ->
run_check(exec, check_tuple)
end,
timeout: :infinity
)
|> Task.async_stream(&run_check(exec, &1), timeout: :infinity, ordered: false)
|> Stream.run()

:ok
Expand Down
7 changes: 2 additions & 5 deletions lib/credo/cli/output/summary.ex
Original file line number Diff line number Diff line change
Expand Up @@ -165,13 +165,10 @@ defmodule Credo.CLI.Output.Summary do
Credo.Code.prewalk(source_file, &scope_count_traverse/2, 0)
end

defp scope_count([]), do: 0

defp scope_count(source_files) when is_list(source_files) do
source_files
|> Enum.map(&Task.async(fn -> scope_count(&1) end))
|> Enum.map(&Task.await/1)
|> Enum.reduce(&(&1 + &2))
|> Task.async_stream(&scope_count/1, ordered: false)
|> Enum.reduce(0, fn {:ok, n}, sum -> n + sum end)
end

@def_ops [:defmodule, :def, :defp, :defmacro]
Expand Down
24 changes: 6 additions & 18 deletions lib/credo/sources.ex
Original file line number Diff line number Diff line change
Expand Up @@ -170,24 +170,12 @@ defmodule Credo.Sources do
end

defp read_files(filenames, parse_timeout) do
tasks = Enum.map(filenames, &Task.async(fn -> to_source_file(&1) end))

task_dictionary =
tasks
|> Enum.zip(filenames)
|> Enum.into(%{})

tasks_with_results = Task.yield_many(tasks, parse_timeout)

results =
Enum.map(tasks_with_results, fn {task, res} ->
# Shutdown the tasks that did not reply nor exit
{task, res || Task.shutdown(task, :brutal_kill)}
end)

Enum.map(results, fn
{_task, {:ok, value}} -> value
{task, nil} -> SourceFile.timed_out(task_dictionary[task])
filenames
|> Task.async_stream(&to_source_file/1, timeout: parse_timeout, on_timeout: :kill_task)
|> Stream.zip(filenames)
|> Enum.map(fn
{{:exit, :timeout}, filename} -> SourceFile.timed_out(filename)
{{:ok, value}, _} -> value
end)
end

Expand Down
Loading