Skip to content
Snippets Groups Projects
Commit 35ff5cfc authored by Gerardo Ganis's avatar Gerardo Ganis
Browse files

From Anna: optimize the number of calls to TProofMgr::GetSessionLogs

git-svn-id: http://root.cern.ch/svn/root/trunk@23929 27541ba8-7e3a-0410-8455-c3a389f83636
parent 341877ed
No related branches found
No related tags found
No related merge requests found
......@@ -43,6 +43,7 @@ private:
TGCheckButton *fAllLines; // display all lines button
TGSplitButton *fAllWorkers; // display all workers button
Bool_t fFullText; // 0 - when grep was called
public:
TProofProgressLog(TProofProgressDialog *d, Int_t w = 700, Int_t h = 300);
virtual ~TProofProgressLog();
......
......@@ -419,8 +419,11 @@ void TProofProgressDialog::Progress(Long64_t total, Long64_t processed)
fStop->SetState(kButtonDisabled);
fAbort->SetState(kButtonDisabled);
fClose->SetState(kButtonUp);
if (!fKeep)
DoClose();
if (!fKeep) DoClose();
// Set the status to done
fStatus = kDone;
} else {
// A negative value for process indicates that we are finished,
// no matter whether the processing was complete
......@@ -460,6 +463,9 @@ void TProofProgressDialog::Progress(Long64_t total, Long64_t processed)
fStop->SetState(kButtonDisabled);
fAbort->SetState(kButtonDisabled);
fClose->SetState(kButtonUp);
// Set the status to done
fStatus = kDone;
}
}
fPrevProcessed = evproc;
......@@ -595,8 +601,11 @@ void TProofProgressDialog::Progress(Long64_t total, Long64_t processed,
fStop->SetState(kButtonDisabled);
fAbort->SetState(kButtonDisabled);
fClose->SetState(kButtonUp);
if (!fKeep)
DoClose();
if (!fKeep) DoClose();
// Set the status to done
fStatus = kDone;
} else {
// A negative value for process indicates that we are finished,
// no matter whether the processing was complete
......
......@@ -38,7 +38,8 @@ TProofProgressLog::TProofProgressLog(TProofProgressDialog *d, Int_t w, Int_t h)
// Create a window frame for log messages.
fDialog = d;
fProofLog = 0;
fFullText = kTRUE;
// use hierarchical cleaning
SetCleanup(kDeepCleanup);
......@@ -273,9 +274,13 @@ void TProofProgressLog::DoLog(Bool_t grep)
to = fLinesTo->GetIntNumber();
}
if (!grep) {
fProofLog = TProof::Mgr(fDialog->fSessionUrl.Data())->GetSessionLogs();
if (!fProofLog || !fFullText || fDialog->fStatus==TProofProgressDialog::kRunning){
fProofLog = TProof::Mgr(fDialog->fSessionUrl.Data())->GetSessionLogs();
fFullText = kTRUE;
}
} else {
fProofLog = TProof::Mgr(fDialog->fSessionUrl.Data())->GetSessionLogs(0, 0, greptext.Data());
fFullText = kFALSE;
}
TList *selected = new TList;
fLogList->GetSelectedEntries(selected);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment