svn commit: r1833015 - in /httpd/test/framework/trunk: c-modules/memory_track/ c-modules/memory_track/mod_memory_track.c t/apache/leaks.t

[jo...@apache.org]

Author: jorton
Date: Wed Jun  6 11:44:02 2018
New Revision: 1833015

URL: http://svn.apache.org/viewvc?rev=1833015&view=rev
Log:
Add regression test for r1833014 leak, requires APR with pool
debugging and doesn't seem to work for event.

Added:
    httpd/test/framework/trunk/c-modules/memory_track/
    httpd/test/framework/trunk/c-modules/memory_track/mod_memory_track.c
    httpd/test/framework/trunk/t/apache/leaks.t

Added: httpd/test/framework/trunk/c-modules/memory_track/mod_memory_track.c
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/c-modules/memory_track/mod_memory_track.c?rev=1833015&view=auto
==============================================================================
--- httpd/test/framework/trunk/c-modules/memory_track/mod_memory_track.c (added)
+++ httpd/test/framework/trunk/c-modules/memory_track/mod_memory_track.c Wed Jun  6 11:44:02 2018
@@ -0,0 +1,45 @@
+#if CONFIG_FOR_HTTPD_TEST
+
+<Location /memory_track>
+  SetHandler memory-track
+</Location>
+
+#endif
+
+#define APACHE_HTTPD_TEST_HANDLER memory_track_handler
+
+#include "apache_httpd_test.h"
+#include "ap_mpm.h"
+
+static int memory_track_handler(request_rec *r)
+{
+    int result;
+    
+    if (strcmp(r->handler, "memory-track")) {
+        return DECLINED;
+    }
+    if (r->method_number != M_GET) {
+        return DECLINED;
+    }
+
+    /* t/apache/leaks.t not reliable with event. */
+    if (!ap_mpm_query(AP_MPMQ_IS_ASYNC, &result) && result) {
+        return HTTP_SERVICE_UNAVAILABLE;
+    }
+    
+#if defined(APR_POOL_DEBUG)
+    {
+        conn_rec *c = r->connection;
+        apr_size_t n = apr_pool_num_bytes(c->pool, 1);
+        
+        ap_rprintf(r, "connection,%ld,%lu\n", c->id, n);
+    }
+
+    return OK;
+#else
+    return HTTP_NOT_IMPLEMENTED;
+#endif
+}
+
+APACHE_HTTPD_TEST_MODULE(memory_track);
+

Added: httpd/test/framework/trunk/t/apache/leaks.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/apache/leaks.t?rev=1833015&view=auto
==============================================================================
--- httpd/test/framework/trunk/t/apache/leaks.t (added)
+++ httpd/test/framework/trunk/t/apache/leaks.t Wed Jun  6 11:44:02 2018
@@ -0,0 +1,69 @@
+use strict;
+use warnings FATAL => 'all';
+
+use Apache::Test;
+use Apache::TestRequest;
+use Apache::TestUtil;
+
+my $url = "/memory_track";
+my $init_iters = 2000;
+my $iters = 500;
+
+my $num_tests = $init_iters + $iters * 2;
+plan tests => $num_tests;
+
+### this doesn't seem sufficient to force all requests over a single
+### persistent connection any more, is there a better trick?
+Apache::TestRequest::user_agent(keep_alive => 1);
+Apache::TestRequest::scheme('http');
+
+my $r = GET $url;
+
+if ($r->code != 200) {
+    # these tests will be skipped for async MPMs or with an APR not
+    # built with --enable-pool-debug.
+    skip "mod_memory_track not activated" foreach (1..$num_tests);
+}
+else {
+    my $cid = -1;
+    my $mem;
+
+    # initial iterations should get workers to steady-state memory use.
+    foreach (1..$init_iters) {
+        ok t_cmp(GET_RC($url), 200, "200 response");
+    }
+
+    # now test whether c->pool memory is increasing for further
+    # requests on a given conn_rec (matched by id)... could track them
+    # all with a bit more effort.
+    foreach (1..$iters) {
+        $r = GET $url;
+
+        print "# iter $_\n";
+        
+        ok t_cmp($r->code, 200, "got response");
+
+        my $content = $r->content;
+        chomp $content;
+        my ($key, $id, $bytes) = split ',', $content;
+
+        print "# $key, $id, $bytes\n";
+
+        if ($cid == -1) {
+            $cid = $id;
+            $mem = $bytes;
+            ok 1;
+        }
+        elsif ($cid != $id) {
+            skip "using wrong connection";
+        }
+        elsif ($bytes > $mem) {
+            print "# error: pool memory increased from $mem to $bytes!\n";
+            ok 0;
+        }
+        else {
+            ok 1;
+        }
+    }
+}
+