Changeset 3271 in orxonox.OLD for orxonox/branches/updater/src/gui/orxonox_gui_update.cc

Timestamp:

Dec 24, 2004, 6:29:38 PM (21 years ago)

Author:

bensch

Message:

orxonox/branches/updater: threads are cool after all. trying again.

File:

• orxonox/branches/updater/src/gui/orxonox_gui_update.cc (modified) (5 diffs)

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

@@ -90 +90 @@
 #ifdef HAVE_GTK2 
   updateDataWindowButton->connectSignal("button_press_event", updateDataWindow, Window::windowOpen);
-  updateDataWindow->connectSignal("destroy", updateDataWindow, cancelDownload);
-  updateDataWindow->connectSignal("delete_event", updateDataWindow, cancelDownload);
+  updateDataWindow->connectSignal("destroy", updateDataWindow, Window::windowClose);
+  updateDataWindow->connectSignal("delete_event", updateDataWindow, Window::windowClose);
 #endif /* HAVE_GTK2 */
 
@@ -149 +149 @@
   FileInfo* info = new FileInfo;
 
-  info->fileName = "03%20orxonox%203'.mp3";
+  info->fileName = "02%20orxonox%203.mp3";
   info->webRoot  = "http://www.orxonox.ethz.ch/files/";
   info->localRoot = "./";
   info->Bar = (ProgressBar*)bar;
   PRINTF(3)("Preparing to download file %s.\n", info->fileName);
-  download(info);
+  download (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");
+  */
 }
 
@@ -188 +197 @@
   Bar->setTotalSize(totalSize);
   return 0;
+
 }
 
 CURL* OrxonoxGuiUpdate::curlHandle = NULL;
+GThread* OrxonoxGuiUpdate::downloadThreadID = NULL;
 
 void* OrxonoxGuiUpdate::download (void* fileInfo)
@@ -209 +220 @@
   if(curlHandle)
     {
+      
       outfile = fopen(fileOnDisk, "w");
-      
+
       curl_easy_setopt(curlHandle, CURLOPT_URL, fileOnNet);
       curl_easy_setopt(curlHandle, CURLOPT_WRITEDATA, outfile);
@@ -218 +230 @@
       curl_easy_setopt(curlHandle, CURLOPT_PROGRESSFUNCTION, curlProgressFunc);
       curl_easy_setopt(curlHandle, CURLOPT_PROGRESSDATA, info->Bar);
+
+      if (!downloadThreadID)
+        {
+          //! \todo check if threads really were created.
+          downloadThreadID = g_thread_create(&downloadThread, info, TRUE, NULL);
+
+          g_thread_create(&downloadThreadFinished, outfile, TRUE, NULL);
+        }
+      else 
+        PRINTF(1)("thread already in use\n");
+      //      res = curl_easy_perform(curlHandle);
       
-      res = curl_easy_perform(curlHandle);
-      
-      fclose(outfile);
-      if (curlHandle)
-        curl_easy_cleanup(curlHandle);
+      //      fclose(outfile);
     }
+  //  downloadThreadID = NULL;
   return NULL;
+}
+void* OrxonoxGuiUpdate::downloadThread(void* fileInfo)
+{
+  //  gdk_threads_enter();
+  curl_easy_perform(curlHandle);
+  if (curlHandle)
+    curl_easy_cleanup(curlHandle);
+  gdk_threads_leave();
+  downloadThreadID = NULL;
+  //  g_thread_exit (NULL);
+}
+
+void* OrxonoxGuiUpdate::downloadThreadFinished(void* outfile)
+{
+  g_thread_join(downloadThreadID);
+  PRINTF(3)("Closing the downloaded file.\n");
+  fclose((FILE*)outfile);
 }