*
*/
+#include <signal.h>
+#include <sys/types.h>
+#include <dirent.h>
#include "para.h"
+#include "error.h"
#include "server.cmdline.h"
#include "afs_common.h"
#include "afh.h"
+#include "string.h"
+#include "afs.h"
#include "server.h"
#include "vss.h"
#include "config.h"
#include "close_on_fork.h"
#include "send.h"
-#include "error.h"
#include "net.h"
#include "daemon.h"
-#include "string.h"
#include "ipc.h"
#include "fd.h"
+#include "list.h"
+#include "sched.h"
#include "signal.h"
#include "user_list.h"
-#include "afs.h"
/** define the array of error lists needed by para_server */
INIT_SERVER_ERRLISTS;
exit(EXIT_FAILURE);
}
-static uint32_t afs_socket_cookie;
-static int afs_socket;
-pid_t afs_pid;
+uint32_t afs_socket_cookie;
+int afs_socket;
+static pid_t afs_pid;
static void init_afs(void)
{
afs_pid = fork();
if (afs_pid < 0)
exit(EXIT_FAILURE);
- if (!afs_pid) /* child (afs) */
+ if (!afs_pid) { /* child (afs) */
+ close(afs_server_socket[0]);
afs_init(afs_socket_cookie, afs_server_socket[1]);
+ }
close(afs_server_socket[1]);
afs_socket = afs_server_socket[0];
+ ret = mark_fd_nonblock(afs_socket);
+ if (ret < 0)
+ exit(EXIT_FAILURE);
+ add_close_on_fork_list(afs_socket);
PARA_INFO_LOG("afs_socket: %d, afs_socket_cookie: %u\n", afs_socket,
(unsigned) afs_socket_cookie);
}
init_selector();
// PARA_ERROR_LOG("num: %d\n", mmd->selector_num);
PARA_NOTICE_LOG("%s", "initializing virtual streaming system\n");
+ afh_init();
vss_init();
mmd->server_pid = getpid();
setup_signal_handling();
mmd->selector_change = mmd->selector_num; /* do not change selector.. */
change_selector(); /* .. just reload */
init_user_list(user_list_file); /* reload user list */
+ if (afs_pid)
+ kill(afs_pid, SIGHUP);
}
static void status_refresh(void)
/* check socket and signal pipe in any case */
para_fd_set(sockfd, &rfds, &max_fileno);
para_fd_set(signal_pipe, &rfds, &max_fileno);
- timeout = vss_preselect();
+ timeout = vss_preselect(&rfds, &wfds, &max_fileno);
status_refresh();
for (i = 0; senders[i].name; i++) {
if (senders[i].status != SENDER_ON)
continue;
if (!senders[i].pre_select)
continue;
- senders[i].pre_select( &max_fileno, &rfds, &wfds);
+ senders[i].pre_select(&max_fileno, &rfds, &wfds);
}
if (selectors[mmd->selector_num].pre_select) {
ret = selectors[mmd->selector_num].pre_select(&rfds, &wfds);
mmd_unlock();
ret = para_select(max_fileno + 1, &rfds, &wfds, timeout);
mmd_lock();
+ vss_post_select(&rfds, &wfds);
if (mmd->selector_change >= 0)
change_selector();
if (selectors[mmd->selector_num].post_select)
break;
case SIGCHLD:
for (;;) {
- pid = para_reap_child();
- if (pid <= 0)
+ ret = para_reap_child(&pid);
+ if (ret <= 0)
break;
if (pid != afs_pid)
continue;