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 11:46:12 UTC
svn commit: r1821624 - in /httpd/httpd/trunk/server: mpm/event/config3.m4
mpm/event/event.c mpm/event/fdqueue.c mpm/event/fdqueue.h mpm_fdqueue.c
mpm_fdqueue.h
Author: ylavic
Date: Fri Jan 19 11:46:12 2018
New Revision: 1821624
URL: http://svn.apache.org/viewvc?rev=1821624&view=rev
Log:
Shared fdqueue code between MPMs event and worker into mpm_fdqueue.
This first step moves the files server/mpm/event/fdqueue.[ch] to
server/mpm_fdqueue.[ch] (untouched for now, simple svn move).
Will follow up with the necessary changes to mpm_unix.* for common code.
Added:
httpd/httpd/trunk/server/mpm_fdqueue.c
- copied unchanged from r1821623, httpd/httpd/trunk/server/mpm/event/fdqueue.c
httpd/httpd/trunk/server/mpm_fdqueue.h
- copied unchanged from r1821623, httpd/httpd/trunk/server/mpm/event/fdqueue.h
Removed:
httpd/httpd/trunk/server/mpm/event/fdqueue.c
httpd/httpd/trunk/server/mpm/event/fdqueue.h
Modified:
httpd/httpd/trunk/server/mpm/event/config3.m4
httpd/httpd/trunk/server/mpm/event/event.c
Modified: httpd/httpd/trunk/server/mpm/event/config3.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/event/config3.m4?rev=1821624&r1=1821623&r2=1821624&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/event/config3.m4 (original)
+++ httpd/httpd/trunk/server/mpm/event/config3.m4 Fri Jan 19 11:46:12 2018
@@ -8,7 +8,7 @@ if test "$ac_cv_serf" = yes ; then
fi
APACHE_SUBST(MOD_MPM_EVENT_LDADD)
-APACHE_MPM_MODULE(event, $enable_mpm_event, event.lo fdqueue.lo,[
+APACHE_MPM_MODULE(event, $enable_mpm_event, event.lo,[
AC_CHECK_FUNCS(pthread_kill)
], , [\$(MOD_MPM_EVENT_LDADD)])
Modified: httpd/httpd/trunk/server/mpm/event/event.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/event/event.c?rev=1821624&r1=1821623&r2=1821624&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/event/event.c (original)
+++ httpd/httpd/trunk/server/mpm/event/event.c Fri Jan 19 11:46:12 2018
@@ -91,7 +91,7 @@
#include "mpm_common.h"
#include "ap_listen.h"
#include "scoreboard.h"
-#include "fdqueue.h"
+#include "mpm_fdqueue.h"
#include "mpm_default.h"
#include "http_vhost.h"
#include "unixd.h"