Changeset 6665

Timestamp:

06/20/09 12:38:08 (15 months ago)

Author:

dbaelde

Message:

Add blocking sections around file_new and file_new_type.
Those calls can indeed be long, when the file is ill-formed (e.g., when
trying to decode a .wav as a .mp3).
But this fixes an even nastier bug in liquidsoap running in daemon mode.
In that mode, liquidsoap attaches stderr to a pipe and has a task reading
this pipe and logging its contents. Since file_new* can write to stderr,
they could create a deadlock: the caml global lock is taken so the reading
task cannot read, the pipe becomes full and blocks file_new*.

Files:

• trunk/ocaml-taglib/src/taglib_stubs.c (modified) (3 diffs)

trunk/ocaml-taglib/src/taglib_stubs.c

@@ -46 +46 @@
 #include <caml/fail.h>
 #include <caml/memory.h>
+#include <caml/signals.h>
 
 CAMLprim value caml_taglib_init()
@@ -91 +92 @@
 {
   CAMLparam1(name);
-  TagLib_File *f = taglib_file_new((const char *)String_val(name)) ;
+
+  int len = caml_string_length(name);
+  char *filename = malloc(len);
+  memcpy(filename, String_val(name), len);
+
+  caml_enter_blocking_section();
+  TagLib_File *f = taglib_file_new(filename) ;
+  caml_leave_blocking_section();
+
+  free(filename);
 
   if (f == NULL)
@@ -102 +112 @@
 {
   CAMLparam2(name,type);
-  TagLib_File *f = taglib_file_new_type((const char *)String_val(name),Int_val(type)) ;
+
+  int len = caml_string_length(name);
+  char *filename = malloc(len);
+  memcpy(filename, String_val(name), len);
+
+  caml_enter_blocking_section();
+  TagLib_File *f =
+    taglib_file_new_type((const char *)String_val(name),Int_val(type)) ;
+  caml_leave_blocking_section();
+
+  free(filename);
 
   if (f == NULL)