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:07:23 UTC
svn commit: r1821625 - in /httpd/httpd/trunk/server: Makefile.in
mpm_fdqueue.c mpm_fdqueue.h
Author: ylavic
Date: Fri Jan 19 12:07:23 2018
New Revision: 1821625
URL: http://svn.apache.org/viewvc?rev=1821625&view=rev
Log:
mpm_fdqueue: follow up to r1821624.
And now it's mpm_fdqueue, with minimal #includes.
Modified:
httpd/httpd/trunk/server/Makefile.in
httpd/httpd/trunk/server/mpm_fdqueue.c
httpd/httpd/trunk/server/mpm_fdqueue.h
Modified: httpd/httpd/trunk/server/Makefile.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/Makefile.in?rev=1821625&r1=1821624&r2=1821625&view=diff
==============================================================================
--- httpd/httpd/trunk/server/Makefile.in (original)
+++ httpd/httpd/trunk/server/Makefile.in Fri Jan 19 12:07:23 2018
@@ -9,7 +9,8 @@ LTLIBRARY_NAME = libmain.la
LTLIBRARY_SOURCES = \
config.c log.c main.c vhost.c util.c util_fcgi.c \
util_script.c util_md5.c util_cfgtree.c util_ebcdic.c util_time.c \
- connection.c listen.c util_mutex.c mpm_common.c mpm_unix.c \
+ connection.c listen.c util_mutex.c \
+ mpm_common.c mpm_unix.c mpm_fdqueue.c \
util_charset.c util_cookies.c util_debug.c util_xml.c \
util_filter.c util_pcre.c util_regex.c exports.c \
scoreboard.c error_bucket.c protocol.c core.c request.c provider.c \
Modified: httpd/httpd/trunk/server/mpm_fdqueue.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm_fdqueue.c?rev=1821625&r1=1821624&r2=1821625&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm_fdqueue.c (original)
+++ httpd/httpd/trunk/server/mpm_fdqueue.c Fri Jan 19 12:07:23 2018
@@ -14,8 +14,9 @@
* limitations under the License.
*/
-#include "fdqueue.h"
-#include "apr_atomic.h"
+#include "mpm_fdqueue.h"
+
+#include <apr_atomic.h>
static const apr_uint32_t zero_pt = APR_UINT32_MAX/2;
Modified: httpd/httpd/trunk/server/mpm_fdqueue.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm_fdqueue.h?rev=1821625&r1=1821624&r2=1821625&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm_fdqueue.h (original)
+++ httpd/httpd/trunk/server/mpm_fdqueue.h Fri Jan 19 12:07:23 2018
@@ -15,30 +15,29 @@
*/
/**
- * @file event/fdqueue.h
+ * @file server/mpm_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>
+#ifndef MPM_FDQUEUE_H
+#define MPM_FDQUEUE_H
+
+#include <apr.h>
+
+/* Not worth thinking about w/o threads... */
+#if APR_HAS_THREADS
#include "ap_mpm.h"
+#include <apr_ring.h>
+#include <apr_pools.h>
+#include <apr_network_io.h>
+#include <apr_thread_mutex.h>
+#include <apr_thread_cond.h>
+
typedef struct fd_queue_info_t fd_queue_info_t;
typedef struct event_conn_state_t event_conn_state_t;
@@ -104,5 +103,7 @@ apr_status_t ap_queue_interrupt_all(fd_q
apr_status_t ap_queue_interrupt_one(fd_queue_t * queue);
apr_status_t ap_queue_term(fd_queue_t * queue);
-#endif /* FDQUEUE_H */
+#endif /* APR_HAS_THREADS */
+
+#endif /* MPM_FDQUEUE_H */
/** @} */