You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2009/05/05 08:23:29 UTC
svn commit: r771579 - in /httpd/httpd/trunk: libhttpd.dsp
modules/mappers/config9.m4 os/win32/modules.c
Author: wrowe
Date: Tue May 5 06:23:29 2009
New Revision: 771579
URL: http://svn.apache.org/viewvc?rev=771579&view=rev
Log:
MPM's are now dynamically loadable; so must mod_watchdog be.
The only module with an excuse now is mod_so which implements
LoadModule itself.
Modified:
httpd/httpd/trunk/libhttpd.dsp
httpd/httpd/trunk/modules/mappers/config9.m4
httpd/httpd/trunk/os/win32/modules.c
Modified: httpd/httpd/trunk/libhttpd.dsp
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/libhttpd.dsp?rev=771579&r1=771578&r2=771579&view=diff
==============================================================================
--- httpd/httpd/trunk/libhttpd.dsp (original)
+++ httpd/httpd/trunk/libhttpd.dsp Tue May 5 06:23:29 2009
@@ -423,10 +423,6 @@
# End Source File
# Begin Source File
-SOURCE=.\modules\mappers\mod_watchdog.c
-# End Source File
-# Begin Source File
-
SOURCE=.\modules\arch\win32\mod_win32.c
# End Source File
# Begin Source File
Modified: httpd/httpd/trunk/modules/mappers/config9.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/config9.m4?rev=771579&r1=771578&r2=771579&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/config9.m4 (original)
+++ httpd/httpd/trunk/modules/mappers/config9.m4 Tue May 5 06:23:29 2009
@@ -61,30 +61,16 @@
APR_CHECK_APR_DEFINE(APR_HAS_THREADS)
-case "x$enable_watchdog" in
- "xyes")
- if test $ac_cv_define_APR_HAS_THREADS = "no"; then
- AC_MSG_ERROR([mod_watchdog has been requested but cannot be built on your system])
- fi
- ;;
- "xshared")
- AC_MSG_ERROR([mod_watchdog can not be built as a shared DSO])
- ;;
- "xno")
- ;;
- "x")
- enable_watchdog=$ac_cv_define_APR_HAS_THREADS
- ;;
-esac
-
-dnl mod_watchdog can only be built statically.
-if test "x$enable_watchdog" = "xyes"; then
- enable_watchdog="static"
+if test $ac_cv_define_APR_HAS_THREADS = "no"; then
+ enable_watchdog="no"
+else
+ enable_watchdog="most"
fi
-APACHE_MODULE(watchdog, Watchdog module, , , $enable_watchdog)
-
-dnl ### why save the cache?
-AC_CACHE_SAVE
+APACHE_MODULE(watchdog, Watchdog module, , , $enable_watchdog, [
+ if test $ac_cv_define_APR_HAS_THREADS = "no"; then
+ AC_MSG_ERROR([mod_watchdog requires apr to be built with --enable-threads])
+ fi
+])
APACHE_MODPATH_FINISH
Modified: httpd/httpd/trunk/os/win32/modules.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/os/win32/modules.c?rev=771579&r1=771578&r2=771579&view=diff
==============================================================================
--- httpd/httpd/trunk/os/win32/modules.c (original)
+++ httpd/httpd/trunk/os/win32/modules.c Tue May 5 06:23:29 2009
@@ -35,7 +35,6 @@
&mpm_winnt_module,
&http_module,
&so_module,
- &watchdog_module,
NULL
};
@@ -45,7 +44,6 @@
{"mpm_winnt_module", &mpm_winnt_module},
{"http_module", &http_module},
{"so_module", &so_module},
- {"watchdog_module", &watchdog_module},
{NULL, NULL}
};
Re: svn commit: r771579 - in /httpd/httpd/trunk: libhttpd.dsp modules/mappers/config9.m4
os/win32/modules.c
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
Jeff Trawick wrote:
>
> If it exports any raw functions (instead of using external hook or
> optional function apis), I think the code should be fixed.
I'm not even clear that folks issues with the mod_watchdog API were
ever addressed, or if this should be set aside from the next release
while some proper attention is paid to it.
But right now, it's little different than mod_dav/mod_dav_fs and I
would just be happy with a server which can make;make install.
Re: svn commit: r771579 - in /httpd/httpd/trunk: libhttpd.dsp
modules/mappers/config9.m4 os/win32/modules.c
Posted by Jeff Trawick <tr...@gmail.com>.
On Tue, May 5, 2009 at 11:58 AM, William A. Rowe, Jr.
<wr...@rowe-clan.net>wrote:
> Jeff Trawick wrote:
> >
> > but LoadModule mod_watchdog falls after other modules. Now I don't
> > recall
> > precisely how Jeff worked out the MPM hooks, and am too tired to
> > work it out
> > just at this moment, but would renaming this config3.m4 work out this
> > ordering issue?
> >
> >
> > Why is there an ordering requirement for mod_watchdog's LoadModule
> > directive?
>
> mod_watchdog exports hooks and functions which are consumed (today) by
> mod_heartbeat and mod_heartmonitor.
>
If it exports any raw functions (instead of using external hook or optional
function apis), I think the code should be fixed.
Re: svn commit: r771579 - in /httpd/httpd/trunk: libhttpd.dsp modules/mappers/config9.m4
os/win32/modules.c
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
Jeff Trawick wrote:
>
> but LoadModule mod_watchdog falls after other modules. Now I don't
> recall
> precisely how Jeff worked out the MPM hooks, and am too tired to
> work it out
> just at this moment, but would renaming this config3.m4 work out this
> ordering issue?
>
>
> Why is there an ordering requirement for mod_watchdog's LoadModule
> directive?
mod_watchdog exports hooks and functions which are consumed (today) by
mod_heartbeat and mod_heartmonitor.
Re: svn commit: r771579 - in /httpd/httpd/trunk: libhttpd.dsp
modules/mappers/config9.m4 os/win32/modules.c
Posted by Jeff Trawick <tr...@gmail.com>.
On Tue, May 5, 2009 at 4:12 AM, William A. Rowe, Jr. <wr...@rowe-clan.net>wrote:
> wrowe@apache.org wrote:
> > Author: wrowe
> > Date: Tue May 5 06:23:29 2009
> > New Revision: 771579
> >
> > URL: http://svn.apache.org/viewvc?rev=771579&view=rev
> > Log:
> > MPM's are now dynamically loadable; so must mod_watchdog be.
> >
> > The only module with an excuse now is mod_so which implements
> > LoadModule itself.
>
> This appears to almost work;
>
> > Modified: httpd/httpd/trunk/modules/mappers/config9.m4
> > URL:
> http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/config9.m4?rev=771579&r1=771578&r2=771579&view=diff
> >
> ==============================================================================
> > --- httpd/httpd/trunk/modules/mappers/config9.m4 (original)
> > +++ httpd/httpd/trunk/modules/mappers/config9.m4 Tue May 5 06:23:29 2009
> > @@ -61,30 +61,16 @@
> >
> > APR_CHECK_APR_DEFINE(APR_HAS_THREADS)
> >
> > -case "x$enable_watchdog" in
> > - "xyes")
> > - if test $ac_cv_define_APR_HAS_THREADS = "no"; then
> > - AC_MSG_ERROR([mod_watchdog has been requested but cannot be
> built on your system])
> > - fi
> > - ;;
> > - "xshared")
> > - AC_MSG_ERROR([mod_watchdog can not be built as a shared DSO])
> > - ;;
> > - "xno")
> > - ;;
> > - "x")
> > - enable_watchdog=$ac_cv_define_APR_HAS_THREADS
> > - ;;
> > -esac
> > -
> > -dnl mod_watchdog can only be built statically.
> > -if test "x$enable_watchdog" = "xyes"; then
> > - enable_watchdog="static"
> > +if test $ac_cv_define_APR_HAS_THREADS = "no"; then
> > + enable_watchdog="no"
> > +else
> > + enable_watchdog="most"
> > fi
> >
> > -APACHE_MODULE(watchdog, Watchdog module, , , $enable_watchdog)
> > -
> > -dnl ### why save the cache?
> > -AC_CACHE_SAVE
> > +APACHE_MODULE(watchdog, Watchdog module, , , $enable_watchdog, [
> > + if test $ac_cv_define_APR_HAS_THREADS = "no"; then
> > + AC_MSG_ERROR([mod_watchdog requires apr to be built with
> --enable-threads])
> > + fi
> > +])
> >
> > APACHE_MODPATH_FINISH
>
> but LoadModule mod_watchdog falls after other modules. Now I don't recall
> precisely how Jeff worked out the MPM hooks, and am too tired to work it
> out
> just at this moment, but would renaming this config3.m4 work out this
> ordering issue?
Why is there an ordering requirement for mod_watchdog's LoadModule
directive?
Re: svn commit: r771579 - in /httpd/httpd/trunk: libhttpd.dsp modules/mappers/config9.m4
os/win32/modules.c
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
wrowe@apache.org wrote:
> Author: wrowe
> Date: Tue May 5 06:23:29 2009
> New Revision: 771579
>
> URL: http://svn.apache.org/viewvc?rev=771579&view=rev
> Log:
> MPM's are now dynamically loadable; so must mod_watchdog be.
>
> The only module with an excuse now is mod_so which implements
> LoadModule itself.
This appears to almost work;
> Modified: httpd/httpd/trunk/modules/mappers/config9.m4
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/config9.m4?rev=771579&r1=771578&r2=771579&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/modules/mappers/config9.m4 (original)
> +++ httpd/httpd/trunk/modules/mappers/config9.m4 Tue May 5 06:23:29 2009
> @@ -61,30 +61,16 @@
>
> APR_CHECK_APR_DEFINE(APR_HAS_THREADS)
>
> -case "x$enable_watchdog" in
> - "xyes")
> - if test $ac_cv_define_APR_HAS_THREADS = "no"; then
> - AC_MSG_ERROR([mod_watchdog has been requested but cannot be built on your system])
> - fi
> - ;;
> - "xshared")
> - AC_MSG_ERROR([mod_watchdog can not be built as a shared DSO])
> - ;;
> - "xno")
> - ;;
> - "x")
> - enable_watchdog=$ac_cv_define_APR_HAS_THREADS
> - ;;
> -esac
> -
> -dnl mod_watchdog can only be built statically.
> -if test "x$enable_watchdog" = "xyes"; then
> - enable_watchdog="static"
> +if test $ac_cv_define_APR_HAS_THREADS = "no"; then
> + enable_watchdog="no"
> +else
> + enable_watchdog="most"
> fi
>
> -APACHE_MODULE(watchdog, Watchdog module, , , $enable_watchdog)
> -
> -dnl ### why save the cache?
> -AC_CACHE_SAVE
> +APACHE_MODULE(watchdog, Watchdog module, , , $enable_watchdog, [
> + if test $ac_cv_define_APR_HAS_THREADS = "no"; then
> + AC_MSG_ERROR([mod_watchdog requires apr to be built with --enable-threads])
> + fi
> +])
>
> APACHE_MODPATH_FINISH
but LoadModule mod_watchdog falls after other modules. Now I don't recall
precisely how Jeff worked out the MPM hooks, and am too tired to work it out
just at this moment, but would renaming this config3.m4 work out this
ordering issue?