mirror of
https://github.com/apache/httpd.git
synced 2026-01-13 21:42:17 +03:00
d758951456
When a socket callback has a timeout, an associated timer event is used to remove the sockets from the pollset and call a timeout function. * This includes a noteworthy change to the main event loop. Previously, we would call epoll, then process the timer events, then iterate through the poll results. After this patch, the timer events are processed before the poll() a _non-queued_ action can change the pollset conents (a users timed callback function conversely could easily sit in a queue while the main thread continues down into epoll) * timer events can now have sockets associated with them, those sockets are removed from the pollset when the timer event fires w/o a queue to the worker. * timer events now have a canceled flag that can be toggled without locking the timer list. * Drop the severity of some wstunnel messages from DEBUG to TRACE1 * Lift the restriction on using asynchronous websockets connections but having an idle timeout git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1593857 13f79535-47bb-0310-9956-ffa450edef68
106 lines
3.5 KiB
C
106 lines
3.5 KiB
C
/* 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.
|
|
*/
|
|
|
|
/**
|
|
* @file event/fdqueue.h
|
|
* @brief fd queue declarations
|
|
*
|
|
* @addtogroup APACHE_MPM_EVENT
|
|
* @{
|
|
*/
|
|
|
|
#ifndef FDQUEUE_H
|
|
#define FDQUEUE_H
|
|
#include "httpd.h"
|
|
#include <stdlib.h>
|
|
#if APR_HAVE_UNISTD_H
|
|
#include <unistd.h>
|
|
#endif
|
|
#include <apr_thread_mutex.h>
|
|
#include <apr_thread_cond.h>
|
|
#include <sys/types.h>
|
|
#if APR_HAVE_SYS_SOCKET_H
|
|
#include <sys/socket.h>
|
|
#endif
|
|
#include <apr_errno.h>
|
|
|
|
#include "ap_mpm.h"
|
|
|
|
typedef struct fd_queue_info_t fd_queue_info_t;
|
|
typedef struct event_conn_state_t event_conn_state_t;
|
|
|
|
apr_status_t ap_queue_info_create(fd_queue_info_t ** queue_info,
|
|
apr_pool_t * pool, int max_idlers,
|
|
int max_recycled_pools);
|
|
apr_status_t ap_queue_info_set_idle(fd_queue_info_t * queue_info,
|
|
apr_pool_t * pool_to_recycle);
|
|
apr_status_t ap_queue_info_try_get_idler(fd_queue_info_t * queue_info);
|
|
apr_status_t ap_queue_info_wait_for_idler(fd_queue_info_t * queue_info,
|
|
int *had_to_block);
|
|
apr_status_t ap_queue_info_term(fd_queue_info_t * queue_info);
|
|
apr_uint32_t ap_queue_info_get_idlers(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 {
|
|
APR_RING_ENTRY(timer_event_t) link;
|
|
apr_time_t when;
|
|
ap_mpm_callback_fn_t *cbfunc;
|
|
void *baton;
|
|
int canceled;
|
|
apr_pollfd_t **remove;
|
|
};
|
|
|
|
struct fd_queue_t
|
|
{
|
|
APR_RING_HEAD(timers_t, timer_event_t) timers;
|
|
fd_queue_elem_t *data;
|
|
unsigned int nelts;
|
|
unsigned int bounds;
|
|
unsigned int in;
|
|
unsigned int out;
|
|
apr_thread_mutex_t *one_big_mutex;
|
|
apr_thread_cond_t *not_empty;
|
|
int terminated;
|
|
};
|
|
typedef struct fd_queue_t fd_queue_t;
|
|
|
|
void ap_pop_pool(apr_pool_t ** recycled_pool, fd_queue_info_t * queue_info);
|
|
void ap_push_pool(fd_queue_info_t * queue_info,
|
|
apr_pool_t * pool_to_recycle);
|
|
|
|
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);
|
|
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,
|
|
timer_event_t ** te);
|
|
apr_status_t ap_queue_interrupt_all(fd_queue_t * queue);
|
|
apr_status_t ap_queue_term(fd_queue_t * queue);
|
|
|
|
#endif /* FDQUEUE_H */
|
|
/** @} */
|