Use mutex instead of pseudo-mutex for network bitmaps locks

Author: MaximDude

Managers/FrameMan.cpp

@@ -81,7 +81,6 @@ namespace RTE {
 			m_FlashScreenColor[screenCount] = -1;
 			m_FlashedLastFrame[screenCount] = false;
 			m_FlashTimer[screenCount].Reset();
-			m_NetworkBitmapIsLocked[screenCount] = false;
 
 			for (short bufferFrame = 0; bufferFrame < 2; bufferFrame++) {
 				m_NetworkBackBufferIntermediate8[bufferFrame][screenCount] = 0;
@@ -862,13 +861,14 @@ namespace RTE {
 
 			// Replace 8 bit backbuffer contents with network received image before post-processing as it is where this buffer is copied to 32 bit buffer
 			if (GetDrawNetworkBackBuffer()) {
-				m_NetworkBitmapIsLocked[0] = true;
+				m_NetworkBitmapIsLocked[0].lock();
+
 				blit(m_NetworkBackBufferFinal8[m_NetworkFrameReady][0], m_BackBuffer8, 0, 0, 0, 0, m_BackBuffer8->w, m_BackBuffer8->h);
 				masked_blit(m_NetworkBackBufferFinalGUI8[m_NetworkFrameReady][0], m_BackBuffer8, 0, 0, 0, 0, m_BackBuffer8->w, m_BackBuffer8->h);
 
 				if (g_UInputMan.FlagAltState() || g_UInputMan.FlagCtrlState() || g_UInputMan.FlagShiftState()) { g_PerformanceMan.DrawCurrentPing(); }
 
-				m_NetworkBitmapIsLocked[0] = false;
+				m_NetworkBitmapIsLocked[0].unlock();
 			}
 		}
 
@@ -1019,10 +1019,10 @@ namespace RTE {
 			dx = (i == 1 || i == 3) ? dw : dx;
 			dy = (i == 2 || i == 3) ? dh : dy;
 
-			m_NetworkBitmapIsLocked[i] = true;
+			m_NetworkBitmapIsLocked[i].lock();
 			blit(m_NetworkBackBufferIntermediate8[m_NetworkFrameCurrent][i], m_NetworkBackBufferFinal8[m_NetworkFrameCurrent][i], 0, 0, 0, 0, m_NetworkBackBufferFinal8[m_NetworkFrameCurrent][i]->w, m_NetworkBackBufferFinal8[m_NetworkFrameCurrent][i]->h);
 			blit(m_NetworkBackBufferIntermediateGUI8[m_NetworkFrameCurrent][i], m_NetworkBackBufferFinalGUI8[m_NetworkFrameCurrent][i], 0, 0, 0, 0, m_NetworkBackBufferFinalGUI8[m_NetworkFrameCurrent][i]->w, m_NetworkBackBufferFinalGUI8[m_NetworkFrameCurrent][i]->h);
-			m_NetworkBitmapIsLocked[i] = false;
+			m_NetworkBitmapIsLocked[i].unlock();
 
 #if defined DEBUG_BUILD || defined MIN_DEBUG_BUILD
 			// Draw all player's screen into one

Managers/FrameMan.h

@@ -445,13 +445,6 @@ namespace RTE {
 		/// <returns>A pointer to the 8bpp intermediate GUI BITMAP. OWNERSHIP IS NOT TRANSFERRED!</returns>
 		BITMAP * GetNetworkBackBufferIntermediateGUI8Current(short player) const { return m_NetworkBackBufferIntermediateGUI8[m_NetworkFrameCurrent][player]; }
 
-		/// <summary>
-		/// Gets whether the network backbuffers are locked to be updated.
-		/// </summary>
-		/// <param name="player">Which player screen to check for.</param>
-		/// <returns>Whether the network backbuffers are locked to be updated.</returns>
-		bool IsNetworkBitmapLocked(short player) const { return m_NetworkBitmapIsLocked[player]; }
-
 		// TODO: Figure out.
 		/// <summary>
 		/// 
@@ -623,9 +616,7 @@ namespace RTE {
 		unsigned short m_NetworkFrameCurrent; //!< Which frame index is being rendered, 0 or 1.
 		unsigned short m_NetworkFrameReady; //!< Which frame is rendered and ready for transmission, 0 or 1.
 
-		bool m_NetworkBitmapIsLocked[c_MaxScreenCount]; //!< If true then the network bitmap is being updated (Pseudo mutex lock/unlock).
-		// TODO: Test if this destroys the whole multiplayer and use instead of the one above if it doesn't.
-		//std::mutex m_NetworkBitmapIsLocked[c_MaxScreenCount];
+		std::mutex m_NetworkBitmapIsLocked[c_MaxScreenCount]; //!< Mutex lock for thread safe updating of the network backbuffer bitmaps.
 
 	private:
 

Managers/NetworkClient.cpp

@@ -778,7 +778,6 @@ namespace RTE
 
 	void NetworkClient::DrawFrame()
 	{
-		while (g_FrameMan.IsNetworkBitmapLocked(0));
 		BITMAP * src_bmp = g_FrameMan.GetNetworkBackBufferIntermediate8Ready(0);
 		BITMAP * dst_bmp = g_FrameMan.GetNetworkBackBuffer8Ready(0);
 

Managers/NetworkServer.cpp

@@ -1435,7 +1435,6 @@ namespace RTE
 
 		// Wait till frameman releases bitmap
 		SetThreadExitReason(player, NetworkServer::LOCKED);
-		//while (g_FrameMan.IsNetworkBitmapLocked(player));
 		SetThreadExitReason(player, NetworkServer::NORMAL);
 
 		// Get backbuffer bitmap for this player