wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix yield timer in findFiles actor

This commit is contained in:
David Youngworth 2020-05-06 09:20:13 -07:00
parent a09f30e48e
commit 65f299715a
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
flow/Platform.actor.cpp
View File

@ -110,7 +110,7 @@ ACTOR Future<vector<std::string>> findFiles( std::string directory, std::string
bool directoryOnly, bool async) {
INJECT_FAULT( platform_error, "findFiles" );
state vector<std::string> result;
state double timer = now();
state int64_t tsc_begin = __rdtsc();
state WIN32_FIND_DATA fd;
@ -129,10 +129,9 @@ ACTOR Future<vector<std::string>> findFiles( std::string directory, std::string
}
if (!FindNextFile( h, &fd ))
break;
if (async && now() - timer > FLOW_KNOBS->TSC_YIELD_TIME) {
TraceEvent("ListFilesYield");
if (async && __rdtsc() - tsc_begin > FLOW_KNOBS->TSC_YIELD_TIME) {
wait( yield() );
timer = now();
tsc_begin = __rdtsc();
}
}
@ -161,7 +160,7 @@ ACTOR Future<vector<std::string>> findFiles( std::string directory, std::string
bool directoryOnly, bool async) {
INJECT_FAULT( platform_error, "findFiles" );
state vector<std::string> result;
state double timer = now();
state int64_t tsc_begin = __rdtsc();
state DIR *dip = NULL;
@ -191,10 +190,10 @@ ACTOR Future<vector<std::string>> findFiles( std::string directory, std::string
(!directoryOnly && acceptFile(buf.st_mode, name, extension))) {
result.push_back( name );
}
if (async && now() - timer > FLOW_KNOBS->TSC_YIELD_TIME) {
TraceEvent("ListFilesYield");
if (async && __rdtsc() - tsc_begin > FLOW_KNOBS->TSC_YIELD_TIME) {
wait( yield() );
timer = now();
tsc_begin = __rdtsc();
}
}