Changeset 1606

Timestamp:

07/04/08 11:30:52 (2 months ago)

Author:

alo

Message:

--

Files:

• cherokee/trunk/ChangeLog (modified) (1 diff)
• cherokee/trunk/cherokee/connection-protected.h (modified) (3 diffs)
• cherokee/trunk/cherokee/connection.c (modified) (4 diffs)
• cherokee/trunk/cherokee/connection.h (modified) (1 diff)

cherokee/trunk/ChangeLog

@@ -1 +1 @@
-2008-07-04  Alvaro Lopez Ortega  <alvaro@alobbs.com>
+
+        * cherokee/connection-protected.h, cherokee/connection.c,
+        cherokee/connection.h: Added TRACE_CONN() macro. It uses TRACE to
+        print details about a specific connection.
-
-        * cherokee/list.h, cherokee/list.c (cherokee_list_get_len): New

cherokee/trunk/cherokee/connection-protected.h

@@ -102 +102 @@
-         */
-        culong_t                      id;
+        cherokee_buffer_t             self_trace;
-        
-        /* Socket stuff
@@ -192 +193 @@
-#define CONN_THREAD(c) (THREAD(CONN(c)->thread))
-
+#define TRACE_CONN(c)  TRACE("conn", "%s", cherokee_connection_print(c));
-
-/* Basic functions
@@ -243 +245 @@
-ret_t cherokee_connection_log_delayed            (cherokee_connection_t *conn);
-ret_t cherokee_connection_update_vhost_traffic   (cherokee_connection_t *conn);
+char *cherokee_connection_print                  (cherokee_connection_t *conn);
-
-/* Transfers

cherokee/trunk/cherokee/connection.c

@@ -133 +133 @@
-        cherokee_buffer_init (&n->redirect);
-        cherokee_buffer_init (&n->host);
+        cherokee_buffer_init (&n->self_trace);
-
-        cherokee_buffer_init (&n->query_string);
@@ -180 +181 @@
-        cherokee_buffer_mrproper (&conn->redirect);
-        cherokee_buffer_mrproper (&conn->host);
+        cherokee_buffer_mrproper (&conn->self_trace);
-
-        if (conn->validator != NULL) {
@@ -264 +266 @@
-        cherokee_buffer_clean (&conn->host);
-        cherokee_buffer_clean (&conn->query_string);
+        cherokee_buffer_clean (&conn->self_trace);
-        
-        if (conn->validator != NULL) {
@@ -1891 +1894 @@
-        return ret_ok;
-}
+
+
+#ifdef TRACE_ENABLED
+char *
+cherokee_connection_print (cherokee_connection_t *conn)
+{
+        cherokee_buffer_t *buf = &conn->self_trace;
+        
+        cherokee_buffer_clean (buf);
+        cherokee_buffer_add_va (buf, "Connection %p info\n", conn);
+
+#define print_buf(title,name)                                             \
+        cherokee_buffer_add_va (buf, "\t| %s: '%s' (%d)\n", title,        \
+                                conn->name.buf ? conn->name.buf : "NULL", \
+                                conn->name.len);
+#define print_int(title,name)                                             \
+        cherokee_buffer_add_va (buf, "\t| % 20s: %d\n", title, conn->name);
+
+        print_buf ("        Request", request);
+        print_buf ("  Web Directory", web_directory);
+        print_buf ("Local Directory", local_directory);
+        print_buf ("       Pathinfo", pathinfo);
+        print_buf ("       User Dir", userdir);
+        print_buf ("   Query string", query_string);
+        print_buf ("           Host", host);
+        print_buf ("       Redirect", redirect);
+        print_int ("      Keepalive", keepalive);
+
+#undef print_buf
+#undef print_int
+
+        cherokee_buffer_add_str (buf, "\t\\_\n");
+        return buf->buf;
+}
+#endif

cherokee/trunk/cherokee/connection.h

@@ -42 +42 @@
-/* Public methods
- */
-    (cherokee_connection_t *cnt
-    (cherokee_connection_t *cnt
+(cherokee_connection_t *conn
+(cherokee_connection_t *conn
-
-CHEROKEE_END_DECLS