d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Diff reduction against Varnish, including one important fix: use a shared

Browse Source 
lock if the file is opened with O_RDONLY.
This commit is contained in:
Dag-Erling Smørgrav 2008-10-20 18:11:30 +00:00
parent 80de06ed6b
commit 0e25c55a95
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/libutil/flopen.c
View File

@ -1,5 +1,5 @@
/*- /*-
* Copyright (c) 2007 Dag-Erling Coïdan Smørgrav * Copyright (c) 2007 Dag-Erling Coïdan Smørgrav
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -42,7 +42,7 @@ int
flopen(const char *path, int flags, ...) flopen(const char *path, int flags, ...)
{ {
int fd, operation, serrno, trunc; int fd, operation, serrno, trunc;
struct flock flock; struct flock lock;
struct stat sb, fsb; struct stat sb, fsb;
mode_t mode; mode_t mode;
@ -55,13 +55,13 @@ flopen(const char *path, int flags, ...)
va_list ap; va_list ap;
va_start(ap, flags); va_start(ap, flags);
mode = va_arg(ap, int); /* mode_t promoted to int */ mode = (mode_t)va_arg(ap, int); /* mode_t promoted to int */
va_end(ap); va_end(ap);
} }
memset(&flock, 0, sizeof flock); memset(&lock, 0, sizeof lock);
flock.l_type = F_WRLCK; lock.l_type = ((flags & O_ACCMODE) == O_RDONLY) ? F_RDLCK : F_WRLCK;
flock.l_whence = SEEK_SET; lock.l_whence = SEEK_SET;
operation = (flags & O_NONBLOCK) ? F_SETLK : F_SETLKW; operation = (flags & O_NONBLOCK) ? F_SETLK : F_SETLKW;
trunc = (flags & O_TRUNC); trunc = (flags & O_TRUNC);
@ -71,35 +71,35 @@ flopen(const char *path, int flags, ...)
if ((fd = open(path, flags, mode)) == -1) if ((fd = open(path, flags, mode)) == -1)
/* non-existent or no access */ /* non-existent or no access */
return (-1); return (-1);
if (fcntl(fd, operation, &flock) == -1) { if (fcntl(fd, operation, &lock) == -1) {
/* unsupported or interrupted */ /* unsupported or interrupted */
serrno = errno; serrno = errno;
close(fd); (void)close(fd);
errno = serrno; errno = serrno;
return (-1); return (-1);
} }
if (stat(path, &sb) == -1) { if (stat(path, &sb) == -1) {
/* disappeared from under our feet */ /* disappeared from under our feet */
close(fd); (void)close(fd);
continue; continue;
} }
if (fstat(fd, &fsb) == -1) { if (fstat(fd, &fsb) == -1) {
/* can't happen [tm] */ /* can't happen [tm] */
serrno = errno; serrno = errno;
close(fd); (void)close(fd);
errno = serrno; errno = serrno;
return (-1); return (-1);
} }
if (sb.st_dev != fsb.st_dev || if (sb.st_dev != fsb.st_dev ||
sb.st_ino != fsb.st_ino) { sb.st_ino != fsb.st_ino) {
/* changed under our feet */ /* changed under our feet */
close(fd); (void)close(fd);
continue; continue;
} }
if (trunc && ftruncate(fd, 0) != 0) { if (trunc && ftruncate(fd, 0) != 0) {
/* can't happen [tm] */ /* can't happen [tm] */
serrno = errno; serrno = errno;
close(fd); (void)close(fd);
errno = serrno; errno = serrno;
return (-1); return (-1);
} }