mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-04 13:13:25 +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:
@@ -9,7 +9,7 @@
|
||||
puts "caf009-A1"
|
||||
|
||||
# Configurate XProgress
|
||||
XProgress -g +t -tcloutput
|
||||
XProgress +t
|
||||
|
||||
# Create binary document
|
||||
NewDocument Doc BinOcaf
|
||||
|
@@ -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] {
|
||||
|
@@ -11,7 +11,7 @@ puts "caf009-B1"
|
||||
set bDoc [CreateBinDoc]
|
||||
|
||||
# Configurate XProgress
|
||||
XProgress -g +t -tcloutput
|
||||
XProgress +t
|
||||
|
||||
# Open binary document
|
||||
if {${bDoc} == "" } {
|
||||
|
@@ -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] {
|
||||
|
@@ -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]
|
||||
|
@@ -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] {
|
||||
|
Reference in New Issue
Block a user