mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-09 13:22:24 +03:00
0025748: Parallel version of progress indicator
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:
@@ -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}
|
||||
|
@@ -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}
|
||||
}
|
||||
|
||||
|
@@ -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"
|
||||
}
|
||||
|
@@ -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 "----------------------"
|
||||
|
@@ -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 "----------------------"
|
||||
|
@@ -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 "----------------------"
|
||||
|
@@ -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 "----------------------"
|
||||
|
Reference in New Issue
Block a user