Changeset 886

Timestamp:

08/09/07 11:21:47 (1 year ago)

Author:

alo

Message:

--

Files:

• cherokee/trunk/ChangeLog (modified) (1 diff)
• cherokee/trunk/cherokee/Makefile.am (modified) (2 diffs)
• cherokee/trunk/cherokee/avl.h (modified) (1 diff)
• cherokee/trunk/cherokee/connection_info.c (modified) (3 diffs)
• cherokee/trunk/cherokee/handler_server_info.c (modified) (9 diffs)
• cherokee/trunk/cherokee/handler_server_info.h (modified) (1 diff)
• cherokee/trunk/cherokee/server.c (modified) (2 diffs)
• cherokee/trunk/cherokee/socket.c (modified) (8 diffs)
• cherokee/trunk/cherokee/virtual_server.c (modified) (2 diffs)
• cherokee/trunk/cherokee/virtual_server.h (modified) (2 diffs)

cherokee/trunk/ChangeLog

@@ +1 @@
+2007-08-08  Alvaro Lopez Ortega  <alvaro@alobbs.com>
+
+        * cherokee/connection_info.c (cherokee_connection_info_list_thread):
+        Now, it includes polling connections as well.
+
+        * cherokee/connection_info.c (cherokee_connection_info_fill_up):
+        Bug fixed. It was failing to generate the IP property; the buffer
+        had length after the IP was added.
+
+        * cherokee/handler_server_info.c, cherokee/handler_server_info.h:
+        Added an additional configuration parameter "connection_details"
+        that, when activated, display data about all the connections that
+        the server is currently handling.
+
+        * cherokee/server.c (cherokee_server_del_connection): Integrated
+        with thread->ownership. Now it's safe (but slower) to use this
+        method.
+
+        * cherokee/socket.c (cherokee_socket_init_tls): Fail if the
+        internal initialization function fails. So far, it wasn't checking
+        the returning value.
+
+        * cherokee/virtual_server.h, cherokee/virtual_server.c,
+        cherokee/socket.c: Switched to use the new cherokee_avl_r_t. It
+        was using a avl_t plus a mutex; now it's slightly cleaner (and
+        should be faster as well).
+
+        * cherokee/avl_r.h, cherokee/avl_r.c: Added new class: Thread-safe
+        AVL. It uses cherokee_avl_t underneath.
+
-2007-08-07  Alvaro Lopez Ortega  <alvaro@alobbs.com>
-

cherokee/trunk/cherokee/Makefile.am

@@ -713 +713 @@
-avl.h \
-avl.c \
+avl_r.h \
+avl_r.c \
-http.h \
-http.c \
@@ -905 +907 @@
-version.h \
-avl.h \
+avl_r.h \
-buffer.h\
-fdpoll.h \

cherokee/trunk/cherokee/avl.h

@@ -70 +70 @@
-CHEROKEE_END_DECLS
-
-TABLE
+AVL

cherokee/trunk/cherokee/connection_info.c

@@ -143 +143 @@
-        /* From
-         */
-
+=
-                cherokee_buffer_ensure_size (&info->ip, CHE_INET_ADDRSTRLEN + 1);
+                memset (info->ip.buf, 0, info->ip.size);
-                cherokee_socket_ntop (&conn->socket, info->ip.buf, info->ip.size - 1);
+                info->ip.len = strlen(info->ip.buf);
-        }
-
@@ -152 +154 @@
-        if (! cherokee_buffer_is_empty (&conn->request_original)) {
-                cherokee_buffer_add_buffer (&info->request, &conn->request_original);
+
+        } else if (! cherokee_buffer_is_empty (&conn->request)) {
+                cherokee_buffer_add_buffer (&info->request, &conn->request);
-        } 
-        else if (! cherokee_buffer_is_empty (&conn->request)) {
-                cherokee_buffer_add_buffer (&info->request, &conn->request);
-        }
-
-        /* Transference
@@ -255 +257 @@
-                cherokee_list_add (LIST(n), list);
-        }
+
+        list_for_each (i, &thread->polling_list) {
+                CHEROKEE_NEW(n,connection_info);
+
+                cherokee_connection_info_fill_up (n, CONN(i));
+                cherokee_list_add (LIST(n), list);
+        }
+
-        ret = ret_ok;
-        if (cherokee_list_empty (list))

cherokee/trunk/cherokee/handler_server_info.c

@@ -36 +36 @@
-#include "server-protected.h"
-#include "plugin_loader.h"
+#include "connection_info.h"
+
-
-#define PAGE_HEADER                                                                                     \
@@ -76 +78 @@
-
-#define LICENSE                                                                                         \
-, 2002, 2003, 2004, 2005 " AUTHOR "</p>"
+ - 2007 " AUTHOR "</p>"                 
-"<p>This program is free software; you can redistribute it and/or"                                  CRLF\
-"modify it under the terms of version 2 of the GNU General Public"                                  CRLF\
@@ -122 +124 @@
-                cherokee_module_props_init_base (MODULE_PROPS(n), 
-                                                 MODULE_PROPS_FREE(props_free));                
-
+
+
+
-                *_props = MODULE_PROPS(n);
-        }
@@ -133 +137 @@
-                if (equal_buf_str (&subconf->key, "just_about")) {
-                        props->just_about = atoi(subconf->val.buf);
+                } else if (equal_buf_str (&subconf->key, "connection_details")) {
+                        props->connection_details = atoi(subconf->val.buf);
-                } else {
-                        PRINT_MSG ("ERROR: Handler file: Unknown key: '%s'\n", subconf->key.buf);
@@ -156 +162 @@
-{
-        cherokee_buffer_add_va (buf, "<tr><td class=\"e\">%s</td><td class=\"v\">%s</td></tr>"CRLF, name, value);
+}
+
+static void
+table_add_row_buf (cherokee_buffer_t *buf, const char *name, cherokee_buffer_t *value)
+{
+        char *cvalue = (value->len > 0) ? value->buf : "";
+        table_add_row_str (buf, name, cvalue);
-}
-
@@ -255 +268 @@
-{
-        cuint_t conns_num = 0;
-
-
+   
+ 
-        
-        cherokee_server_get_conns_num (srv, &conns_num);
@@ -341 +354 @@
-                return;
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-static void
-server_info_build_page (cherokee_handler_server_info_t *hdl)
-{
+        ret_t              ret;
-        cherokee_server_t *srv;
-        cherokee_buffer_t *buf;
@@ -387 +442 @@
-                cherokee_buffer_clean (&table);
-                build_modules_table_content (&table, srv);
-
+Loaded 
-
-                /* Icons
@@ -394 +449 @@
-                build_icons_table_content (&table, srv);
-                server_info_add_table (buf, "Icons", "icons", &table);
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        /* Add the page ending
-         */
+        cherokee_buffer_mrproper (&table);
-        cherokee_buffer_add_str (buf, PAGE_FOOT);
-

