X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fsysdep.c;h=ea89f5ac5e9e3865be37c6c8111f6a0d1a61030d;hb=2b402dc292b6dcdbc7a3786a6c722e06e3be5ab5;hp=5468d24ca7519af883d5aa7a1209466479b31d95;hpb=f1ee61891901850ebbdee1e9440b363dc6df540a;p=citadel.git diff --git a/citadel/sysdep.c b/citadel/sysdep.c index 5468d24ca..ea89f5ac5 100644 --- a/citadel/sysdep.c +++ b/citadel/sysdep.c @@ -9,7 +9,7 @@ * * Copyright (c) 1987-2011 by the citadel.org team * - * This program is free software; you can redistribute it and/or modify + * This program is open source software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. @@ -21,7 +21,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "sysdep.h" @@ -89,18 +89,6 @@ #include "control.h" -#ifdef DEBUG_MEMORY_LEAKS -struct igheap { - struct igheap *next; - char file[32]; - int line; - void *block; -}; - -struct igheap *igheap = NULL; -#endif - - /* * Signal handler to shut down the server. */ @@ -111,16 +99,9 @@ volatile int restart_server = 0; volatile int running_as_daemon = 0; static RETSIGTYPE signal_cleanup(int signum) { - ThreadTSD *Cc; - - Cc = CTP; - if (Cc && Cc->self) - Cc->self->signal = signum; - else - { - syslog(LOG_DEBUG, "Caught signal %d; shutting down.\n", signum); - exit_signal = signum; - } + syslog(LOG_DEBUG, "Caught signal %d; shutting down.", signum); + exit_signal = signum; + server_shutting_down = 1; } static RETSIGTYPE signal_exit(int signum) { @@ -157,33 +138,24 @@ void init_sysdep(void) { * CitContext structure (in the ContextList linked list) of the * session to which the calling thread is currently bound. */ - if (citthread_key_create(&MyConKey, NULL) != 0) { - syslog(LOG_CRIT, "Can't create TSD key: %s\n", - strerror(errno)); + if (pthread_key_create(&MyConKey, NULL) != 0) { + syslog(LOG_CRIT, "Can't create TSD key: %s", strerror(errno)); } /* - * The action for unexpected signals and exceptions should be to - * call signal_cleanup() to gracefully shut down the server. + * Interript, hangup, and terminate signals should cause the server + * to gracefully clean up and shut down. */ sigemptyset(&set); - sigaddset(&set, SIGINT); // intr = shutdown - // sigaddset(&set, SIGQUIT); // quit = force quit + sigaddset(&set, SIGINT); sigaddset(&set, SIGHUP); sigaddset(&set, SIGTERM); - // sigaddset(&set, SIGSEGV); // we want core dumps - // sigaddset(&set, SIGILL); // we want core dumps - // sigaddset(&set, SIGBUS); sigprocmask(SIG_UNBLOCK, &set, NULL); - signal(SIGINT, signal_cleanup); // intr = shutdown - // signal(SIGQUIT, signal_cleanup); // quit = force quit + signal(SIGINT, signal_cleanup); signal(SIGHUP, signal_cleanup); signal(SIGTERM, signal_cleanup); signal(SIGUSR2, signal_exit); - // signal(SIGSEGV, signal_cleanup); // we want coredumps - // signal(SIGILL, signal_cleanup); // we want core dumps - // signal(SIGBUS, signal_cleanup); /* * Do not shut down the server on broken pipe signals, otherwise the @@ -234,7 +206,7 @@ int ctdl_tcp_server(char *ip_addr, int port_number, int queue_len, char *errorme snprintf(errormessage, SIZ, "Error binding to [%s] : %s", ip_addr, strerror(errno) ); - syslog(LOG_ALERT, "%s\n", errormessage); + syslog(LOG_ALERT, "%s", errormessage); return (-1); } } @@ -245,16 +217,14 @@ int ctdl_tcp_server(char *ip_addr, int port_number, int queue_len, char *errorme snprintf(errormessage, SIZ, "Error binding to [%s] : %s", ip_addr, strerror(errno) ); - syslog(LOG_ALERT, "%s\n", errormessage); + syslog(LOG_ALERT, "%s", errormessage); return (-1); } } if (port_number == 0) { - snprintf(errormessage, SIZ, - "Can't start: no port number specified." - ); - syslog(LOG_ALERT, "%s\n", errormessage); + snprintf(errormessage, SIZ, "Can't start: no port number specified."); + syslog(LOG_ALERT, "%s", errormessage); return (-1); } sin6.sin6_port = htons((u_short) port_number); @@ -267,7 +237,7 @@ int ctdl_tcp_server(char *ip_addr, int port_number, int queue_len, char *errorme snprintf(errormessage, SIZ, "Can't create a listening socket: %s", strerror(errno) ); - syslog(LOG_ALERT, "%s\n", errormessage); + syslog(LOG_ALERT, "%s", errormessage); return (-1); } /* Set some socket options that make sense. */ @@ -285,7 +255,7 @@ int ctdl_tcp_server(char *ip_addr, int port_number, int queue_len, char *errorme snprintf(errormessage, SIZ, "Can't bind: %s", strerror(errno) ); - syslog(LOG_ALERT, "%s\n", errormessage); + syslog(LOG_ALERT, "%s", errormessage); return (-1); } @@ -295,7 +265,7 @@ int ctdl_tcp_server(char *ip_addr, int port_number, int queue_len, char *errorme snprintf(errormessage, SIZ, "Can't listen: %s", strerror(errno) ); - syslog(LOG_ALERT, "%s\n", errormessage); + syslog(LOG_ALERT, "%s", errormessage); return (-1); } return (s); @@ -326,7 +296,7 @@ int ctdl_uds_server(char *sockpath, int queue_len, char *errormessage) snprintf(errormessage, SIZ, "citserver: can't unlink %s: %s", sockpath, strerror(errno) ); - syslog(LOG_EMERG, "%s\n", errormessage); + syslog(LOG_EMERG, "%s", errormessage); return(-1); } @@ -339,7 +309,7 @@ int ctdl_uds_server(char *sockpath, int queue_len, char *errormessage) snprintf(errormessage, SIZ, "citserver: Can't create a socket: %s", strerror(errno)); - syslog(LOG_EMERG, "%s\n", errormessage); + syslog(LOG_EMERG, "%s", errormessage); return(-1); } @@ -347,7 +317,7 @@ int ctdl_uds_server(char *sockpath, int queue_len, char *errormessage) snprintf(errormessage, SIZ, "citserver: Can't bind: %s", strerror(errno)); - syslog(LOG_EMERG, "%s\n", errormessage); + syslog(LOG_EMERG, "%s", errormessage); return(-1); } @@ -356,7 +326,7 @@ int ctdl_uds_server(char *sockpath, int queue_len, char *errormessage) snprintf(errormessage, SIZ, "citserver: Can't set socket to non-blocking: %s", strerror(errno)); - syslog(LOG_EMERG, "%s\n", errormessage); + syslog(LOG_EMERG, "%s", errormessage); close(s); return(-1); } @@ -365,7 +335,7 @@ int ctdl_uds_server(char *sockpath, int queue_len, char *errormessage) snprintf(errormessage, SIZ, "citserver: Can't listen: %s", strerror(errno)); - syslog(LOG_EMERG, "%s\n", errormessage); + syslog(LOG_EMERG, "%s", errormessage); return(-1); } @@ -433,6 +403,24 @@ static void flush_client_inbuf(void) } */ + +/* + * client_close() ... close the client socket + */ +void client_close(void) { + CitContext *CCC = CC; + + if (!CCC) return; + if (CCC->client_socket <= 0) return; + syslog(LOG_DEBUG, "Closing socket %d", CCC->client_socket); + + close(CCC->client_socket); + CCC->client_socket = -1 ; +} + + + + /* * client_write() ... Send binary data to the client. */ @@ -494,9 +482,11 @@ int client_write(const char *buf, int nbytes) if (select(1, NULL, &wset, NULL, NULL) == -1) { if (errno == EINTR) { - syslog(LOG_DEBUG, "client_write(%d bytes) select() interrupted.\n", nbytes-bytes_written); - if (CtdlThreadCheckStop()) { - CC->kill_me = 1; + syslog(LOG_DEBUG, "client_write(%d bytes) select() interrupted.", + nbytes-bytes_written + ); + if (server_shutting_down) { + CC->kill_me = KILLME_SELECT_INTERRUPTED; return (-1); } else { /* can't trust fd's and stuff so we need to re-create them */ @@ -504,26 +494,28 @@ int client_write(const char *buf, int nbytes) } } else { syslog(LOG_ERR, - "client_write(%d bytes) select failed: %s (%d)\n", + "client_write(%d bytes) select failed: %s (%d)", nbytes - bytes_written, - strerror(errno), errno); + strerror(errno), errno + ); cit_backtrace(); - Ctx->kill_me = 1; + client_close(); + Ctx->kill_me = KILLME_SELECT_FAILED; return -1; } } } - retval = write(Ctx->client_socket, &buf[bytes_written], - nbytes - bytes_written); + retval = write(Ctx->client_socket, &buf[bytes_written], nbytes - bytes_written); if (retval < 1) { syslog(LOG_ERR, - "client_write(%d bytes) failed: %s (%d)\n", + "client_write(%d bytes) failed: %s (%d)", nbytes - bytes_written, - strerror(errno), errno); + strerror(errno), errno + ); cit_backtrace(); - // syslog(LOG_DEBUG, "Tried to send: %s", &buf[bytes_written]); - Ctx->kill_me = 1; + client_close(); + Ctx->kill_me = KILLME_WRITE_FAILED; return -1; } bytes_written = bytes_written + retval; @@ -591,9 +583,7 @@ int client_read_blob(StrBuf *Target, int bytes, int timeout) #endif retval = client_read_sslblob(Target, bytes, timeout); if (retval < 0) { - syslog(LOG_CRIT, - "%s failed\n", - __FUNCTION__); + syslog(LOG_CRIT, "%s failed", __FUNCTION__); } #ifdef BIGBAD_IODBG snprintf(fn, SIZ, "/tmp/foolog_%s.%d", CCC->ServiceName, CCC->cs_pid); @@ -636,10 +626,8 @@ int client_read_blob(StrBuf *Target, int bytes, int timeout) O_TERM, &Error); if (retval < 0) { - syslog(LOG_CRIT, - "%s failed: %s\n", - __FUNCTION__, - Error); + syslog(LOG_CRIT, "%s failed: %s\n", __FUNCTION__, Error); + client_close(); return retval; } #ifdef BIGBAD_IODBG @@ -650,8 +638,6 @@ int client_read_blob(StrBuf *Target, int bytes, int timeout) StrLength(Target)); rv = fwrite(ChrPtr(Target), StrLength(Target), 1, fd); fprintf(fd, "]\n"); - - fclose(fd); #endif } @@ -744,10 +730,10 @@ int client_read_to(char *buf, int bytes, int timeout) int HaveMoreLinesWaiting(CitContext *CCC) { - if ((CCC->kill_me == 1) || ( - (CCC->RecvBuf.ReadWritePointer == NULL) && - (StrLength(CCC->RecvBuf.Buf) == 0) && - (CCC->client_socket != -1)) ) + if ((CCC->kill_me != 0) || + ( (CCC->RecvBuf.ReadWritePointer == NULL) && + (StrLength(CCC->RecvBuf.Buf) == 0) && + (CCC->client_socket != -1)) ) return 0; else return 1; @@ -1148,32 +1134,7 @@ int convert_login(char NameToConvert[]) { /* * This loop just keeps going and going and going... */ -/* - * FIXME: - * This current implimentation of worker_thread creates a bottle neck in several situations - * The first thing to remember is that a single thread can handle more than one connection at a time. - * More threads mean less memory for the system to run in. - * So for efficiency we want every thread to be doing something useful or waiting in the main loop for - * something to happen anywhere. - * This current implimentation requires worker threads to wait in other locations, after it has - * been committed to a single connection which is very wasteful. - * As an extreme case consider this: - * A slow client connects and this slow client sends only one character each second. - * With this current implimentation a single worker thread is dispatched to handle that connection - * until such times as the client timeout expires, an error occurs on the socket or the client - * completes its transmission. - * THIS IS VERY BAD since that thread could have handled a read from many more clients in each one - * second interval between chars. - * - * It is my intention to re-write this code and the associated client_getln, client_read functions - * to allow any thread to read data on behalf of any connection (context). - * To do this I intend to have this main loop read chars into a buffer stored in the context. - * Once the correct criteria for a full buffer is met then we will dispatch a thread to - * process it. - * This worker thread loop also needs to be able to handle binary data. - */ - -void *worker_thread(void *arg) { +void *worker_thread(void *blah) { int highest; CitContext *ptr; CitContext *bind_me = NULL; @@ -1181,9 +1142,10 @@ void *worker_thread(void *arg) { int retval = 0; struct timeval tv; int force_purge = 0; - - while (!CtdlThreadCheckStop()) { + ++num_workers; + + while (!server_shutting_down) { /* make doubly sure we're not holding any stale db handles * which might cause a deadlock. @@ -1198,18 +1160,17 @@ do_select: force_purge = 0; begin_critical_section(S_SESSION_TABLE); for (ptr = ContextList; ptr != NULL; ptr = ptr->next) { - int client_socket; if ((ptr->state == CON_SYS) && (ptr->client_socket == 0)) continue; - client_socket = ptr->client_socket; - /* Dont select on dead sessions only truly idle ones */ - if ((ptr->state == CON_IDLE) && - (CC->kill_me == 0) && - (client_socket > 0)) - { - FD_SET(client_socket, &readfds); - if (client_socket > highest) - highest = client_socket; + + /* Don't select on dead sessions, only truly idle ones */ + if ( (ptr->state == CON_IDLE) + && (ptr->kill_me == 0) + && (ptr->client_socket > 0) + ) { + FD_SET(ptr->client_socket, &readfds); + if (ptr->client_socket > highest) + highest = ptr->client_socket; } if ((bind_me == NULL) && (ptr->state == CON_READY)) { bind_me = ptr; @@ -1233,37 +1194,37 @@ do_select: force_purge = 0; * ahead and get ready to select(). */ - if (!CtdlThreadCheckStop()) { + if (!server_shutting_down) { tv.tv_sec = 1; /* wake up every second if no input */ tv.tv_usec = 0; - retval = CtdlThreadSelect(highest + 1, &readfds, NULL, NULL, &tv); + retval = select(highest + 1, &readfds, NULL, NULL, &tv); } - else + else { return NULL; + } /* Now figure out who made this select() unblock. * First, check for an error or exit condition. */ if (retval < 0) { if (errno == EBADF) { - syslog(LOG_NOTICE, "select() failed: (%s)\n", - strerror(errno)); + syslog(LOG_NOTICE, "select() failed: (%s)\n", strerror(errno)); goto do_select; } if (errno != EINTR) { syslog(LOG_EMERG, "Exiting (%s)\n", strerror(errno)); - CtdlThreadStopAll(); + server_shutting_down = 1; continue; } else { #if 0 - syslog(LOG_DEBUG, "Interrupted CtdlThreadSelect.\n"); + syslog(LOG_DEBUG, "Interrupted select()\n"); #endif - if (CtdlThreadCheckStop()) return(NULL); + if (server_shutting_down) return(NULL); goto do_select; } } - else if(retval == 0) { - if (CtdlThreadCheckStop()) return(NULL); + else if (retval == 0) { + if (server_shutting_down) return(NULL); } /* It must be a client socket. Find a context that has data @@ -1300,6 +1261,7 @@ do_select: force_purge = 0; SKIP_SELECT: /* We're bound to a session */ + ++active_workers; if (bind_me != NULL) { become_session(bind_me); @@ -1333,8 +1295,11 @@ SKIP_SELECT: dead_session_purge(force_purge); do_housekeeping(); + --active_workers; } - /* If control reaches this point, the server is shutting down */ + + /* If control reaches this point, the server is shutting down */ + --num_workers; return(NULL); } @@ -1346,23 +1311,23 @@ SKIP_SELECT: * In other words it handles new connections. * It is a thread. */ -void *select_on_master (void *arg) +void *select_on_master(void *blah) { struct ServiceFunctionHook *serviceptr; fd_set master_fds; int highest; struct timeval tv; int ssock; /* Descriptor for client socket */ - CitContext *con= NULL; /* Temporary context pointer */ + CitContext *con = NULL; /* Temporary context pointer */ int m; int i; int retval; struct CitContext select_on_master_CC; CtdlFillSystemContext(&select_on_master_CC, "select_on_master"); - citthread_setspecific(MyConKey, (void *)&select_on_master_CC); + pthread_setspecific(MyConKey, (void *)&select_on_master_CC); - while (!CtdlThreadCheckStop()) { + while (!server_shutting_down) { /* Initialize the fdset. */ FD_ZERO(&master_fds); highest = 0; @@ -1377,10 +1342,10 @@ void *select_on_master (void *arg) } } - if (!CtdlThreadCheckStop()) { + if (!server_shutting_down) { tv.tv_sec = 60; /* wake up every second if no input */ tv.tv_usec = 0; - retval = CtdlThreadSelect(highest + 1, &master_fds, NULL, NULL, &tv); + retval = select(highest + 1, &master_fds, NULL, NULL, &tv); } else return NULL; @@ -1396,17 +1361,17 @@ void *select_on_master (void *arg) } if (errno != EINTR) { syslog(LOG_EMERG, "Exiting (%s)\n", strerror(errno)); - CtdlThreadStopAll(); + server_shutting_down = 1; } else { #if 0 syslog(LOG_DEBUG, "Interrupted CtdlThreadSelect.\n"); #endif - if (CtdlThreadCheckStop()) return(NULL); + if (server_shutting_down) return(NULL); continue; } } else if(retval == 0) { - if (CtdlThreadCheckStop()) return(NULL); + if (server_shutting_down) return(NULL); continue; } /* Next, check to see if it's a new client connecting @@ -1418,9 +1383,7 @@ void *select_on_master (void *arg) if (FD_ISSET(serviceptr->msock, &master_fds)) { ssock = accept(serviceptr->msock, NULL, 0); if (ssock >= 0) { - syslog(LOG_DEBUG, - "New client socket %d\n", - ssock); + syslog(LOG_DEBUG, "New client socket %d\n", ssock); /* The master socket is non-blocking but the client * sockets need to be blocking, otherwise certain @@ -1439,26 +1402,20 @@ void *select_on_master (void *arg) /* Assign our new socket number to it. */ con->client_socket = ssock; - con->h_command_function = - serviceptr->h_command_function; - con->h_async_function = - serviceptr->h_async_function; + con->h_command_function = serviceptr->h_command_function; + con->h_async_function = serviceptr->h_async_function; con->h_greeting_function = serviceptr->h_greeting_function; - con->ServiceName = - serviceptr->ServiceName; + con->ServiceName = serviceptr->ServiceName; /* Determine whether it's a local socket */ - if (serviceptr->sockpath != NULL) + if (serviceptr->sockpath != NULL) { con->is_local_socket = 1; + } /* Set the SO_REUSEADDR socket option */ i = 1; - setsockopt(ssock, SOL_SOCKET, - SO_REUSEADDR, - &i, sizeof(i)); - + setsockopt(ssock, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i)); con->state = CON_GREETING; - retval--; if (retval == 0) break; @@ -1511,112 +1468,3 @@ int SyslogFacility(char *name) } return LOG_DAEMON; } - - -/********** MEM CHEQQER ***********/ - -#ifdef DEBUG_MEMORY_LEAKS - -#undef malloc -#undef realloc -#undef strdup -#undef free - -void *tracked_malloc(size_t size, char *file, int line) { - struct igheap *thisheap; - void *block; - - block = malloc(size); - if (block == NULL) return(block); - - thisheap = malloc(sizeof(struct igheap)); - if (thisheap == NULL) { - free(block); - return(NULL); - } - - thisheap->block = block; - strcpy(thisheap->file, file); - thisheap->line = line; - - begin_critical_section(S_DEBUGMEMLEAKS); - thisheap->next = igheap; - igheap = thisheap; - end_critical_section(S_DEBUGMEMLEAKS); - - return(block); -} - - -void *tracked_realloc(void *ptr, size_t size, char *file, int line) { - struct igheap *thisheap; - void *block; - - block = realloc(ptr, size); - if (block == NULL) return(block); - - thisheap = malloc(sizeof(struct igheap)); - if (thisheap == NULL) { - free(block); - return(NULL); - } - - thisheap->block = block; - strcpy(thisheap->file, file); - thisheap->line = line; - - begin_critical_section(S_DEBUGMEMLEAKS); - thisheap->next = igheap; - igheap = thisheap; - end_critical_section(S_DEBUGMEMLEAKS); - - return(block); -} - - - -void tracked_free(void *ptr) { - struct igheap *thisheap; - struct igheap *trash; - - free(ptr); - - if (igheap == NULL) return; - begin_critical_section(S_DEBUGMEMLEAKS); - for (thisheap = igheap; thisheap != NULL; thisheap = thisheap->next) { - if (thisheap->next != NULL) { - if (thisheap->next->block == ptr) { - trash = thisheap->next; - thisheap->next = thisheap->next->next; - free(trash); - } - } - } - if (igheap->block == ptr) { - trash = igheap; - igheap = igheap->next; - free(trash); - } - end_critical_section(S_DEBUGMEMLEAKS); -} - -char *tracked_strdup(const char *s, char *file, int line) { - char *ptr; - - if (s == NULL) return(NULL); - ptr = tracked_malloc(strlen(s) + 1, file, line); - if (ptr == NULL) return(NULL); - strncpy(ptr, s, strlen(s)); - return(ptr); -} - -void dump_heap(void) { - struct igheap *thisheap; - - for (thisheap = igheap; thisheap != NULL; thisheap = thisheap->next) { - syslog(LOG_CRIT, "UNFREED: %30s : %d\n", - thisheap->file, thisheap->line); - } -} - -#endif /* DEBUG_MEMORY_LEAKS */