You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2013/10/02 14:12:36 UTC
svn commit: r1528437 - in /httpd/httpd/trunk: LICENSE include/ap_skiplist.h
server/Makefile.in server/mpm/event/event.c server/mpm/eventopt/eventopt.c
server/skiplist.c
Author: jim
Date: Wed Oct 2 12:12:36 2013
New Revision: 1528437
URL: http://svn.apache.org/r1528437
Log:
skiplist is now in apr 1.5 and above
Removed:
httpd/httpd/trunk/include/ap_skiplist.h
httpd/httpd/trunk/server/skiplist.c
Modified:
httpd/httpd/trunk/LICENSE
httpd/httpd/trunk/server/Makefile.in
httpd/httpd/trunk/server/mpm/event/event.c
httpd/httpd/trunk/server/mpm/eventopt/eventopt.c
Modified: httpd/httpd/trunk/LICENSE
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/LICENSE?rev=1528437&r1=1528436&r2=1528437&view=diff
==============================================================================
--- httpd/httpd/trunk/LICENSE (original)
+++ httpd/httpd/trunk/LICENSE Wed Oct 2 12:12:36 2013
@@ -544,24 +544,5 @@ CLAIM, DAMAGES OR OTHER LIABILITY, WHETH
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-for the server/skiplist.c component:
-
-/* ======================================================================
- * Copyright (c) 2000,2006 Theo Schlossnagle
- * All rights reserved.
- * The following code was written by Theo Schlossnagle for use in the
- * Backhand project at The Center for Networking and Distributed Systems
- * at The Johns Hopkins University.
- *
- * This is a skiplist implementation to be used for abstract structures
- * and is release under the LGPL license version 2.1 or later. A copy
- * of this license can be found file LGPL.
- *
- * Alternatively, this file may be licensed under the new BSD license.
- * A copy of this license can be found file BSD.
- *
- * ======================================================================
- */
-
====================================================================
Modified: httpd/httpd/trunk/server/Makefile.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/Makefile.in?rev=1528437&r1=1528436&r2=1528437&view=diff
==============================================================================
--- httpd/httpd/trunk/server/Makefile.in (original)
+++ httpd/httpd/trunk/server/Makefile.in Wed Oct 2 12:12:36 2013
@@ -18,7 +18,7 @@ LTLIBRARY_SOURCES = \
apreq_cookie.c apreq_error.c apreq_module.c \
apreq_module_cgi.c apreq_module_custom.c apreq_param.c \
apreq_parser.c apreq_parser_header.c apreq_parser_multipart.c \
- apreq_parser_urlencoded.c apreq_util.c skiplist.c
+ apreq_parser_urlencoded.c apreq_util.c
LTLIBRARY_DEPENDENCIES = test_char.h
Modified: httpd/httpd/trunk/server/mpm/event/event.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/event/event.c?rev=1528437&r1=1528436&r2=1528437&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/event/event.c (original)
+++ httpd/httpd/trunk/server/mpm/event/event.c Wed Oct 2 12:12:36 2013
@@ -91,7 +91,7 @@
#include "mpm_default.h"
#include "http_vhost.h"
#include "unixd.h"
-#include "ap_skiplist.h"
+#include "apr_skiplist.h"
#include <signal.h>
#include <limits.h> /* for INT_MAX */
@@ -1299,7 +1299,7 @@ static void get_worker(int *have_idle_wo
/* Structures to reuse */
static APR_RING_HEAD(timer_free_ring_t, timer_event_t) timer_free_ring;
-static ap_skiplist *timer_skiplist;
+static apr_skiplist *timer_skiplist;
static int indexing_comp(void *a, void *b)
{
@@ -1333,7 +1333,7 @@ static apr_status_t event_register_timed
APR_RING_REMOVE(te, link);
}
else {
- te = ap_skiplist_alloc(timer_skiplist, sizeof(timer_event_t));
+ te = apr_skiplist_alloc(timer_skiplist, sizeof(timer_event_t));
APR_RING_ELEM_INIT(te, link);
}
@@ -1343,7 +1343,7 @@ static apr_status_t event_register_timed
te->when = t + apr_time_now();
/* Okay, insert sorted by when.. */
- ap_skiplist_insert(timer_skiplist, (void *)te);
+ apr_skiplist_insert(timer_skiplist, (void *)te);
apr_thread_mutex_unlock(g_timer_skiplist_mtx);
@@ -1578,7 +1578,7 @@ static void * APR_THREAD_FUNC listener_t
}
apr_thread_mutex_lock(g_timer_skiplist_mtx);
- te = ap_skiplist_peek(timer_skiplist);
+ te = apr_skiplist_peek(timer_skiplist);
if (te) {
if (te->when > now) {
timeout_interval = te->when - now;
@@ -1620,16 +1620,16 @@ static void * APR_THREAD_FUNC listener_t
now = apr_time_now();
apr_thread_mutex_lock(g_timer_skiplist_mtx);
- ep = ap_skiplist_peek(timer_skiplist);
+ ep = apr_skiplist_peek(timer_skiplist);
while (ep) {
if (ep->when < now + EVENT_FUDGE_FACTOR) {
- ap_skiplist_pop(timer_skiplist, NULL);
+ apr_skiplist_pop(timer_skiplist, NULL);
push_timer2worker(ep);
}
else {
break;
}
- ep = ap_skiplist_peek(timer_skiplist);
+ ep = apr_skiplist_peek(timer_skiplist);
}
apr_thread_mutex_unlock(g_timer_skiplist_mtx);
@@ -1814,7 +1814,7 @@ static void * APR_THREAD_FUNC listener_t
APR_RING_REMOVE(te, link);
}
else {
- te = ap_skiplist_alloc(timer_skiplist, sizeof(timer_event_t));
+ te = apr_skiplist_alloc(timer_skiplist, sizeof(timer_event_t));
APR_RING_ELEM_INIT(te, link);
}
apr_thread_mutex_unlock(g_timer_skiplist_mtx);
@@ -2290,8 +2290,8 @@ static void child_main(int child_num_arg
apr_thread_mutex_create(&g_timer_skiplist_mtx, APR_THREAD_MUTEX_DEFAULT, pchild);
APR_RING_INIT(&timer_free_ring, timer_event_t, link);
- ap_skiplist_init(&timer_skiplist, pchild);
- ap_skiplist_set_compare(timer_skiplist, indexing_comp, indexing_compk);
+ apr_skiplist_init(&timer_skiplist, pchild);
+ apr_skiplist_set_compare(timer_skiplist, indexing_comp, indexing_compk);
ap_run_child_init(pchild, ap_server_conf);
/* done with init critical section */
Modified: httpd/httpd/trunk/server/mpm/eventopt/eventopt.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/eventopt/eventopt.c?rev=1528437&r1=1528436&r2=1528437&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/eventopt/eventopt.c (original)
+++ httpd/httpd/trunk/server/mpm/eventopt/eventopt.c Wed Oct 2 12:12:36 2013
@@ -97,7 +97,7 @@
#include "equeue.h"
-#include "ap_skiplist.h"
+#include "apr_skiplist.h"
#if HAVE_SERF
#include "mod_serf.h"
@@ -1353,7 +1353,7 @@ static void get_worker(int *have_idle_wo
/* Structures to reuse */
static APR_RING_HEAD(timer_free_ring_t, timer_event_t) timer_free_ring;
-static ap_skiplist *timer_skiplist;
+static apr_skiplist *timer_skiplist;
static int indexing_comp(void *a, void *b)
{
@@ -1387,7 +1387,7 @@ static apr_status_t event_register_timed
APR_RING_REMOVE(te, link);
}
else {
- te = ap_skiplist_alloc(timer_skiplist, sizeof(timer_event_t));
+ te = apr_skiplist_alloc(timer_skiplist, sizeof(timer_event_t));
APR_RING_ELEM_INIT(te, link);
}
@@ -1397,7 +1397,7 @@ static apr_status_t event_register_timed
te->when = t + apr_time_now();
/* Okay, insert sorted by when.. */
- ap_skiplist_insert(timer_skiplist, (void *)te);
+ apr_skiplist_insert(timer_skiplist, (void *)te);
apr_thread_mutex_unlock(g_timer_skiplist_mtx);
@@ -1561,7 +1561,7 @@ static void * APR_THREAD_FUNC listener_t
}
apr_thread_mutex_lock(g_timer_skiplist_mtx);
- te = ap_skiplist_peek(timer_skiplist);
+ te = apr_skiplist_peek(timer_skiplist);
if (te) {
if (te->when > now) {
timeout_interval = te->when - now;
@@ -1600,16 +1600,16 @@ static void * APR_THREAD_FUNC listener_t
now = apr_time_now() + EVENT_FUDGE_FACTOR;
apr_thread_mutex_lock(g_timer_skiplist_mtx);
- ep = ap_skiplist_peek(timer_skiplist);
+ ep = apr_skiplist_peek(timer_skiplist);
while (ep) {
if (ep->when < now) {
- ap_skiplist_pop(timer_skiplist, NULL);
+ apr_skiplist_pop(timer_skiplist, NULL);
push_timer2worker(ep);
}
else {
break;
}
- ep = ap_skiplist_peek(timer_skiplist);
+ ep = apr_skiplist_peek(timer_skiplist);
}
apr_thread_mutex_unlock(g_timer_skiplist_mtx);
@@ -2267,8 +2267,8 @@ static void child_main(int child_num_arg
apr_thread_mutex_create(&g_timer_skiplist_mtx, APR_THREAD_MUTEX_DEFAULT, pchild);
APR_RING_INIT(&timer_free_ring, timer_event_t, link);
apr_pool_create(&pskip, pchild);
- ap_skiplist_init(&timer_skiplist, pskip);
- ap_skiplist_set_compare(timer_skiplist, indexing_comp, indexing_compk);
+ apr_skiplist_init(&timer_skiplist, pskip);
+ apr_skiplist_set_compare(timer_skiplist, indexing_comp, indexing_compk);
ap_run_child_init(pchild, ap_server_conf);
/* done with init critical section */