};
/**
- * Ask the parent process to call a given function.
+ * Ask the afs process to call a given function.
*
* \param f The function to be called.
* \param query Pointer to arbitrary data for the callback.
return 1;
}
+/**
+ * Execute the given function for each matching row.
+ *
+ * \param pmd Describes what to match and how.
+ *
+ * \return The return value of the underlying call to osl_rbtree_loop()
+ * or osl_rbtree_loop_reverse().
+ */
int for_each_matching_row(struct pattern_match_data *pmd)
{
if (pmd->pm_flags & PM_REVERSE_LOOP)
return para_munmap(afd->map.data, afd->map.size);
}
-#if 0
-static void play_loop(enum play_mode current_play_mode)
-{
- int i, ret;
- struct audio_file_data afd;
-
- afd.current_play_mode = current_play_mode;
- for (i = 0; i < 0; i++) {
- ret = open_next_audio_file(&afd);
- if (ret < 0) {
- PARA_ERROR_LOG("failed to open next audio file: %d\n", ret);
- return;
- }
- PARA_NOTICE_LOG("next audio file: %s, score: %li\n", afd.path, afd.score);
- sleep(1);
- close_audio_file(&afd);
- }
-}
-#endif
-
-
static enum play_mode init_admissible_files(void)
{
int ret;
return ret;
}
-static int server_socket;
-static struct command_task command_task_struct;
-static struct signal_task signal_task_struct;
-
-static void unregister_tasks(void)
-{
- unregister_task(&command_task_struct.task);
- unregister_task(&signal_task_struct.task);
-}
-
static void close_afs_tables(enum osl_close_flags flags)
{
PARA_NOTICE_LOG("closing afs_tables\n");
aft_shutdown(flags);
}
+static char *database_dir;
+
+static int make_database_dir(void)
+{
+ int ret;
+
+ if (!database_dir) {
+ if (conf.afs_database_dir_given)
+ database_dir = para_strdup(conf.afs_database_dir_arg);
+ else {
+ char *home = para_homedir();
+ database_dir = make_message(
+ "%s/.paraslash/afs_database", home);
+ free(home);
+ }
+ }
+ PARA_INFO_LOG("afs_database dir %s\n", database_dir);
+ ret = para_mkdir(database_dir, 0777);
+ if (ret >= 0 || ret == -E_EXIST)
+ return 1;
+ free(database_dir);
+ database_dir = NULL;
+ return ret;
+}
+
+
+static int open_afs_tables(void)
+{
+ int ret = make_database_dir();
+
+ if (ret < 0)
+ return ret;
+ ret = attribute_init(&afs_tables[TBLNUM_ATTRIBUTES], database_dir);
+ if (ret < 0)
+ return ret;
+ ret = moods_init(&afs_tables[TBLNUM_MOODS], database_dir);
+ if (ret < 0)
+ goto moods_init_error;
+ ret = playlists_init(&afs_tables[TBLNUM_PLAYLIST], database_dir);
+ if (ret < 0)
+ goto playlists_init_error;
+ ret = lyrics_init(&afs_tables[TBLNUM_LYRICS], database_dir);
+ if (ret < 0)
+ goto lyrics_init_error;
+ ret = images_init(&afs_tables[TBLNUM_IMAGES], database_dir);
+ if (ret < 0)
+ goto images_init_error;
+ ret = score_init(&afs_tables[TBLNUM_SCORES], database_dir);
+ if (ret < 0)
+ goto score_init_error;
+ ret = aft_init(&afs_tables[TBLNUM_AUDIO_FILES], database_dir);
+ if (ret < 0)
+ goto aft_init_error;
+ return 1;
+
+aft_init_error:
+ score_shutdown(OSL_MARK_CLEAN);
+score_init_error:
+ images_shutdown(OSL_MARK_CLEAN);
+images_init_error:
+ lyrics_shutdown(OSL_MARK_CLEAN);
+lyrics_init_error:
+ playlists_shutdown(OSL_MARK_CLEAN);
+playlists_init_error:
+ moods_shutdown(OSL_MARK_CLEAN);
+moods_init_error:
+ attribute_shutdown(OSL_MARK_CLEAN);
+ return ret;
+}
+
+static int server_socket;
+static struct command_task command_task_struct;
+static struct signal_task signal_task_struct;
+
+static void unregister_tasks(void)
+{
+ unregister_task(&command_task_struct.task);
+ unregister_task(&signal_task_struct.task);
+}
+
static void signal_pre_select(struct sched *s, struct task *t)
{
struct signal_task *st = t->private_data;
t->ret = 1;
if (st->signum == SIGUSR1)
return; /* ignore SIGUSR1 */
+ if (st->signum == SIGHUP) {
+ close_afs_tables(OSL_MARK_CLEAN);
+ t->ret = open_afs_tables();
+ return;
+ }
PARA_NOTICE_LOG("caught signal %d\n", st->signum);
- t->ret = -E_SIGNAL_CAUGHT;
+ t->ret = -E_AFS_SIGNAL;
unregister_tasks();
}
para_install_sighandler(SIGINT);
para_install_sighandler(SIGTERM);
para_install_sighandler(SIGPIPE);
+ para_install_sighandler(SIGHUP);
st->task.pre_select = signal_pre_select;
st->task.post_select = signal_post_select;
query_shmid);
return;
}
- /* Ignore return value: Errors might be ok here. */
+ /* Ignore return value: Errors might be OK here. */
call_callback(fd, query_shmid);
}
+/** Shutdown connection if query has not arrived until this many seconds. */
#define AFS_CLIENT_TIMEOUT 3
static void command_post_select(struct sched *s, struct task *t)
list_for_each_entry_safe(client, tmp, &afs_client_list, node) {
if (FD_ISSET(client->fd, &s->rfds))
execute_afs_command(client->fd, ct->cookie);
- else { /* prevent bogus connection flodding */
+ else { /* prevent bogus connection flooding */
struct timeval diff;
tv_diff(now, &client->connect_time, &diff);
if (diff.tv_sec < AFS_CLIENT_TIMEOUT)
register_task(&ct->task);
}
-void register_tasks(uint32_t cookie)
+static void register_tasks(uint32_t cookie)
{
register_signal_task();
register_command_task(cookie);
}
-static char *database_dir;
-
-static int make_database_dir(void)
-{
- int ret;
-
- if (!database_dir) {
- if (conf.afs_database_dir_given)
- database_dir = para_strdup(conf.afs_database_dir_arg);
- else {
- char *home = para_homedir();
- database_dir = make_message(
- "%s/.paraslash/afs_database", home);
- free(home);
- }
- }
- PARA_INFO_LOG("afs_database dir %s\n", database_dir);
- ret = para_mkdir(database_dir, 0777);
- if (ret >= 0 || ret == -E_EXIST)
- return 1;
- free(database_dir);
- database_dir = NULL;
- return ret;
-}
-
-static int open_afs_tables(void)
-{
- int ret = make_database_dir();
-
- if (ret < 0)
- return ret;
- ret = attribute_init(&afs_tables[TBLNUM_ATTRIBUTES], database_dir);
- if (ret < 0)
- return ret;
- ret = moods_init(&afs_tables[TBLNUM_MOODS], database_dir);
- if (ret < 0)
- goto moods_init_error;
- ret = playlists_init(&afs_tables[TBLNUM_PLAYLIST], database_dir);
- if (ret < 0)
- goto playlists_init_error;
- ret = lyrics_init(&afs_tables[TBLNUM_LYRICS], database_dir);
- if (ret < 0)
- goto lyrics_init_error;
- ret = images_init(&afs_tables[TBLNUM_IMAGES], database_dir);
- if (ret < 0)
- goto images_init_error;
- ret = score_init(&afs_tables[TBLNUM_SCORES], database_dir);
- if (ret < 0)
- goto score_init_error;
- ret = aft_init(&afs_tables[TBLNUM_AUDIO_FILES], database_dir);
- if (ret < 0)
- goto aft_init_error;
- return 1;
-
-aft_init_error:
- score_shutdown(OSL_MARK_CLEAN);
-score_init_error:
- images_shutdown(OSL_MARK_CLEAN);
-images_init_error:
- lyrics_shutdown(OSL_MARK_CLEAN);
-lyrics_init_error:
- playlists_shutdown(OSL_MARK_CLEAN);
-playlists_init_error:
- moods_shutdown(OSL_MARK_CLEAN);
-moods_init_error:
- attribute_shutdown(OSL_MARK_CLEAN);
- return ret;
-}
-
-__noreturn int afs_init(uint32_t cookie, int socket_fd)
+/**
+ * Initialize the audio file selector process.
+ *
+ * \param cookie The value used for "authentication".
+ * \param socket_fd File descriptor used for communication with the server.
+ */
+__noreturn void afs_init(uint32_t cookie, int socket_fd)
{
enum play_mode current_play_mode;
struct sched s;
return send_va_buffer(fd, "successfully created afs table(s)\n");
}
+/**
+ * Flags for the check command.
+ *
+ * \sa com_check().
+ */
enum com_check_flags {
+ /** Check the audio file table. */
CHECK_AFT = 1,
+ /** Check the mood table. */
CHECK_MOODS = 2,
+ /** Check the playlist table. */
CHECK_PLAYLISTS = 4
};
projects / paraslash.git / blobdiff