2004-02-24 00:41:20 +01:00
|
|
|
/* the Music Player Daemon (MPD)
|
2007-04-05 05:22:33 +02:00
|
|
|
* Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com)
|
2008-08-26 08:44:12 +02:00
|
|
|
* Copyright (C) 2008 Max Kellermann <max@duempel.org>
|
2004-02-24 00:41:20 +01:00
|
|
|
* This project's homepage is: http://www.musicpd.org
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
*/
|
|
|
|
|
2008-08-26 08:44:12 +02:00
|
|
|
#include "decoder_thread.h"
|
2008-08-26 08:44:19 +02:00
|
|
|
#include "decoder_control.h"
|
2008-08-26 08:27:04 +02:00
|
|
|
#include "decoder_internal.h"
|
2009-01-04 17:26:12 +01:00
|
|
|
#include "decoder_list.h"
|
2009-02-15 18:33:31 +01:00
|
|
|
#include "decoder_plugin.h"
|
|
|
|
#include "input_stream.h"
|
2008-08-26 08:44:38 +02:00
|
|
|
#include "player_control.h"
|
2008-11-02 14:12:52 +01:00
|
|
|
#include "pipe.h"
|
2008-10-08 10:49:11 +02:00
|
|
|
#include "song.h"
|
2009-02-15 18:33:31 +01:00
|
|
|
#include "tag.h"
|
2008-10-14 11:10:49 +02:00
|
|
|
#include "mapper.h"
|
2004-02-24 00:41:20 +01:00
|
|
|
#include "path.h"
|
|
|
|
#include "log.h"
|
2009-02-25 16:44:06 +01:00
|
|
|
#include "uri.h"
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2008-11-25 15:12:00 +01:00
|
|
|
#include <glib.h>
|
|
|
|
|
2009-01-04 17:26:12 +01:00
|
|
|
#include <unistd.h>
|
|
|
|
|
2008-11-10 15:02:38 +01:00
|
|
|
static bool
|
|
|
|
decoder_stream_decode(const struct decoder_plugin *plugin,
|
|
|
|
struct decoder *decoder,
|
|
|
|
struct input_stream *input_stream)
|
|
|
|
{
|
|
|
|
assert(plugin != NULL);
|
|
|
|
assert(plugin->stream_decode != NULL);
|
|
|
|
assert(decoder != NULL);
|
2009-01-03 23:29:45 +01:00
|
|
|
assert(decoder->stream_tag == NULL);
|
|
|
|
assert(decoder->decoder_tag == NULL);
|
2008-11-10 15:02:38 +01:00
|
|
|
assert(input_stream != NULL);
|
|
|
|
assert(input_stream->ready);
|
|
|
|
assert(dc.state == DECODE_STATE_START);
|
|
|
|
|
2008-11-10 15:02:47 +01:00
|
|
|
/* rewind the stream, so each plugin gets a fresh start */
|
|
|
|
input_stream_seek(input_stream, 0, SEEK_SET);
|
|
|
|
|
2009-02-15 18:33:28 +01:00
|
|
|
decoder_plugin_stream_decode(plugin, decoder, input_stream);
|
2008-11-10 15:02:38 +01:00
|
|
|
|
2008-11-11 17:13:44 +01:00
|
|
|
assert(dc.state == DECODE_STATE_START ||
|
|
|
|
dc.state == DECODE_STATE_DECODE);
|
2008-11-10 15:02:38 +01:00
|
|
|
|
2008-11-11 17:13:44 +01:00
|
|
|
return dc.state != DECODE_STATE_START;
|
2008-11-10 15:02:38 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static bool
|
|
|
|
decoder_file_decode(const struct decoder_plugin *plugin,
|
|
|
|
struct decoder *decoder, const char *path)
|
|
|
|
{
|
|
|
|
assert(plugin != NULL);
|
2008-11-11 21:23:30 +01:00
|
|
|
assert(plugin->file_decode != NULL);
|
2008-11-10 15:02:38 +01:00
|
|
|
assert(decoder != NULL);
|
2009-01-03 23:29:45 +01:00
|
|
|
assert(decoder->stream_tag == NULL);
|
|
|
|
assert(decoder->decoder_tag == NULL);
|
2008-11-10 15:02:38 +01:00
|
|
|
assert(path != NULL);
|
|
|
|
assert(path[0] == '/');
|
|
|
|
assert(dc.state == DECODE_STATE_START);
|
|
|
|
|
2009-02-15 18:33:28 +01:00
|
|
|
decoder_plugin_file_decode(plugin, decoder, path);
|
2008-11-10 15:02:38 +01:00
|
|
|
|
2008-11-11 17:13:44 +01:00
|
|
|
assert(dc.state == DECODE_STATE_START ||
|
|
|
|
dc.state == DECODE_STATE_DECODE);
|
2008-11-10 15:02:38 +01:00
|
|
|
|
2008-11-11 17:13:44 +01:00
|
|
|
return dc.state != DECODE_STATE_START;
|
2008-11-10 15:02:38 +01:00
|
|
|
}
|
|
|
|
|
2009-01-02 10:48:55 +01:00
|
|
|
static void decoder_run_song(const struct song *song, const char *uri)
|
2006-07-20 18:02:40 +02:00
|
|
|
{
|
2008-08-26 08:27:04 +02:00
|
|
|
struct decoder decoder;
|
2006-07-14 21:52:29 +02:00
|
|
|
int ret;
|
2008-10-08 11:03:39 +02:00
|
|
|
bool close_instream = true;
|
2008-11-03 21:43:02 +01:00
|
|
|
struct input_stream input_stream;
|
2008-11-01 14:51:41 +01:00
|
|
|
const struct decoder_plugin *plugin;
|
2004-04-11 20:27:12 +02:00
|
|
|
|
2008-11-03 21:43:02 +01:00
|
|
|
if (!input_stream_open(&input_stream, uri)) {
|
2008-11-08 15:48:00 +01:00
|
|
|
dc.state = DECODE_STATE_ERROR;
|
2008-10-31 16:29:24 +01:00
|
|
|
return;
|
2006-07-14 21:52:29 +02:00
|
|
|
}
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2008-10-08 11:03:39 +02:00
|
|
|
decoder.seeking = false;
|
2009-01-03 23:29:45 +01:00
|
|
|
decoder.stream_tag = NULL;
|
|
|
|
decoder.decoder_tag = NULL;
|
2009-03-06 00:42:01 +01:00
|
|
|
decoder.chunk = NULL;
|
2008-08-26 08:27:14 +02:00
|
|
|
|
2008-04-13 03:16:03 +02:00
|
|
|
dc.state = DECODE_STATE_START;
|
2008-08-26 08:27:04 +02:00
|
|
|
dc.command = DECODE_COMMAND_NONE;
|
2008-10-17 17:53:44 +02:00
|
|
|
notify_signal(&pc.notify);
|
2004-05-19 04:14:20 +02:00
|
|
|
|
2008-08-26 08:27:10 +02:00
|
|
|
/* wait for the input stream to become ready; its metadata
|
|
|
|
will be available then */
|
|
|
|
|
2008-11-03 21:43:02 +01:00
|
|
|
while (!input_stream.ready) {
|
2008-11-20 21:08:16 +01:00
|
|
|
if (dc.command == DECODE_COMMAND_STOP) {
|
2008-11-03 21:43:02 +01:00
|
|
|
input_stream_close(&input_stream);
|
2008-11-08 15:48:00 +01:00
|
|
|
dc.state = DECODE_STATE_STOP;
|
2008-10-31 16:29:45 +01:00
|
|
|
return;
|
|
|
|
}
|
2008-08-26 08:27:10 +02:00
|
|
|
|
2008-11-03 21:43:02 +01:00
|
|
|
ret = input_stream_buffer(&input_stream);
|
2008-10-31 16:29:45 +01:00
|
|
|
if (ret < 0) {
|
2008-11-03 21:43:02 +01:00
|
|
|
input_stream_close(&input_stream);
|
2008-11-08 15:48:00 +01:00
|
|
|
dc.state = DECODE_STATE_ERROR;
|
2008-10-31 16:29:45 +01:00
|
|
|
return;
|
|
|
|
}
|
2008-08-26 08:27:10 +02:00
|
|
|
}
|
|
|
|
|
2008-10-31 16:29:45 +01:00
|
|
|
if (dc.command == DECODE_COMMAND_STOP) {
|
2008-11-03 21:43:02 +01:00
|
|
|
input_stream_close(&input_stream);
|
2008-11-08 15:48:00 +01:00
|
|
|
dc.state = DECODE_STATE_STOP;
|
2008-10-31 16:29:45 +01:00
|
|
|
return;
|
|
|
|
}
|
2004-05-31 13:42:46 +02:00
|
|
|
|
2009-01-07 22:20:30 +01:00
|
|
|
pcm_convert_init(&decoder.conv_state);
|
|
|
|
|
2008-10-30 08:38:54 +01:00
|
|
|
ret = false;
|
2009-02-11 19:58:50 +01:00
|
|
|
if (!song_is_file(song)) {
|
2006-03-16 07:52:46 +01:00
|
|
|
unsigned int next = 0;
|
|
|
|
|
|
|
|
/* first we try mime types: */
|
2008-11-03 21:43:02 +01:00
|
|
|
while ((plugin = decoder_plugin_from_mime_type(input_stream.mime, next++))) {
|
2008-09-29 15:54:27 +02:00
|
|
|
if (plugin->stream_decode == NULL)
|
2006-03-16 07:52:46 +01:00
|
|
|
continue;
|
2008-11-10 15:02:38 +01:00
|
|
|
ret = decoder_stream_decode(plugin, &decoder,
|
|
|
|
&input_stream);
|
2008-11-10 15:02:47 +01:00
|
|
|
if (ret)
|
|
|
|
break;
|
|
|
|
|
|
|
|
plugin = NULL;
|
2006-03-16 07:52:46 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* if that fails, try suffix matching the URL: */
|
2006-07-20 18:02:40 +02:00
|
|
|
if (plugin == NULL) {
|
2009-01-04 17:46:42 +01:00
|
|
|
const char *s = uri_get_suffix(uri);
|
2006-03-16 07:52:46 +01:00
|
|
|
next = 0;
|
2008-10-30 08:38:54 +01:00
|
|
|
while ((plugin = decoder_plugin_from_suffix(s, next++))) {
|
2008-09-29 15:54:27 +02:00
|
|
|
if (plugin->stream_decode == NULL)
|
2006-03-16 07:52:46 +01:00
|
|
|
continue;
|
2008-11-10 15:02:38 +01:00
|
|
|
ret = decoder_stream_decode(plugin, &decoder,
|
2008-11-03 21:43:02 +01:00
|
|
|
&input_stream);
|
2008-11-10 15:02:47 +01:00
|
|
|
if (ret)
|
|
|
|
break;
|
|
|
|
|
|
|
|
assert(dc.state == DECODE_STATE_START);
|
|
|
|
plugin = NULL;
|
2006-03-16 07:52:46 +01:00
|
|
|
}
|
2006-07-14 21:52:29 +02:00
|
|
|
}
|
2006-03-16 07:52:46 +01:00
|
|
|
/* fallback to mp3: */
|
2006-07-14 21:52:29 +02:00
|
|
|
/* this is needed for bastard streams that don't have a suffix
|
2006-07-20 18:02:40 +02:00
|
|
|
or set the mimeType */
|
|
|
|
if (plugin == NULL) {
|
2006-03-16 07:52:46 +01:00
|
|
|
/* we already know our mp3Plugin supports streams, no
|
|
|
|
* need to check for stream{Types,DecodeFunc} */
|
2008-08-26 08:27:09 +02:00
|
|
|
if ((plugin = decoder_plugin_from_name("mp3"))) {
|
2008-11-10 15:02:38 +01:00
|
|
|
ret = decoder_stream_decode(plugin, &decoder,
|
2008-11-03 21:43:02 +01:00
|
|
|
&input_stream);
|
Initial cut of fork() => pthreads() for decoder and player
I initially started to do a heavy rewrite that changed the way processes
communicated, but that was too much to do at once. So this change only
focuses on replacing the player and decode processes with threads and
using condition variables instead of polling in loops; so the changeset
itself is quiet small.
* The shared output buffer variables will still need locking
to guard against race conditions. So in this effect, we're probably
just as buggy as before. The reduced context-switching overhead of
using threads instead of processes may even make bugs show up more or
less often...
* Basic functionality appears to be working for playing local (and NFS)
audio, including:
play, pause, stop, seek, previous, next, and main playlist editing
* I haven't tested HTTP streams yet, they should work.
* I've only tested ALSA and Icecast. ALSA works fine, Icecast
metadata seems to get screwy at times and breaks song
advancement in the playlist at times.
* state file loading works, too (after some last-minute hacks with
non-blocking wakeup functions)
* The non-blocking (*_nb) variants of the task management functions are
probably overused. They're more lenient and easier to use because
much of our code is still based on our previous polling-based system.
* It currently segfaults on exit. I haven't paid much attention
to the exit/signal-handling routines other than ensuring it
compiles. At least the state file seems to work. We don't
do any cleanups of the threads on exit, yet.
* Update is still done in a child process and not in a thread.
To do this in a thread, we'll need to ensure it does proper
locking and communication with the main thread; but should
require less memory in the end because we'll be updating
the database "in-place" rather than updating a copy and
then bulk-loading when done.
* We're more sensitive to bugs in 3rd party libraries now.
My plan is to eventually use a master process which forks()
and restarts the child when it dies:
locking and communication with the main thread; but should
require less memory in the end because we'll be updating
the database "in-place" rather than updating a copy and
then bulk-loading when done.
* We're more sensitive to bugs in 3rd party libraries now.
My plan is to eventually use a master process which forks()
and restarts the child when it dies:
master - just does waitpid() + fork() in a loop
\- main thread
\- decoder thread
\- player thread
At the beginning of every song, the main thread will set
a dirty flag and update the state file. This way, if we
encounter a song that triggers a segfault killing the
main thread, the master will start the replacement main
on the next song.
* The main thread still wakes up every second on select()
to check for signals; which affects power management.
[merged r7138 from branches/ew]
git-svn-id: https://svn.musicpd.org/mpd/trunk@7240 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2008-04-12 06:08:00 +02:00
|
|
|
}
|
2006-07-14 21:52:29 +02:00
|
|
|
}
|
2006-07-20 18:02:40 +02:00
|
|
|
} else {
|
2006-03-16 07:52:46 +01:00
|
|
|
unsigned int next = 0;
|
2009-01-04 17:46:42 +01:00
|
|
|
const char *s = uri_get_suffix(uri);
|
2008-10-30 08:38:54 +01:00
|
|
|
while ((plugin = decoder_plugin_from_suffix(s, next++))) {
|
2008-09-29 15:54:27 +02:00
|
|
|
if (plugin->file_decode != NULL) {
|
2008-11-03 21:43:02 +01:00
|
|
|
input_stream_close(&input_stream);
|
2008-10-08 11:03:39 +02:00
|
|
|
close_instream = false;
|
2008-11-10 15:02:38 +01:00
|
|
|
ret = decoder_file_decode(plugin,
|
|
|
|
&decoder, uri);
|
2008-11-10 15:02:47 +01:00
|
|
|
if (ret)
|
|
|
|
break;
|
2008-09-29 15:54:27 +02:00
|
|
|
} else if (plugin->stream_decode != NULL) {
|
2008-11-10 15:02:38 +01:00
|
|
|
ret = decoder_stream_decode(plugin, &decoder,
|
2008-11-03 21:43:02 +01:00
|
|
|
&input_stream);
|
2008-11-10 15:02:47 +01:00
|
|
|
if (ret)
|
|
|
|
break;
|
2006-03-16 07:52:46 +01:00
|
|
|
}
|
|
|
|
}
|
2006-07-20 18:02:40 +02:00
|
|
|
}
|
2004-05-31 03:21:17 +02:00
|
|
|
|
2009-01-07 22:20:30 +01:00
|
|
|
pcm_convert_deinit(&decoder.conv_state);
|
|
|
|
|
2009-03-06 00:42:01 +01:00
|
|
|
/* flush the last chunk */
|
|
|
|
if (decoder.chunk != NULL &&
|
|
|
|
decoder_flush_chunk(&decoder, NULL) != DECODE_COMMAND_NONE)
|
|
|
|
music_pipe_cancel(decoder.chunk);
|
2008-10-29 17:29:06 +01:00
|
|
|
|
2008-01-01 11:09:56 +01:00
|
|
|
if (close_instream)
|
2008-11-03 21:43:02 +01:00
|
|
|
input_stream_close(&input_stream);
|
2008-11-08 15:48:00 +01:00
|
|
|
|
2009-01-03 23:29:45 +01:00
|
|
|
if (decoder.stream_tag != NULL)
|
|
|
|
tag_free(decoder.stream_tag);
|
|
|
|
|
|
|
|
if (decoder.decoder_tag != NULL)
|
|
|
|
tag_free(decoder.decoder_tag);
|
|
|
|
|
2008-11-08 15:48:00 +01:00
|
|
|
dc.state = ret ? DECODE_STATE_STOP : DECODE_STATE_ERROR;
|
2004-05-18 15:13:55 +02:00
|
|
|
}
|
|
|
|
|
2009-01-02 10:48:55 +01:00
|
|
|
static void decoder_run(void)
|
|
|
|
{
|
|
|
|
struct song *song = dc.next_song;
|
|
|
|
char *uri;
|
|
|
|
|
|
|
|
if (song_is_file(song))
|
|
|
|
uri = map_song_fs(song);
|
2009-01-04 19:09:34 +01:00
|
|
|
else
|
|
|
|
uri = song_get_uri(song);
|
2009-01-02 10:48:55 +01:00
|
|
|
|
|
|
|
if (uri == NULL) {
|
|
|
|
dc.state = DECODE_STATE_ERROR;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
dc.current_song = dc.next_song; /* NEED LOCK */
|
|
|
|
decoder_run_song(song, uri);
|
|
|
|
g_free(uri);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2008-12-28 22:09:33 +01:00
|
|
|
static gpointer decoder_task(G_GNUC_UNUSED gpointer arg)
|
2006-07-20 18:02:40 +02:00
|
|
|
{
|
2008-12-28 19:48:53 +01:00
|
|
|
do {
|
2008-11-08 15:48:00 +01:00
|
|
|
assert(dc.state == DECODE_STATE_STOP ||
|
|
|
|
dc.state == DECODE_STATE_ERROR);
|
2008-06-02 00:24:35 +02:00
|
|
|
|
2008-10-31 16:29:22 +01:00
|
|
|
switch (dc.command) {
|
|
|
|
case DECODE_COMMAND_START:
|
|
|
|
case DECODE_COMMAND_SEEK:
|
2008-11-03 21:43:02 +01:00
|
|
|
decoder_run();
|
2008-10-31 16:29:24 +01:00
|
|
|
|
|
|
|
dc.command = DECODE_COMMAND_NONE;
|
2008-10-31 16:29:34 +01:00
|
|
|
notify_signal(&pc.notify);
|
2008-10-31 16:29:22 +01:00
|
|
|
break;
|
|
|
|
|
|
|
|
case DECODE_COMMAND_STOP:
|
2008-08-26 08:27:04 +02:00
|
|
|
dc.command = DECODE_COMMAND_NONE;
|
|
|
|
notify_signal(&pc.notify);
|
2008-10-31 16:29:22 +01:00
|
|
|
break;
|
|
|
|
|
|
|
|
case DECODE_COMMAND_NONE:
|
2008-08-26 08:27:04 +02:00
|
|
|
notify_wait(&dc.notify);
|
2008-10-31 16:29:22 +01:00
|
|
|
break;
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
2008-12-28 19:48:53 +01:00
|
|
|
} while (dc.command != DECODE_COMMAND_NONE || !dc.quit);
|
2008-04-12 06:20:45 +02:00
|
|
|
|
|
|
|
return NULL;
|
Initial cut of fork() => pthreads() for decoder and player
I initially started to do a heavy rewrite that changed the way processes
communicated, but that was too much to do at once. So this change only
focuses on replacing the player and decode processes with threads and
using condition variables instead of polling in loops; so the changeset
itself is quiet small.
* The shared output buffer variables will still need locking
to guard against race conditions. So in this effect, we're probably
just as buggy as before. The reduced context-switching overhead of
using threads instead of processes may even make bugs show up more or
less often...
* Basic functionality appears to be working for playing local (and NFS)
audio, including:
play, pause, stop, seek, previous, next, and main playlist editing
* I haven't tested HTTP streams yet, they should work.
* I've only tested ALSA and Icecast. ALSA works fine, Icecast
metadata seems to get screwy at times and breaks song
advancement in the playlist at times.
* state file loading works, too (after some last-minute hacks with
non-blocking wakeup functions)
* The non-blocking (*_nb) variants of the task management functions are
probably overused. They're more lenient and easier to use because
much of our code is still based on our previous polling-based system.
* It currently segfaults on exit. I haven't paid much attention
to the exit/signal-handling routines other than ensuring it
compiles. At least the state file seems to work. We don't
do any cleanups of the threads on exit, yet.
* Update is still done in a child process and not in a thread.
To do this in a thread, we'll need to ensure it does proper
locking and communication with the main thread; but should
require less memory in the end because we'll be updating
the database "in-place" rather than updating a copy and
then bulk-loading when done.
* We're more sensitive to bugs in 3rd party libraries now.
My plan is to eventually use a master process which forks()
and restarts the child when it dies:
locking and communication with the main thread; but should
require less memory in the end because we'll be updating
the database "in-place" rather than updating a copy and
then bulk-loading when done.
* We're more sensitive to bugs in 3rd party libraries now.
My plan is to eventually use a master process which forks()
and restarts the child when it dies:
master - just does waitpid() + fork() in a loop
\- main thread
\- decoder thread
\- player thread
At the beginning of every song, the main thread will set
a dirty flag and update the state file. This way, if we
encounter a song that triggers a segfault killing the
main thread, the master will start the replacement main
on the next song.
* The main thread still wakes up every second on select()
to check for signals; which affects power management.
[merged r7138 from branches/ew]
git-svn-id: https://svn.musicpd.org/mpd/trunk@7240 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2008-04-12 06:08:00 +02:00
|
|
|
}
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2008-08-26 08:44:29 +02:00
|
|
|
void decoder_thread_start(void)
|
Initial cut of fork() => pthreads() for decoder and player
I initially started to do a heavy rewrite that changed the way processes
communicated, but that was too much to do at once. So this change only
focuses on replacing the player and decode processes with threads and
using condition variables instead of polling in loops; so the changeset
itself is quiet small.
* The shared output buffer variables will still need locking
to guard against race conditions. So in this effect, we're probably
just as buggy as before. The reduced context-switching overhead of
using threads instead of processes may even make bugs show up more or
less often...
* Basic functionality appears to be working for playing local (and NFS)
audio, including:
play, pause, stop, seek, previous, next, and main playlist editing
* I haven't tested HTTP streams yet, they should work.
* I've only tested ALSA and Icecast. ALSA works fine, Icecast
metadata seems to get screwy at times and breaks song
advancement in the playlist at times.
* state file loading works, too (after some last-minute hacks with
non-blocking wakeup functions)
* The non-blocking (*_nb) variants of the task management functions are
probably overused. They're more lenient and easier to use because
much of our code is still based on our previous polling-based system.
* It currently segfaults on exit. I haven't paid much attention
to the exit/signal-handling routines other than ensuring it
compiles. At least the state file seems to work. We don't
do any cleanups of the threads on exit, yet.
* Update is still done in a child process and not in a thread.
To do this in a thread, we'll need to ensure it does proper
locking and communication with the main thread; but should
require less memory in the end because we'll be updating
the database "in-place" rather than updating a copy and
then bulk-loading when done.
* We're more sensitive to bugs in 3rd party libraries now.
My plan is to eventually use a master process which forks()
and restarts the child when it dies:
locking and communication with the main thread; but should
require less memory in the end because we'll be updating
the database "in-place" rather than updating a copy and
then bulk-loading when done.
* We're more sensitive to bugs in 3rd party libraries now.
My plan is to eventually use a master process which forks()
and restarts the child when it dies:
master - just does waitpid() + fork() in a loop
\- main thread
\- decoder thread
\- player thread
At the beginning of every song, the main thread will set
a dirty flag and update the state file. This way, if we
encounter a song that triggers a segfault killing the
main thread, the master will start the replacement main
on the next song.
* The main thread still wakes up every second on select()
to check for signals; which affects power management.
[merged r7138 from branches/ew]
git-svn-id: https://svn.musicpd.org/mpd/trunk@7240 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2008-04-12 06:08:00 +02:00
|
|
|
{
|
2009-01-04 19:51:54 +01:00
|
|
|
GError *e = NULL;
|
Initial cut of fork() => pthreads() for decoder and player
I initially started to do a heavy rewrite that changed the way processes
communicated, but that was too much to do at once. So this change only
focuses on replacing the player and decode processes with threads and
using condition variables instead of polling in loops; so the changeset
itself is quiet small.
* The shared output buffer variables will still need locking
to guard against race conditions. So in this effect, we're probably
just as buggy as before. The reduced context-switching overhead of
using threads instead of processes may even make bugs show up more or
less often...
* Basic functionality appears to be working for playing local (and NFS)
audio, including:
play, pause, stop, seek, previous, next, and main playlist editing
* I haven't tested HTTP streams yet, they should work.
* I've only tested ALSA and Icecast. ALSA works fine, Icecast
metadata seems to get screwy at times and breaks song
advancement in the playlist at times.
* state file loading works, too (after some last-minute hacks with
non-blocking wakeup functions)
* The non-blocking (*_nb) variants of the task management functions are
probably overused. They're more lenient and easier to use because
much of our code is still based on our previous polling-based system.
* It currently segfaults on exit. I haven't paid much attention
to the exit/signal-handling routines other than ensuring it
compiles. At least the state file seems to work. We don't
do any cleanups of the threads on exit, yet.
* Update is still done in a child process and not in a thread.
To do this in a thread, we'll need to ensure it does proper
locking and communication with the main thread; but should
require less memory in the end because we'll be updating
the database "in-place" rather than updating a copy and
then bulk-loading when done.
* We're more sensitive to bugs in 3rd party libraries now.
My plan is to eventually use a master process which forks()
and restarts the child when it dies:
locking and communication with the main thread; but should
require less memory in the end because we'll be updating
the database "in-place" rather than updating a copy and
then bulk-loading when done.
* We're more sensitive to bugs in 3rd party libraries now.
My plan is to eventually use a master process which forks()
and restarts the child when it dies:
master - just does waitpid() + fork() in a loop
\- main thread
\- decoder thread
\- player thread
At the beginning of every song, the main thread will set
a dirty flag and update the state file. This way, if we
encounter a song that triggers a segfault killing the
main thread, the master will start the replacement main
on the next song.
* The main thread still wakes up every second on select()
to check for signals; which affects power management.
[merged r7138 from branches/ew]
git-svn-id: https://svn.musicpd.org/mpd/trunk@7240 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2008-04-12 06:08:00 +02:00
|
|
|
|
2009-01-25 13:44:27 +01:00
|
|
|
assert(dc.thread == NULL);
|
|
|
|
|
|
|
|
dc.thread = g_thread_create(decoder_task, NULL, true, &e);
|
|
|
|
if (dc.thread == NULL)
|
2008-12-28 22:09:33 +01:00
|
|
|
FATAL("Failed to spawn decoder task: %s\n", e->message);
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|