* some of the shiny new citadel optimized functions

* terminate well for gprof

diff --git a/webcit/configure.ac b/webcit/configure.ac
index ce25377fa5b93239ded74a0ffcb05dfeb3dca5d8..992c4321a4fc1ca3c235aecb5782d87da0fd2f37 100644 (file)
--- a/webcit/configure.ac
+++ b/webcit/configure.ac
@@ -94,7 +94,7 @@ dnl AC_HEADER_TIME
 dnl Checks for library functions.
 AC_TYPE_SIGNAL
 dnl AC_FUNC_VPRINTF
-dnl AC_CHECK_FUNCS(strerror)
+AC_CHECK_FUNCS(backtrace)
 AC_REPLACE_FUNCS(snprintf)
 
 dnl Checks for the libical calendaring library.

diff --git a/webcit/tools.c b/webcit/tools.c
index f83a7d863bf60360d99fef3fe986a869b48a1909..6ee7f3cbe0e1e2acdf201e7a53fcda87f74610cb 100644 (file)
--- a/webcit/tools.c
+++ b/webcit/tools.c
@@ -187,13 +187,14 @@ long extract_long(const char *source, int parmnum)
  * \param ch the char to search
  * \return the position inside of st
  */
-int haschar(char *st,char ch)
+int haschar(const char *st,char ch)
 {
-       int a, b, len;
+       const char *ptr;
+       int b;
        b = 0;
-       len = strlen(st);
-       for (a = 0; a < len; ++a)
-               if (st[a] == ch)
+       ptr = st;
+       while (!IsEmptyStr(ptr))
+               if (*ptr == ch)
                        ++b;
        return (b);
 }
@@ -213,15 +214,13 @@ char *memreadline(char *start, char *buf, int maxlen)
        int len = 0;            /**< tally our own length to avoid strlen() delays */
 
        ptr = start;
-       memset(buf, 0, maxlen);
-
        while (1) {
                ch = *ptr++;
                if ((len + 1 < (maxlen)) && (ch != 13) && (ch != 10)) {
                        buf[len++] = ch;
-                       buf[len] = 0;
                }
                if ((ch == 10) || (ch == 0)) {
+                       buf[len] = 0;
                        return ptr;
                }
        }

diff --git a/webcit/webcit.h b/webcit/webcit.h
index 741003e695743812c8ac45bbcd6d3957f4c2a89c..3068770abf922e93105ddfe84533c08eac6cebf7 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -498,7 +498,7 @@ void stripout(char *str, char leftboundary, char rightboundary);
 void dump_vars(void);
 void embed_main_menu(void);
 void serv_read(char *buf, int bytes);
-int haschar(char *, char);
+int haschar(const char *, char);
 void readloop(char *oper);
 void read_message(long msgnum, int printable_view, char *section);
 void embed_message(char *msgnum_as_string);

diff --git a/webcit/webserver.c b/webcit/webserver.c
index b56e15bdd40a142ef65d355f96234632c8a7a9ac..07f8fad85cdc821604f6a44a67fbb1d30d01cc19 100644 (file)
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -25,6 +25,7 @@ int msock;                        /**< master listening socket */
 int is_https = 0;              /**< Nonzero if I am an HTTPS service */
 int follow_xff = 0;            /**< Follow X-Forwarded-For: header */
 int home_specified = 0; /**< did the user specify a homedir? */
+int time_to_die = 0;            /**< shold we shut down? */
 extern void *context_loop(int);
 extern void *housekeeping_loop(void);
 extern pthread_mutex_t SessionListMutex;
@@ -455,11 +456,24 @@ int client_getln(int sock, char *buf, int bufsiz)
  * param signum the signal we want to forward
  */
 pid_t current_child;
-void graceful_shutdown(int signum) {
+void graceful_shutdown_watcher(int signum) {
+       lprintf (1, "bye; shutting down watcher.");
        kill(current_child, signum);
        exit(0);
 }
 
+/**
+ * \brief shut us down the regular way.
+ * param signum the signal we want to forward
+ */
+pid_t current_child;
+void graceful_shutdown(int signum) {
+//     kill(current_child, signum);
+       lprintf (1, "bye going down gracefull.");
+       time_to_die = 1;
+       exit(0);
+}
+
 
 /**
  * \brief      Start running as a daemon.  
@@ -499,6 +513,7 @@ void start_daemon(char *pid_file)
        freopen("/dev/null", "r", stdin);
        freopen("/dev/null", "w", stdout);
        freopen("/dev/null", "w", stderr);
+       signal(SIGTERM, graceful_shutdown_watcher);
 
        do {
                current_child = fork();
@@ -511,7 +526,7 @@ void start_daemon(char *pid_file)
        
                else if (current_child == 0) {
                        signal(SIGTERM, graceful_shutdown);
-                       return; /* continue starting citadel. */
+                       return; /* continue starting webcit. */
                }
        
                else {
@@ -713,6 +728,9 @@ int main(int argc, char **argv)
        if (running_as_daemon) {
                start_daemon(pidfile);
        }
+       else {
+               signal(SIGTERM, graceful_shutdown);
+       }
 
        /** Tell 'em who's in da house */
        lprintf(1, SERVER "\n");
@@ -837,7 +855,6 @@ void worker_entry(void)
 {
        int ssock;
        int i = 0;
-       int time_to_die = 0;
        int fail_this_transaction = 0;
 
        do {
@@ -883,6 +900,7 @@ void worker_entry(void)
 
        } while (!time_to_die);
 
+       lprintf (1, "bye");
        pthread_exit(NULL);
 }