fixed bugs with thread functions calling thread-unsave functions

[rocksndiamonds.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index bb3832bd082ed26e354eb9fe5234c6299b0f692c..4878aa8368e42bfdf1ddf59b7e901bd877a381dd 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -9002,14 +9002,10 @@ void SaveScore(int nr)
   SaveScoreToFilename(filename);
 }
 
-static void ExecuteAsThread(SDL_ThreadFunction function, char *name, int data,
+static void ExecuteAsThread(SDL_ThreadFunction function, char *name, void *data,
                            char *error)
 {
-  static int data_static;
-
-  data_static = data;
-
-  SDL_Thread *thread = SDL_CreateThread(function, name, &data_static);
+  SDL_Thread *thread = SDL_CreateThread(function, name, data);
 
   if (thread != NULL)
     SDL_DetachThread(thread);
@@ -9022,7 +9018,8 @@ static void ExecuteAsThread(SDL_ThreadFunction function, char *name, int data,
 
 static void DownloadServerScoreToCacheExt(struct HttpRequest *request,
                                          struct HttpResponse *response,
-                                         int nr)
+                                         int level_nr,
+                                         char *score_cache_filename)
 {
   request->hostname = setup.api_server_hostname;
   request->port     = API_SERVER_PORT;
@@ -9034,7 +9031,7 @@ static void DownloadServerScoreToCacheExt(struct HttpRequest *request,
           "  \"levelset_identifier\":  \"%s\",\n"
           "  \"level_nr\":             \"%d\"\n"
           "}\n",
-          levelset.identifier, nr);
+          levelset.identifier, level_nr);
 
   ConvertHttpRequestBodyToServerEncoding(request);
 
@@ -9063,7 +9060,7 @@ static void DownloadServerScoreToCacheExt(struct HttpRequest *request,
 
   ConvertHttpResponseBodyToClientEncoding(response);
 
-  char *filename = getScoreCacheFilename(nr);
+  char *filename = score_cache_filename;
   FILE *file;
   int i;
 
@@ -9087,28 +9084,46 @@ static void DownloadServerScoreToCacheExt(struct HttpRequest *request,
   server_scores.updated = TRUE;
 }
 
-static void DownloadServerScoreToCache(int nr)
+static void DownloadServerScoreToCache(int level_nr, char *score_cache_filename)
 {
   struct HttpRequest *request = checked_calloc(sizeof(struct HttpRequest));
   struct HttpResponse *response = checked_calloc(sizeof(struct HttpResponse));
 
-  DownloadServerScoreToCacheExt(request, response, nr);
+  DownloadServerScoreToCacheExt(request, response,
+                               level_nr, score_cache_filename);
 
   checked_free(request);
   checked_free(response);
 }
 
-static int DownloadServerScoreToCacheThread(void *data)
+struct DownloadServerScoreToCacheThreadData
+{
+  int level_nr;
+  char *score_cache_filename;
+};
+
+static int DownloadServerScoreToCacheThread(void *data_raw)
 {
-  DownloadServerScoreToCache(*(int *)data);
+  struct DownloadServerScoreToCacheThreadData *data = data_raw;
+
+  DownloadServerScoreToCache(data->level_nr,
+                            data->score_cache_filename);
 
   return 0;
 }
 
 static void DownloadServerScoreToCacheAsThread(int nr)
 {
+  static struct DownloadServerScoreToCacheThreadData data;
+  char *score_cache_filename = getScoreCacheFilename(nr);
+
+  checked_free(data.score_cache_filename);
+
+  data.level_nr = nr;
+  data.score_cache_filename = getStringCopy(score_cache_filename);
+
   ExecuteAsThread(DownloadServerScoreToCacheThread,
-                 "DownloadServerScoreToCache", nr,
+                 "DownloadServerScoreToCache", &data,
                  "download scores from server");
 }
 
@@ -9254,17 +9269,16 @@ static char *get_file_base64(char *filename)
 
 static void UploadScoreToServerExt(struct HttpRequest *request,
                                   struct HttpResponse *response,
-                                  int nr)
+                                  int level_nr,
+                                  char *score_tape_filename,
+                                  struct ScoreEntry *score_entry)
 {
-  struct ScoreEntry *score_entry = &scores.entry[scores.last_added];
-
   request->hostname = setup.api_server_hostname;
   request->port     = API_SERVER_PORT;
   request->method   = API_SERVER_METHOD;
   request->uri      = API_SERVER_URI_ADD;
 
-  char *tape_filename = getScoreTapeFilename(score_entry->tape_basename, nr);
-  char *tape_base64 = get_file_base64(tape_filename);
+  char *tape_base64 = get_file_base64(score_tape_filename);
 
   if (tape_base64 == NULL)
   {
@@ -9276,6 +9290,8 @@ static void UploadScoreToServerExt(struct HttpRequest *request,
   char *levelset_identifier = getEscapedJSON(leveldir_current->identifier);
   char *levelset_name       = getEscapedJSON(leveldir_current->name);
   char *levelset_author     = getEscapedJSON(leveldir_current->author);
+  char *level_name          = getEscapedJSON(level.name);
+  char *level_author        = getEscapedJSON(level.author);
   char *player_name         = getEscapedJSON(score_entry->name);
 
   snprintf(request->body, MAX_HTTP_BODY_SIZE,
@@ -9287,6 +9303,9 @@ static void UploadScoreToServerExt(struct HttpRequest *request,
           "  \"levelset_num_levels\":  \"%d\",\n"
           "  \"levelset_first_level\": \"%d\",\n"
           "  \"level_nr\":             \"%d\",\n"
+          "  \"level_name\":           \"%s\",\n"
+          "  \"level_author\":         \"%s\",\n"
+          "  \"rate_time_over_score\": \"%d\",\n"
           "  \"player_name\":          \"%s\",\n"
           "  \"score\":                \"%d\",\n"
           "  \"time\":                 \"%d\",\n"
@@ -9300,6 +9319,9 @@ static void UploadScoreToServerExt(struct HttpRequest *request,
           leveldir_current->levels,
           leveldir_current->first_level,
           level_nr,
+          level_name,
+          level_author,
+          level.rate_time_over_score,
           player_name,
           score_entry->score,
           score_entry->time,
@@ -9311,6 +9333,8 @@ static void UploadScoreToServerExt(struct HttpRequest *request,
   checked_free(levelset_identifier);
   checked_free(levelset_name);
   checked_free(levelset_author);
+  checked_free(level_name);
+  checked_free(level_author);
   checked_free(player_name);
 
   ConvertHttpRequestBodyToServerEncoding(request);
@@ -9332,28 +9356,51 @@ static void UploadScoreToServerExt(struct HttpRequest *request,
   }
 }
 
-static void UploadScoreToServer(int nr)
+static void UploadScoreToServer(int level_nr, char *score_tape_filename,
+                               struct ScoreEntry *score_entry)
 {
   struct HttpRequest *request = checked_calloc(sizeof(struct HttpRequest));
   struct HttpResponse *response = checked_calloc(sizeof(struct HttpResponse));
 
-  UploadScoreToServerExt(request, response, nr);
+  UploadScoreToServerExt(request, response,
+                        level_nr, score_tape_filename, score_entry);
 
   checked_free(request);
   checked_free(response);
 }
 
-static int UploadScoreToServerThread(void *data)
+struct UploadScoreToServerThreadData
+{
+  int level_nr;
+  char *score_tape_filename;
+  struct ScoreEntry score_entry;
+};
+
+static int UploadScoreToServerThread(void *data_raw)
 {
-  UploadScoreToServer(*(int *)data);
+  struct UploadScoreToServerThreadData *data = data_raw;
+
+  UploadScoreToServer(data->level_nr,
+                     data->score_tape_filename,
+                     &data->score_entry);
 
   return 0;
 }
 
 static void UploadScoreToServerAsThread(int nr)
 {
+  static struct UploadScoreToServerThreadData data;
+  struct ScoreEntry *score_entry = &scores.entry[scores.last_added];
+  char *score_tape_filename = getScoreTapeFilename(score_entry->tape_basename, nr);
+
+  checked_free(data.score_tape_filename);
+
+  data.level_nr = nr;
+  data.score_entry = *score_entry;
+  data.score_tape_filename = getStringCopy(score_tape_filename);
+
   ExecuteAsThread(UploadScoreToServerThread,
-                 "UploadScoreToServer", nr,
+                 "UploadScoreToServer", &data,
                  "upload score to server");
 }