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:
@@ -277,11 +277,11 @@ void BinMNaming_NamedShapeDriver::Paste (const Handle(TDF_Attribute)& theSource,
|
||||
//=======================================================================
|
||||
|
||||
void BinMNaming_NamedShapeDriver::WriteShapeSection (Standard_OStream& theOS,
|
||||
const Handle(Message_ProgressIndicator)& theProgress)
|
||||
const Message_ProgressRange& theRange)
|
||||
{
|
||||
theOS << SHAPESET;
|
||||
myShapeSet.SetFormatNb(myFormatNb);
|
||||
myShapeSet.Write (theOS, theProgress);
|
||||
myShapeSet.Write (theOS, theRange);
|
||||
myShapeSet.Clear();
|
||||
}
|
||||
|
||||
@@ -301,7 +301,7 @@ void BinMNaming_NamedShapeDriver::Clear()
|
||||
//=======================================================================
|
||||
|
||||
void BinMNaming_NamedShapeDriver::ReadShapeSection (Standard_IStream& theIS,
|
||||
const Handle(Message_ProgressIndicator)& theProgress)
|
||||
const Message_ProgressRange& theRange)
|
||||
{
|
||||
// check section title string; note that some versions of OCCT (up to 6.3.1)
|
||||
// might avoid writing shape section if it is empty
|
||||
@@ -310,7 +310,7 @@ void BinMNaming_NamedShapeDriver::ReadShapeSection (Standard_IStream& theIS,
|
||||
theIS >> aSectionTitle;
|
||||
if(aSectionTitle.Length() > 0 && aSectionTitle == SHAPESET) {
|
||||
myShapeSet.Clear();
|
||||
myShapeSet.Read (theIS, theProgress);
|
||||
myShapeSet.Read (theIS, theRange);
|
||||
SetFormatNb(myShapeSet.FormatNb());
|
||||
}
|
||||
else
|
||||
|
Reference in New Issue
Block a user