Skip to content

fix: serialize pretty-mode build progress output under OpenMP #1296

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.

Sign up for GitHub

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

Open
krystophny wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: serialize pretty-mode build progress output under OpenMP #1296

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 15 additions & 6 deletions src/fpm_backend_output.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ subroutine output_status_compiling(progress, queue_index)
character(:), allocatable :: target_name
character(100) :: output_string
character(7) :: overall_progress
integer :: n_done

associate(target=>progress%target_queue(queue_index)%ptr)

Expand All @@ -104,7 +105,9 @@ subroutine output_status_compiling(progress, queue_index)
target_name = basename(target%output_file)
end if

write(overall_progress,'(A,I3,A)') '[',100*progress%n_complete/progress%n_target,'%] '
!$omp atomic read
n_done = progress%n_complete
write(overall_progress,'(A,I3,A)') '[',100*n_done/progress%n_target,'%] '

if (progress%plain_mode) then ! Plain output

Expand All @@ -116,9 +119,12 @@ subroutine output_status_compiling(progress, queue_index)

write(output_string,'(A,T40,A,A)') target_name, COLOR_YELLOW//'compiling...'//COLOR_RESET

! Keep a target's two-line update atomic so concurrent threads do
! not interleave it and corrupt the console's relative cursor math.
!$omp critical(fpm_progress)
call progress%console%write_line(trim(output_string),progress%output_lines(queue_index))

call progress%console%write_line(overall_progress//'Compiling...',advance=.false.)
!$omp end critical(fpm_progress)

end if

Expand All @@ -138,10 +144,12 @@ subroutine output_status_complete(progress, queue_index, build_stat)
character(:), allocatable :: target_name
character(100) :: output_string
character(7) :: overall_progress
integer :: n_done

!$omp critical
!$omp atomic capture
progress%n_complete = progress%n_complete + 1
!$omp end critical
n_done = progress%n_complete
!$omp end atomic

associate(target=>progress%target_queue(queue_index)%ptr)

Expand All @@ -157,7 +165,7 @@ subroutine output_status_complete(progress, queue_index, build_stat)
write(output_string,'(A,T40,A,A)') target_name,COLOR_RED//'failed.'//COLOR_RESET
end if

write(overall_progress,'(A,I3,A)') '[',100*progress%n_complete/progress%n_target,'%] '
write(overall_progress,'(A,I3,A)') '[',100*n_done/progress%n_target,'%] '

if (progress%plain_mode) then ! Plain output

Expand All @@ -167,9 +175,10 @@ subroutine output_status_complete(progress, queue_index, build_stat)

else ! Pretty output

!$omp critical(fpm_progress)
call progress%console%update_line(progress%output_lines(queue_index),trim(output_string))

call progress%console%write_line(overall_progress//'Compiling...',advance=.false.)
!$omp end critical(fpm_progress)

end if

Expand Down
Loading