* Here's where we (hopefully) have most parts of the Citadel server that
* would need to be altered to run the server in a non-POSIX environment.
*
- * Eventually we'll try porting to a different platform and either have
- * multiple variants of this file or simply load it up with #ifdefs.
+ * If we ever port to a different platform and either have multiple
+ * variants of this file or simply load it up with #ifdefs.
*
*/
/*
- * we used to use master_cleanup() as a signal handler to shut down the server.
+ * We used to use master_cleanup() as a signal handler to shut down the server.
* however, master_cleanup() and the functions it calls do some things that
* aren't such a good idea to do from a signal handler: acquiring mutexes,
* playing with signal masks on BSDI systems, etc. so instead we install the
/*
* Set up a place to put thread-specific data.
* We only need a single pointer per thread - it points to the
- * thread's CitContext structure in the ContextList linked list.
+ * CitContext structure (in the ContextList linked list) of the
+ * session to which the calling thread is currently bound.
*/
if (pthread_key_create(&MyConKey, NULL) != 0) {
lprintf(1, "Can't create TSD key!! %s\n", strerror(errno));
{
struct sockaddr_in sin;
int s, i;
+ int actual_queue_len;
+
+ actual_queue_len = queue_len;
+ if (actual_queue_len < 5) actual_queue_len = 5;
memset(&sin, 0, sizeof(sin));
sin.sin_family = AF_INET;
return(-1);
}
- if (listen(s, queue_len) < 0) {
+ if (listen(s, actual_queue_len) < 0) {
lprintf(1, "citserver: Can't listen: %s\n", strerror(errno));
close(s);
return(-1);
struct sockaddr_un addr;
int s;
int i;
+ int actual_queue_len;
+
+ actual_queue_len = queue_len;
+ if (actual_queue_len < 5) actual_queue_len = 5;
i = unlink(sockpath);
if (i != 0) if (errno != ENOENT) {
return(-1);
}
- if (listen(s, queue_len) < 0) {
+ if (listen(s, actual_queue_len) < 0) {
lprintf(1, "citserver: Can't listen: %s\n", strerror(errno));
return(-1);
}
/*
- * Initialize a new context and place it in the list.
+ * Initialize a new context and place it in the list. The session number
+ * used to be the PID (which is why it's called cs_pid), but that was when we
+ * had one process per session. Now we just assign them sequentially, starting
+ * at 1 (don't change it to 0 because masterCC uses 0) and re-using them when
+ * sessions terminate.
*/
struct CitContext *CreateNewContext(void) {
struct CitContext *me, *ptr;
*/
void cprintf(const char *format, ...) {
va_list arg_ptr;
- char buf[256];
+ char buf[SIZ];
va_start(arg_ptr, format);
if (vsnprintf(buf, sizeof buf, format, arg_ptr) == -1)
*/
for (serviceptr = ServiceHookTable; serviceptr != NULL;
serviceptr = serviceptr->next ) {
- lprintf(3, "Closing listener on port %d\n",
- serviceptr->tcp_port);
+
+ if (serviceptr->tcp_port > 0)
+ lprintf(3, "Closing listener on port %d\n",
+ serviceptr->tcp_port);
+
+ if (serviceptr->sockpath != NULL)
+ lprintf(3, "Closing listener on '%s'\n",
+ serviceptr->sockpath);
+
close(serviceptr->msock);
/* If it's a Unix domain socket, remove the file. */
FILE *netsetup;
int ch;
int a, b;
- char netsetup_args[3][256];
+ char netsetup_args[3][SIZ];
if (CC->usersupp.axlevel < 6) {
cprintf("%d Higher access required.\n",
void InitializeMasterCC(void) {
memset(&masterCC, 0, sizeof(struct CitContext));
masterCC.internal_pgm = 1;
+ masterCC.cs_pid = 0;
}
FD_ZERO(&masterfds);
masterhighest = 0;
+
lprintf(9, "Will listen on rescan pipe %d\n", rescan[0]);
FD_SET(rescan[0], &masterfds);
if (rescan[0] > masterhighest) masterhighest = rescan[0];
*/
int main(int argc, char **argv)
{
- pthread_t HousekeepingThread; /* Thread descriptor */
+ pthread_t WorkerThread; /* Thread descriptor */
pthread_attr_t attr; /* Thread attributes */
char tracefile[128]; /* Name of file to log traces to */
int a, i; /* General-purpose variables */
lprintf(7, "Loading citadel.config\n");
get_config();
+
/*
* Do non system dependent startup functions.
*/
master_startup();
/*
- * Bind the server to our favorite ports.
+ * Bind the server to a Unix-domain socket.
*/
- CtdlRegisterServiceHook(0, /* Unix */
+ CtdlRegisterServiceHook(0,
"citadel.socket",
citproto_begin_session,
do_command_loop);
- CtdlRegisterServiceHook(config.c_port_number, /* TCP */
+
+ /*
+ * Bind the server to our favorite TCP port (usually 504).
+ */
+ CtdlRegisterServiceHook(config.c_port_number,
NULL,
citproto_begin_session,
do_command_loop);
}
}
- /*
- * Create the housekeeper thread
- */
- lprintf(7, "Starting housekeeper thread\n");
- pthread_attr_init(&attr);
- pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
- if (pthread_create(&HousekeepingThread, &attr,
- (void* (*)(void*)) housekeeping_loop, NULL) != 0) {
- lprintf(1, "Can't create housekeeping thead: %s\n",
- strerror(errno));
- }
-
-
+ /* We want to check for idle sessions once per minute */
+ CtdlRegisterSessionHook(terminate_idle_sessions, EVT_TIMER);
+
/*
* Now create a bunch of worker threads.
*/
for (i=0; i<(config.c_min_workers-1); ++i) {
+ lprintf(9, "Creating worker thread %d\n", i);
pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
- if (pthread_create(&HousekeepingThread, &attr,
+ if (pthread_create(&WorkerThread, &attr,
(void* (*)(void*)) worker_thread, NULL) != 0) {
lprintf(1, "Can't create worker thead: %s\n",
strerror(errno));
}
}
+
/* Now this thread can become a worker as well. */
+ lprintf(9, "Original thread entering worker loop\n");
worker_thread();
return(0);
*/
begin_critical_section(S_I_WANNA_SELECT);
-SETUP_FD: memcpy(&readfds, &masterfds, sizeof(fd_set) );
+SETUP_FD: memcpy(&readfds, &masterfds, sizeof masterfds);
highest = masterhighest;
begin_critical_section(S_SESSION_TABLE);
for (ptr = ContextList; ptr != NULL; ptr = ptr->next) {
last_timer = time(NULL);
PerformSessionHooks(EVT_TIMER);
}
+
+ check_sched_shutdown();
}
/* If control reaches this point, the server is shutting down */
projects / citadel.git / blobdiff