Consider GC free zone when making appData callbacks

haxenme · Oct 30, 2023 · ad245e9 · ad245e9
1 parent 34c6673
commit ad245e9
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 5 deletions.
diff --git a/project/include/Surface.h b/project/include/Surface.h
@@ -40,7 +40,9 @@ extern bool RpiHardwareDecodeJPeg(I420Callback inCallback, void *inUserData, con
 
 struct IAppDataCallback
 {
+   virtual void beginCallbacks() = 0;
    virtual void onAppData(int marker, const uint8 *inBytes,int inLen ) = 0;
+   virtual void endCallbacks() = 0;
 };
 
 

diff --git a/project/src/common/ExternalInterface.cpp b/project/src/common/ExternalInterface.cpp
@@ -4136,8 +4136,9 @@ TEXT_PROP_GET_IDX_PRIME(line_offset,LineOffset,int);
 struct ValueAppDataCallback : public IAppDataCallback
 {
    value cbValue;
+   bool  unblocked;
 
-   ValueAppDataCallback(value inValue) : cbValue(inValue) { }
+   ValueAppDataCallback(value inValue) : cbValue(inValue), unblocked(false) { }
 
    IAppDataCallback *get()
    {
@@ -4146,13 +4147,31 @@ struct ValueAppDataCallback : public IAppDataCallback
       return this;
    }
 
+   void beginCallbacks()
+   {
+      unblocked =  gc_try_unblocking();
+   }
+
    void onAppData(int marker, const uint8 *inBytes,int inLen )
    {
       ByteArray byteArray(inLen);
       uint8 *bytes = byteArray.Bytes();
       if (bytes)
          memcpy(bytes, inBytes, inLen);
-      val_call2( cbValue, alloc_int(marker), byteArray.mValue );
+      try
+      {
+         val_call2( cbValue, alloc_int(marker), byteArray.mValue );
+      }
+      catch(...)
+      {
+         // Ignore?
+      }
+   }
+
+   void endCallbacks()
+   {
+      if (unblocked)
+          gc_enter_blocking();
    }
 
 };

diff --git a/project/src/common/SurfaceIO.cpp b/project/src/common/SurfaceIO.cpp
@@ -270,10 +270,15 @@ static Surface *TryJPEG(FILE *inFile,const uint8 *inData, int inDataLen, IAppDat
    if (onAppData)
    {
       jpeg_saved_marker_ptr marker = cinfo.marker_list;
-      while(marker)
+      if (marker)
       {
-         onAppData->onAppData(marker->marker, marker->data, marker->data_length);
-         marker = marker->next;
+         onAppData->beginCallbacks();
+         while(marker)
+         {
+            onAppData->onAppData(marker->marker, marker->data, marker->data_length);
+            marker = marker->next;
+         }
+         onAppData->endCallbacks();
       }
    }