properly merge directory configs in mod_include

[apache] / apache_probes.d

diff --git a/apache_probes.d b/apache_probes.d
index 9ac1de0fa2882e4ff868f3e2ee67dfb10642a65d..294626df70b79ffbe2beda37580434faed53dd18 100644 (file)
--- a/apache_probes.d
+++ b/apache_probes.d
@@ -21,6 +21,10 @@ provider ap {
   probe auth_checker__dispatch__invoke(char *);
   probe auth_checker__dispatch__complete(char *, uint32_t);
   probe auth_checker__return(uint32_t);
+  probe check_config__entry();
+  probe check_config__dispatch__invoke(char *);
+  probe check_config__dispatch__complete(char *, uint32_t);
+  probe check_config__return(uint32_t);
   probe check_user_id__entry();
   probe check_user_id__dispatch__invoke(char *);
   probe check_user_id__dispatch__complete(char *, uint32_t);
@@ -41,10 +45,18 @@ provider ap {
   probe default_port__dispatch__invoke(char *);
   probe default_port__dispatch__complete(char *, uint32_t);
   probe default_port__return(uint32_t);
+  probe drop_privileges__entry();
+  probe drop_privileges__dispatch__invoke(char *);
+  probe drop_privileges__dispatch__complete(char *, uint32_t);
+  probe drop_privileges__return(uint32_t);
   probe error_log__entry();
   probe error_log__dispatch__invoke(char *);
   probe error_log__dispatch__complete(char *, uint32_t);
   probe error_log__return(uint32_t);
+  probe fatal_exception__entry();
+  probe fatal_exception__dispatch__invoke(char *);
+  probe fatal_exception__dispatch__complete(char *, uint32_t);
+  probe fatal_exception__return(uint32_t);
   probe fixups__entry();
   probe fixups__dispatch__invoke(char *);
   probe fixups__dispatch__complete(char *, uint32_t);
@@ -89,6 +101,26 @@ provider ap {
   probe monitor__dispatch__invoke(char *);
   probe monitor__dispatch__complete(char *, uint32_t);
   probe monitor__return(uint32_t);
+  probe mpm__entry();
+  probe mpm__dispatch__invoke(char *);
+  probe mpm__dispatch__complete(char *, uint32_t);
+  probe mpm__return(uint32_t);
+  probe mpm_get_name__entry();
+  probe mpm_get_name__dispatch__invoke(char *);
+  probe mpm_get_name__dispatch__complete(char *, uint32_t);
+  probe mpm_get_name__return(uint32_t);
+  probe mpm_note_child_killed__entry();
+  probe mpm_note_child_killed__dispatch__invoke(char *);
+  probe mpm_note_child_killed__dispatch__complete(char *, uint32_t);
+  probe mpm_note_child_killed__return(uint32_t);
+  probe mpm_register_timed_callback__entry();
+  probe mpm_register_timed_callback__dispatch__invoke(char *);
+  probe mpm_register_timed_callback__dispatch__complete(char *, uint32_t);
+  probe mpm_register_timed_callback__return(uint32_t);
+  probe mpm_query__entry();
+  probe mpm_query__dispatch__invoke(char *);
+  probe mpm_query__dispatch__complete(char *, uint32_t);
+  probe mpm_query__return(uint32_t);
   probe open_logs__entry();
   probe open_logs__dispatch__invoke(char *);
   probe open_logs__dispatch__complete(char *, uint32_t);
@@ -169,4 +201,22 @@ provider ap {
   probe insert_all_liveprops__dispatch__invoke(char *);
   probe insert_all_liveprops__dispatch__complete(char *, uint32_t);
   probe insert_all_liveprops__return(uint32_t);
+
+  /* Implicit, APR hooks for watchdog */
+  probe watchdog_exit__entry();
+  probe watchdog_exit__dispatch__invoke(char *);
+  probe watchdog_exit__dispatch__complete(char *, uint32_t);
+  probe watchdog_exit__return(uint32_t);
+  probe watchdog_init__entry();
+  probe watchdog_init__dispatch__invoke(char *);
+  probe watchdog_init__dispatch__complete(char *, uint32_t);
+  probe watchdog_init__return(uint32_t);
+  probe watchdog_need__entry();
+  probe watchdog_need__dispatch__invoke(char *);
+  probe watchdog_need__dispatch__complete(char *, uint32_t);
+  probe watchdog_need__return(uint32_t);
+  probe watchdog_step__entry();
+  probe watchdog_step__dispatch__invoke(char *);
+  probe watchdog_step__dispatch__complete(char *, uint32_t);
+  probe watchdog_step__return(uint32_t);
 };