mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-14 13:30:48 +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:
@@ -158,11 +158,11 @@ static Standard_Integer DDocStd_Open (Draw_Interpretor& di,
|
||||
std::ifstream aFileStream;
|
||||
OSD_OpenStream (aFileStream, path, std::ios::in | std::ios::binary);
|
||||
|
||||
theStatus = A->Open (aFileStream, D, aProgress);
|
||||
theStatus = A->Open (aFileStream, D, aProgress->Start());
|
||||
}
|
||||
else
|
||||
{
|
||||
theStatus = A->Open (path, D, aProgress);
|
||||
theStatus = A->Open (path, D, aProgress->Start());
|
||||
}
|
||||
if (theStatus == PCDM_RS_OK && !D.IsNull())
|
||||
{
|
||||
@@ -230,7 +230,7 @@ static Standard_Integer DDocStd_Save (Draw_Interpretor& di,
|
||||
}
|
||||
|
||||
Handle(Draw_ProgressIndicator) aProgress = new Draw_ProgressIndicator(di, 1);
|
||||
A->Save (D, aProgress);
|
||||
A->Save (D, aProgress->Start());
|
||||
return 0;
|
||||
}
|
||||
di << "DDocStd_Save : Error\n";
|
||||
@@ -272,11 +272,11 @@ static Standard_Integer DDocStd_SaveAs (Draw_Interpretor& di,
|
||||
{
|
||||
std::ofstream aFileStream;
|
||||
OSD_OpenStream (aFileStream, path, std::ios::out | std::ios::binary);
|
||||
theStatus = A->SaveAs (D, aFileStream, aProgress);
|
||||
theStatus = A->SaveAs (D, aFileStream, aProgress->Start());
|
||||
}
|
||||
else
|
||||
{
|
||||
theStatus = A->SaveAs(D,path, aProgress);
|
||||
theStatus = A->SaveAs(D,path, aProgress->Start());
|
||||
}
|
||||
|
||||
if (theStatus != PCDM_SS_OK ) {
|
||||
|
Reference in New Issue
Block a user