Move fopen out of pl_lock in decoders (DeaDBeeF-Player#2035)

abextm · Jul 18, 2018 · 26dba6d · 26dba6d
1 parent 0e6f657
commit 26dba6d
Show file tree

Hide file tree

Showing 24 changed files with 151 additions and 113 deletions.
diff --git a/junklib.c b/junklib.c
@@ -4982,9 +4982,7 @@ junk_rewrite_tags (playItem_t *it, uint32_t junk_flags, int id3v2_version, const
         free (buffer);
     }
     if (!err) {
-        pl_lock ();
         rename (tmppath, fname);
-        pl_unlock ();
     }
     else {
         unlink (tmppath);

diff --git a/plugins/aac/aac.c b/plugins/aac/aac.c
@@ -27,6 +27,7 @@
 #include <stdlib.h>
 #include <math.h>
 #include "../../deadbeef.h"
+#include "../../strdupa.h"
 #include "aac_parser.h"
 
 #include "mp4ff.h"
@@ -294,8 +295,9 @@ aac_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
     aac_info_t *info = (aac_info_t *)_info;
 
     deadbeef->pl_lock ();
-    info->file = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
+    const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
     deadbeef->pl_unlock ();
+    info->file = deadbeef->fopen (uri);
     if (!info->file) {
         return -1;
     }

diff --git a/plugins/adplug/adplug-db.cpp b/plugins/adplug/adplug-db.cpp
@@ -25,6 +25,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include "../../deadbeef.h"
+#include "../../strdupa.h"
 #include "adplug.h"
 #include "emuopl.h"
 #include "kemuopl.h"
@@ -95,10 +96,11 @@ adplug_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
         }
     }
     deadbeef->pl_lock ();
-    info->decoder = CAdPlug::factory (deadbeef->pl_find_meta (it, ":URI"), info->opl, CAdPlug::players);
+    const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
     deadbeef->pl_unlock ();
+    info->decoder = CAdPlug::factory (uri, info->opl, CAdPlug::players);
     if (!info->decoder) {
-        trace ("adplug: failed to open %s\n", deadbeef->pl_find_meta (it, ":URI"));
+        trace ("adplug: failed to open %s\n", uri);
         return -1;
     }
 

diff --git a/plugins/alac/alac_plugin.c b/plugins/alac/alac_plugin.c
@@ -34,6 +34,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include "../../strdupa.h"
 
 #define USE_MP4FF 1
 
@@ -226,8 +227,9 @@ alacplug_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
     alacplug_info_t *info = (alacplug_info_t *)_info;
 
     deadbeef->pl_lock ();
-    info->file = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
+    const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
     deadbeef->pl_unlock ();
+    info->file = deadbeef->fopen (uri);
     if (!info->file) {
         return -1;
     }

diff --git a/plugins/dca/dcaplug.c b/plugins/dca/dcaplug.c
@@ -25,6 +25,7 @@
 #  include <config.h>
 #endif
 #include "../../deadbeef.h"
+#include "../../strdupa.h"
 #include "dca.h"
 #include "gettimeofday.h"
 
@@ -405,10 +406,11 @@ dts_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
     ddb_dca_state_t *info = (ddb_dca_state_t *)_info;
 
     deadbeef->pl_lock ();
-    info->file = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
+    const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
     deadbeef->pl_unlock ();
+    info->file = deadbeef->fopen (uri);
     if (!info->file) {
-        trace ("dca: failed to open %s\n", deadbeef->pl_find_meta (it, ":URI"));
+        trace ("dca: failed to open %s\n", uri);
         return -1;
     }
 

diff --git a/plugins/dumb/cdumb.c b/plugins/dumb/cdumb.c
@@ -31,6 +31,7 @@
 #include "internal/it.h"
 #include "modloader.h"
 #include "../../deadbeef.h"
+#include "../../strdupa.h"
 
 //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
 #define trace(fmt,...)
@@ -76,19 +77,17 @@ cdumb_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
     trace ("cdumb_init %s\n", deadbeef->pl_find_meta (it, ":URI"));
     dumb_info_t *info = (dumb_info_t *)_info;
 
-	int is_dos, is_it, is_ptcompat;
-	deadbeef->pl_lock ();
-    {
-        const char *uri = deadbeef->pl_find_meta (it, ":URI");
-        const char *ext = uri + strlen (uri) - 1;
-        while (*ext != '.' && ext > uri) {
-            ext--;
-        }
-        ext++;
-        const char *ftype;
-        info->duh = g_open_module (uri, &is_it, &is_dos, &is_ptcompat, 0, &ftype);
-    }
+    int is_dos, is_it, is_ptcompat;
+    deadbeef->pl_lock ();
+    const char *uri = strdupa(deadbeef->pl_find_meta (it, ":URI"));
     deadbeef->pl_unlock ();