cherokee/trunk/cherokee/handler_server_info.h

@@ -38 +38 @@
-        cherokee_module_props_t  base;
-        cherokee_boolean_t       just_about;
+        cherokee_boolean_t       connection_details;
-} cherokee_handler_server_info_props_t;
-

cherokee/trunk/cherokee/server.c

@@ -1924 +1924 @@
-
-        list_for_each (t, &srv->thread_list) {
+                cherokee_thread_t *thread = THREAD(t);
+
+                CHEROKEE_MUTEX_LOCK (&thread->ownership);
+
-                list_for_each (c, &THREAD(t)->active_list) {
-                        cherokee_connection_t *conn = CONN(c);
@@ -1932 +1936 @@
-                                {
-                                        conn->phase = phase_shutdown;
+                                        CHEROKEE_MUTEX_UNLOCK (&thread->ownership);
-                                        return ret_ok;
-                                }
-                        }
-                }
+                CHEROKEE_MUTEX_UNLOCK (&thread->ownership);
-        }
-

cherokee/trunk/cherokee/socket.c

@@ -205 +205 @@
-{
-        ret_t                      ret;
-t  
+r_t
-        cherokee_virtual_server_t *vserver;
-        gnutls_datum               session;
@@ -233 +233 @@
-        /* Get (and remove) the object from the session cache
-         */
-
-
-
-
+
-        if (ret == ret_ok) {
-                TRACE (ENTRIES",ssl", "fd=%d key=%s - found=%p\n", socket->socket, strkey.buf, session);
@@ -254 +251 @@
-{
-        ret_t                      ret;
-t  
+r_t
-        cherokee_virtual_server_t *vserver;
-        cherokee_buffer_t          faked;
@@ -282 +279 @@
-        /* Remove the entry
-         */
-
-
-
-
+
-        if ((ret == ret_ok) && (n != NULL)) {
-                TRACE (ENTRIES",ssl", "fd=%d key=%s - found=%p ret=%d\n", socket->socket, strkey.buf, n, ret);
@@ -303 +297 @@
-{
-        ret_t                      ret;
-t  
+r_t
-        cherokee_virtual_server_t *vserver;
-        cherokee_buffer_t          faked;
- 
+
-        cherokee_socket_t         *socket = SOCKET(ptr);
-
@@ -330 +324 @@
-        /* Add the copy to the table
-         */
-
-
-
+
-
-        TRACE (ENTRIES",ssl", "fd=%d key=%s - added=%p ret=%d\n", socket->socket, strkey.buf, &data, ret);
@@ -391 +383 @@
-        gnutls_dh_set_prime_bits (socket->session, 1024);
-
-
+ment
-         */
-        gnutls_db_set_retrieve_function (socket->session, db_retrieve);
@@ -440 +432 @@
-{
-#ifdef HAVE_TLS
-
+
+
-        
-        socket->is_tls = TLS;
-
-        if (socket->initialized == false) {
-
+
+
+
-                socket->initialized = true;
-        }

cherokee/trunk/cherokee/virtual_server.c

@@ -78 +78 @@
-
-#ifdef HAVE_TLS
-
+r_
-        if (unlikely(ret < ret_ok))
-                return ret;
-
-        CHEROKEE_MUTEX_INIT(&n->session_cache_mutex, NULL);
-
-# ifdef HAVE_GNUTLS
@@ -132 +130 @@
-
-#ifdef HAVE_TLS
-
-
+
-
-# ifdef HAVE_GNUTLS

cherokee/trunk/cherokee/virtual_server.h

@@ -39 +39 @@
-
-#include "avl.h"
+#include "avl_r.h"
-#include "list.h"
-#include "handler.h"
@@ -81 +82 @@
-
-#ifdef HAVE_TLS
-
-
+
-
-# ifdef HAVE_GNUTLS