mirror of
https://github.com/OpenTTD/OpenTTD.git
synced 2025-07-06 20:39:38 +01:00
970fedd78c
Basically, modal windows had their own thread-locking for what drawing was possible. This is a bit nonsense now we have a game-thread. And it makes much more sense to do things like NewGRFScan and GenerateWorld in the game-thread, and not in a thread next to the game-thread. This commit changes that: it removes the threads for NewGRFScan and GenerateWorld, and just runs the code in the game-thread. On regular intervals it allows the draw-thread to do a tick, which gives a much smoother look and feel. It does slow down NewGRFScan and GenerateWorld ever so slightly as it spends more time on drawing. But the slowdown is not measureable on my machines (with 700+ NewGRFs / 4kx4k map and a Debug build). Running without a game-thread means NewGRFScan and GenerateWorld are now blocking.
75 lines
2.3 KiB
C++
75 lines
2.3 KiB
C++
/*
|
|
* This file is part of OpenTTD.
|
|
* OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
|
|
* OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
* See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
/** @file thread.h Base of all threads. */
|
|
|
|
#ifndef THREAD_H
|
|
#define THREAD_H
|
|
|
|
#include "debug.h"
|
|
#include <system_error>
|
|
#include <thread>
|
|
|
|
/**
|
|
* Sleep on the current thread for a defined time.
|
|
* @param milliseconds Time to sleep for in milliseconds.
|
|
*/
|
|
inline void CSleep(int milliseconds)
|
|
{
|
|
std::this_thread::sleep_for(std::chrono::milliseconds(milliseconds));
|
|
}
|
|
|
|
/**
|
|
* Name the thread this function is called on for the debugger.
|
|
* @param name Name to set for the thread..
|
|
*/
|
|
void SetCurrentThreadName(const char *name);
|
|
|
|
|
|
/**
|
|
* Start a new thread.
|
|
* @tparam TFn Type of the function to call on the thread.
|
|
* @tparam TArgs Type of the parameters of the thread function.
|
|
* @param thr Pointer to a thread object; may be \c nullptr if a detached thread is wanted.
|
|
* @param name Name of the thread.
|
|
* @param _Fx Function to call on the thread.
|
|
* @param _Ax Arguments for the thread function.
|
|
* @return True if the thread was successfully started, false otherwise.
|
|
*/
|
|
template<class TFn, class... TArgs>
|
|
inline bool StartNewThread(std::thread *thr, const char *name, TFn&& _Fx, TArgs&&... _Ax)
|
|
{
|
|
#ifndef NO_THREADS
|
|
try {
|
|
std::thread t([] (const char *name, TFn&& F, TArgs&&... A) {
|
|
SetCurrentThreadName(name);
|
|
try {
|
|
/* Call user function with the given arguments. */
|
|
F(A...);
|
|
} catch (...) {
|
|
NOT_REACHED();
|
|
}
|
|
}, name, std::forward<TFn>(_Fx), std::forward<TArgs>(_Ax)...);
|
|
|
|
if (thr != nullptr) {
|
|
*thr = std::move(t);
|
|
} else {
|
|
t.detach();
|
|
}
|
|
|
|
return true;
|
|
} catch (const std::system_error& e) {
|
|
/* Something went wrong, the system we are running on might not support threads. */
|
|
DEBUG(misc, 1, "Can't create thread '%s': %s", name, e.what());
|
|
}
|
|
#endif
|
|
|
|
return false;
|
|
}
|
|
|
|
#endif /* THREAD_H */
|