Enhance mod_echo with an illustration of using the scoreboard for a connection

based protocol, and clean up the event loop and diagnostic messages.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@587772 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/echo/mod_echo.c b/modules/echo/mod_echo.c
index ddbe972c589231ff517b6f500194f549233464c4..4fb9e1dc69f32e2b34726550d3b197da46bee9e9 100644 (file)
--- a/modules/echo/mod_echo.c
+++ b/modules/echo/mod_echo.c
@@ -14,14 +14,19 @@
  * limitations under the License.
  */
 
+#define CORE_PRIVATE
 #include "ap_config.h"
 #include "ap_mmn.h"
 #include "httpd.h"
 #include "http_config.h"
 #include "http_connection.h"
+#include "http_core.h"
+#include "http_log.h"
 
 #include "apr_buckets.h"
+#include "apr_strings.h"
 #include "util_filter.h"
+#include "scoreboard.h"
 
 module AP_MODULE_DECLARE_DATA echo_module;
 
@@ -47,37 +52,147 @@ static const char *echo_on(cmd_parms *cmd, void *dummy, int arg)
     return NULL;
 }
 
+static apr_status_t brigade_peek(apr_bucket_brigade *bbIn,
+                                 char *buff, apr_size_t bufflen)
+{
+    apr_bucket *b;
+    apr_size_t readbytes = 0;
+
+    if (bufflen--)
+        /* compensate for NULL */
+        *buff = '\0';
+    else
+        return APR_EGENERAL;
+
+    if (APR_BRIGADE_EMPTY(bbIn))
+        return APR_EGENERAL;
+
+    b = APR_BRIGADE_FIRST(bbIn);
+
+    while ((b != APR_BRIGADE_SENTINEL(bbIn)) && (readbytes < bufflen)) {
+        const char *pos;
+        const char *str;
+        apr_size_t len;
+        apr_status_t rv;
+
+        if ((rv = apr_bucket_read(b, &str, &len, APR_NONBLOCK_READ))
+                != APR_SUCCESS)
+            return rv;
+
+        if ((pos = memchr(str, APR_ASCII_LF, len)) != NULL)
+            len = pos - str;
+        if (len > bufflen - readbytes)
+            len = bufflen - readbytes;
+        memcpy (buff + readbytes, str, len);
+        readbytes += len;
+        buff[readbytes] = '\0';
+
+        b = APR_BUCKET_NEXT(b);
+    }
+    return APR_SUCCESS;
+}
+
+
+static int update_echo_child_status(ap_sb_handle_t *sbh, 
+                                    int status, conn_rec *c,
+                                    apr_bucket_brigade *last_echoed)
+{
+    worker_score *ws = ap_get_scoreboard_worker(sbh);
+    int old_status = ws->status;
+
+    ws->status = status;
+
+    if (!ap_extended_status)
+        return old_status;
+
+    ws->last_used = apr_time_now();
+
+    /* initial pass only, please - in the name of efficiency */
+    if (c) {
+        apr_cpystrn(ws->client, 
+                    ap_get_remote_host(c, c->base_server->lookup_defaults,
+                                       REMOTE_NOLOOKUP, NULL),
+                    sizeof(ws->client));
+        apr_cpystrn(ws->vhost, c->base_server->server_hostname,
+                    sizeof(ws->vhost));
+        /* Deliberate trailing space - filling in string on WRITE passes */
+        apr_cpystrn(ws->request, "ECHO ", sizeof(ws->request));
+    }
+
+    /* each subsequent WRITE pass, let's update what we echoed */
+    if (last_echoed) {
+        brigade_peek(last_echoed, ws->request + sizeof("ECHO ") - 1, 
+                     sizeof(ws->request) - sizeof("ECHO ") + 1);
+    }
+
+    return old_status;
+}
+
 static int process_echo_connection(conn_rec *c)
 {
     apr_bucket_brigade *bb;
     apr_bucket *b;
-    apr_status_t rv;
+    apr_socket_t *csd = NULL;
     EchoConfig *pConfig = ap_get_module_config(c->base_server->module_config,
                                                &echo_module);
 
     if (!pConfig->bEnabled) {
         return DECLINED;
     }
+    
+    ap_time_process_request(c->sbh, START_PREQUEST);
+    update_echo_child_status(c->sbh, SERVER_BUSY_READ, c, NULL);
+
+    bb = apr_brigade_create(c->pool, c->bucket_alloc);
 
-    do {
-        bb = apr_brigade_create(c->pool, c->bucket_alloc);
+    for ( ; ; ) {
+        apr_status_t rv;
 
         /* Get a single line of input from the client */
         if (((rv = ap_get_brigade(c->input_filters, bb, AP_MODE_GETLINE,
-                                 APR_BLOCK_READ, 0)) != APR_SUCCESS) ||
-             APR_BRIGADE_EMPTY(bb)) {
+                                  APR_BLOCK_READ, 0)) != APR_SUCCESS)) {
+            apr_brigade_destroy(bb);
+            if (!APR_STATUS_IS_EOF(rv))
+                ap_log_error(APLOG_MARK, APLOG_INFO, rv, c->base_server,
+                             "ProtocolEcho: Failure reading from %s",
+                             c->remote_ip);
+            break;
+        }
+
+        /* Something horribly wrong happened.  Someone didn't block! */
+        if (APR_BRIGADE_EMPTY(bb)) {
             apr_brigade_destroy(bb);
+            ap_log_error(APLOG_MARK, APLOG_INFO, rv, c->base_server,
+                         "ProtocolEcho: Error - read empty brigade from %s!",
+                         c->remote_ip);
             break;
         }
 
+        if (!csd) {
+            csd = ap_get_module_config(c->conn_config, &core_module);
+            apr_socket_timeout_set(csd, c->base_server->keep_alive_timeout);
+        }
+
+        update_echo_child_status(c->sbh, SERVER_BUSY_WRITE, NULL, bb);
+
         /* Make sure the data is flushed to the client */
         b = apr_bucket_flush_create(c->bucket_alloc);
         APR_BRIGADE_INSERT_TAIL(bb, b);
-
-        /* Send back the data. */
         rv = ap_pass_brigade(c->output_filters, bb);
-    } while (rv == APR_SUCCESS);
+        if (rv != APR_SUCCESS) {
+            ap_log_error(APLOG_MARK, APLOG_INFO, rv, c->base_server,
+                         "ProtocolEcho: Failure writing to %s",
+                         c->remote_ip);
+            break; 
+        }
+        apr_brigade_cleanup(bb);
 
+        /* Announce our intent to loop */
+        update_echo_child_status(c->sbh, SERVER_BUSY_KEEPALIVE, NULL, NULL);
+    }
+    apr_brigade_destroy(bb);
+    ap_time_process_request(c->sbh, STOP_PREQUEST);
+    update_echo_child_status(c->sbh, SERVER_CLOSING, c, NULL);
     return OK;
 }