Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

text_search: avoid flooding messages while searching.

Browse Source 
* This was making unresponsive the target window, making impossible
  to cancel it at all. Now the current filename is reported at 20Hz,
  well enough for good visual search progress feedback. Fixed #14175.

Signed-off-by: Kacper Kasper <kacperkasper@gmail.com>

Style fixes:
* Commit message formatting.
* Removed commented code and unnecessary whitespace.
This commit is contained in:
Philippe Houdoin 2018-06-07 23:49:37 +02:00 committed by Kacper Kasper
parent 459da273e4
commit 739e2ceffc
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/apps/text_search/Grepper.cpp
View File

@ -170,21 +170,19 @@ Grepper::_WriterThread()
BMessage message;
char fileName[B_PATH_NAME_LENGTH*2];
int count = 0;
bigtime_t lastProgressReportTime = 0, now;
printf("paths_writer started.\n");
while (!fMustQuit && fIterator->GetNextName(fileName)) {
message.MakeEmpty();
message.what = MSG_REPORT_FILE_NAME;
message.AddString("filename", fileName);
BEntry entry(fileName);
entry_ref ref;
entry.GetRef(&ref);
if (!entry.Exists()) {
if (fIterator->NotifyNegatives()) {
message.MakeEmpty();
message.what = MSG_REPORT_RESULT;
message.AddString("filename", fileName);
message.AddRef("ref", &ref);
fTarget.SendMessage(&message);
}
@ -202,14 +200,22 @@ Grepper::_WriterThread()
continue;
}
count++;
// file exists, send it to xargs
write(fXargsInput, fileName, strlen(fileName));
write(fXargsInput, "\n", 1);
// printf(">>>>>> %s\n", fileName);
fTarget.SendMessage(&message);
count++;
now = system_time();
// to avoid message flood,
// report progress no more than 20 times per second
if (now - lastProgressReportTime > 50000) {
message.MakeEmpty();
message.what = MSG_REPORT_FILE_NAME;
message.AddString("filename", fileName);
fTarget.SendMessage(&message);
lastProgressReportTime = now;
}
}
write(fXargsInput, kEOFTag, strlen(kEOFTag));