summaryrefslogtreecommitdiff
path: root/server/mpm/worker/pod.c
diff options
context:
space:
mode:
Diffstat (limited to 'server/mpm/worker/pod.c')
-rw-r--r--server/mpm/worker/pod.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/server/mpm/worker/pod.c b/server/mpm/worker/pod.c
index 77ad1c90..86f7b39d 100644
--- a/server/mpm/worker/pod.c
+++ b/server/mpm/worker/pod.c
@@ -14,13 +14,16 @@
* limitations under the License.
*/
+#include "apr_portable.h"
#include "pod.h"
#if APR_HAVE_UNISTD_H
#include <unistd.h>
#endif
-AP_DECLARE(apr_status_t) ap_mpm_pod_open(apr_pool_t *p, ap_pod_t **pod)
+APLOG_USE_MODULE(mpm_worker);
+
+AP_DECLARE(apr_status_t) ap_worker_pod_open(apr_pool_t *p, ap_worker_pod_t **pod)
{
apr_status_t rv;
@@ -41,7 +44,7 @@ AP_DECLARE(apr_status_t) ap_mpm_pod_open(apr_pool_t *p, ap_pod_t **pod)
return APR_SUCCESS;
}
-AP_DECLARE(int) ap_mpm_pod_check(ap_pod_t *pod)
+AP_DECLARE(int) ap_worker_pod_check(ap_worker_pod_t *pod)
{
char c;
apr_os_file_t fd;
@@ -63,7 +66,7 @@ AP_DECLARE(int) ap_mpm_pod_check(ap_pod_t *pod)
return AP_NORESTART;
}
-AP_DECLARE(apr_status_t) ap_mpm_pod_close(ap_pod_t *pod)
+AP_DECLARE(apr_status_t) ap_worker_pod_close(ap_worker_pod_t *pod)
{
apr_status_t rv;
@@ -79,7 +82,7 @@ AP_DECLARE(apr_status_t) ap_mpm_pod_close(ap_pod_t *pod)
return rv;
}
-static apr_status_t pod_signal_internal(ap_pod_t *pod, int graceful)
+static apr_status_t pod_signal_internal(ap_worker_pod_t *pod, int graceful)
{
apr_status_t rv;
char char_of_death = graceful ? GRACEFUL_CHAR : RESTART_CHAR;
@@ -87,18 +90,18 @@ static apr_status_t pod_signal_internal(ap_pod_t *pod, int graceful)
rv = apr_file_write(pod->pod_out, &char_of_death, &one);
if (rv != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_WARNING, rv, ap_server_conf,
+ ap_log_error(APLOG_MARK, APLOG_WARNING, rv, ap_server_conf, APLOGNO(00325)
"write pipe_of_death");
}
return rv;
}
-AP_DECLARE(apr_status_t) ap_mpm_pod_signal(ap_pod_t *pod, int graceful)
+AP_DECLARE(apr_status_t) ap_worker_pod_signal(ap_worker_pod_t *pod, int graceful)
{
return pod_signal_internal(pod, graceful);
}
-AP_DECLARE(void) ap_mpm_pod_killpg(ap_pod_t *pod, int num, int graceful)
+AP_DECLARE(void) ap_worker_pod_killpg(ap_worker_pod_t *pod, int num, int graceful)
{
int i;
apr_status_t rv = APR_SUCCESS;