Remove NO_THREADS fallback code, Godot 4 requires thread support

This also removes `OS::can_use_threads` from the public API since it's always true.
jarnovanderlinden · Oct 3, 2022 · 54418ea · 54418ea
1 parent d331b80
commit 54418ea
Show file tree

Hide file tree

Showing 29 changed files with 12 additions and 560 deletions.
diff --git a/core/core_bind.cpp b/core/core_bind.cpp
@@ -425,10 +425,6 @@ void OS::delay_msec(int p_msec) const {
 	::OS::get_singleton()->delay_usec(int64_t(p_msec) * 1000);
 }
 
-bool OS::can_use_threads() const {
-	return ::OS::get_singleton()->can_use_threads();
-}
-
 bool OS::is_userfs_persistent() const {
 	return ::OS::get_singleton()->is_userfs_persistent();
 }
@@ -561,8 +557,6 @@ void OS::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("is_userfs_persistent"), &OS::is_userfs_persistent);
 	ClassDB::bind_method(D_METHOD("is_stdout_verbose"), &OS::is_stdout_verbose);
 
-	ClassDB::bind_method(D_METHOD("can_use_threads"), &OS::can_use_threads);
-
 	ClassDB::bind_method(D_METHOD("is_debug_build"), &OS::is_debug_build);
 
 	ClassDB::bind_method(D_METHOD("get_static_memory_usage"), &OS::get_static_memory_usage);

