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

25
src/GeomPlate/GeomPlate_BuildPlateSurface.cxx
View File

@@ -66,7 +66,7 @@
#include <TColgp_SequenceOfVec.hxx>
#include <TColStd_HArray1OfReal.hxx>
#include <TColStd_SequenceOfInteger.hxx>
#include <Message_ProgressIndicator.hxx>
#include <Message_ProgressScope.hxx>
#include <stdio.h>
@@ -448,7 +448,7 @@ void GeomPlate_BuildPlateSurface::
// Function : Perform
// Calculates the surface filled with loaded constraints
//---------------------------------------------------------
void GeomPlate_BuildPlateSurface::Perform(const Handle(Message_ProgressIndicator) & aProgress)
void GeomPlate_BuildPlateSurface::Perform(const Message_ProgressRange& theProgress)
{
#ifdef OCCT_DEBUG
// Timing
@@ -479,8 +479,13 @@ void GeomPlate_BuildPlateSurface::Perform(const Handle(Message_ProgressIndicator
//======================================================================
// Initial Surface
//======================================================================
Message_ProgressScope aPS(theProgress, NULL, 100, Standard_True);
if (!mySurfInitIsGive)
ComputeSurfInit(aProgress);
{
ComputeSurfInit (aPS.Next(10));
if (aPS.UserBreak())
return;
}
else {
if (NTLinCont>=2)
@@ -651,9 +656,9 @@ void GeomPlate_BuildPlateSurface::Perform(const Handle(Message_ProgressIndicator
// Construction of the surface
//====================================================================
myPlate.SolveTI(myDegree, ComputeAnisotropie(), aProgress);
myPlate.SolveTI(myDegree, ComputeAnisotropie(), aPS.Next(90));
if (!aProgress.IsNull() && aProgress->UserBreak())
if (aPS.UserBreak())
{
return;
}
@@ -690,9 +695,9 @@ void GeomPlate_BuildPlateSurface::Perform(const Handle(Message_ProgressIndicator
//====================================================================
//Construction of the surface
//====================================================================
myPlate.SolveTI(myDegree, ComputeAnisotropie(), aProgress);
myPlate.SolveTI(myDegree, ComputeAnisotropie(), aPS.Next(90));
if (!aProgress.IsNull() && aProgress->UserBreak())
if (aPS.UserBreak())
{
return;
}
@@ -1358,7 +1363,7 @@ Standard_Boolean GeomPlate_BuildPlateSurface::
// there are point constraints.
//-------------------------------------------------------------------------
void GeomPlate_BuildPlateSurface::ComputeSurfInit(const Handle(Message_ProgressIndicator) & aProgress)
void GeomPlate_BuildPlateSurface::ComputeSurfInit(const Message_ProgressRange& theProgress)
{
Standard_Integer nopt=2, popt=2, Np=1;
Standard_Boolean isHalfSpace = Standard_True;
@@ -1723,8 +1728,8 @@ void GeomPlate_BuildPlateSurface::ComputeSurfInit(const Handle(Message_ProgressI
//====================================================================
// Construction of the surface
//====================================================================
myPlate.SolveTI(2, ComputeAnisotropie(), aProgress);
if (!aProgress.IsNull() && aProgress->UserBreak())
myPlate.SolveTI(2, ComputeAnisotropie(), theProgress);
if (theProgress.UserBreak())
{
return;
}

5
src/GeomPlate/GeomPlate_BuildPlateSurface.hxx
View File

@@ -46,7 +46,6 @@ class gp_Pnt;
class Geom2d_Curve;
class Adaptor3d_HCurve;
class Adaptor2d_HCurve2d;
class Message_ProgressIndicator;
@@ -131,7 +130,7 @@ public:
//! Exceptions
//! Standard_RangeError if the value of the constraint is
//! null or if plate is not done.
Standard_EXPORT void Perform(const Handle(Message_ProgressIndicator) & aProgress = Handle(Message_ProgressIndicator)());
Standard_EXPORT void Perform(const Message_ProgressRange& theProgress = Message_ProgressRange());
//! returns the CurveConstraints of order order
Standard_EXPORT Handle(GeomPlate_CurveConstraint) CurveConstraint (const Standard_Integer order) const;
@@ -218,7 +217,7 @@ private:
Standard_EXPORT Handle(Adaptor2d_HCurve2d) ProjectedCurve (Handle(Adaptor3d_HCurve)& Curv);
Standard_EXPORT void ComputeSurfInit(const Handle(Message_ProgressIndicator) & aProgress);
Standard_EXPORT void ComputeSurfInit(const Message_ProgressRange& theProgress);
Standard_EXPORT void Intersect (Handle(GeomPlate_HArray1OfSequenceOfReal)& PntInter, Handle(GeomPlate_HArray1OfSequenceOfReal)& PntG1G1);