Changeset 3266 in orxonox.OLD

Timestamp:

Dec 24, 2004, 2:58:32 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/updater: race-condition-prevention.

Location:

orxonox/branches/updater/src/gui

Files:

• orxonox_gui_update.cc (modified) (4 diffs)
• orxonox_gui_update.h (modified) (1 diff)

orxonox/branches/updater/src/gui/orxonox_gui_update.cc

@@ -30 +30 @@
 #include "orxonox_gui.h"
 #include <stdio.h>
+#ifdef HAVE_CURL
 #include <curl/curl.h>
 #include <curl/types.h>
-#include <curl/easy.h> /* new for v7 */
+#include <curl/easy.h>
+#endif /* HAVE_CURL */
 using namespace std;
 
@@ -154 +156 @@
   strcpy (info->fileOnDisk, "test");
   info->fileOnNet = new char [100];
-  strcpy(info->fileOnNet, "http://www.orxonox.ethz.ch/files/taskHorizon.at.bermuda-funk.ogg");
+  strcpy(info->fileOnNet, "http://www.orxonox.ethz.ch/files/02%20orxonox%203.mp3");
   info->Bar = (ProgressBar*)bar;
   PRINTF(3)("Preparing to download file %s.\n", info->fileOnNet);
-  //downloadThread (info);
-
-  if (!g_thread_create(&downloadThread, info, FALSE, NULL) != 0)
-    PRINTF(1)("can't create the thread"); 
+  //  downloadThread (info);
+
+  if (downloadThreadID == NULL)
+    {
+        if ( (downloadThreadID =g_thread_create(&downloadThread, info, TRUE, NULL)) == 0 )
+          PRINTF(1)("can't create the thread");
+    }
+  else 
+    PRINTF(1)("thread already in use\n");
+
 }
 
@@ -191 +199 @@
 int OrxonoxGuiUpdate::curlProgressFunc (ProgressBar* Bar, double totalSize, double progress, double upTotal, double upProgress)
 {
-  //  gdk_threads_enter();
+  gdk_threads_enter();
   Bar->setProgress(progress);
   Bar->setTotalSize(totalSize);
-  //  gdk_threads_leave();
+  gdk_threads_leave();
   return 0;
 
 }
 
+GThread* OrxonoxGuiUpdate::downloadThreadID = NULL;
+
 void* OrxonoxGuiUpdate::downloadThread (void* fileInfo)
 {
+  
   PRINTF(3)("Downloading.\n");
   FileInfo* info = (FileInfo*)fileInfo;
@@ -225 +236 @@
       curl_easy_cleanup(curl);
     }
+  downloadThreadID = NULL;
   return NULL;
 }

orxonox/branches/updater/src/gui/orxonox_gui_update.h

@@ -50 +50 @@
   static int curlProgressFunc (ProgressBar* Bar, double totalSize, double progress, double upTotal, double upProgress);
 
+  static GThread* downloadThreadID;
   static void* downloadThread (void* fileInfo);