You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2001/08/13 17:44:00 UTC
cvs commit: httpd-2.0/server/mpm/worker mpm.h
trawick 01/08/13 08:44:00
Modified: . configure.in
include mpm_common.h
server mpm_common.c
server/mpm/beos mpm.h
server/mpm/perchild mpm.h
server/mpm/prefork mpm.h
server/mpm/threaded mpm.h
server/mpm/worker mpm.h
Log:
allow non-Unix MPMs to use mpm_common.c by not automatically
building in Unix-specific code
Revision Changes Path
1.168 +2 -0 httpd-2.0/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/httpd-2.0/configure.in,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- configure.in 2001/07/27 11:22:43 1.167
+++ configure.in 2001/08/13 15:44:00 1.168
@@ -202,6 +202,8 @@
dnl See Comment #Spoon
AC_CHECK_FUNCS( \
+getpwnam \
+getgrnam \
initgroups \
bindprocessor \
)
1.25 +5 -0 httpd-2.0/include/mpm_common.h
Index: mpm_common.h
===================================================================
RCS file: /home/cvs/httpd-2.0/include/mpm_common.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- mpm_common.h 2001/08/13 04:57:34 1.24
+++ mpm_common.h 2001/08/13 15:44:00 1.25
@@ -124,7 +124,9 @@
* @param ret The process id of the process that died
* @param p The pool to allocate out of
*/
+#ifdef AP_MPM_WANT_WAIT_OR_TIMEOUT
void ap_wait_or_timeout(apr_wait_t *status, apr_proc_t *ret, apr_pool_t *p);
+#endif
/**
* Log why a child died to the error log, if the child died without the
@@ -132,7 +134,9 @@
* @param pid The child that has died
* @param status The status returned from ap_wait_or_timeout
*/
+#ifdef AP_MPM_WANT_PROCESS_CHILD_STATUS
void ap_process_child_status(apr_proc_t *pid, apr_wait_t status);
+#endif
#if defined(TCP_NODELAY) && !defined(MPE) && !defined(TPF)
/**
@@ -154,6 +158,7 @@
* @deffunc uid_t ap_uname2id(const char *name)
*/
AP_DECLARE(uid_t) ap_uname2id(const char *name);
+
/**
* Convert a group name to a numeric ID
* @param name The name to convert
1.61 +10 -1 httpd-2.0/server/mpm_common.c
Index: mpm_common.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm_common.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- mpm_common.c 2001/08/13 04:57:34 1.60
+++ mpm_common.c 2001/08/13 15:44:00 1.61
@@ -186,8 +186,10 @@
}
}
}
-#endif /* NEED_RECLAIM_CHILD_PROCESSES */
+#endif /* AP_MPM_NEEDS_RECLAIM_CHILD_PROCESSES */
+#ifdef AP_MPM_WANT_WAIT_OR_TIMEOUT
+
/* number of calls to wait_or_timeout between writable probes */
#ifndef INTERVAL_OF_WRITABLE_PROBES
#define INTERVAL_OF_WRITABLE_PROBES 10
@@ -219,7 +221,9 @@
ret->pid = -1;
return;
}
+#endif /* AP_MPM_WANT_WAIT_OR_TIMEOUT */
+#ifdef AP_MPM_WANT_PROCESS_CHILD_STATUS
void ap_process_child_status(apr_proc_t *pid, apr_wait_t status)
{
int signum = WTERMSIG(status);
@@ -265,6 +269,7 @@
}
}
}
+#endif /* AP_MPM_WANT_PROCESS_CHILD_STATUS */
#if defined(TCP_NODELAY) && !defined(MPE) && !defined(TPF)
void ap_sock_disable_nagle(apr_socket_t *s)
@@ -287,6 +292,7 @@
}
#endif
+#ifdef HAVE_GETPWNAM
AP_DECLARE(uid_t) ap_uname2id(const char *name)
{
struct passwd *ent;
@@ -300,7 +306,9 @@
}
return (ent->pw_uid);
}
+#endif
+#ifdef HAVE_GETGRNAM
AP_DECLARE(gid_t) ap_gname2id(const char *name)
{
struct group *ent;
@@ -313,6 +321,7 @@
}
return (ent->gr_gid);
}
+#endif
#ifndef HAVE_INITGROUPS
int initgroups(const char *name, gid_t basegid)
1.10 +2 -0 httpd-2.0/server/mpm/beos/mpm.h
Index: mpm.h
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/beos/mpm.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mpm.h 2001/08/13 04:57:34 1.9
+++ mpm.h 2001/08/13 15:44:00 1.10
@@ -68,6 +68,8 @@
#define MPM_CHILD_PID(i) (ap_scoreboard_image->servers[0][i].tid)
#define MPM_NOTE_CHILD_KILLED(i) (MPM_CHILD_PID(i) = 0)
+#define AP_MPM_WANT_WAIT_OR_TIMEOUT
+#define AP_MPM_WANT_PROCESS_CHILD_STATUS
#define AP_MPM_WANT_SET_PIDFILE
#define AP_MPM_WANT_SET_SCOREBOARD
#define AP_MPM_WANT_SET_MAX_REQUESTS
1.9 +2 -0 httpd-2.0/server/mpm/perchild/mpm.h
Index: mpm.h
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/perchild/mpm.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mpm.h 2001/08/13 04:57:35 1.8
+++ mpm.h 2001/08/13 15:44:00 1.9
@@ -67,6 +67,8 @@
#define MPM_NAME "Perchild"
+#define AP_MPM_WANT_WAIT_OR_TIMEOUT
+#define AP_MPM_WANT_PROCESS_CHILD_STATUS
#define AP_MPM_WANT_SET_PIDFILE
#define AP_MPM_WANT_SET_SCOREBOARD
#define AP_MPM_WANT_SET_LOCKFILE
1.14 +2 -0 httpd-2.0/server/mpm/prefork/mpm.h
Index: mpm.h
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/prefork/mpm.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mpm.h 2001/08/13 04:57:35 1.13
+++ mpm.h 2001/08/13 15:44:00 1.14
@@ -68,6 +68,8 @@
#define MPM_NAME "Prefork"
+#define AP_MPM_WANT_WAIT_OR_TIMEOUT
+#define AP_MPM_WANT_PROCESS_CHILD_STATUS
#define AP_MPM_WANT_SET_PIDFILE
#define AP_MPM_WANT_SET_SCOREBOARD
#define AP_MPM_WANT_SET_LOCKFILE
1.7 +2 -0 httpd-2.0/server/mpm/threaded/mpm.h
Index: mpm.h
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/threaded/mpm.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mpm.h 2001/08/13 04:57:35 1.6
+++ mpm.h 2001/08/13 15:44:00 1.7
@@ -65,6 +65,8 @@
#define MPM_NAME "Threaded"
+#define AP_MPM_WANT_WAIT_OR_TIMEOUT
+#define AP_MPM_WANT_PROCESS_CHILD_STATUS
#define AP_MPM_WANT_SET_PIDFILE
#define AP_MPM_WANT_SET_SCOREBOARD
#define AP_MPM_WANT_SET_LOCKFILE
1.3 +2 -0 httpd-2.0/server/mpm/worker/mpm.h
Index: mpm.h
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/worker/mpm.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mpm.h 2001/08/13 04:57:35 1.2
+++ mpm.h 2001/08/13 15:44:00 1.3
@@ -65,6 +65,8 @@
#define MPM_NAME "Worker"
+#define AP_MPM_WANT_WAIT_OR_TIMEOUT
+#define AP_MPM_WANT_PROCESS_CHILD_STATUS
#define AP_MPM_WANT_SET_PIDFILE
#define AP_MPM_WANT_SET_SCOREBOARD
#define AP_MPM_WANT_SET_LOCKFILE