manoj 99/10/20 12:11:54
Modified: src/modules/mpm/mpmt_pthread acceptlock.c
Log:
Add errno to ap_log_error calls that were missed before.
Revision Changes Path
1.16 +10 -7 apache-2.0/src/modules/mpm/mpmt_pthread/acceptlock.c
Index: acceptlock.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/acceptlock.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -u -r1.15 -r1.16
--- acceptlock.c 1999/10/20 12:50:01 1.15
+++ acceptlock.c 1999/10/20 19:11:53 1.16
@@ -584,7 +584,7 @@
ap_open(&tempfile, lock_fname, APR_WRITE, APR_UREAD | APR_UWRITE, p);
ap_get_os_file(&lock_fd[i], tempfile);
if (lock_fd[i] == -1) {
- ap_log_error(APLOG_MARK, APLOG_EMERG,
+ ap_log_error(APLOG_MARK, APLOG_EMERG, errno,
(const server_rec *)ap_get_server_conf(),
"Child cannot open lock file: %s", lock_fname);
clean_child_exit(APEXIT_CHILDINIT);
@@ -612,7 +612,7 @@
APR_UREAD | APR_UWRITE, p);
ap_get_os_file(&lock_fd[i], tempfile);
if (lock_fd[i] == -1) {
- ap_log_error(APLOG_MARK, APLOG_EMERG,
+ ap_log_error(APLOG_MARK, APLOG_EMERG, errno,
(const server_rec *) ap_get_server_conf(),
"Parent cannot open lock file: %s", lock_fname);
exit(APEXIT_INIT);
@@ -629,7 +629,7 @@
continue;
if (ret < 0) {
- ap_log_error(APLOG_MARK, APLOG_EMERG,
+ ap_log_error(APLOG_MARK, APLOG_EMERG, errno,
(const server_rec *) ap_get_server_conf(),
"flock: LOCK_EX: Error getting accept lock. Exiting!");
clean_child_exit(APEXIT_CHILDFATAL);
@@ -639,7 +639,7 @@
void accept_mutex_off(int locknum)
{
if (flock(lock_fd[locknum], LOCK_UN) < 0) {
- ap_log_error(APLOG_MARK, APLOG_EMERG,
+ ap_log_error(APLOG_MARK, APLOG_EMERG, errno,
(const server_rec *) ap_get_server_conf(),
"flock: LOCK_UN: Error freeing accept lock. Exiting!");
clean_child_exit(APEXIT_CHILDFATAL);
@@ -672,7 +672,8 @@
int rc = DosOpenMutexSem(NULL, &lock_sem[locknum]);
if (rc != 0) {
- ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_EMERG,
ap_get_server_conf(),
+ ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_EMERG, errno,
+ ap_get_server_conf(),
"Child cannot open lock semaphore, rc=%d", rc);
clean_child_exit(APEXIT_CHILDINIT);
}
@@ -708,7 +709,8 @@
int rc = DosRequestMutexSem(lock_sem[locknum], SEM_INDEFINITE_WAIT);
if (rc != 0) {
- ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_EMERG,
ap_get_server_conf(),
+ ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_EMERG, errno,
+ ap_get_server_conf(),
"OS2SEM: Error %d getting accept lock. Exiting!", rc);
clean_child_exit(APEXIT_CHILDFATAL);
}
@@ -719,7 +721,8 @@
int rc = DosReleaseMutexSem(lock_sem[locknum]);
if (rc != 0) {
- ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_EMERG,
ap_get_server_conf(),
+ ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_EMERG, errno,
+ ap_get_server_conf(),
"OS2SEM: Error %d freeing accept lock. Exiting!", rc);
clean_child_exit(APEXIT_CHILDFATAL);
}
