OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00
Code Activity

0025748: Parallel version of progress indicator

Browse Source 
Progress indication mechanism is refactored to support incrementing progress within multithreaded algorithms.

The class Message_ProgressIndicator is only an interface to the user application.
It accumulates the progress provided by progress scopes.
The counter is protected by mutex for thread-safety.

The new class Message_ProgressScope replacing Message_ProgressSentry should be used to advance the progress.
The scopes are nested to each other to reflect the nested nature of operations.
The new class Message_ProgressRange should be used to pass the progress to sub-scopes.

All OCCT algorithms involving progress indication have been updated to new API.

Improvements in Draw_ProgressIndicator:
- Separate console mode has been added in order to make possible to put the progress into std::cout instead
  or in addition to the draw interpreter, instead of trigger option "-tclOutput".
- Treatment of Ctrl-Break signal has been added.
  Now any operation can be aborted by Ctrl-C or Ctrl-Break keystroke.

Added new test case 'perf fclasses progr_par' for testing of parallel work of the progress.
This commit is contained in:
msv
2020-07-10 14:19:31 +03:00
committed by abv
parent 99289bed0a
commit 7e785937b3
271 changed files with 3701 additions and 3149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/bugs/fclasses/bug28478
View File

@@ -5,10 +5,13 @@ puts ""
puts "# Test output of progress indicator in text mode"
pload QAcommands
XProgress +t
set out [OCC28478 3 2]
set expected {
{Progress: 0% Outer: 0 / 3}
{Progress: 0%}
{Progress: 17% Outer: 1 / 3 Inner: 1 / 2}
{Progress: 33% Outer: 1 / 3 Inner: 2 / 2}
{Progress: 50% Outer: 2 / 3 Inner: 1 / 2}

8
tests/bugs/fclasses/bug31092
View File

@@ -5,21 +5,27 @@ puts ""
puts "# Test output of progress indicator in text mode (infinite scale)"
pload QAcommands
XProgress +t
set out [OCC28478 3 2 -inf]
set expected {
{Progress: 0% Outer: 0 / 3}
{Progress: 0%}
{Progress: 11% Outer: 1 / 3 Inner: 1}
{Progress: 17% Outer: 1 / 3 Inner: 2}
{Progress: 20% Outer: 1 / 3 Inner: 3}
{Progress: 22% Outer: 1 / 3 Inner: 4}
{Progress: 33% Outer: 1 / 3 Inner: finished}
{Progress: 44% Outer: 2 / 3 Inner: 1}
{Progress: 50% Outer: 2 / 3 Inner: 2}
{Progress: 53% Outer: 2 / 3 Inner: 3}
{Progress: 56% Outer: 2 / 3 Inner: 4}
{Progress: 67% Outer: 2 / 3 Inner: finished}
{Progress: 78% Outer: 3 / 3 Inner: 1}
{Progress: 83% Outer: 3 / 3 Inner: 2}
{Progress: 87% Outer: 3 / 3 Inner: 3}
{Progress: 89% Outer: 3 / 3 Inner: 4}
{Progress: 100% Outer: 3 / 3 Inner: finished}
}

3
tests/bugs/modalg_5/bug22747
View File

@@ -12,11 +12,10 @@ pload XSDRAW
restore [locate_data_file OCC22765.brep] a
vinit
XProgress -tclOutput
XProgress -t
set List1 [sewing result 0.1 a]
if { [string compare $List1 ""] != 0 } {
puts "Error: XProgress should not have any output in this mode"
puts "Error: XProgress should not have any DRAW output in this mode"
} else {
puts "Mode -t works properly"
}

1
tests/bugs/moddata_2/bug22572
View File

@@ -10,7 +10,6 @@ set BugNumber OCC22572
catch { pload XSDRAW }
vinit
XProgress -tclOutput
XProgress -t
set List1 [meshfromstl result [locate_data_file bearing.stl]]
puts "----------------------"

1
tests/bugs/moddata_2/bug22746_1
View File

@@ -11,7 +11,6 @@ set BugNumber OCC22746
catch { pload XSDRAW }
restore [locate_data_file OCC22746-om.brep] a
vinit
XProgress -tclOutput
XProgress -t
set List1 [fixshape result a]
puts "----------------------"

1
tests/bugs/moddata_2/bug22746_2
View File

@@ -11,7 +11,6 @@ set BugNumber OCC22746
catch { pload XSDRAW }
restore [locate_data_file OCC22746-trampafus-notfixed.brep] a
vinit
XProgress -tclOutput
XProgress -t
set List1 [fixshape result a]
puts "----------------------"

1
tests/bugs/moddata_2/bug22746_3
View File

@@ -14,7 +14,6 @@ catch { pload XSDRAW }
restore [locate_data_file OCC22761-TransmissionTestModel5-notfixed.brep] a
vinit
XProgress -tclOutput
XProgress -t
set List1 [fixshape result a]
puts "----------------------"

2
tests/caf/progress/A1
View File

@@ -9,7 +9,7 @@
puts "caf009-A1"
# Configurate XProgress
XProgress -g +t -tcloutput
XProgress +t
# Create binary document
NewDocument Doc BinOcaf

6
tests/caf/progress/A2
View File

@@ -9,7 +9,7 @@
puts "caf009-A2"
# Configurate XProgress
XProgress -g +t -tcloutput
XProgress +t
# Create binary document
NewDocument Doc XmlOcaf
@@ -27,7 +27,9 @@ Close Doc
# Test data
set ctr { "0%" "Writing sub-tree" "Writing shape section"
"Writing Shapes" "Writing geometry" "2D Curves" "3D Curves" "Surfaces" "100%" }
"Writing" "Geometry" "2D Curves" "3D Curves"
"Polygons On Triangulation" "Surfaces"
"3D Polygons" "Triangulations" "100%" "Shapes" }
foreach data ${ctr} {
if ![regexp $data $output] {

2
tests/caf/progress/B1
View File

@@ -11,7 +11,7 @@ puts "caf009-B1"
set bDoc [CreateBinDoc]
# Configurate XProgress
XProgress -g +t -tcloutput
XProgress +t
# Open binary document
if {${bDoc} == "" } {

7
tests/caf/progress/B2
View File

@@ -11,7 +11,7 @@ puts "caf009-B2"
set xDoc [CreateXmlDoc]
# Configurate XProgress
XProgress -g +t -tcloutput
XProgress +t
# Open xml document
if {${xDoc} == "" } {
@@ -25,8 +25,9 @@ set output [Open ${xDoc} Doc]
Close Doc
# Test data
set ctr {"0%" "Reading document" "Reading geometry" "3D Curves"
"Surfaces" "Shapes" "Reading sub-tree" "100%" }
set ctr { "0%" "Reading document" "Reading" "3D Curves" "2D Curves"
"3D Polygons" "Polygons On Triangulation" "Shapes"
"Triangulations" "Surfaces" "Reading sub-tree" "100%" }
foreach data ${ctr} {
if ![regexp $data $output] {

2
tests/caf/progress/C1
View File

@@ -22,7 +22,7 @@ box b 1 1 1
SetShape Doc 0:2 b
# Configurate XProgress
XProgress -g +t -tcloutput
XProgress +t
# Save
set output [Save Doc]

7
tests/caf/progress/C2
View File

@@ -22,7 +22,7 @@ box b 1 1 1
SetShape Doc 0:2 b
# Configurate XProgress
XProgress -g +t -tcloutput
XProgress +t
# Save
set output [Save Doc]
@@ -31,8 +31,9 @@ set output [Save Doc]
Close Doc
# Test data
set ctr { "0%" "Writing sub-tree" "Writing shape section"
"Writing Shapes" "Writing geometry" "2D Curves" "3D Curves" "Surfaces" "100%" }
set ctr { "0%" "Writing sub-tree" "Writing shape section" "Polygons On Triangulation"
"3D Polygons" "Locations" "Writing" "Geometry" "2D Curves"
"Triangulations" "3D Curves" "Surfaces" "Shapes" "100%" }
foreach data ${ctr} {
if ![regexp $data $output] {

41
tests/de_mesh/shape_write_stl/B1
View File

@@ -1,30 +1,29 @@
sphere s 10
tessellate result s 100 100
XProgress -tclOutput
XProgress +t
set out [writestl result s.stl]
set expected {
{Progress: 0% Triangles: 0 / 20000}
{Progress: 5% Triangles: 1001 / 20000}
{Progress: 10% Triangles: 2001 / 20000}
{Progress: 15% Triangles: 3001 / 20000}
{Progress: 20% Triangles: 4001 / 20000}
{Progress: 25% Triangles: 5001 / 20000}
{Progress: 30% Triangles: 6001 / 20000}
{Progress: 35% Triangles: 7001 / 20000}
{Progress: 40% Triangles: 8001 / 20000}
{Progress: 45% Triangles: 9001 / 20000}
{Progress: 50% Triangles: 10001 / 20000}
{Progress: 55% Triangles: 11001 / 20000}
{Progress: 60% Triangles: 12001 / 20000}
{Progress: 65% Triangles: 13001 / 20000}
{Progress: 70% Triangles: 14001 / 20000}
{Progress: 75% Triangles: 15001 / 20000}
{Progress: 80% Triangles: 16001 / 20000}
{Progress: 85% Triangles: 17001 / 20000}
{Progress: 90% Triangles: 18001 / 20000}
{Progress: 95% Triangles: 19001 / 20000}
{Progress: 0%}
{Progress: 5% Triangles: 1000 / 20000}
{Progress: 10% Triangles: 2000 / 20000}
{Progress: 15% Triangles: 3000 / 20000}
{Progress: 20% Triangles: 4000 / 20000}
{Progress: 25% Triangles: 5000 / 20000}
{Progress: 30% Triangles: 6000 / 20000}
{Progress: 35% Triangles: 7000 / 20000}
{Progress: 40% Triangles: 8000 / 20000}
{Progress: 45% Triangles: 9000 / 20000}
{Progress: 50% Triangles: 10000 / 20000}
{Progress: 55% Triangles: 11000 / 20000}
{Progress: 60% Triangles: 12000 / 20000}
{Progress: 65% Triangles: 13000 / 20000}
{Progress: 70% Triangles: 14000 / 20000}
{Progress: 75% Triangles: 15000 / 20000}
{Progress: 80% Triangles: 16000 / 20000}
{Progress: 85% Triangles: 17000 / 20000}
{Progress: 90% Triangles: 18000 / 20000}
{Progress: 95% Triangles: 19000 / 20000}
{Progress: 100% Triangles: 20000 / 20000}
}

13
tests/perf/fclasses/progr_par Normal file
View File

@@ -0,0 +1,13 @@
puts "# ========"
puts "# 0025748: Parallel version of progress indicator"
puts "# ========"
puts ""
pload QAcommands
XProgress +t
set out [OCC25748 -niter 10000 -matsize 100 -parallel -progr]
if {[llength [split $out \n]] != 103} {
puts "Error: unexpected number of lines in the output, must be 103"
}