Improve thumbnail parallelism

rtgui/filebrowserentry.cc

@@ -56,14 +56,20 @@ FileBrowserEntry::FileBrowserEntry (Thumbnail* thm, const Glib::ustring& fname)
 
 FileBrowserEntry::~FileBrowserEntry () {
 
-    thumbImageUpdater.removeJobs (this);
+	// so jobs arriving now do nothing
+    if (feih->pending)
+	{
+        feih->destroyed = true;
+	}
+    else
+	{
+        delete feih;
+		feih = 0;
+	}
+
+    thumbImageUpdater->removeJobs (this);
     if (thumbnail)
         thumbnail->removeThumbnailListener (this);
-
-    if (feih->pending)
-        feih->destroyed = true;
-    else
-        delete feih;
 }
 
 void FileBrowserEntry::refreshThumbnailImage () {
@@ -71,8 +77,7 @@ void FileBrowserEntry::refreshThumbnailImage () {
     if (!thumbnail)
         return;
 
-    thumbImageUpdater.add (thumbnail, thumbnail->getProcParams(), preh, &updatepriority, this);    
-    thumbImageUpdater.process ();
+    thumbImageUpdater->add (thumbnail, thumbnail->getProcParams(), preh, &updatepriority, this);    
 }
 
 void FileBrowserEntry::calcThumbnailSize () {
@@ -134,10 +139,11 @@ struct tiupdate {
 
 int fbeupdate (void* data) {
     
-    gdk_threads_enter ();
     tiupdate* params = (tiupdate*)data;
     FileBrowserEntryIdleHelper* feih = params->feih;
 
+	GThreadLock lock;
+
     if (feih->destroyed) {
         if (feih->pending == 1)
             delete feih;
@@ -145,14 +151,12 @@ int fbeupdate (void* data) {
             feih->pending--;
         params->img->free ();
         delete params;
-        gdk_threads_leave ();
         return 0;
     }
     
     feih->fbentry->_updateImage (params->img, params->scale, params->cropParams);
     feih->pending--;
 
-    gdk_threads_leave ();
     delete params;
     
     return 0;
@@ -160,8 +164,19 @@ int fbeupdate (void* data) {
 
 void FileBrowserEntry::updateImage (rtengine::IImage8* img, double scale, rtengine::procparams::CropParams cropParams) {
 
-    redrawRequests++;
-    feih->pending++;
+	{
+		GThreadLock lock;
+
+		if ( feih == 0 ||
+				feih->destroyed )
+		{
+			return;
+		}
+
+		redrawRequests++;
+		feih->pending++;
+	}
+
     tiupdate* param = new tiupdate ();
     param->feih = feih;
     param->img = img;