Skip to content

lib/gis: solve write out conflicts of G_percent/G_progress when multithreading #6121

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
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

lib/gis: solve write out conflicts of G_percent/G_progress when multithreading #6121

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0d33774
add omp critical block to fprintf that may cause write out conflicts
cyliang368 Jul 26, 2025
5d26b1e
make the omp critical block not contain return
cyliang368 Jul 26, 2025
6a42351
remove the testing line to make percentage print out in the same place
cyliang368 Jul 26, 2025
780ee50
Merge branch 'main' into parallel_percent
cyliang368 Jul 26, 2025
6aa9971
Merge branch 'main' into parallel_percent
cyliang368 Aug 3, 2025
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
82 changes: 48 additions & 34 deletions lib/gis/percent.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,30 +70,33 @@ void G_percent(long n, long d, int s)
if (format == G_INFO_FORMAT_SILENT || G_verbose() < 1)
return;

if (n <= 0 || n >= d || x > st->prev + s) {
st->prev = x;
#pragma omp critical
{
if (n <= 0 || n >= d || x > st->prev + s) {
st->prev = x;

if (ext_percent) {
ext_percent(x);
}
else {
if (format == G_INFO_FORMAT_STANDARD) {
fprintf(stderr, "%4d%%\b\b\b\b\b", x);
if (ext_percent) {
ext_percent(x);
}
else {
if (format == G_INFO_FORMAT_PLAIN) {
if (x == 100)
fprintf(stderr, "%d\n", x);
else
fprintf(stderr, "%d..", x);
if (format == G_INFO_FORMAT_STANDARD) {
fprintf(stderr, "%4d%%\b\b\b\b\b", x);
}
else { /* GUI */
if (st->first) {
fprintf(stderr, "\n");
else {
if (format == G_INFO_FORMAT_PLAIN) {
if (x == 100)
fprintf(stderr, "%d\n", x);
else
fprintf(stderr, "%d..", x);
}
else { /* GUI */
if (st->first) {
fprintf(stderr, "\n");
}
fprintf(stderr, "GRASS_INFO_PERCENT: %d\n", x);
fflush(stderr);
st->first = 0;
}
fprintf(stderr, "GRASS_INFO_PERCENT: %d\n", x);
fflush(stderr);
st->first = 0;
}
}
}
Expand All @@ -104,7 +107,10 @@ void G_percent(long n, long d, int s)
ext_percent(100);
}
else if (format == G_INFO_FORMAT_STANDARD) {
fprintf(stderr, "\n");
#pragma omp critical
{
fprintf(stderr, "\n");
}
}
st->prev = -1;
st->first = 1;
Expand Down Expand Up @@ -165,21 +171,29 @@ void G_progress(long n, int s)
if (format == G_INFO_FORMAT_SILENT || G_verbose() < 1)
return;

if (n == s && n == 1) {
if (format == G_INFO_FORMAT_PLAIN)
fprintf(stderr, "\n");
else if (format != G_INFO_FORMAT_GUI)
fprintf(stderr, "\r");
return;
}
{
if (n == s && n == 1) {
#pragma omp critical
{
if (format == G_INFO_FORMAT_PLAIN)
fprintf(stderr, "\n");
else if (format != G_INFO_FORMAT_GUI)
fprintf(stderr, "\r");
}
return;
}

if (n % s == 0) {
if (format == G_INFO_FORMAT_PLAIN)
fprintf(stderr, "%ld..", n);
else if (format == G_INFO_FORMAT_GUI)
fprintf(stderr, "GRASS_INFO_PROGRESS: %ld\n", n);
else
fprintf(stderr, "%10ld\b\b\b\b\b\b\b\b\b\b", n);
if (n % s == 0) {
#pragma omp critical
{
if (format == G_INFO_FORMAT_PLAIN)
fprintf(stderr, "%ld..", n);
else if (format == G_INFO_FORMAT_GUI)
fprintf(stderr, "GRASS_INFO_PROGRESS: %ld\n", n);
else
fprintf(stderr, "%10ld\b\b\b\b\b\b\b\b\b\b", n);
}
}
}
}

Expand Down
Loading