Mailing-List: contact dev-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Received-SPF: pass (nike.apache.org: local policy)
Message-ID: <4EC2A08B.10306@vodafone.com>
Date: Tue, 15 Nov 2011 18:25:31 +0100
From: =?UTF-8?B?UsO8ZGlnZXIgUGzDvG0=?= <ruediger.pluem@vodafone.com>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; de;
 rv:1.9.2.23) Gecko/20110920 SUSE/3.1.15 Thunderbird/3.1.15
MIME-Version: 1.0
To: dev@httpd.apache.org
Subject: Fwd: svn commit: r1202257 - in /httpd/httpd/trunk/server/mpm/event:
 config3.m4 equeue.c equeue.h event.c
Content-Type: multipart/alternative;
 boundary="------------070401070106030405040000"

This is a multi-part message in MIME format.
--------------070401070106030405040000
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit


-------- Original-Nachricht --------
Betreff: 	svn commit: r1202257 - in /httpd/httpd/trunk/server/mpm/event: config3.m4 equeue.c equeue.h event.c
Datum: 	Tue, 15 Nov 2011 15:51:04 GMT
Von: 	pquerna@apache.org


Author: pquerna
Date: Tue Nov 15 15:51:03 2011
New Revision: 1202257

URL: http://svn.apache.org/viewvc?rev=1202257&view=rev
Log:
Create a new lock free circular queue, and use it in the EventMPM to remove the timeout mutex
that was wrapping both timeout queue operations and pollset operations.

Added:
     httpd/httpd/trunk/server/mpm/event/equeue.c   (with props)
     httpd/httpd/trunk/server/mpm/event/equeue.h   (with props)
Modified:
     httpd/httpd/trunk/server/mpm/event/config3.m4
     httpd/httpd/trunk/server/mpm/event/event.c


