thdat75/thdat105: fix openmp race condition

thpatch · Sep 13, 2023 · 7503f34 · 7503f34
1 parent 78bbf35
commit 7503f34
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/thtk/thdat105.c b/thtk/thdat105.c
@@ -158,17 +158,18 @@ th105_write(
     if (ret != entry->size)
         return -1;
 
-    /* FIXME: race condition on thdat->offset */
-    th_crypt105_file(data, entry->size, thdat->offset, THCRYPT_PATCHCON_KEY);
+#pragma omp critical
+    {
+        entry->offset = thdat->offset;
+        thdat->offset += entry->size;
+    }
+
+    th_crypt105_file(data, entry->size, entry->offset, THCRYPT_PATCHCON_KEY);
 
     int failed = 0;
 #pragma omp critical
     {
         failed = (thtk_io_write(thdat->stream, data, entry->size, error) != entry->size);
-        if (!failed) {
-            entry->offset = thdat->offset;
-            thdat->offset += entry->size;
-        }
     }
 
     free(data);

diff --git a/thtk/thdat75.c b/thtk/thdat75.c
@@ -147,18 +147,19 @@ th75_write(
     if (ret != entry->size)
         return -1;
 
-    /* FIXME: race condition on thdat->offset */
+#pragma omp critical
+    {
+        entry->offset = thdat->offset;
+        thdat->offset += entry->size;
+    }
+
     if (thdat->version == 7575)
-        th_crypt105_file(data, entry->size, thdat->offset, THCRYPT_MEGAMARI_KEY);
+        th_crypt105_file(data, entry->size, entry->offset, THCRYPT_MEGAMARI_KEY);
 
     int failed = 0;
 #pragma omp critical
     {
         failed = (thtk_io_write(thdat->stream, data, entry->size, error) != entry->size);
-        if (!failed) {
-            entry->offset = thdat->offset;
-            thdat->offset += entry->size;
-        }
     }
 
     free(data);