+    const char *ext = uri + strlen (uri) - 1;
+    while (*ext != '.' && ext > uri) {
+        ext--;
+    }
+    ext++;
+    const char *ftype;
+    info->duh = g_open_module (uri, &is_it, &is_dos, &is_ptcompat, 0, &ftype);
 
     dumb_it_do_initial_runthrough (info->duh);
 
@@ -327,12 +326,11 @@ cdumb_read_metadata (DB_playItem_t *it) {
     int is_ptcompat;
 
     deadbeef->pl_lock ();
-    {
-        const char *fname = deadbeef->pl_find_meta (it, ":URI");
-        const char *ftype;
-        duh = g_open_module(fname, &is_it, &is_dos, &is_ptcompat, 0, &ftype);
-    }
+    const char *fname = strdupa(deadbeef->pl_find_meta (it, ":URI"));
     deadbeef->pl_unlock ();
+    const char *ftype;
+    duh = g_open_module(fname, &is_it, &is_dos, &is_ptcompat, 0, &ftype);
+
     if (!duh) {
         unload_duh (duh);
         return -1;

diff --git a/plugins/ffap/ffap.c b/plugins/ffap/ffap.c
@@ -38,6 +38,7 @@
 #include <assert.h>
 #include <math.h>
 #include "../../deadbeef.h"
+#include "../../strdupa.h"
 
 #ifdef TARGET_ANDROID
 int posix_memalign (void **memptr, size_t alignment, size_t size) {
@@ -701,8 +702,9 @@ ffap_init (DB_fileinfo_t *_info, DB_playItem_t *it)
     ape_info_t *info = (ape_info_t*)_info;
 
     deadbeef->pl_lock ();
-    info->fp = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
+    const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
     deadbeef->pl_unlock ();
+    info->fp = deadbeef->fopen (uri);
     if (!info->fp) {
         return -1;
     }
@@ -1855,8 +1857,9 @@ ffap_seek (DB_fileinfo_t *_info, float seconds) {
 
 static int ffap_read_metadata (DB_playItem_t *it) {
     deadbeef->pl_lock ();
-    DB_FILE *fp = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
+    const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
     deadbeef->pl_unlock ();
+    DB_FILE *fp = deadbeef->fopen (uri);
     if (!fp) {
         return -1;
     }

diff --git a/plugins/flac/flac.c b/plugins/flac/flac.c
@@ -277,11 +277,12 @@ cflac_open2 (uint32_t hints, DB_playItem_t *it) {
     }
 
     deadbeef->pl_lock();
-    info->file = deadbeef->fopen(deadbeef->pl_find_meta(it, ":URI"));
+    const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
+    deadbeef->pl_unlock();
+    info->file = deadbeef->fopen(uri);
     if (!info->file) {
-        trace("cflac_open2 failed to open file %s\n", deadbeef->pl_find_meta(it, ":URI"));
+        trace("cflac_open2 failed to open file %s\n", uri);
     }
-    deadbeef->pl_unlock();
 
     return (DB_fileinfo_t *)info;
 }
@@ -293,10 +294,11 @@ cflac_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
 
     if (!info->file) {
         deadbeef->pl_lock ();
-        info->file = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
+	const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
         deadbeef->pl_unlock ();
+        info->file = deadbeef->fopen (uri);
         if (!info->file) {
-            trace ("cflac_init failed to open file %s\n", deadbeef->pl_find_meta(it, ":URI"));
+            trace ("cflac_init failed to open file %s\n", uri);
             return -1;
         }
     }
@@ -1006,8 +1008,9 @@ cflac_read_metadata (DB_playItem_t *it) {
         return -1;
     }
     deadbeef->pl_lock ();
-    DB_FILE *file = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
+    const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
     deadbeef->pl_unlock ();
+    DB_FILE *file = deadbeef->fopen (uri);
     if (!file) {
         return -1;
     }

diff --git a/plugins/gme/cgme.c b/plugins/gme/cgme.c
@@ -32,6 +32,7 @@
 #include "gme/gme.h"
 #include <zlib.h>
 #include "../../deadbeef.h"
+#include "../../strdupa.h"
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
@@ -185,45 +186,39 @@ cgme_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
 
     gme_err_t res = "gme uninitialized";
     deadbeef->pl_lock ();
-    {
-        const char *fname = deadbeef->pl_find_meta (it, ":URI");
-        char *buffer;
-        int sz;
-        if (!read_gzfile (fname, &buffer, &sz)) {
-            res = gme_open_data (buffer, sz, &info->emu, samplerate);
-            free (buffer);
+    const char *fname = strdupa(deadbeef->pl_find_meta (it, ":URI"));
+    deadbeef->pl_unlock ();
+    char *buffer;
+    int sz;
+    if (!read_gzfile (fname, &buffer, &sz)) {
+        res = gme_open_data (buffer, sz, &info->emu, samplerate);
+        free (buffer);
+    }
+    if (res) {
+        DB_FILE *f = deadbeef->fopen (fname);
+        if (!f) {
+            return -1;
         }
-        if (res) {
-            DB_FILE *f = deadbeef->fopen (fname);
-            if (!f) {
-                deadbeef->pl_unlock ();
-                return -1;
-            }
-            int64_t sz = deadbeef->fgetlength (f);
-            if (sz <= 0) {
-                deadbeef->fclose (f);
-                deadbeef->pl_unlock ();
-                return -1;
-            }
-            char *buf = malloc (sz);
-            if (!buf) {
-                deadbeef->fclose (f);
-                deadbeef->pl_unlock ();
-                return -1;
-            }
-            int64_t rb = deadbeef->fread (buf, 1, sz, f);
-            deadbeef->fclose(f);
-            if (rb != sz) {
-                free (buf);
-                deadbeef->pl_unlock ();
-                return -1;
-            }
-
-            res = gme_open_data (buf, sz, &info->emu, samplerate);
+        int64_t sz = deadbeef->fgetlength (f);
+        if (sz <= 0) {
+            deadbeef->fclose (f);
+            return -1;
+        }
+        char *buf = malloc (sz);
+        if (!buf) {
+            deadbeef->fclose (f);
+            return -1;
+        }
+        int64_t rb = deadbeef->fread (buf, 1, sz, f);
+        deadbeef->fclose(f);
+        if (rb != sz) {
             free (buf);
+            return -1;
         }
+
+        res = gme_open_data (buf, sz, &info->emu, samplerate);
+        free (buf);
     }
-    deadbeef->pl_unlock ();
 
     if (res) {
         trace ("failed with error %d\n", res);

diff --git a/plugins/mp3/mp3.c b/plugins/mp3/mp3.c
@@ -29,6 +29,7 @@
 #include <unistd.h>
 #include <sys/time.h>
 #include "../../deadbeef.h"
+#include "../../strdupa.h"
 #include "mp3.h"
 #ifdef USE_LIBMAD
 #include "mp3_mad.h"
@@ -807,8 +808,9 @@ cmp3_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
     _info->plugin = &plugin;
     memset (&info->buffer, 0, sizeof (info->buffer));
     deadbeef->pl_lock ();
-    info->buffer.file = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
+    const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
     deadbeef->pl_unlock ();
+    info->buffer.file = deadbeef->fopen (uri);
     if (!info->buffer.file) {
         return -1;
     }
@@ -1241,8 +1243,9 @@ cmp3_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
 int
 cmp3_read_metadata (DB_playItem_t *it) {
     deadbeef->pl_lock ();
-    DB_FILE *fp = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
+    const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
     deadbeef->pl_unlock ();
+    DB_FILE *fp = deadbeef->fopen (uri);
     if (!fp) {
         return -1;
     }

diff --git a/plugins/musepack/musepack.c b/plugins/musepack/musepack.c
@@ -33,6 +33,7 @@
 #  include <config.h>
 #endif
 #include "../../deadbeef.h"
+#include "../../strdupa.h"
 
 #define min(x,y) ((x)<(y)?(x):(y))
 #define max(x,y) ((x)>(y)?(x):(y))
@@ -105,8 +106,9 @@ musepack_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
     info->reader.canseek = musepack_vfs_canseek;
 
     deadbeef->pl_lock ();
-    DB_FILE *fp = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
+    const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
     deadbeef->pl_unlock ();
+    DB_FILE *fp = deadbeef->fopen (uri);
     if (!fp) {
         return -1;
     }
@@ -476,8 +478,9 @@ musepack_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
 
 static int musepack_read_metadata (DB_playItem_t *it) {
     deadbeef->pl_lock ();
-    DB_FILE *fp = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
+    const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
     deadbeef->pl_unlock ();
+    DB_FILE *fp = deadbeef->fopen (uri);
     if (!fp) {
         return -1;
     }

diff --git a/plugins/opus/opus.c b/plugins/opus/opus.c
@@ -103,8 +103,9 @@ opusdec_open (uint32_t hints) {
 static DB_fileinfo_t *
 opusdec_open2 (uint32_t hints, DB_playItem_t *it) {
     deadbeef->pl_lock ();
-    DB_FILE *fp = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
+    const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
     deadbeef->pl_unlock ();
+    DB_FILE *fp = deadbeef->fopen (uri);
 
     if (!fp) {
         return NULL;
@@ -253,8 +254,9 @@ opusdec_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
 
     if (!info->info.file) {
         deadbeef->pl_lock ();
-        DB_FILE *fp = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
+	const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
         deadbeef->pl_unlock ();
+        DB_FILE *fp = deadbeef->fopen (uri);
 
         if (!fp) {
             return -1;
@@ -568,8 +570,9 @@ opusdec_read_metadata (DB_playItem_t *it) {
     const OpusHead *head = NULL;
 
     deadbeef->pl_lock ();
-    fp = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
+    const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
     deadbeef->pl_unlock ();
+    fp = deadbeef->fopen (uri);
     if (!fp) {
         goto error;
     }