New reservations

Memory system cleanup
sys_memory_get_page_attribute

rpcs3/Emu/Memory/wait_engine.cpp

@@ -1,129 +1 @@
 #include "stdafx.h"
-#include "Emu/System.h"
-#include "vm.h"
-#include "wait_engine.h"
-
-#include "Utilities/Thread.h"
-#include "Utilities/mutex.h"
-
-#include <unordered_set>
-
-namespace vm
-{
-	static shared_mutex s_mutex;
-
-	static std::unordered_set<waiter_base*, pointer_hash<waiter_base>> s_waiters(256);
-
-	void waiter_base::initialize(u32 addr, u32 size)
-	{
-		verify(HERE), addr, (size & (~size + 1)) == size, (addr & (size - 1)) == 0;
-
-		this->addr = addr;
-		this->mask = ~(size - 1);
-		this->thread = thread_ctrl::get_current();
-
-		struct waiter final
-		{
-			waiter_base* m_ptr;
-			thread_ctrl* m_thread;
-
-			waiter(waiter_base* ptr)
-				: m_ptr(ptr)
-				, m_thread(ptr->thread)
-			{
-				// Initialize waiter
-				writer_lock lock(s_mutex);
-				s_waiters.emplace(m_ptr);
-			}
-
-			~waiter()
-			{
-				// Reset thread
-				m_ptr->thread = nullptr;
-
-				// Remove waiter
-				writer_lock lock(s_mutex);
-				s_waiters.erase(m_ptr);
-			}
-		};
-
-		// Wait until thread == nullptr
-		waiter{this}, thread_ctrl::wait([&] { return !thread || test(); });
-	}
-
-	bool waiter_base::try_notify()
-	{
-		const auto _t = thread.load();
-
-		try
-		{
-			// Test predicate
-			if (UNLIKELY(!_t || !test()))
-			{
-				return false;
-			}
-		}
-		catch (...)
-		{
-			// Capture any exception thrown by the predicate
-			_t->set_exception(std::current_exception());
-		}
-
-		// Signal the thread with nullptr
-		if (auto _t = thread.exchange(nullptr))
-		{
-			_t->notify();
-		}
-		
-		return true;
-	}
-
-	void notify_at(u32 addr, u32 size)
-	{
-		reader_lock lock(s_mutex);
-
-		for (const auto _w : s_waiters)
-		{
-			// Check address range overlapping using masks generated from size (power of 2)
-			if (((_w->addr ^ addr) & (_w->mask & ~(size - 1))) == 0)
-			{
-				_w->try_notify();
-			}
-		}
-	}
-
-	// Return amount of threads which are not notified
-	static std::size_t notify_all()
-	{
-		reader_lock lock(s_mutex);
-
-		std::size_t signaled = 0;
-
-		for (const auto _w : s_waiters)
-		{
-			if (_w->try_notify())
-			{
-				signaled++;
-			}
-		}
-
-		return s_waiters.size() - signaled;
-	}
-
-	void start()
-	{
-		thread_ctrl::spawn("vm::wait", []()
-		{
-			while (!Emu.IsStopped())
-			{
-				// Poll waiters periodically (TODO)
-				while (notify_all() && !Emu.IsPaused() && !Emu.IsStopped())
-				{
-					thread_ctrl::wait_for(50);
-				}
-
-				thread_ctrl::wait_for(1000);
-			}
-		});
-	}
-}