Added a mutex protecting texture accesses (#845)

Emulator/Components/Denise/PixelEngine.cpp

@@ -13,6 +13,7 @@
 #include "Colors.h"
 #include "Denise.h"
 #include "DmaDebugger.h"
+#include "Emulator.h"
 
 #include <fstream>
 
@@ -309,6 +310,8 @@ PixelEngine::stablePtr(isize row, isize col)
 void
 PixelEngine::swapBuffers()
 {
+    emulator.textureLock.lock();
+
     videoPort.buffersWillSwap();
 
     isize oldActiveBuffer = activeBuffer;
@@ -319,6 +322,8 @@ PixelEngine::swapBuffers()
     emuTexture[newActiveBuffer].prevlof = emuTexture[oldActiveBuffer].lof;
 
     activeBuffer = newActiveBuffer;
+
+    emulator.textureLock.unlock();
 }
 
 void

Emulator/Components/Emulator.h

@@ -40,6 +40,9 @@ class Emulator : public Thread, public Synchronizable, public Inspectable<Emulat
     // Incoming external events
     CmdQueue cmdQueue;
 
+    // Texture lock
+    util::Mutex textureLock;
+
 
     //
     // Methods
@@ -157,7 +160,8 @@ class Emulator : public Thread, public Synchronizable, public Inspectable<Emulat
     //
 
     const FrameBuffer &getTexture() const;
-
+    void lockTexture() { textureLock.lock(); }
+    void unlockTexture() { textureLock.unlock(); }
 
     //
     // Command queue

Emulator/VAmiga.cpp

@@ -811,6 +811,18 @@ SerialPortAPI::readOutgoingPrintableByte() const
 // Ports (VideoPort)
 //
 
+void
+VideoPortAPI::lockTexture()
+{
+    emu->lockTexture();
+}
+
+void
+VideoPortAPI::unlockTexture()
+{
+    emu->unlockTexture();
+}
+
 const u32 *
 VideoPortAPI::getTexture() const
 {

Emulator/VAmiga.h

@@ -999,6 +999,20 @@ struct VideoPortAPI : public API {
     /// @name Retrieving video data
     /// @{
 
+    /** @brief  Locks the emulator texture
+     *
+     * This function aquires a mutex that prevents the emulator to modify the
+     * stable texture. Call this function prior to getTexture().
+     */
+    void lockTexture();
+
+    /** @brief  Unlocks the emulator texture
+     *
+     * This function releases the mutex acquired in lockTexture(). Call this
+     * function when the pointer returned by getTexture() is no longer needed.
+     */
+    void unlockTexture();
+
     /** @brief  Returns a pointer to the most recent stable texture
      *
      * The texture dimensions are given by constants vamiga::Texture::width

Emulator/config.cpp

@@ -108,7 +108,7 @@ debugflag POSREG_DEBUG    = 0;
 debugflag JOYREG_DEBUG    = 0;
 debugflag POTREG_DEBUG    = 0;
 debugflag VID_DEBUG       = 0;
-debugflag PRT_DEBUG       = 1;
+debugflag PRT_DEBUG       = 0;
 debugflag SER_DEBUG       = 0;
 debugflag POT_DEBUG       = 0;
 debugflag HOLD_MOUSE_L    = 0;

GUI/Metal/Layers/Canvas.swift

@@ -237,6 +237,11 @@ class Canvas: Layer {
         // Get the emulator texture
         var buffer: UnsafePointer<u32>!
         var nr = 0
+
+        // Prevent the stable texture from changing
+        amiga.videoPort.lockTexture()
+
+        // Grab the stable texture
         amiga.videoPort.texture(&buffer, nr: &nr, lof: &currLOF, prevlof: &prevLOF)
 
         // Check for duplicated or dropped frames
@@ -255,6 +260,9 @@ class Canvas: Layer {
         } else {
             sfTexture.replace(w: Int(TPP) * HPIXELS, h: VPIXELS, buffer: buffer)
         }
+
+        // Release the texture lock
+        amiga.videoPort.unlockTexture()
     }
 
     //

Proxy/EmulatorProxy.h

@@ -594,6 +594,8 @@
 
 @interface VideoPortProxy : CoreComponentProxy { }
 
+- (void)lockTexture;
+- (void)unlockTexture;
 - (void)texture:(const u32 **)ptr nr:(NSInteger *)nr lof:(bool *)lof prevlof:(bool *)prevlof;
 
 @end

Proxy/EmulatorProxy.mm

@@ -1081,6 +1081,16 @@ - (VideoPortAPI *)port
     return (VideoPortAPI *)obj;
 }
 
+- (void)lockTexture
+{
+    [self port]->lockTexture();
+}
+
+- (void)unlockTexture
+{
+    [self port]->unlockTexture();
+}
+
 - (void)texture:(const u32 **)ptr nr:(NSInteger *)nr lof:(bool *)lof prevlof:(bool *)prevlof
 {
     isize inr;