You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2018/01/19 12:12:17 UTC
svn commit: r1821626 - in /httpd/httpd/trunk/server: mpm/event/event.c
mpm_fdqueue.c mpm_fdqueue.h
Author: ylavic
Date: Fri Jan 19 12:12:17 2018
New Revision: 1821626
URL: http://svn.apache.org/viewvc?rev=1821626&view=rev
Log:
mpm_fdqueue: follow up to r1821624.
Opacify fdqueue types.
Modified:
httpd/httpd/trunk/server/mpm/event/event.c
httpd/httpd/trunk/server/mpm_fdqueue.c
httpd/httpd/trunk/server/mpm_fdqueue.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=1821626&r1=1821625&r2=1821626&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/event/event.c (original)
+++ httpd/httpd/trunk/server/mpm/event/event.c Fri Jan 19 12:12:17 2018
@@ -219,6 +219,8 @@ static apr_pollfd_t *listener_pollfd;
*/
static apr_pollset_t *event_pollset;
+typedef struct event_conn_state_t event_conn_state_t;
+
/*
* The chain of connections to be shutdown by a worker thread (deferred),
* linked list updated atomically.
@@ -2307,7 +2309,8 @@ static void *APR_THREAD_FUNC worker_thre
break;
}
- rv = ap_queue_pop_something(worker_queue, &csd, &cs, &ptrans, &te);
+ rv = ap_queue_pop_something(worker_queue, &csd, (void **)&cs,
+ &ptrans, &te);
if (rv != APR_SUCCESS) {
/* We get APR_EOF during a graceful shutdown once all the
Modified: httpd/httpd/trunk/server/mpm_fdqueue.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm_fdqueue.c?rev=1821626&r1=1821625&r2=1821626&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm_fdqueue.c (original)
+++ httpd/httpd/trunk/server/mpm_fdqueue.c Fri Jan 19 12:12:17 2018
@@ -42,6 +42,13 @@ struct fd_queue_info_t
struct recycled_pool *volatile recycled_pools;
};
+struct fd_queue_elem_t
+{
+ apr_socket_t *sd;
+ apr_pool_t *p;
+ void *baton;
+};
+
static apr_status_t queue_info_cleanup(void *data_)
{
fd_queue_info_t *qi = data_;
@@ -375,7 +382,7 @@ apr_status_t ap_queue_init(fd_queue_t *
* to reserve an idle worker thread
*/
apr_status_t ap_queue_push(fd_queue_t * queue, apr_socket_t * sd,
- event_conn_state_t * ecs, apr_pool_t * p)
+ void * baton, apr_pool_t * p)
{
fd_queue_elem_t *elem;
apr_status_t rv;
@@ -392,7 +399,7 @@ apr_status_t ap_queue_push(fd_queue_t *
if (queue->in >= queue->bounds)
queue->in -= queue->bounds;
elem->sd = sd;
- elem->ecs = ecs;
+ elem->baton = baton;
elem->p = p;
queue->nelts++;
@@ -433,7 +440,7 @@ apr_status_t ap_queue_push_timer(fd_queu
* 'sd'.
*/
apr_status_t ap_queue_pop_something(fd_queue_t * queue, apr_socket_t ** sd,
- event_conn_state_t ** ecs, apr_pool_t ** p,
+ void ** baton, apr_pool_t ** p,
timer_event_t ** te_out)
{
fd_queue_elem_t *elem;
@@ -476,7 +483,7 @@ apr_status_t ap_queue_pop_something(fd_q
queue->out -= queue->bounds;
queue->nelts--;
*sd = elem->sd;
- *ecs = elem->ecs;
+ *baton = elem->baton;
*p = elem->p;
#ifdef AP_DEBUG
elem->sd = NULL;
Modified: httpd/httpd/trunk/server/mpm_fdqueue.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm_fdqueue.h?rev=1821626&r1=1821625&r2=1821626&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm_fdqueue.h (original)
+++ httpd/httpd/trunk/server/mpm_fdqueue.h Fri Jan 19 12:12:17 2018
@@ -38,8 +38,10 @@
#include <apr_thread_mutex.h>
#include <apr_thread_cond.h>
+struct fd_queue_info_t; /* opaque */
+struct fd_queue_elem_t; /* opaque */
typedef struct fd_queue_info_t fd_queue_info_t;
-typedef struct event_conn_state_t event_conn_state_t;
+typedef struct fd_queue_elem_t fd_queue_elem_t;
apr_status_t ap_queue_info_create(fd_queue_info_t ** queue_info,
apr_pool_t * pool, int max_idlers,
@@ -53,14 +55,6 @@ apr_status_t ap_queue_info_term(fd_queue
apr_uint32_t ap_queue_info_get_idlers(fd_queue_info_t * queue_info);
void ap_free_idle_pools(fd_queue_info_t *queue_info);
-struct fd_queue_elem_t
-{
- apr_socket_t *sd;
- apr_pool_t *p;
- event_conn_state_t *ecs;
-};
-typedef struct fd_queue_elem_t fd_queue_elem_t;
-
typedef struct timer_event_t timer_event_t;
struct timer_event_t
@@ -94,10 +88,10 @@ void ap_push_pool(fd_queue_info_t * queu
apr_status_t ap_queue_init(fd_queue_t * queue, int queue_capacity,
apr_pool_t * a);
apr_status_t ap_queue_push(fd_queue_t * queue, apr_socket_t * sd,
- event_conn_state_t * ecs, apr_pool_t * p);
+ void * baton, apr_pool_t * p);
apr_status_t ap_queue_push_timer(fd_queue_t *queue, timer_event_t *te);
apr_status_t ap_queue_pop_something(fd_queue_t * queue, apr_socket_t ** sd,
- event_conn_state_t ** ecs, apr_pool_t ** p,
+ void ** baton, apr_pool_t ** p,
timer_event_t ** te);
apr_status_t ap_queue_interrupt_all(fd_queue_t * queue);
apr_status_t ap_queue_interrupt_one(fd_queue_t * queue);