Changeset 0a756ea

Timestamp:

Oct 5, 2016, 2:30:57 PM (8 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

sampler

Children:

cb1fad8

Parents:

88042ef

Message:

src/synth/sampler.{c,h}: prepare reading thread, reset waited in _queue, only join open thread if still open, improve documentation

Location:

src/synth

Files:

• sampler.c (modified) (7 diffs)
• sampler.h (modified) (1 diff)

src/synth/sampler.c

@@ -44 +44 @@
   uint_t opened;
   uint_t loop;
-  uint_t finished;
-  uint_t eof;
-#ifdef HAVE_THREADS
+  uint_t finished;              // end of file was reached
+  uint_t eof;                   // end of file is now
+#ifdef HAVE_THREADS
+  pthread_t read_thread;        // file reading thread
+  pthread_mutex_t read_mutex;
+  pthread_cond_t read_avail;
+  pthread_cond_t read_request;
   pthread_t open_thread;        // file opening thread
   pthread_mutex_t open_mutex;
@@ -54 +58 @@
   sint_t available;             // number of samples currently available
   uint_t started;               // source warmed up
-  uint_t finish;                // flag to tell reading thread to exit
+  uint_t read_thread_finish;    // flag to tell reading thread to exit
 #endif
 };
+
+#ifdef HAVE_THREADS
+static void *aubio_sampler_readfn(void *p);
+#endif
 
 aubio_sampler_t *new_aubio_sampler(uint_t blocksize, uint_t samplerate)
@@ -80 +88 @@
   s->open_thread = 0;
   s->open_thread_running = 0;
+
+  s->read_thread_finish = 0;
+  pthread_mutex_init(&s->read_mutex, 0);
+  pthread_cond_init (&s->read_avail, 0);
+  pthread_cond_init (&s->read_request, 0);
+  pthread_create(&s->read_thread, 0, aubio_sampler_readfn, s);
 #endif
   return s;
@@ -164 +178 @@
   o->available = 0;
   o->next_uri = uri;
+  o->waited = 0;
   if (pthread_create(&o->open_thread, 0, aubio_sampler_openfn, o) != 0) {
     AUBIO_ERR("sampler: failed creating opening thread\n");
@@ -184 +199 @@
 #endif
 }
+
+#ifdef HAVE_THREADS
+void *aubio_sampler_readfn(void *z) {
+  aubio_sampler_t *p = z;
+  while(1) {
+    pthread_mutex_lock(&p->read_mutex);
+    if (1) {
+      // idle
+      pthread_cond_wait(&p->read_request, &p->read_mutex);
+      if (p->read_thread_finish) {
+        goto done;
+      }
+    }
+    pthread_mutex_unlock(&p->read_mutex);
+  }
+done:
+  //AUBIO_WRN("sampler: exiting reading thread\n");
+  pthread_mutex_unlock(&p->read_mutex);
+  pthread_exit(NULL);
+}
+#endif
 
 void
@@ -251 +287 @@
   o->finished = 0;
   if (!o->opened) return AUBIO_OK;
-#ifdef HAVE_THREADS
-  if (pthread_mutex_trylock(&o->open_mutex)) {
-    AUBIO_WRN("sampler: failed locking in seek\n");
-    return ret;
-  }
-#endif
   if (o->source) {
     ret = aubio_source_seek(o->source, pos);
   }
-#ifdef HAVE_THREADS
-  pthread_mutex_unlock(&o->open_mutex);
-#endif
   return ret;
 }
@@ -364 +391 @@
 {
 #ifdef HAVE_THREADS
-  AUBIO_WRN("sampler: cleaning up\n");
+  void *threadret;
+
+  // clean up opening thread
   pthread_mutex_destroy(&o->open_mutex);
   if (o->open_thread_running) {
     if (pthread_cancel(o->open_thread)) {
-      AUBIO_WRN("sampler: cancelling open thread failed\n");
-    }
-  }
-  void *threadret;
-  if (pthread_join(o->open_thread, &threadret)) {
-    AUBIO_WRN("sampler: joining open thread failed\n");
+      AUBIO_WRN("sampler: cancelling file opening thread failed\n");
+    }
+  }
+  if (o->open_thread && pthread_join(o->open_thread, &threadret)) {
+    AUBIO_WRN("sampler: joining file opening thread failed\n");
   }
   pthread_mutex_destroy(&o->open_mutex);
+
+  // close reading thread
+  o->read_thread_finish = 1;
+  pthread_cond_signal(&o->read_request);
+  if (pthread_cancel(o->read_thread)) {
+    AUBIO_WRN("sampler: cancelling file reading thread failed\n");
+  }
+  if (pthread_join(o->read_thread, &threadret)) {
+    AUBIO_WRN("sampler: joining file reading thread failed\n");
+  }
+  pthread_mutex_destroy(&o->read_mutex);
+  pthread_cond_destroy(&o->read_avail);
+  pthread_cond_destroy(&o->read_request);
 #endif
   if (o->source) {

src/synth/sampler.h

@@ -194 +194 @@
 
   \param o sampler, created by new_aubio_sampler()
-
-  \return samplerate of the sampler
+  \param waited the number of frames processed during this block
+
+  \return the total delay in samples when the file was successfuly opened, 0
+  otherwise
 
 */