*
* Starting points for getting an overview:
*
+ *
* - The main programs: \ref server.c, \ref audiod.c, \ref client.c,
- * \ref audioc.c, \ref fsck.c,
+ * \ref audioc.c, \ref fsck.c, \ref afh.c
* - Server: \ref server_command, \ref sender,
* - Audio file selector: \ref audio_format_handler, \ref mood, \ref afs_table,
* - Client: \ref receiver, \ref receiver_node, \ref filter, \ref filter_node.
*
* The gory details, listed by topic:
*
- * - Audio format handlers: \ref mp3_afh.c, \ref ogg_afh.c, \ref aac_afh.c,
- * - Decoders: \ref mp3dec.c, \ref oggdec.c, \ref aacdec.c,
- * - Volume normalizer: \ref compress.c,
+ * - Audio format handlers: \ref send_common.c \ref mp3_afh.c, \ref ogg_afh.c, \ref aac_afh.c,
+ * - Decoders: \ref mp3dec_filter.c, \ref oggdec_filter.c, \ref aacdec_filter.c,
+ * - Volume normalizer: \ref compress_filter.c,
* - Output: \ref alsa_write.c, \ref osx_write.c,
* - http: \ref http_recv.c, \ref http_send.c,
* - ortp: \ref ortp_recv.c, \ref ortp_send.c,
/** A random value used in child context for authentication. */
uint32_t afs_socket_cookie;
+/** The mutex protecting the shared memory area containing the mmd struct. */
+int mmd_mutex;
+
/* global variables for server-internal use */
static FILE *logfile;
/** The file containing user information (public key, permissions). */
static char *user_list_file = NULL;
-static int mmd_mutex, mmd_shm_id;
-static pid_t afs_pid;
+static int mmd_shm_id;
-/** The task resposible for server command handling. */
+/** The task responsible for server command handling. */
struct server_command_task {
/** TCP port on which para_server listens for connections. */
int listen_fd;
* \param ll The log level.
* \param fmt The format string describing the log message.
*/
-void para_log(int ll, const char* fmt,...)
+__printf_2_3 void para_log(int ll, const char* fmt,...)
{
va_list argp;
FILE *outfd;
exit(EXIT_FAILURE);
}
-/**
- * Lock the shared memory area containing the mmd struct.
- *
- * \sa semop(2), struct misc_meta_data.
- */
-void mmd_lock(void)
-{
- mutex_lock(mmd_mutex);
-}
-
-/**
- * Unlock the shared memory area containing the mmd struct.
- *
- * \sa semop(2), struct misc_meta_data.
- */
-
-void mmd_unlock(void)
-{
- mutex_unlock(mmd_mutex);
-}
-
static void parse_config(int override)
{
char *home = para_homedir();
.initialize = 0,
.check_required = 1,
.check_ambiguity = 0,
- .print_errors = 1
+ .print_errors = !conf.daemon_given
};
server_cmdline_parser_config_file(cf, &conf, ¶ms);
conf.daemon_given = tmp;
logfile = NULL;
parse_config(1); /* reopens log */
init_user_list(user_list_file); /* reload user list */
- if (afs_pid)
- kill(afs_pid, SIGHUP);
+ if (mmd->afs_pid)
+ kill(mmd->afs_pid, SIGHUP);
}
static void signal_post_select(struct sched *s, struct task *t)
int ret = para_reap_child(&pid);
if (ret <= 0)
break;
- if (pid != afs_pid)
+ if (pid != mmd->afs_pid)
continue;
PARA_EMERG_LOG("fatal: afs died\n");
goto genocide;
if (ret < 0)
exit(EXIT_FAILURE);
afs_socket_cookie = para_random((uint32_t)-1);
- afs_pid = fork();
- if (afs_pid < 0)
+ mmd->afs_pid = fork();
+ if (mmd->afs_pid < 0)
exit(EXIT_FAILURE);
- if (!afs_pid) { /* child (afs) */
+ if (!mmd->afs_pid) { /* child (afs) */
close(afs_server_socket[0]);
afs_init(afs_socket_cookie, afs_server_socket[1]);
}
daemon_init();
PARA_NOTICE_LOG("initializing audio format handlers\n");
afh_init();
- mmd->server_pid = getpid();
- init_signal_task();
PARA_NOTICE_LOG("initializing the audio file selector\n");
afs_socket = init_afs();
+ init_signal_task();
PARA_NOTICE_LOG("initializing virtual streaming system\n");
init_vss_task(afs_socket);
init_server_command_task(argc, argv);
int ret;
status_refresh();
- mmd_unlock();
+ mutex_unlock(mmd_mutex);
ret = para_select(max_fileno + 1, readfds, writefds, timeout_tv);
- mmd_lock();
+ mutex_lock(mmd_mutex);
return ret;
}
.select_function = server_select
};
server_init(argc, argv);
- mmd_lock();
+ mutex_lock(mmd_mutex);
ret = schedule(&s);
if (ret < 0) {
PARA_EMERG_LOG("%s\n", para_strerror(-ret));