Added: httpd/httpd/trunk/server/mpm/event/equeue.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/event/equeue.c?rev=1202257&view=auto
==============================================================================
--- httpd/httpd/trunk/server/mpm/event/equeue.c (added)
+++ httpd/httpd/trunk/server/mpm/event/equeue.c Tue Nov 15 15:51:03 2011
@@ -0,0 +1,125 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "equeue.h"
+
+#include<apr_atomic.h>
+#include<sched.h>
+
+struct ap_equeue_t {
+    apr_uint32_t nelem;
+    apr_size_t elem_size;
+    uint8_t *bytes;
+    volatile apr_uint32_t writeCount;
+    volatile apr_uint32_t readCount;
+};
+
+
+static APR_INLINE apr_uint32_t count_to_index(ap_equeue_t *eq, apr_uint32_t count)
+{
+    return (count&  (eq->nelem - 1));
+}
+
+static APR_INLINE void* index_to_bytes(ap_equeue_t *eq, apr_uint32_t idx)
+{
+    apr_size_t offset = idx * eq->elem_size;
+    return (void*)&eq->bytes[offset];
+}
+
+static APR_INLINE apr_uint32_t nearest_power(apr_uint32_t num)
+{
+    apr_uint32_t n = 1;
+    while (n<  num) {
+        n<<= 1;
+    }
+
+    return n;
+}
+
+#if 0
+static void dump_queue(ap_equeue_t *eq)
+{
+    apr_uint32_t i;
+
+    fprintf(stderr, "dumping %p\n", eq);
+    fprintf(stderr, "  nelem:   %u\n", eq->nelem);
+    fprintf(stderr, "  esize:   %"APR_SIZE_T_FMT"\n", eq->elem_size);
+    fprintf(stderr, "  wcnt:    %u\n", eq->writeCount);
+    fprintf(stderr, "  rcnt:    %u\n", eq->writeCount);
+    fprintf(stderr, "  bytes:   %p\n", eq->bytes);
+    for (i = 0; i<  eq->nelem; i++) {
+        fprintf(stderr, "    [%u] = %p\n", i, index_to_bytes(eq, i));
+    }
+
+    fprintf(stderr, "\n");
+    fflush(stderr);
+}
+#endif
+
+apr_status_t
+ap_equeue_create(apr_pool_t *p, apr_uint32_t nelem, apr_size_t elem_size, ap_equeue_t **eqout)
+{
+    ap_equeue_t *eq;
+
+    *eqout = NULL;
+
+    eq = apr_palloc(p, sizeof(ap_equeue_t));
+    eq->bytes = apr_palloc(p, (1 + nelem) * elem_size);
+    eq->nelem = nearest_power(nelem);

Shouldn't that be

+    eq->nelem = nearest_power(nelem);
+    eq->bytes = apr_palloc(p, eq->nelem * elem_size);


instead? Otherwise we might allocate too few elements.

Regards

Rüdiger


--------------070401070106030405040000
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
  <head>

    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
    <title>svn commit: r1202257 - in
      /httpd/httpd/trunk/server/mpm/event: config3.m4 equeue.c equeue.h
      event.c</title>
    <base
      href="http://mail-archives.apache.org/mod_mbox/httpd-cvs/?format=atom">
  </head>
  <body text="#000000" bgcolor="#ffffff">
    <br>
    <br>
    -------- Original-Nachricht --------
    <table class="moz-email-headers-table" border="0" cellpadding="0"
      cellspacing="0">
      <tbody>
        <tr>
          <th nowrap="nowrap" valign="BASELINE" align="RIGHT">Betreff: </th>
          <td>svn commit: r1202257 - in
            /httpd/httpd/trunk/server/mpm/event: config3.m4 equeue.c
            equeue.h event.c</td>
        </tr>
        <tr>
          <th nowrap="nowrap" valign="BASELINE" align="RIGHT">Datum: </th>
          <td>Tue, 15 Nov 2011 15:51:04 GMT</td>
        </tr>
        <tr>
          <th nowrap="nowrap" valign="BASELINE" align="RIGHT">Von: </th>
          <td><a class="moz-txt-link-abbreviated" href="mailto:pquerna@apache.org">pquerna@apache.org</a></td>
        </tr>
      </tbody>
    </table>
    <br>
    <br>
    <title>svn commit: r1202257 - in
      /httpd/httpd/trunk/server/mpm/event: config3.m4 equeue.c equeue.h
      event.c</title>
    <base
      href="http://mail-archives.apache.org/mod_mbox/httpd-cvs/?format=atom">
    <div xmlns="http://www.w3.org/1999/xhtml">
      <pre>Author: pquerna
Date: Tue Nov 15 15:51:03 2011
New Revision: 1202257

URL: <a class="moz-txt-link-freetext" href="http://svn.apache.org/viewvc?rev=1202257&amp;view=rev">http://svn.apache.org/viewvc?rev=1202257&amp;view=rev</a>
Log:
Create a new lock free circular queue, and use it in the EventMPM to remove the timeout mutex
that was wrapping both timeout queue operations and pollset operations.

Added:
    httpd/httpd/trunk/server/mpm/event/equeue.c   (with props)
    httpd/httpd/trunk/server/mpm/event/equeue.h   (with props)
Modified:
    httpd/httpd/trunk/server/mpm/event/config3.m4
    httpd/httpd/trunk/server/mpm/event/event.c


Added: httpd/httpd/trunk/server/mpm/event/equeue.c
URL: <a class="moz-txt-link-freetext" href="http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/event/equeue.c?rev=1202257&amp;view=auto">http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/event/equeue.c?rev=1202257&amp;view=auto</a>
==============================================================================
--- httpd/httpd/trunk/server/mpm/event/equeue.c (added)
+++ httpd/httpd/trunk/server/mpm/event/equeue.c Tue Nov 15 15:51:03 2011
@@ -0,0 +1,125 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     <a class="moz-txt-link-freetext" href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "equeue.h"
+
+#include &lt;apr_atomic.h&gt;
+#include &lt;sched.h&gt;
+
+struct ap_equeue_t {
+    apr_uint32_t nelem;
+    apr_size_t elem_size;
+    uint8_t *bytes;
+    volatile apr_uint32_t writeCount;
+    volatile apr_uint32_t readCount;
+};
+
+
+static APR_INLINE apr_uint32_t count_to_index(ap_equeue_t *eq, apr_uint32_t count)
+{
+    return (count &amp; (eq-&gt;nelem - 1));
+}
+
+static APR_INLINE void* index_to_bytes(ap_equeue_t *eq, apr_uint32_t idx)
+{
+    apr_size_t offset = idx * eq-&gt;elem_size;
+    return (void*)&amp;eq-&gt;bytes[offset];
+}
+
+static APR_INLINE apr_uint32_t nearest_power(apr_uint32_t num)
+{
+    apr_uint32_t n = 1;
+    while (n &lt; num) {
+        n &lt;&lt;= 1;
+    }
+
+    return n;
+}
+
+#if 0
+static void dump_queue(ap_equeue_t *eq)
+{
+    apr_uint32_t i;
+
+    fprintf(stderr, "dumping %p\n", eq);
+    fprintf(stderr, "  nelem:   %u\n", eq-&gt;nelem);
+    fprintf(stderr, "  esize:   %"APR_SIZE_T_FMT"\n", eq-&gt;elem_size);
+    fprintf(stderr, "  wcnt:    %u\n", eq-&gt;writeCount);
+    fprintf(stderr, "  rcnt:    %u\n", eq-&gt;writeCount);
+    fprintf(stderr, "  bytes:   %p\n", eq-&gt;bytes);
+    for (i = 0; i &lt; eq-&gt;nelem; i++) {
+        fprintf(stderr, "    [%u] = %p\n", i, index_to_bytes(eq, i));
+    }
+
+    fprintf(stderr, "\n");
+    fflush(stderr);
+}
+#endif
+
+apr_status_t
+ap_equeue_create(apr_pool_t *p, apr_uint32_t nelem, apr_size_t elem_size, ap_equeue_t **eqout)
+{
+    ap_equeue_t *eq;
+
+    *eqout = NULL;
+
+    eq = apr_palloc(p, sizeof(ap_equeue_t));
+    eq-&gt;bytes = apr_palloc(p, (1 + nelem) * elem_size);
+    eq-&gt;nelem = nearest_power(nelem);

Shouldn't that be 

+    eq-&gt;nelem = nearest_power(nelem);
+    eq-&gt;bytes = apr_palloc(p, eq-&gt;nelem * elem_size);


instead? Otherwise we might allocate too few elements.

Regards

Rüdiger


</pre>
    </div>
  </body>
</html>

--------------070401070106030405040000--