The afs_pid variable is read-only after it has been initialized. Hence
it does not qualify for being part of the shared memory area which
contains the mmd struct. Make it a global variable instead.
"supported audio formats: %s\n",
ut, mmd->num_played,
(int)getppid(),
"supported audio formats: %s\n",
ut, mmd->num_played,
(int)getppid(),
mmd->active_connections,
mmd->num_commands,
mmd->num_connects,
mmd->active_connections,
mmd->num_commands,
mmd->num_connects,
static struct sched sched;
static struct signal_task *signal_task;
static struct sched sched;
static struct signal_task *signal_task;
+/** The process id of the audio file selector process. */
+pid_t afs_pid = 0;
+
/** The task responsible for server command handling. */
struct server_command_task {
/** TCP port on which para_server listens for connections. */
/** The task responsible for server command handling. */
struct server_command_task {
/** TCP port on which para_server listens for connections. */
cf = para_strdup(OPT_STRING_VAL(CONFIG_FILE));
else
cf = make_message("%s/.paraslash/server.conf", home);
cf = para_strdup(OPT_STRING_VAL(CONFIG_FILE));
else
cf = make_message("%s/.paraslash/server.conf", home);
- if (!mmd || getpid() != mmd->afs_pid) {
+ if (!mmd || getpid() != afs_pid) {
if (OPT_GIVEN(USER_LIST))
user_list_file = para_strdup(OPT_STRING_VAL(USER_LIST));
else
if (OPT_GIVEN(USER_LIST))
user_list_file = para_strdup(OPT_STRING_VAL(USER_LIST));
else
PARA_NOTICE_LOG("SIGHUP\n");
parse_config_or_die(true);
PARA_NOTICE_LOG("SIGHUP\n");
parse_config_or_die(true);
- if (mmd->afs_pid)
- kill(mmd->afs_pid, SIGHUP);
+ if (afs_pid != 0)
+ kill(afs_pid, SIGHUP);
}
static int signal_post_select(struct sched *s, __a_unused void *context)
}
static int signal_post_select(struct sched *s, __a_unused void *context)
int ret = para_reap_child(&pid);
if (ret <= 0)
break;
int ret = para_reap_child(&pid);
if (ret <= 0)
break;
- if (pid != mmd->afs_pid)
continue;
PARA_EMERG_LOG("fatal: afs died\n");
kill(0, SIGTERM);
continue;
PARA_EMERG_LOG("fatal: afs died\n");
kill(0, SIGTERM);
* processes get killed immediately by the above kill().
*/
PARA_INFO_LOG("waiting for afs (pid %d) to die\n",
* processes get killed immediately by the above kill().
*/
PARA_INFO_LOG("waiting for afs (pid %d) to die\n",
- (int)mmd->afs_pid);
- waitpid(mmd->afs_pid, NULL, 0);
+ (int)afs_pid);
+ waitpid(afs_pid, NULL, 0);
cleanup:
free(mmd->afd.afhi.chunk_table);
close_listed_fds();
cleanup:
free(mmd->afd.afhi.chunk_table);
close_listed_fds();
static int init_afs(int argc, char **argv)
{
int ret, afs_server_socket[2];
static int init_afs(int argc, char **argv)
{
int ret, afs_server_socket[2];
char c;
ret = socketpair(PF_UNIX, SOCK_STREAM, 0, afs_server_socket);
char c;
ret = socketpair(PF_UNIX, SOCK_STREAM, 0, afs_server_socket);
if (afs_pid == 0) { /* child (afs) */
int i;
if (afs_pid == 0) { /* child (afs) */
int i;
for (i = argc - 1; i >= 0; i--)
memset(argv[i], 0, strlen(argv[i]));
i = argc - lls_num_inputs(cmdline_lpr) - 1;
for (i = argc - 1; i >= 0; i--)
memset(argv[i], 0, strlen(argv[i]));
i = argc - lls_num_inputs(cmdline_lpr) - 1;
close(afs_server_socket[0]);
afs_init(afs_socket_cookie, afs_server_socket[1]);
}
close(afs_server_socket[0]);
afs_init(afs_socket_cookie, afs_server_socket[1]);
}
- mmd->afs_pid = afs_pid;
close(afs_server_socket[1]);
if (read(afs_server_socket[0], &c, 1) <= 0) {
PARA_EMERG_LOG("early afs exit\n");
close(afs_server_socket[1]);
if (read(afs_server_socket[0], &c, 1) <= 0) {
PARA_EMERG_LOG("early afs exit\n");
unsigned int num_connects;
/** The number of connections currently active. */
unsigned int active_connections;
unsigned int num_connects;
/** The number of connections currently active. */
unsigned int active_connections;
- /** The process id of the audio file selector. */
- pid_t afs_pid;
/** This gets updated by afs and contains its current mode. */
char afs_mode_string[MAXLINE];
/** Used by the sender command. */
/** This gets updated by afs and contains its current mode. */
char afs_mode_string[MAXLINE];
/** Used by the sender command. */
struct audio_file_data afd;
};
struct audio_file_data afd;
};
extern struct lls_parse_result *server_lpr;
/**
extern struct lls_parse_result *server_lpr;
/**