CERBERUS/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2026-07-01 22:32:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r2564 merge:

Browse source 
compatibility with Tru64 UNIX: fcntl(F_SETLK, F_WRLCK) returns EINVAL if busy
This commit is contained in:
Igor Sysoev 2009-04-01 16:39:29 +00:00
parent e40b8d042e
commit 954dfd389f
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/core/ngx_shmtx.h
View file

@ -57,7 +57,15 @@ ngx_shmtx_trylock(ngx_shmtx_t *mtx)
return 0;
}
ngx_log_abort(err, ngx_trylock_fd_n " failed");
#if __osf__ /* Tru64 UNIX */
if (err == NGX_EACCESS) {
return 0;
}
#endif
ngx_log_abort(err, ngx_trylock_fd_n " %s failed", mtx->name);
return 0;
}
@ -74,7 +82,7 @@ ngx_shmtx_lock(ngx_shmtx_t *mtx)
return;
}
ngx_log_abort(err, ngx_lock_fd_n " failed");
ngx_log_abort(err, ngx_lock_fd_n " %s failed", mtx->name);
}
@ -89,7 +97,7 @@ ngx_shmtx_unlock(ngx_shmtx_t *mtx)
return;
}
ngx_log_abort(err, ngx_unlock_fd_n " failed");
ngx_log_abort(err, ngx_unlock_fd_n " %s failed", mtx->name);
}