httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1101066 - in /httpd/httpd/trunk: configure.in include/ap_config.h include/ap_hooks.h
Date Mon, 09 May 2011 15:36:22 GMT
Author: jim
Date: Mon May  9 15:36:22 2011
New Revision: 1101066

URL: http://svn.apache.org/viewvc?rev=1101066&view=rev
Log:
Start of ap_hooks.h setup

Added:
    httpd/httpd/trunk/include/ap_hooks.h
      - copied, changed from r1100786, httpd/httpd/trunk/include/ap_config.h
Modified:
    httpd/httpd/trunk/configure.in
    httpd/httpd/trunk/include/ap_config.h

Modified: httpd/httpd/trunk/configure.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/configure.in?rev=1101066&r1=1101065&r2=1101066&view=diff
==============================================================================
--- httpd/httpd/trunk/configure.in (original)
+++ httpd/httpd/trunk/configure.in Mon May  9 15:36:22 2011
@@ -510,6 +510,12 @@ esac
 
 APACHE_SUBST(DTRACE)
 
+AC_ARG_ENABLE(hook-probes,APACHE_HELP_STRING(--enable-hook-probes,Enable APR hook probes),
+[
+    AC_DEFINE(APR_HOOK_PROBES_ENABLED, 1,
+        [Enable the APR hook probes capability, reading from ap_hook_probes.h])
+])dnl
+
 AC_ARG_ENABLE(exception-hook,APACHE_HELP_STRING(--enable-exception-hook,Enable fatal exception
hook),
 [
     AC_DEFINE(AP_ENABLE_EXCEPTION_HOOK, 1,

Modified: httpd/httpd/trunk/include/ap_config.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_config.h?rev=1101066&r1=1101065&r2=1101066&view=diff
==============================================================================
--- httpd/httpd/trunk/include/ap_config.h (original)
+++ httpd/httpd/trunk/include/ap_config.h Mon May  9 15:36:22 2011
@@ -22,13 +22,11 @@
 #ifndef AP_CONFIG_H
 #define AP_CONFIG_H
 
-#include "apr.h"
-#include "apr_hooks.h"
-#include "apr_optional_hooks.h"
+#include "ap_hooks.h"
 
-/* Although this file doesn't declare any hooks, declare the hook group here */
+/* Although this file doesn't declare any hooks, declare the exports group here */
 /** 
- * @defgroup hooks Apache Hooks 
+ * @defgroup exports Apache exports 
  * @ingroup  APACHE_CORE
  */
 
@@ -135,100 +133,6 @@
 #define AP_MODULE_DECLARE_DATA           __declspec(dllexport)
 #endif
 
-/**
- * Declare a hook function
- * @param ret The return type of the hook
- * @param name The hook's name (as a literal)
- * @param args The arguments the hook function takes, in brackets.
- */
-#define AP_DECLARE_HOOK(ret,name,args) \
-	APR_DECLARE_EXTERNAL_HOOK(ap,AP,ret,name,args)
-
-/** @internal */
-#define AP_IMPLEMENT_HOOK_BASE(name) \
-	APR_IMPLEMENT_EXTERNAL_HOOK_BASE(ap,AP,name)
-
-/**
- * Implement an Apache core hook that has no return code, and
- * therefore runs all of the registered functions. The implementation
- * is called ap_run_<i>name</i>.
- *
- * @param name The name of the hook
- * @param args_decl The declaration of the arguments for the hook, for example
- * "(int x,void *y)"
- * @param args_use The arguments for the hook as used in a call, for example
- * "(x,y)"
- * @note If IMPLEMENTing a hook that is not linked into the Apache core,
- * (e.g. within a dso) see APR_IMPLEMENT_EXTERNAL_HOOK_VOID.
- */
-#define AP_IMPLEMENT_HOOK_VOID(name,args_decl,args_use) \
-	APR_IMPLEMENT_EXTERNAL_HOOK_VOID(ap,AP,name,args_decl,args_use)
-
-/**
- * Implement an Apache core hook that runs until one of the functions
- * returns something other than ok or decline. That return value is
- * then returned from the hook runner. If the hooks run to completion,
- * then ok is returned. Note that if no hook runs it would probably be
- * more correct to return decline, but this currently does not do
- * so. The implementation is called ap_run_<i>name</i>.
- *
- * @param ret The return type of the hook (and the hook runner)
- * @param name The name of the hook
- * @param args_decl The declaration of the arguments for the hook, for example
- * "(int x,void *y)"
- * @param args_use The arguments for the hook as used in a call, for example
- * "(x,y)"
- * @param ok The "ok" return value
- * @param decline The "decline" return value
- * @return ok, decline or an error.
- * @note If IMPLEMENTing a hook that is not linked into the Apache core,
- * (e.g. within a dso) see APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL.
- */
-#define AP_IMPLEMENT_HOOK_RUN_ALL(ret,name,args_decl,args_use,ok,decline) \
-	APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(ap,AP,ret,name,args_decl, \
-                                            args_use,ok,decline)
-
-/**
- * Implement a hook that runs until a function returns something other than 
- * decline. If all functions return decline, the hook runner returns decline. 
- * The implementation is called ap_run_<i>name</i>.
- *
- * @param ret The return type of the hook (and the hook runner)
- * @param name The name of the hook
- * @param args_decl The declaration of the arguments for the hook, for example
- * "(int x,void *y)"
- * @param args_use The arguments for the hook as used in a call, for example
- * "(x,y)"
- * @param decline The "decline" return value
- * @return decline or an error.
- * @note If IMPLEMENTing a hook that is not linked into the Apache core
- * (e.g. within a dso) see APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST.
- */
-#define AP_IMPLEMENT_HOOK_RUN_FIRST(ret,name,args_decl,args_use,decline) \
-	APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(ap,AP,ret,name,args_decl, \
-                                              args_use,decline)
-
-/* Note that the other optional hook implementations are straightforward but
- * have not yet been needed
- */
-
-/**
- * Implement an optional hook. This is exactly the same as a standard hook
- * implementation, except the hook is optional.
- * @see AP_IMPLEMENT_HOOK_RUN_ALL
- */
-#define AP_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(ret,name,args_decl,args_use,ok, \
-					   decline) \
-	APR_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(ap,AP,ret,name,args_decl, \
-                                            args_use,ok,decline)
-
-/**
- * Hook an optional hook. Unlike static hooks, this uses a macro instead of a
- * function.
- */
-#define AP_OPTIONAL_HOOK(name,fn,pre,succ,order) \
-        APR_OPTIONAL_HOOK(ap,name,fn,pre,succ,order)
-
 #include "os.h"
 #if (!defined(WIN32) && !defined(NETWARE)) || defined(__MINGW32__)
 #include "ap_config_auto.h"

Copied: httpd/httpd/trunk/include/ap_hooks.h (from r1100786, httpd/httpd/trunk/include/ap_config.h)
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_hooks.h?p2=httpd/httpd/trunk/include/ap_hooks.h&p1=httpd/httpd/trunk/include/ap_config.h&r1=1100786&r2=1101066&rev=1101066&view=diff
==============================================================================
--- httpd/httpd/trunk/include/ap_config.h (original)
+++ httpd/httpd/trunk/include/ap_hooks.h Mon May  9 15:36:22 2011
@@ -15,16 +15,12 @@
  */
 
 /**
- * @file ap_config.h
- * @brief Symbol export macros and hook functions
+ * @file ap_hooks.h
+ * @brief ap hook functions and macros
  */
 
-#ifndef AP_CONFIG_H
-#define AP_CONFIG_H
-
-#include "apr.h"
-#include "apr_hooks.h"
-#include "apr_optional_hooks.h"
+#ifndef AP_HOOKS_H
+#define AP_HOOKS_H
 
 /* Although this file doesn't declare any hooks, declare the hook group here */
 /** 
@@ -32,6 +28,14 @@
  * @ingroup  APACHE_CORE
  */
 
+#ifdef APR_HOOK_PROBES_ENABLED
+#include "ap_hook_probes.h"
+#endif
+
+#include "apr.h"
+#include "apr_hooks.h"
+#include "apr_optional_hooks.h"
+
 #ifdef DOXYGEN
 /* define these just so doxygen documents them */
 
@@ -57,84 +61,6 @@
 
 #endif /* def DOXYGEN */
 
-#if !defined(WIN32)
-/**
- * Apache Core dso functions are declared with AP_DECLARE(), so they may
- * use the most appropriate calling convention.  Hook functions and other
- * Core functions with variable arguments must use AP_DECLARE_NONSTD().
- * @code
- * AP_DECLARE(rettype) ap_func(args)
- * @endcode
- */
-#define AP_DECLARE(type)            type
-
-/**
- * Apache Core dso variable argument and hook functions are declared with 
- * AP_DECLARE_NONSTD(), as they must use the C language calling convention.
- * @see AP_DECLARE
- * @code
- * AP_DECLARE_NONSTD(rettype) ap_func(args [...])
- * @endcode
- */
-#define AP_DECLARE_NONSTD(type)     type
-
-/**
- * Apache Core dso variables are declared with AP_MODULE_DECLARE_DATA.
- * This assures the appropriate indirection is invoked at compile time.
- *
- * @note AP_DECLARE_DATA extern type apr_variable; syntax is required for
- * declarations within headers to properly import the variable.
- * @code
- * AP_DECLARE_DATA type apr_variable
- * @endcode
- */
-#define AP_DECLARE_DATA
-
-#elif defined(AP_DECLARE_STATIC)
-#define AP_DECLARE(type)            type __stdcall
-#define AP_DECLARE_NONSTD(type)     type
-#define AP_DECLARE_DATA
-#elif defined(AP_DECLARE_EXPORT)
-#define AP_DECLARE(type)            __declspec(dllexport) type __stdcall
-#define AP_DECLARE_NONSTD(type)     __declspec(dllexport) type
-#define AP_DECLARE_DATA             __declspec(dllexport)
-#else
-#define AP_DECLARE(type)            __declspec(dllimport) type __stdcall
-#define AP_DECLARE_NONSTD(type)     __declspec(dllimport) type
-#define AP_DECLARE_DATA             __declspec(dllimport)
-#endif
-
-#if !defined(WIN32) || defined(AP_MODULE_DECLARE_STATIC)
-/**
- * Declare a dso module's exported module structure as AP_MODULE_DECLARE_DATA.
- *
- * Unless AP_MODULE_DECLARE_STATIC is defined at compile time, symbols 
- * declared with AP_MODULE_DECLARE_DATA are always exported.
- * @code
- * module AP_MODULE_DECLARE_DATA mod_tag
- * @endcode
- */
-#if defined(WIN32)
-#define AP_MODULE_DECLARE(type)            type __stdcall
-#else
-#define AP_MODULE_DECLARE(type)            type
-#endif
-#define AP_MODULE_DECLARE_NONSTD(type)     type
-#define AP_MODULE_DECLARE_DATA
-#else
-/**
- * AP_MODULE_DECLARE_EXPORT is a no-op.  Unless contradicted by the
- * AP_MODULE_DECLARE_STATIC compile-time symbol, it is assumed and defined.
- *
- * The old SHARED_MODULE compile-time symbol is now the default behavior, 
- * so it is no longer referenced anywhere with Apache 2.0.
- */
-#define AP_MODULE_DECLARE_EXPORT
-#define AP_MODULE_DECLARE(type)          __declspec(dllexport) type __stdcall
-#define AP_MODULE_DECLARE_NONSTD(type)   __declspec(dllexport) type
-#define AP_MODULE_DECLARE_DATA           __declspec(dllexport)
-#endif
-
 /**
  * Declare a hook function
  * @param ret The return type of the hook
@@ -229,44 +155,4 @@
 #define AP_OPTIONAL_HOOK(name,fn,pre,succ,order) \
         APR_OPTIONAL_HOOK(ap,name,fn,pre,succ,order)
 
-#include "os.h"
-#if (!defined(WIN32) && !defined(NETWARE)) || defined(__MINGW32__)
-#include "ap_config_auto.h"
-#endif
-#include "ap_config_layout.h"
-
-/* Where the main/parent process's pid is logged */
-#ifndef DEFAULT_PIDLOG
-#define DEFAULT_PIDLOG DEFAULT_REL_RUNTIMEDIR "/httpd.pid"
-#endif
-
-#if defined(NETWARE)
-#define AP_NONBLOCK_WHEN_MULTI_LISTEN 1
-#endif
-
-#if AP_ENABLE_DTRACE && HAVE_SYS_SDT_H
-#include <sys/sdt.h>
-#else
-#undef _DTRACE_VERSION
-#endif
-
-#ifdef _DTRACE_VERSION
-#include "apache_probes.h"
-#else
-#include "apache_noprobes.h"
-#endif
-
-/* If APR has OTHER_CHILD logic, use reliable piped logs. */
-#if APR_HAS_OTHER_CHILD
-#define AP_HAVE_RELIABLE_PIPED_LOGS TRUE
-#endif
-
-/* Presume that the compiler supports C99-style designated
- * initializers if using GCC (but not G++), or for any other compiler
- * which claims C99 support. */
-#if (defined(__GNUC__) && !defined(__cplusplus))                \
-     || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
-#define AP_HAVE_DESIGNATED_INITIALIZER
-#endif
-
-#endif /* AP_CONFIG_H */
+#endif /* AP_HOOKS_H */



Mime
View raw message