diff --git a/core/core_bind.h b/core/core_bind.h
@@ -218,8 +218,6 @@ class OS : public Object {
 	uint64_t get_ticks_msec() const;
 	uint64_t get_ticks_usec() const;
 
-	bool can_use_threads() const;
-
 	bool is_userfs_persistent() const;
 
 	bool is_stdout_verbose() const;

diff --git a/core/debugger/remote_debugger_peer.cpp b/core/debugger/remote_debugger_peer.cpp
@@ -79,10 +79,8 @@ RemoteDebuggerPeerTCP::RemoteDebuggerPeerTCP(Ref<StreamPeerTCP> p_tcp) {
 	tcp_client = p_tcp;
 	if (tcp_client.is_valid()) { // Attaching to an already connected stream.
 		connected = true;
-#ifndef NO_THREADS
 		running = true;
 		thread.start(_thread_func, this);
-#endif
 	} else {
 		tcp_client.instantiate();
 	}
@@ -183,10 +181,8 @@ Error RemoteDebuggerPeerTCP::connect_to_host(const String &p_host, uint16_t p_po
 		return FAILED;
 	}
 	connected = true;
-#ifndef NO_THREADS
 	running = true;
 	thread.start(_thread_func, this);
-#endif
 	return OK;
 }
 
@@ -208,9 +204,7 @@ void RemoteDebuggerPeerTCP::_thread_func(void *p_ud) {
 }
 
 void RemoteDebuggerPeerTCP::poll() {
-#ifdef NO_THREADS
-	_poll();
-#endif
+	// Nothing to do, polling is done in thread.
 }
 
 void RemoteDebuggerPeerTCP::_poll() {

diff --git a/core/debugger/remote_debugger_peer.h b/core/debugger/remote_debugger_peer.h
@@ -43,12 +43,12 @@ class RemoteDebuggerPeer : public RefCounted {
 
 public:
 	virtual bool is_peer_connected() = 0;
+	virtual int get_max_message_size() const = 0;
 	virtual bool has_message() = 0;
 	virtual Error put_message(const Array &p_arr) = 0;
 	virtual Array get_message() = 0;
 	virtual void close() = 0;
 	virtual void poll() = 0;
-	virtual int get_max_message_size() const = 0;
 	virtual bool can_block() const { return true; } // If blocking io is allowed on main thread (debug).
 
 	RemoteDebuggerPeer();
@@ -81,12 +81,12 @@ class RemoteDebuggerPeerTCP : public RemoteDebuggerPeer {
 
 	Error connect_to_host(const String &p_host, uint16_t p_port);
 
-	void poll() override;
 	bool is_peer_connected() override;
+	int get_max_message_size() const override;
 	bool has_message() override;
-	Array get_message() override;
 	Error put_message(const Array &p_arr) override;
-	int get_max_message_size() const override;
+	Array get_message() override;
+	void poll() override;
 	void close() override;
 
 	RemoteDebuggerPeerTCP(Ref<StreamPeerTCP> p_stream = Ref<StreamPeerTCP>());

diff --git a/core/os/mutex.cpp b/core/os/mutex.cpp
@@ -40,11 +40,7 @@ void _global_unlock() {
 	_global_mutex.unlock();
 }
 
-#ifndef NO_THREADS
-
 template class MutexImpl<std::recursive_mutex>;
 template class MutexImpl<std::mutex>;
 template class MutexLock<MutexImpl<std::recursive_mutex>>;
 template class MutexLock<MutexImpl<std::mutex>>;
-
-#endif
diff --git a/core/os/mutex.h b/core/os/mutex.h
@@ -34,8 +34,6 @@
 #include "core/error/error_list.h"
 #include "core/typedefs.h"
 
-#if !defined(NO_THREADS)
-
 #include <mutex>
 
 template <class StdMutexT>
@@ -79,29 +77,4 @@ extern template class MutexImpl<std::mutex>;
 extern template class MutexLock<MutexImpl<std::recursive_mutex>>;
 extern template class MutexLock<MutexImpl<std::mutex>>;
 
-#else
-
-class FakeMutex {
-	FakeMutex() {}
-};
-
-template <class MutexT>
-class MutexImpl {
-public:
-	_ALWAYS_INLINE_ void lock() const {}
-	_ALWAYS_INLINE_ void unlock() const {}
-	_ALWAYS_INLINE_ Error try_lock() const { return OK; }
-};
-
-template <class MutexT>
-class MutexLock {
-public:
-	explicit MutexLock(const MutexT &p_mutex) {}
-};
-
-using Mutex = MutexImpl<FakeMutex>;
-using BinaryMutex = MutexImpl<FakeMutex>; // Non-recursive, handle with care
-
-#endif // !NO_THREADS
-
 #endif // MUTEX_H
diff --git a/core/os/os.cpp b/core/os/os.cpp
@@ -328,14 +328,6 @@ String OS::get_processor_name() const {
 	return "";
 }
 
-bool OS::can_use_threads() const {
-#ifdef NO_THREADS
-	return false;
-#else
-	return true;
-#endif
-}
-
 void OS::set_has_server_feature_callback(HasServerFeatureCallback p_callback) {
 	has_server_feature_callback = p_callback;
 }

diff --git a/core/os/os.h b/core/os/os.h
@@ -299,8 +299,6 @@ class OS {
 
 	virtual String get_unique_id() const;
 
-	virtual bool can_use_threads() const;
-
 	bool has_feature(const String &p_feature);
 
 	void set_has_server_feature_callback(HasServerFeatureCallback p_callback);

diff --git a/core/os/rw_lock.h b/core/os/rw_lock.h
@@ -33,8 +33,6 @@
 
 #include "core/error/error_list.h"
 
-#if !defined(NO_THREADS)
-
 #include <shared_mutex>
 
 class RWLock {
@@ -72,21 +70,6 @@ class RWLock {
 	}
 };
 
-#else
-
-class RWLock {
-public:
-	void read_lock() const {}
-	void read_unlock() const {}
-	Error read_try_lock() const { return OK; }
-
-	void write_lock() {}
-	void write_unlock() {}
-	Error write_try_lock() { return OK; }
-};
-
-#endif
-
 class RWLockRead {
 	const RWLock &lock;
 

diff --git a/core/os/semaphore.h b/core/os/semaphore.h
@@ -34,8 +34,6 @@
 #include "core/error/error_list.h"
 #include "core/typedefs.h"
 
-#if !defined(NO_THREADS)
-
 #include <condition_variable>
 #include <mutex>
 
@@ -70,15 +68,4 @@ class Semaphore {
 	}
 };
 
-#else
-
-class Semaphore {
-public:
-	_ALWAYS_INLINE_ void post() const {}
-	_ALWAYS_INLINE_ void wait() const {}
-	_ALWAYS_INLINE_ bool try_wait() const { return true; }
-};
-
-#endif
-
 #endif // SEMAPHORE_H
diff --git a/core/os/thread.cpp b/core/os/thread.cpp
@@ -34,9 +34,6 @@
 #include "thread.h"
 
 #include "core/object/script_language.h"
-
-#if !defined(NO_THREADS)
-
 #include "core/templates/safe_refcount.h"
 
 Error (*Thread::set_name_func)(const String &) = nullptr;
@@ -128,5 +125,4 @@ Thread::~Thread() {
 	}
 }
 
-#endif
 #endif // PLATFORM_THREAD_OVERRIDE
diff --git a/core/os/thread.h b/core/os/thread.h
@@ -35,15 +35,14 @@
 #ifdef PLATFORM_THREAD_OVERRIDE
 #include "platform_thread.h"
 #else
+
 #ifndef THREAD_H
 #define THREAD_H
 
+#include "core/templates/safe_refcount.h"
 #include "core/typedefs.h"
 
-#if !defined(NO_THREADS)
-#include "core/templates/safe_refcount.h"
 #include <thread>
-#endif
 
 class String;
 
@@ -65,7 +64,6 @@ class Thread {
 	};
 
 private:
-#if !defined(NO_THREADS)
 	friend class Main;
 
 	static ID main_thread_id;
@@ -82,7 +80,6 @@ class Thread {
 	static void (*set_priority_func)(Thread::Priority);
 	static void (*init_func)();
 	static void (*term_func)();
-#endif
 
 public:
 	static void _set_platform_funcs(
@@ -91,7 +88,6 @@ class Thread {
 			void (*p_init_func)() = nullptr,
 			void (*p_term_func)() = nullptr);
 
-#if !defined(NO_THREADS)
 	_FORCE_INLINE_ ID get_id() const { return id; }
 	// get the ID of the caller thread
 	_FORCE_INLINE_ static ID get_caller_id() { return caller_id; }
@@ -107,19 +103,6 @@ class Thread {
 
 	Thread();
 	~Thread();
-#else
-	_FORCE_INLINE_ ID get_id() const { return 0; }
-	// get the ID of the caller thread
-	_FORCE_INLINE_ static ID get_caller_id() { return 0; }
-	// get the ID of the main thread
-	_FORCE_INLINE_ static ID get_main_id() { return 0; }
-
-	static Error set_name(const String &p_name) { return ERR_UNAVAILABLE; }
-
-	void start(Thread::Callback p_callback, void *p_user, const Settings &p_settings = Settings()) {}
-	bool is_started() const { return false; }
-	void wait_to_finish() {}
-#endif
 };
 
 #endif // THREAD_H

diff --git a/core/os/threaded_array_processor.h b/core/os/threaded_array_processor.h
@@ -49,8 +49,6 @@ struct ThreadArrayProcessData {
 	}
 };
 
-#ifndef NO_THREADS
-
 template <class T>
 void process_array_thread(void *ud) {
 	T &data = *(T *)ud;
@@ -86,21 +84,4 @@ void thread_process_array(uint32_t p_elements, C *p_instance, M p_method, U p_us
 	memdelete_arr(threads);
 }
 
-#else
-
-template <class C, class M, class U>
-void thread_process_array(uint32_t p_elements, C *p_instance, M p_method, U p_userdata) {
-	ThreadArrayProcessData<C, U> data;
-	data.method = p_method;
-	data.instance = p_instance;
-	data.userdata = p_userdata;
-	data.index.set(0);
-	data.elements = p_elements;
-	for (uint32_t i = 0; i < p_elements; i++) {
-		data.process(i);
-	}
-}
-
-#endif
-
 #endif // THREADED_ARRAY_PROCESSOR_H
diff --git a/core/templates/cowdata.h b/core/templates/cowdata.h
@@ -46,9 +46,7 @@ class CharString;
 template <class T, class V>
 class VMap;
 
-#if !defined(NO_THREADS)
 SAFE_NUMERIC_TYPE_PUN_GUARANTEES(uint32_t)
-#endif
 
 // Silence a false positive warning (see GH-52119).
 #if defined(__GNUC__) && !defined(__clang__)