Wait for all threads to terminate before exitting.

I think it is not defined what would happen to detached threads
when the main thread tries to exit. That means it was not guaranteed
that unlinkAsync correctly removes a temporary file. It was also
reported that this unlinkAsync caused a crash on Windows.

This patch adds a few new functions so that the main thread always
waits for non-main threads before exitting.

I don't actually like the new two functions, runBackground and
waitForBackgroundThreads, because it looks like it is a bit
overdesigned. After all, what we are doing with these functions
is to just remove a file.

An alternative would be to do fork(2) and make the child process
remove a file asynchronously. However, it has its own problems.
Correctly forking and reclaiming a resource using waitpid(2) is not
doable unless we know our process-wide settings (such as signal mask),
but we can't make any assumption on it when lld is embedded to other
process. So I chose to stick with threads instead of multi-processes.

Differential Revision: https://reviews.llvm.org/D38571

llvm-svn: 315033
This commit is contained in:
Rui Ueyama 2017-10-05 23:01:11 +00:00
parent 27e66fb579
commit 945cd64471
6 changed files with 41 additions and 3 deletions

View File

@ -40,6 +40,7 @@ add_lld_library(lldELF
Symbols.cpp
SyntheticSections.cpp
Target.cpp
Threads.cpp
Thunks.cpp
Writer.cpp

View File

@ -89,6 +89,7 @@ bool elf::link(ArrayRef<const char *> Args, bool CanExitEarly,
Config->Argv = {Args.begin(), Args.end()};
Driver->main(Args, CanExitEarly);
waitForBackgroundThreads();
// Exit immediately if we don't need to return to the caller.
// This saves time because the overhead of calling destructors

View File

@ -9,6 +9,7 @@
#include "Error.h"
#include "Config.h"
#include "Threads.h"
#include "llvm/ADT/Twine.h"
#include "llvm/Support/Error.h"
@ -100,6 +101,8 @@ void elf::error(const Twine &Msg) {
}
void elf::exitLld(int Val) {
waitForBackgroundThreads();
// Dealloc/destroy ManagedStatic variables before calling
// _exit(). In a non-LTO build, this is a nop. In an LTO
// build allows us to get the output of -time-passes.

View File

@ -13,9 +13,9 @@
#include "Filesystem.h"
#include "Config.h"
#include "llvm/Support/FileSystem.h"
#include "Threads.h"
#include "llvm/Support/FileOutputBuffer.h"
#include <thread>
#include "llvm/Support/FileSystem.h"
using namespace llvm;
@ -55,7 +55,7 @@ void elf::unlinkAsync(StringRef Path) {
}
// Remove TempPath in background.
std::thread([=] { ::remove(TempPath.str().str().c_str()); }).detach();
runBackground([=] { ::remove(TempPath.str().str().c_str()); });
}
// Simulate file creation to see if Path is writable.

29
lld/ELF/Threads.cpp Normal file
View File

@ -0,0 +1,29 @@
//===- Threads.cpp --------------------------------------------------------===//
//
// The LLVM Linker
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
#include "Threads.h"
#include <thread>
static std::vector<std::thread> Threads;
// Runs a given function in a new thread.
void lld::elf::runBackground(std::function<void()> Fn) {
Threads.emplace_back(Fn);
}
// Wait for all threads spawned for runBackground() to finish.
//
// You need to call this function from the main thread before exiting
// because it is not defined what will happen to non-main threads when
// the main thread exits.
void lld::elf::waitForBackgroundThreads() {
for (std::thread &T : Threads)
if (T.joinable())
T.join();
}

View File

@ -81,6 +81,10 @@ inline void parallelForEachN(size_t Begin, size_t End,
else
for_each_n(llvm::parallel::seq, Begin, End, Fn);
}
void runBackground(std::function<void()> Fn);
void waitForBackgroundThreads();
} // namespace elf
} // namespace lld