apple/foundationdb
1
0
Fork 0
mirror of https://github.com/apple/foundationdb.git synced 2025-05-15 18:32:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't copy the external libraries if you aren't using more than one thread

Browse Source
This commit is contained in:
A.J. Beamon 2021-03-10 15:09:30 -08:00
parent 2ba257e6f3
commit fe4ff420a3
1 changed files with 48 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
fdbclient/MultiVersionTransaction.actor.cpp
View File

@ -1136,52 +1136,64 @@ std::vector<std::pair<std::string, bool>> MultiVersionApi::copyExternalLibraryPe
ASSERT_GE(threadCount, 1); ASSERT_GE(threadCount, 1);
// Copy library for each thread configured per version // Copy library for each thread configured per version
std::vector<std::pair<std::string, bool>> paths; std::vector<std::pair<std::string, bool>> paths;
// It's tempting to use the so once without copying. However, we don't know
// if the thing we're about to copy is the shared object executing this code
// or not, so this optimization is unsafe.
// paths.push_back({path, false});
for (int ii = 0; ii < threadCount; ++ii) {
std::string filename = basename(path);
char tempName[PATH_MAX + 12]; if (threadCount == 1) {
sprintf(tempName, "/tmp/%s-XXXXXX", filename.c_str()); paths.push_back({ path, false });
int tempFd = mkstemp(tempName); } else {
int fd; // It's tempting to use the so once without copying. However, we don't know
// if the thing we're about to copy is the shared object executing this code
// or not, so this optimization is unsafe.
// paths.push_back({path, false});
for (int ii = 0; ii < threadCount; ++ii) {
std::string filename = basename(path);
if ((fd = open(path.c_str(), O_RDONLY)) == -1) { char tempName[PATH_MAX + 12];
TraceEvent("ExternalClientNotFound").detail("LibraryPath", path); sprintf(tempName, "/tmp/%s-XXXXXX", filename.c_str());
throw file_not_found(); int tempFd = mkstemp(tempName);
} int fd;
constexpr size_t buf_sz = 4096; if ((fd = open(path.c_str(), O_RDONLY)) == -1) {
char buf[buf_sz]; TraceEvent("ExternalClientNotFound").detail("LibraryPath", path);
while (1) { throw file_not_found();
ssize_t readCount = read(fd, buf, buf_sz);
if (readCount == 0) {
// eof
break;
} }
if (readCount == -1) {
TraceEvent(SevError, "ExternalClientCopyFailedReadError").GetLastError().detail("LibraryPath", path); TraceEvent("CopyingExternalClient")
throw platform_error(); .detail("FileName", filename)
} .detail("LibraryPath", path)
ssize_t written = 0; .detail("TempPath", tempName);
while (written != readCount) {
ssize_t writeCount = write(tempFd, buf + written, readCount - written); constexpr size_t buf_sz = 4096;
if (writeCount == -1) { char buf[buf_sz];
TraceEvent(SevError, "ExternalClientCopyFailedWriteError") while (1) {
ssize_t readCount = read(fd, buf, buf_sz);
if (readCount == 0) {
// eof
break;
}
if (readCount == -1) {
TraceEvent(SevError, "ExternalClientCopyFailedReadError")
.GetLastError() .GetLastError()
.detail("LibraryPath", path); .detail("LibraryPath", path);
throw platform_error(); throw platform_error();
} }
written += writeCount; ssize_t written = 0;
while (written != readCount) {
ssize_t writeCount = write(tempFd, buf + written, readCount - written);
if (writeCount == -1) {
TraceEvent(SevError, "ExternalClientCopyFailedWriteError")
.GetLastError()
.detail("LibraryPath", path);
throw platform_error();
}
written += writeCount;
}
} }
close(fd);
close(tempFd);
paths.push_back({ tempName, true }); // use + delete temporary copies of the library.
} }
close(fd);
close(tempFd);
paths.push_back({ tempName, true }); // use + delete temporary copies of the library.
} }
return paths; return paths;
@ -1315,10 +1327,6 @@ void MultiVersionApi::setupNetwork() {
if (externalClients.count(filename) == 0) { if (externalClients.count(filename) == 0) {
externalClients[filename] = {}; externalClients[filename] = {};
for (const auto& tmp : copyExternalLibraryPerThread(path)) { for (const auto& tmp : copyExternalLibraryPerThread(path)) {
TraceEvent("AddingExternalClient")
.detail("FileName", filename)
.detail("LibraryPath", path)
.detail("TempPath", tmp.first);
externalClients[filename].push_back(Reference<ClientInfo>( externalClients[filename].push_back(Reference<ClientInfo>(
new ClientInfo(new DLApi(tmp.first, tmp.second /*unlink on load*/), path))); new ClientInfo(new DLApi(tmp.first, tmp.second /*unlink on load*/), path)));
} }