tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r603650 - /tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
Date Wed, 12 Dec 2007 15:57:54 GMT
Author: rjung
Date: Wed Dec 12 07:57:54 2007
New Revision: 603650

URL: http://svn.apache.org/viewvc?rev=603650&view=rev
Log:
Formatting and unified last_errno handling.

Modified:
    tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c?rev=603650&r1=603649&r2=603650&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Wed Dec 12 07:57:54 2007
@@ -587,9 +587,9 @@
 {
     jk_pool_t *p = &ae->pool;
 
-    d->status = jk_b_get_int(msg);
     JK_TRACE_ENTER(l);
 
+    d->status = jk_b_get_int(msg);
     if (!d->status) {
         jk_log(l, JK_LOG_ERROR,
                "NULL status");
@@ -726,6 +726,8 @@
     int rc;
     ajp_worker_t *aw = ae->worker;
 
+    JK_TRACE_ENTER(l);
+
     /* Close previous socket */
     if (IS_VALID_SOCKET(ae->sd))
         jk_shutdown_socket(ae->sd, l);
@@ -748,10 +750,12 @@
                    "(%s) Will try pooled connection sd = %d from slot %d",
                     ae->worker->name, ae->sd, i);
     }
+    JK_TRACE_EXIT(l);
 }
 
 /*
  * Handle the CPING/CPONG initial query
+ * Cares about ae->errno.
  */
 static int ajp_handle_cping_cpong(ajp_endpoint_t * ae, int timeout, jk_logger_t *l)
 {
@@ -759,6 +763,8 @@
     jk_msg_buf_t *msg;
 
     JK_TRACE_ENTER(l);
+
+    ae->last_errno = 0;
     msg = jk_b_new(&ae->pool);
     if (!msg) {
         jk_log(l, JK_LOG_ERROR,
@@ -816,6 +822,10 @@
     return JK_TRUE;
 }
 
+/*
+ * Connect an endpoint to a backend.
+ * Cares about ae->errno.
+ */
 int ajp_connect_to_endpoint(ajp_endpoint_t * ae, jk_logger_t *l)
 {
     char buf[32];
@@ -823,6 +833,7 @@
 
     JK_TRACE_ENTER(l);
 
+    ae->last_errno = 0;
     ae->sd = jk_open_socket(&ae->worker->worker_inet_addr,
                             ae->worker->keepalive,
                             ae->worker->socket_timeout,
@@ -879,6 +890,7 @@
 
 /*
  * Send a message to endpoint, using corresponding PROTO HEADER
+ * Cares about ae->errno.
  */
 
 int ajp_connection_tcp_send_message(ajp_endpoint_t * ae,
@@ -887,6 +899,8 @@
     int rc;
 
     JK_TRACE_ENTER(l);
+
+    ae->last_errno = 0;
     if (ae->proto == AJP13_PROTO) {
         jk_b_end(msg, AJP13_WS_HEADER);
         if (JK_IS_DEBUG_LEVEL(l))
@@ -899,7 +913,8 @@
     }
     else {
         jk_log(l, JK_LOG_ERROR,
-               "unknown protocol %d, supported are AJP13/AJP14", ae->proto);
+               "(%s) unknown protocol %d, supported are AJP13/AJP14",
+                ae->worker->name, ae->proto);
         JK_TRACE_EXIT(l);
         return JK_FATAL_ERROR;
     }
@@ -911,7 +926,6 @@
     if ((rc = jk_tcp_socket_sendfull(ae->sd, msg->buf,
                                      msg->len, l)) > 0) {
         ae->endpoint.wr += (jk_uint64_t)rc;
-        ae->last_errno = 0;
         JK_TRACE_EXIT(l);
         return JK_TRUE;
     }
@@ -926,6 +940,7 @@
 
 /*
  * Receive a message from endpoint, checking PROTO HEADER
+ * Cares about ae->errno.
  */
 
 int ajp_connection_tcp_get_message(ajp_endpoint_t * ae,
@@ -939,6 +954,7 @@
 
     JK_TRACE_ENTER(l);
 
+    ae->last_errno = 0;
     /* If recvfull gets an error, it implicitely closes the socket. */
     /* We will invalidate the endpoint connection. */
     rc = jk_tcp_socket_recvfull(ae->sd, head, AJP_HEADER_LEN, l);
@@ -961,7 +977,6 @@
         JK_TRACE_EXIT(l);
         return JK_FALSE;
     }
-    ae->last_errno = 0;
     ae->endpoint.rd += (jk_uint64_t)rc;
     header = ((unsigned int)head[0] << 8) | head[1];
 
@@ -1052,7 +1067,6 @@
         JK_TRACE_EXIT(l);
         return JK_FALSE;
     }
-    ae->last_errno = 0;
     ae->endpoint.rd += (jk_uint64_t)rc;
 
     if (ae->proto == AJP13_PROTO) {
@@ -1081,6 +1095,7 @@
     unsigned int padded_len = len;
 
     JK_TRACE_ENTER(l);
+
     if (s->is_chunked && s->no_more_chunks) {
         JK_TRACE_EXIT(l);
         return 0;
@@ -1127,6 +1142,7 @@
     unsigned char *read_buf = msg->buf;
 
     JK_TRACE_ENTER(l);
+
     jk_b_reset(msg);
 
     read_buf += AJP_HEADER_LEN; /* leave some space for the buffer headers */
@@ -1201,6 +1217,8 @@
     int postlen;
 
     JK_TRACE_ENTER(l);
+
+    ae->last_errno = 0;
     /* Up to now, we can recover */
     op->recoverable = JK_TRUE;
 
@@ -1211,9 +1229,10 @@
         int rc = 0;
         err = 0;
         if (!jk_is_socket_connected(ae->sd, l)) {
+            ae->last_errno = errno;
             jk_log(l, JK_LOG_DEBUG,
                    "(%s) socket %d is not connected any more (errno=%d)",
-                   ae->worker->name, ae->sd, errno);
+                   ae->worker->name, ae->sd, ae->last_errno);
             ae->sd = JK_INVALID_SOCKET;
             err = 1;
         }
@@ -1446,6 +1465,7 @@
     int code = (int)jk_b_get_byte(msg);
 
     JK_TRACE_ENTER(l);
+
     switch (code) {
     case JK_AJP13_SEND_HEADERS:
         {
@@ -1635,6 +1655,7 @@
 
     JK_TRACE_ENTER(l);
 
+    p->last_errno = 0;
     /* Start read all reply message */
     while (1) {
         int rc = 0;
@@ -2226,6 +2247,7 @@
     time_t now = time(NULL);
 
     JK_TRACE_ENTER(l);
+
     p->ep_cache = (ajp_endpoint_t **)calloc(1, sizeof(ajp_endpoint_t *) *
                                             p->ep_cache_sz);
     if (!p->ep_cache) {
@@ -2443,6 +2465,7 @@
 int JK_METHOD ajp_done(jk_endpoint_t **e, jk_logger_t *l)
 {
     JK_TRACE_ENTER(l);
+
     if (e && *e && (*e)->endpoint_private) {
         ajp_endpoint_t *p = (*e)->endpoint_private;
         int rc;



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message