update: splitted update.c into several sources

Makefile.am

@@ -73,6 +73,7 @@ mpd_headers = \
 	src/encoder_api.h \
 	src/fifo_buffer.h \
 	src/update.h \
+	src/update_internal.h \
 	src/dirvec.h \
 	src/gcc.h \
 	src/decoder_list.h \
@@ -203,6 +204,9 @@ src_mpd_SOURCES = \
 	src/filter_plugin.c \
 	src/filter_registry.c \
 	src/update.c \
+	src/update_queue.c \
+	src/update_walk.c \
+	src/update_remove.c \
 	src/client.c \
 	src/client_event.c \
 	src/client_expire.c \

src/update_internal.h

+/*
+ * Copyright (C) 2003-2009 The Music Player Daemon Project
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_UPDATE_INTERNAL_H
+#define MPD_UPDATE_INTERNAL_H
+
+#include <stdbool.h>
+
+#undef G_LOG_DOMAIN
+#define G_LOG_DOMAIN "update"
+
+struct stat;
+struct song;
+struct directory;
+
+/** used by the main thread to notify the update thread */
+extern struct notify update_notify;
+
+unsigned
+update_queue_push(const char *path, unsigned base);
+
+char *
+update_queue_shift(void);
+
+void
+update_walk_global_init(void);
+
+void
+update_walk_global_finish(void);
+
+/**
+ * Returns true if the database was modified.
+ */
+bool
+update_walk(const char *path);
+
+void
+update_remove_global_init(void);
+
+void
+update_remove_global_finish(void);
+
+/**
+ * Sends a signal to the main thread which will in turn remove the
+ * song: from the sticker database and from the playlist.  This
+ * serialized access is implemented to avoid excessive locking.
+ */
+void
+update_remove_song(const struct song *song);
+
+#endif

src/update_queue.c

+/*
+ * Copyright (C) 2003-2009 The Music Player Daemon Project
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "update_internal.h"
+
+#include <glib.h>
+
+#include <assert.h>
+#include <string.h>
+
+/* make this dynamic?, or maybe this is big enough... */
+static char *update_paths[32];
+static size_t update_paths_nr;
+
+unsigned
+update_queue_push(const char *path, unsigned base)
+{
+	assert(update_paths_nr <= G_N_ELEMENTS(update_paths));
+
+	if (update_paths_nr == G_N_ELEMENTS(update_paths))
+		return 0;
+
+	update_paths[update_paths_nr++] = g_strdup(path);
+	return base + update_paths_nr;
+}
+
+char *
+update_queue_shift(void)
+{
+	char *path;
+
+	if (update_paths_nr == 0)
+		return NULL;
+
+	path = update_paths[0];
+	memmove(&update_paths[0], &update_paths[1],
+		--update_paths_nr * sizeof(char *));
+	return path;
+}

src/update_remove.c

+/*
+ * Copyright (C) 2003-2009 The Music Player Daemon Project
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "update_internal.h"
+#include "notify.h"
+#include "event_pipe.h"
+#include "song.h"
+#include "playlist.h"
+
+#ifdef ENABLE_SQLITE
+#include "sticker.h"
+#include "song_sticker.h"
+#endif
+
+#include <glib.h>
+
+#include <assert.h>
+
+static const struct song *removed_song;
+
+static struct notify remove_notify;
+
+/**
+ * Safely remove a song from the database.  This must be done in the
+ * main task, to be sure that there is no pointer left to it.
+ */
+static void
+song_remove_event(void)
+{
+	char *uri;
+
+	assert(removed_song != NULL);
+
+	uri = song_get_uri(removed_song);
+	g_debug("removing: %s", uri);
+	g_free(uri);
+
+#ifdef ENABLE_SQLITE
+	/* if the song has a sticker, remove it */
+	if (sticker_enabled())
+		sticker_song_remove(song);
+#endif
+
+	playlist_delete_song(&g_playlist, removed_song);
+	removed_song = NULL;
+
+	notify_signal(&remove_notify);
+}
+
+void
+update_remove_global_init(void)
+{
+	notify_init(&remove_notify);
+
+	event_pipe_register(PIPE_EVENT_DELETE, song_remove_event);
+}
+
+void
+update_remove_global_finish(void)
+{
+	notify_deinit(&remove_notify);
+}
+
+void
+update_remove_song(const struct song *song)
+{
+	assert(removed_song == NULL);
+
+	removed_song = song;
+
+	event_pipe_emit(PIPE_EVENT_DELETE);
+
+	do {
+		notify_wait(&remove_notify);
+	} while (removed_song != NULL);
+
+}