From fa1d6a0b8bfbad090a3e5f7f5808524e1db2ace5 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Mon, 14 Sep 2009 17:11:12 +0000 Subject: [PATCH] * When spawning another worker thread, indicate the new size of the thread pool * Removed some of the old doxygen markup from webcit.h * Silenced some of the warn_unused_result warnings that can't be turned off in certain OS's --- webcit/context_loop.c | 27 +++---- webcit/crypto.c | 10 ++- webcit/webcit.h | 180 +++++++++++++++++++++--------------------- webcit/webserver.c | 29 +++---- 4 files changed, 124 insertions(+), 122 deletions(-) diff --git a/webcit/context_loop.c b/webcit/context_loop.c index 9c1dde0af..b728b268b 100644 --- a/webcit/context_loop.c +++ b/webcit/context_loop.c @@ -15,12 +15,13 @@ /* Only one thread may manipulate SessionList at a time... */ pthread_mutex_t SessionListMutex; -wcsession *SessionList = NULL; /**< our sessions ????*/ +wcsession *SessionList = NULL; /* Linked list of all webcit sessions */ -pthread_key_t MyConKey; /**< TSD key for MySession() */ +pthread_key_t MyConKey; /* TSD key for MySession() */ HashList *HttpReqTypes = NULL; HashList *HttpHeaderHandler = NULL; extern HashList *HandlerHash; +int num_threads = 1; /* Number of worker threads. Start at 1 because the parent counts. */ void DestroyHttpHeaderHandler(void *V) { @@ -44,9 +45,8 @@ void do_housekeeping(void) wcsession *sptr, *ss; wcsession *sessions_to_kill = NULL; int num_sessions = 0; - static int num_threads = MIN_WORKER_THREADS; - /** + /* * Lock the session list, moving any candidates for euthanasia into * a separate list. */ @@ -55,13 +55,12 @@ void do_housekeeping(void) for (sptr = SessionList; sptr != NULL; sptr = sptr->next) { ++num_sessions; - /** Kill idle sessions */ - if ((time(NULL) - (sptr->lastreq)) > - (time_t) WEBCIT_TIMEOUT) { + /* Kill idle sessions */ + if ((time(NULL) - (sptr->lastreq)) > (time_t) WEBCIT_TIMEOUT) { sptr->killthis = 1; } - /** Remove sessions flagged for kill */ + /* Remove sessions flagged for kill */ if (sptr->killthis) { /** remove session from linked list */ @@ -80,7 +79,7 @@ void do_housekeeping(void) } pthread_mutex_unlock(&SessionListMutex); - /** + /* * Now free up and destroy the culled sessions. */ while (sessions_to_kill != NULL) { @@ -94,14 +93,12 @@ void do_housekeeping(void) --num_sessions; } - /** + /* * If there are more sessions than threads, then we should spawn * more threads ... up to a predefined maximum. */ - while ( (num_sessions > num_threads) - && (num_threads <= MAX_WORKER_THREADS) ) { + while ( (num_sessions > num_threads) && (num_threads <= MAX_WORKER_THREADS) ) { spawn_another_worker_thread(); - ++num_threads; lprintf(3, "There are %d sessions and %d threads active.\n", num_sessions, num_threads); } @@ -227,8 +224,8 @@ wcsession *CreateSession(int Lockable, wcsession **wclist, ParsedHttpHdrs *Hdr, } -/** - * \brief Detects a 'mobile' user agent +/* + * Detects a 'mobile' user agent */ int is_mobile_ua(char *user_agent) { if (strstr(user_agent,"iPhone OS") != NULL) { diff --git a/webcit/crypto.c b/webcit/crypto.c index a09a69b77..8f89948a1 100644 --- a/webcit/crypto.c +++ b/webcit/crypto.c @@ -52,6 +52,7 @@ void init_ssl(void) X509_NAME *name = NULL; FILE *fp; char buf[SIZ]; + int rv = 0; if (!access("/var/run/egd-pool", F_OK)) { RAND_egd("/var/run/egd-pool"); @@ -114,11 +115,14 @@ void init_ssl(void) */ if (!strcasecmp(ctdlhost, "uds")) { sprintf(buf, "%s/keys/citadel.key", ctdlport); - symlink(buf, CTDL_KEY_PATH); + rv = symlink(buf, CTDL_KEY_PATH); + if (!rv) lprintf(1, "%s\n", strerror(errno)); sprintf(buf, "%s/keys/citadel.csr", ctdlport); - symlink(buf, CTDL_CSR_PATH); + rv = symlink(buf, CTDL_CSR_PATH); + if (!rv) lprintf(1, "%s\n", strerror(errno)); sprintf(buf, "%s/keys/citadel.cer", ctdlport); - symlink(buf, CTDL_CER_PATH); + rv = symlink(buf, CTDL_CER_PATH); + if (!rv) lprintf(1, "%s\n", strerror(errno)); } /* diff --git a/webcit/webcit.h b/webcit/webcit.h index f370c9298..4142cf15f 100644 --- a/webcit/webcit.h +++ b/webcit/webcit.h @@ -240,16 +240,16 @@ /* - * \brief Linked list of session variables encoded in an x-www-urlencoded content type + * Linked list of session variables encoded in an x-www-urlencoded content type */ typedef struct urlcontent urlcontent; struct urlcontent { - char url_key[32]; /* the variable name */ - StrBuf *url_data; /* its value */ + char url_key[32]; /* key */ + StrBuf *url_data; /* value */ }; /* - * \brief information about us ??? + * Information about the Citadel server to which we are connected */ typedef struct _serv_info { int serv_pid; /* Process ID of the Citadel server */ @@ -261,7 +261,6 @@ typedef struct _serv_info { StrBuf *serv_bbs_city; /* Geographic location of the Citadel server */ StrBuf *serv_sysadm; /* Name of system administrator */ StrBuf *serv_moreprompt; /* Whats the commandline textprompt */ - int serv_ok_floors; /* nonzero == server supports floors */ int serv_supports_ldap; /* is the server linked against an ldap tree for adresses? */ int serv_newuser_disabled; /* Has the server disabled self-service new user creation? */ StrBuf *serv_default_cal_zone; /* Default timezone for unspecified calendar items */ @@ -298,8 +297,8 @@ typedef struct _IcalEnumMap { * which we can use to get to the real meat and bones later) */ typedef struct _addrbookent { - char ab_name[64]; /**< name string */ - long ab_msgnum; /**< message number of address book entry */ + char ab_name[64]; /* name string */ + long ab_msgnum; /* message number of address book entry */ } addrbookent; @@ -362,7 +361,7 @@ const char *ReqStrs[eNONE]; typedef struct _HdrRefs { - long eReqType; /**< eGET, ePOST.... */ + long eReqType; /* HTTP method */ int desired_session; int SessionKey; @@ -370,7 +369,7 @@ typedef struct _HdrRefs { int DontNeedAuth; long ContentLength; time_t if_modified_since; - int gzip_ok; /**< Nonzero if Accept-encoding: gzip */ + int gzip_ok; /* Nonzero if Accept-encoding: gzip */ int prohibit_caching; int dav_depth; @@ -378,7 +377,7 @@ typedef struct _HdrRefs { StrBuf *ContentType; StrBuf *RawCookie; StrBuf *ReqLine; - StrBuf *http_host; /**< HTTP Host: header */ + StrBuf *http_host; /* HTTP Host: header */ StrBuf *browser_host; StrBuf *user_agent; StrBuf *plainauth; @@ -388,7 +387,7 @@ typedef struct _HdrRefs { } HdrRefs; typedef struct _ParsedHttpHdrs { - int http_sock; /**< HTTP server socket */ + int http_sock; /* HTTP server socket */ const char *Pos; StrBuf *ReadBuf; @@ -396,12 +395,12 @@ typedef struct _ParsedHttpHdrs { StrBuf *c_password; StrBuf *c_roomname; StrBuf *c_language; - StrBuf *this_page; /**< URL of current page */ + StrBuf *this_page; /* URL of current page */ StrBuf *PlainArgs; - HashList *urlstrings; /**< variables passed to webcit in a URL */ - HashList *HTTPHeaders; /**< the headers the client sent us */ - int nWildfireHeaders; /**< how many wildfire headers did we already send? */ + HashList *urlstrings; /* variables passed to webcit in a URL */ + HashList *HTTPHeaders; /* the headers the client sent us */ + int nWildfireHeaders; /* how many wildfire headers did we already send? */ HdrRefs HR; } ParsedHttpHdrs; @@ -414,111 +413,111 @@ typedef struct _ParsedHttpHdrs { typedef struct wcsession wcsession; struct wcsession { /* infrastructural members */ - wcsession *next; /**< Linked list */ - pthread_mutex_t SessionMutex; /**< mutex for exclusive access */ - int wc_session; /**< WebCit session ID */ - int killthis; /**< Nonzero == purge this session */ - int is_mobile; /**< Client is a handheld browser */ - int ctdl_pid; /**< Session ID on the Citadel server */ - int nonce; /**< session nonce (to prevent session riding) */ + wcsession *next; /* Linked list */ + pthread_mutex_t SessionMutex; /* mutex for exclusive access */ + int wc_session; /* WebCit session ID */ + int killthis; /* Nonzero == purge this session */ + int is_mobile; /* Client is a handheld browser */ + int ctdl_pid; /* Session ID on the Citadel server */ + int nonce; /* session nonce (to prevent session riding) */ int SessionKey; /* Session local Members */ - int serv_sock; /**< Client socket to Citadel server */ - StrBuf *ReadBuf; /**< here we keep our stuff while reading linebuffered from the server. */ - StrBuf *MigrateReadLineBuf; /**< here we buffer legacy server read stuff */ - const char *ReadPos; /**< whats our read position in ReadBuf? */ - int chat_sock; /**< Client socket to Citadel server - for chat */ - time_t lastreq; /**< Timestamp of most recent HTTP */ - time_t last_pager_check; /**< last time we polled for instant msgs */ - ServInfo *serv_info; /**< Iformation about the citserver we're connected to */ - int is_ajax; /** < are we doing an ajax request? */ + int serv_sock; /* Client socket to Citadel server */ + StrBuf *ReadBuf; /* here we keep our stuff while reading linebuffered from the server. */ + StrBuf *MigrateReadLineBuf; /* here we buffer legacy server read stuff */ + const char *ReadPos; /* whats our read position in ReadBuf? */ + int chat_sock; /* Client socket to Citadel server - for chat */ + time_t lastreq; /* Timestamp of most recent HTTP */ + time_t last_pager_check; /* last time we polled for instant msgs */ + ServInfo *serv_info; /* Information about the citserver we're connected to */ + int is_ajax; /* are we doing an ajax request? */ /* Request local Members */ - StrBuf *CLineBuf; /**< linebuffering client stuff */ + StrBuf *CLineBuf; /* linebuffering client stuff */ ParsedHttpHdrs *Hdr; - StrBuf *WBuf; /**< Our output buffer */ - StrBuf *HBuf; /**< Our HeaderBuffer */ + StrBuf *WBuf; /* Our output buffer */ + StrBuf *HBuf; /* Our HeaderBuffer */ - HashList *vars; /**< HTTP variable substitutions for this page */ - StrBuf *trailing_javascript; /**< extra javascript to be appended to page */ - char ImportantMessage[SIZ]; /**< ??? todo */ + HashList *vars; /* HTTP variable substitutions for this page */ + StrBuf *trailing_javascript; /* extra javascript to be appended to page */ + char ImportantMessage[SIZ]; StrBuf *ImportantMsg; - HashList *Directory; /**< Parts of the directory URL in snippets */ + HashList *Directory; /* Parts of the directory URL in snippets */ /* accounting */ - StrBuf *wc_username; /**< login name of current user */ - StrBuf *wc_fullname; /**< Screen name of current user */ - StrBuf *wc_password; /**< Password of current user */ - StrBuf *httpauth_pass; /**< only for GroupDAV sessions */ - int axlevel; /**< this user's access level */ - int is_aide; /**< nonzero == this user is an Aide */ - int is_room_aide; /**< nonzero == this user is a Room Aide in this room */ - int connected; /**< nonzero == we are connected to Citadel */ - int logged_in; /**< nonzero == we are logged in */ - int need_regi; /**< This user needs to register. */ - int need_vali; /**< New users require validation. */ + StrBuf *wc_username; /* login name of current user */ + StrBuf *wc_fullname; /* Screen name of current user */ + StrBuf *wc_password; /* Password of current user */ + StrBuf *httpauth_pass; /* only for GroupDAV sessions */ + int axlevel; /* this user's access level */ + int is_aide; /* nonzero == this user is an Aide */ + int is_room_aide; /* nonzero == this user is a Room Aide in this room */ + int connected; /* nonzero == we are connected to Citadel */ + int logged_in; /* nonzero == we are logged in */ + int need_regi; /* This user needs to register. */ + int need_vali; /* New users require validation. */ /* Preferences */ - StrBuf *cs_inet_email; /**< User's preferred Internet addr. */ - char reply_to[512]; /**< reply-to address */ - HashList *hash_prefs; /**< WebCit preferences for this user */ - StrBuf *DefaultCharset; /**< Charset the user preferes */ - int downloaded_prefs; /** Has the client download its prefs yet? */ - int SavePrefsToServer; /**< Should we save our preferences to the server at the end of the request? */ - int selected_language; /**< Language selected by user */ - int time_format_cache; /**< which timeformat does our user like? */ + StrBuf *cs_inet_email; /* User's preferred Internet addr. */ + char reply_to[512]; /* reply-to address */ + HashList *hash_prefs; /* WebCit preferences for this user */ + StrBuf *DefaultCharset; /* Charset the user preferes */ + int downloaded_prefs; /* Has the client download its prefs yet? */ + int SavePrefsToServer; /* Should we save our preferences to the server at the end of the request? */ + int selected_language; /* Language selected by user */ + int time_format_cache; /* which timeformat does our user like? */ /* current room related */ - StrBuf *wc_roomname; /**< Room we are currently in */ - unsigned room_flags; /**< flags associated with the current room */ - unsigned room_flags2; /**< flags associated with the current room */ - int wc_view; /**< view for the current room */ - int wc_default_view; /**< default view for the current room */ - int wc_is_trash; /**< nonzero == current room is a Trash folder */ - int wc_floor; /**< floor number of current room */ - int is_mailbox; /**< the current room is a private mailbox */ + StrBuf *wc_roomname; /* Room we are currently in */ + unsigned room_flags; /* flags associated with the current room */ + unsigned room_flags2; /* flags associated with the current room */ + int wc_view; /* view for the current room */ + int wc_default_view; /* default view for the current room */ + int wc_is_trash; /* nonzero == current room is a Trash folder */ + int wc_floor; /* floor number of current room */ + int is_mailbox; /* the current room is a private mailbox */ /* next/previous room thingabob */ - struct march *march; /**< march mode room list */ - char ugname[128]; /**< where does 'ungoto' take us */ - long uglsn; /**< last seen message number for ungoto */ + struct march *march; /* march mode room list */ + char ugname[128]; /* where does 'ungoto' take us */ + long uglsn; /* last seen message number for ungoto */ /* Uploading; mime attachments for composing messages */ - HashList *attachments; /**< list of attachments for 'enter message' */ - int upload_length; /**< content length of http-uploaded data */ - StrBuf *upload; /**< pointer to http-uploaded data */ - char upload_filename[PATH_MAX]; /**< filename of http-uploaded data */ - char upload_content_type[256]; /**< content type of http-uploaded data */ + HashList *attachments; /* list of attachments for 'enter message' */ + int upload_length; /* content length of http-uploaded data */ + StrBuf *upload; /* pointer to http-uploaded data */ + char upload_filename[PATH_MAX]; /* filename of http-uploaded data */ + char upload_content_type[256]; /* content type of http-uploaded data */ - int new_mail; /**< user has new mail waiting */ - int remember_new_mail; /**< last count of new mail messages */ + int new_mail; /* user has new mail waiting */ + int remember_new_mail; /* last count of new mail messages */ /* Roomiew control */ - HashList *Floors; /**< floors our citserver has... */ - HashList *summ; /**< list of messages for mailbox summary view */ + HashList *Floors; /* floors our citserver has... */ + HashList *summ; /* list of messages for mailbox summary view */ /** Perhaps these should be within a struct instead */ - long startmsg; /**< message number to start at */ - long maxmsgs; /**< maximum messages to display */ - long num_displayed; /**< number of messages actually displayed */ - HashList *disp_cal_items; /**< sorted list of calendar items; startdate is the sort criteria. */ + long startmsg; /* message number to start at */ + long maxmsgs; /* maximum messages to display */ + long num_displayed; /* number of messages actually displayed */ + HashList *disp_cal_items; /* sorted list of calendar items; startdate is the sort criteria. */ - char last_chat_user[256]; /**< ??? todo */ + char last_chat_user[256]; /* Iconbar controls */ - struct __ofolder *cache_fold; /**< cache the iconbar room list */ - int cache_max_folders; /**< ??? todo */ - int cache_num_floors; /**< ??? todo */ - time_t cache_timestamp; /**< ??? todo */ - HashList *IconBarSettings; /**< which icons should be shown / not shown? */ - const StrBuf *floordiv_expanded; /**< which floordiv currently expanded */ + struct __ofolder *cache_fold; /* cache the iconbar room list */ + int cache_max_folders; + int cache_num_floors; + time_t cache_timestamp; + HashList *IconBarSettings; /* which icons should be shown / not shown? */ + const StrBuf *floordiv_expanded; /* which floordiv currently expanded */ /* cache stuff for templates. TODO: find a smartrer way */ - HashList *ServCfg; /**< cache our server config for editing */ - HashList *InetCfg; /**< Our inet server config for editing */ + HashList *ServCfg; /* cache our server config for editing */ + HashList *InetCfg; /* Our inet server config for editing */ }; @@ -568,6 +567,7 @@ extern int is_https; extern int setup_wizard; extern char wizard_filename[]; extern int follow_xff; +extern int num_threads; void InitialiseSemaphores(void); void begin_critical_section(int which_one); diff --git a/webcit/webserver.c b/webcit/webserver.c index fa02e2dd4..81f4ac837 100644 --- a/webcit/webserver.c +++ b/webcit/webserver.c @@ -99,11 +99,10 @@ void graceful_shutdown_watcher(int signum) { */ pid_t current_child; void graceful_shutdown(int signum) { - char wd[SIZ]; FILE *FD; int fd; - getcwd(wd, SIZ); - lprintf (1, "bye going down gracefull.[%d][%s]\n", signum, wd); + + lprintf (1, "WebCit is being shut down on signal %d.\n", signum); fd = msock; msock = -1; time_to_die = 1; @@ -123,6 +122,8 @@ void start_daemon(char *pid_file) pid_t child = 0; FILE *fp; int do_restart = 0; + int rv; + FILE *rvfp = NULL; current_child = 0; @@ -130,7 +131,7 @@ void start_daemon(char *pid_file) * We don't just call close() because we don't want these fd's * to be reused for other files. */ - chdir("/"); + rv = chdir("/"); signal(SIGHUP, SIG_IGN); signal(SIGINT, SIG_IGN); @@ -143,9 +144,9 @@ void start_daemon(char *pid_file) setsid(); umask(0); - freopen("/dev/null", "r", stdin); - freopen("/dev/null", "w", stdout); - freopen("/dev/null", "w", stderr); + rvfp = freopen("/dev/null", "r", stdin); + rvfp = freopen("/dev/null", "w", stdout); + rvfp = freopen("/dev/null", "w", stderr); signal(SIGTERM, graceful_shutdown_watcher); signal(SIGHUP, graceful_shutdown_watcher); @@ -219,16 +220,15 @@ void spawn_another_worker_thread() pthread_attr_t attr; /* Thread attributes */ int ret; - lprintf(3, "Creating a new thread\n"); + lprintf(3, "Creating a new thread. Pool size is now %d\n", ++num_threads); /* set attributes for the new thread */ pthread_attr_init(&attr); pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); /* - * Our per-thread stacks need to be bigger than the default size, otherwise - * the MIME parser crashes on FreeBSD, and the IMAP service crashes on - * 64-bit Linux. + * Our per-thread stacks need to be bigger than the default size, + * otherwise the MIME parser crashes on FreeBSD. */ if ((ret = pthread_attr_setstacksize(&attr, 1024 * 1024))) { lprintf(1, "pthread_attr_setstacksize: %s\n", @@ -331,6 +331,7 @@ int main(int argc, char **argv) const char *basedir = NULL; char uds_listen_path[PATH_MAX]; /* listen on a unix domain socket? */ const char *I18nDumpFile = NULL; + FILE *rvfp = NULL; WildFireInitBacktrace(argv[0], 2); @@ -393,9 +394,9 @@ int main(int argc, char **argv) break; case 't': safestrncpy(tracefile, optarg, sizeof tracefile); - freopen(tracefile, "w", stdout); - freopen(tracefile, "w", stderr); - freopen(tracefile, "r", stdin); + rvfp = freopen(tracefile, "w", stdout); + rvfp = freopen(tracefile, "w", stderr); + rvfp = freopen(tracefile, "r", stdin); break; case 'T': LoadTemplates = atoi(optarg); -- 2.30.2