OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-04 13:13:25 +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
src/ShapeProcessAPI/ShapeProcessAPI_ApplySequence.cxx
View File

@@ -61,7 +61,8 @@ Handle(ShapeProcess_ShapeContext)& ShapeProcessAPI_ApplySequence::Context()
TopoDS_Shape ShapeProcessAPI_ApplySequence::PrepareShape(const TopoDS_Shape& shape,
const Standard_Boolean /*fillmap*/,
const TopAbs_ShapeEnum /*until*/)
const TopAbs_ShapeEnum /*until*/,
const Message_ProgressRange& theProgress)
{
if (shape.IsNull())
return shape;
@@ -71,7 +72,7 @@ TopoDS_Shape ShapeProcessAPI_ApplySequence::PrepareShape(const TopoDS_Shape& sha
TCollection_AsciiString str(mySeq);
str += ".exec.op";
if ( rsc->Find ( str.ToCString() ) ) {
ShapeProcess::Perform ( myContext, mySeq.ToCString() );
ShapeProcess::Perform(myContext, mySeq.ToCString(), theProgress);
}
return myContext->Result();

8
src/ShapeProcessAPI/ShapeProcessAPI_ApplySequence.hxx
View File

@@ -26,10 +26,11 @@
#include <Standard_CString.hxx>
#include <Standard_Boolean.hxx>
#include <TopAbs_ShapeEnum.hxx>
#include <Message_ProgressRange.hxx>
class ShapeProcess_ShapeContext;
class TopoDS_Shape;
//! Applies one of the sequence read from resource file.
class ShapeProcessAPI_ApplySequence
{
@@ -50,7 +51,10 @@ public:
//! If <fillmap> is True adds history "shape-shape" into myMap
//! for shape and its subshapes until level <until> (included).
//! If <until> is TopAbs_SHAPE, all the subshapes are considered.
Standard_EXPORT TopoDS_Shape PrepareShape (const TopoDS_Shape& shape, const Standard_Boolean fillmap = Standard_False, const TopAbs_ShapeEnum until = TopAbs_SHAPE);
Standard_EXPORT TopoDS_Shape PrepareShape (const TopoDS_Shape& shape,
const Standard_Boolean fillmap = Standard_False,
const TopAbs_ShapeEnum until = TopAbs_SHAPE,
const Message_ProgressRange& theProgress = Message_ProgressRange());
//! Clears myMap with accumulated history.
Standard_EXPORT void ClearMap();