/*
* Copyright 2000, International Business Machines Corporation and others.
* All Rights Reserved.
- *
+ *
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
#include <afsconfig.h>
#include <afs/param.h>
+#include <roken.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <errno.h>
-#include <string.h>
-#ifdef AFS_NT40_ENV
-#include <fcntl.h>
-#else
-#include <sys/file.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#if defined(AFS_SUN5_ENV) || defined(AFS_NBSD_ENV)
-#include <sys/fcntl.h>
+#include <limits.h>
+
+#ifdef HAVE_SYS_RESOURCE_H
#include <sys/resource.h>
#endif
-#endif
-#include <rx/xdr.h>
+#include <afs/opr.h>
+#ifdef AFS_PTHREAD_ENV
+# include <opr/lock.h>
+#endif
#include <afs/afsint.h>
-#include <errno.h>
#include <afs/afssyscalls.h>
+#include <afs/afsutil.h>
+
#include "nfs.h"
#include "ihandle.h"
#include "viceinode.h"
-#ifdef AFS_PTHREAD_ENV
-#include <assert.h>
-#else /* AFS_PTHREAD_ENV */
-#include "afs/assert.h"
-#endif /* AFS_PTHREAD_ENV */
-#include <limits.h>
-
-#ifndef AFS_NT40_ENV
-#ifdef O_LARGEFILE
-#define afs_stat stat64
-#define afs_fstat fstat64
-#else /* !O_LARGEFILE */
-#define afs_stat stat
-#define afs_fstat fstat
-#endif /* !O_LARGEFILE */
-#endif /* AFS_NT40_ENV */
#ifdef AFS_PTHREAD_ENV
pthread_once_t ih_glock_once = PTHREAD_ONCE_INIT;
/* Hash table for inode handles */
IHashBucket_t ihashTable[I_HANDLE_HASH_SIZE];
-void *ih_sync_thread(void *);
+static int _ih_release_r(IHandle_t * ihP);
/* start-time configurable I/O limits */
ih_init_params vol_io_params;
/* fd cache size that will be used if/when ih_UseLargeCache()
* is called */
vol_io_params.fd_max_cachesize = FD_MAX_CACHESIZE;
+
+ vol_io_params.sync_behavior = IH_SYNC_ONCLOSE;
+}
+
+int
+ih_SetSyncBehavior(const char *behavior)
+{
+ int val;
+
+ if (strcmp(behavior, "always") == 0) {
+ val = IH_SYNC_ALWAYS;
+
+ } else if (strcmp(behavior, "onclose") == 0) {
+ val = IH_SYNC_ONCLOSE;
+
+ } else if (strcmp(behavior, "never") == 0) {
+ val = IH_SYNC_NEVER;
+
+ } else {
+ /* invalid behavior name */
+ return -1;
+ }
+
+ vol_io_params.sync_behavior = val;
+ return 0;
}
#ifdef AFS_PTHREAD_ENV
void
ih_glock_init(void)
{
- assert(pthread_mutex_init(&ih_glock_mutex, NULL) == 0);
+ opr_mutex_init(&ih_glock_mutex);
}
#endif /* AFS_PTHREAD_ENV */
ih_Initialize(void)
{
int i;
- assert(!ih_Inited);
+ opr_Assert(!ih_Inited);
ih_Inited = 1;
DLL_INIT_LIST(ihAvailHead, ihAvailTail);
DLL_INIT_LIST(fdAvailHead, fdAvailTail);
#elif defined(AFS_SUN5_ENV) || defined(AFS_NBSD_ENV)
{
struct rlimit rlim;
- assert(getrlimit(RLIMIT_NOFILE, &rlim) == 0);
+ opr_Verify(getrlimit(RLIMIT_NOFILE, &rlim) == 0);
rlim.rlim_cur = rlim.rlim_max;
- assert(setrlimit(RLIMIT_NOFILE, &rlim) == 0);
+ opr_Verify(setrlimit(RLIMIT_NOFILE, &rlim) == 0);
fdMaxCacheSize = rlim.rlim_cur - vol_io_params.fd_handle_setaside;
#ifdef AFS_NBSD_ENV
/* XXX this is to avoid using up all system fd netbsd is
*/
fdMaxCacheSize /= 4;
#endif
- fdMaxCacheSize = MIN(fdMaxCacheSize, vol_io_params.fd_max_cachesize);
- assert(fdMaxCacheSize > 0);
+ fdMaxCacheSize = min(fdMaxCacheSize, vol_io_params.fd_max_cachesize);
+ opr_Assert(fdMaxCacheSize > 0);
}
#elif defined(AFS_HPUX_ENV)
/* Avoid problems with "UFSOpen: igetinode failed" panics on HPUX 11.0 */
fdMaxCacheSize = 0;
#else
{
- long fdMax = MAX(sysconf(_SC_OPEN_MAX) - vol_io_params.fd_handle_setaside,
+ long fdMax = max(sysconf(_SC_OPEN_MAX) - vol_io_params.fd_handle_setaside,
0);
- fdMaxCacheSize = (int)MIN(fdMax, vol_io_params.fd_max_cachesize);
+ fdMaxCacheSize = (int)min(fdMax, vol_io_params.fd_max_cachesize);
}
#endif
- fdCacheSize = MIN(fdMaxCacheSize, vol_io_params.fd_initial_cachesize);
-
- {
-#ifdef AFS_PTHREAD_ENV
- pthread_t syncer;
- pthread_attr_t tattr;
-
- pthread_attr_init(&tattr);
- pthread_attr_setdetachstate(&tattr, PTHREAD_CREATE_DETACHED);
-
- pthread_create(&syncer, &tattr, ih_sync_thread, NULL);
-#else /* AFS_PTHREAD_ENV */
- PROCESS syncer;
- LWP_CreateProcess(ih_sync_thread, 16*1024, LWP_MAX_PRIORITY - 2,
- NULL, "ih_syncer", &syncer);
-#endif /* AFS_PTHREAD_ENV */
- }
-
+ fdCacheSize = min(fdMaxCacheSize, vol_io_params.fd_initial_cachesize);
}
/* Make the file descriptor cache as big as possible. Don't this call
int i;
IHandle_t *ihP;
- assert(ihAvailHead == NULL);
- ihP = (IHandle_t *) malloc(I_HANDLE_MALLOCSIZE * sizeof(IHandle_t));
- assert(ihP != NULL);
+ opr_Assert(ihAvailHead == NULL);
+ ihP = malloc(I_HANDLE_MALLOCSIZE * sizeof(IHandle_t));
+ opr_Assert(ihP != NULL);
for (i = 0; i < I_HANDLE_MALLOCSIZE; i++) {
ihP[i].ih_refcnt = 0;
DLL_INSERT_TAIL(&ihP[i], ihAvailHead, ihAvailTail, ih_next, ih_prev);
iHandleAllocateChunk();
}
ihP = ihAvailHead;
- assert(ihP->ih_refcnt == 0);
+ opr_Assert(ihP->ih_refcnt == 0);
DLL_DELETE(ihP, ihAvailHead, ihAvailTail, ih_next, ih_prev);
ihP->ih_dev = dev;
ihP->ih_vid = vid;
ih_copy(IHandle_t * ihP)
{
IH_LOCK;
- assert(ih_Inited);
- assert(ihP->ih_refcnt > 0);
+ opr_Assert(ih_Inited);
+ opr_Assert(ihP->ih_refcnt > 0);
ihP->ih_refcnt++;
IH_UNLOCK;
return ihP;
int i;
FdHandle_t *fdP;
- assert(fdAvailHead == NULL);
- fdP = (FdHandle_t *) malloc(FD_HANDLE_MALLOCSIZE * sizeof(FdHandle_t));
- assert(fdP != NULL);
+ opr_Assert(fdAvailHead == NULL);
+ fdP = malloc(FD_HANDLE_MALLOCSIZE * sizeof(FdHandle_t));
+ opr_Assert(fdP != NULL);
for (i = 0; i < FD_HANDLE_MALLOCSIZE; i++) {
fdP[i].fd_status = FD_HANDLE_AVAIL;
+ fdP[i].fd_refcnt = 0;
fdP[i].fd_ih = NULL;
fdP[i].fd_fd = INVALID_FD;
+ fdP[i].fd_ihnext = NULL;
+ fdP[i].fd_ihprev = NULL;
DLL_INSERT_TAIL(&fdP[i], fdAvailHead, fdAvailTail, fd_next, fd_prev);
}
}
int i;
StreamHandle_t *streamP;
- assert(streamAvailHead == NULL);
+ opr_Assert(streamAvailHead == NULL);
streamP = (StreamHandle_t *)
malloc(STREAM_HANDLE_MALLOCSIZE * sizeof(StreamHandle_t));
- assert(streamP != NULL);
+ opr_Assert(streamP != NULL);
for (i = 0; i < STREAM_HANDLE_MALLOCSIZE; i++) {
streamP[i].str_fd = INVALID_FD;
DLL_INSERT_TAIL(&streamP[i], streamAvailHead, streamAvailTail,
/*
* Get a file descriptor handle given an Inode handle
+ * Takes the given file descriptor, and creates a new FdHandle_t for it,
+ * attached to the given IHandle_t. fd can be INVALID_FD, indicating that the
+ * caller failed to open the relevant file because we had too many FDs open;
+ * ih_attachfd_r will then just evict/close an existing fd in the cache, and
+ * return NULL.
*/
-FdHandle_t *
-ih_open(IHandle_t * ihP)
+static FdHandle_t *
+ih_attachfd_r(IHandle_t *ihP, FD_t fd)
{
- FdHandle_t *fdP;
- FD_t fd;
FD_t closeFd;
-
- if (!ihP) /* XXX should log here in the fileserver */
- return NULL;
-
- IH_LOCK;
-
- /* Do we already have an open file handle for this Inode? */
- for (fdP = ihP->ih_fdtail; fdP != NULL; fdP = fdP->fd_ihprev) {
- if (fdP->fd_status != FD_HANDLE_INUSE) {
- assert(fdP->fd_status == FD_HANDLE_OPEN);
- fdP->fd_status = FD_HANDLE_INUSE;
- DLL_DELETE(fdP, fdLruHead, fdLruTail, fd_next, fd_prev);
- ihP->ih_refcnt++;
- IH_UNLOCK;
- (void)FDH_SEEK(fdP, 0, SEEK_SET);
- return fdP;
- }
- }
-
- /*
- * Try to open the Inode, return NULL on error.
- */
- fdInUseCount += 1;
- IH_UNLOCK;
-ih_open_retry:
- fd = OS_IOPEN(ihP);
- IH_LOCK;
- if (fd == INVALID_FD && (errno != EMFILE || fdLruHead == NULL) ) {
- fdInUseCount -= 1;
- IH_UNLOCK;
- return NULL;
- }
+ FdHandle_t *fdP;
/* fdCacheSize limits the size of the descriptor cache, but
* we permit the number of open files to exceed fdCacheSize.
* of open files reaches the size of the cache */
if ((fdInUseCount > fdCacheSize || fd == INVALID_FD) && fdLruHead != NULL) {
fdP = fdLruHead;
- assert(fdP->fd_status == FD_HANDLE_OPEN);
+ opr_Assert(fdP->fd_status == FD_HANDLE_OPEN);
DLL_DELETE(fdP, fdLruHead, fdLruTail, fd_next, fd_prev);
DLL_DELETE(fdP, fdP->fd_ih->ih_fdhead, fdP->fd_ih->ih_fdtail,
fd_ihnext, fd_ihprev);
fdP->fd_fd = INVALID_FD;
IH_UNLOCK;
OS_CLOSE(closeFd);
- goto ih_open_retry;
+ IH_LOCK;
+ fdInUseCount -= 1;
+ return NULL;
}
} else {
if (fdAvailHead == NULL) {
fdHandleAllocateChunk();
}
fdP = fdAvailHead;
- assert(fdP->fd_status == FD_HANDLE_AVAIL);
+ opr_Assert(fdP->fd_status == FD_HANDLE_AVAIL);
DLL_DELETE(fdP, fdAvailHead, fdAvailTail, fd_next, fd_prev);
closeFd = INVALID_FD;
}
fdP->fd_status = FD_HANDLE_INUSE;
fdP->fd_fd = fd;
fdP->fd_ih = ihP;
+ fdP->fd_refcnt++;
ihP->ih_refcnt++;
fdInUseCount -= 1;
}
+ return fdP;
+}
+
+FdHandle_t *
+ih_attachfd(IHandle_t *ihP, FD_t fd)
+{
+ FdHandle_t *fdP;
+
+ IH_LOCK;
+
+ fdInUseCount += 1;
+
+ fdP = ih_attachfd_r(ihP, fd);
+ if (!fdP) {
+ fdInUseCount -= 1;
+ }
+
+ IH_UNLOCK;
+
+ return fdP;
+}
+
+/*
+ * Get a file descriptor handle given an Inode handle
+ */
+FdHandle_t *
+ih_open(IHandle_t * ihP)
+{
+ FdHandle_t *fdP;
+ FD_t fd;
+
+ if (!ihP) /* XXX should log here in the fileserver */
+ return NULL;
+
+ IH_LOCK;
+
+ /* Do we already have an open file handle for this Inode? */
+ for (fdP = ihP->ih_fdtail; fdP != NULL; fdP = fdP->fd_ihprev) {
+ if (fdP->fd_status == FD_HANDLE_CLOSING) {
+ /* The handle was open when an IH_REALLYCLOSE was issued, so we
+ * cannot reuse it; it will be closed soon. */
+ continue;
+ }
+#ifndef HAVE_PIO
+ /*
+ * If we don't have positional i/o, don't try to share fds, since
+ * we can't do so in a threadsafe way.
+ */
+ if (fdP->fd_status == FD_HANDLE_INUSE) {
+ continue;
+ }
+ opr_Assert(fdP->fd_status == FD_HANDLE_OPEN);
+#else /* HAVE_PIO */
+ opr_Assert(fdP->fd_status != FD_HANDLE_AVAIL);
+#endif /* HAVE_PIO */
+
+ fdP->fd_refcnt++;
+ if (fdP->fd_status == FD_HANDLE_OPEN) {
+ fdP->fd_status = FD_HANDLE_INUSE;
+ DLL_DELETE(fdP, fdLruHead, fdLruTail, fd_next, fd_prev);
+ }
+ ihP->ih_refcnt++;
+ IH_UNLOCK;
+ return fdP;
+ }
+
+ /*
+ * Try to open the Inode, return NULL on error.
+ */
+ fdInUseCount += 1;
+ IH_UNLOCK;
+ih_open_retry:
+ fd = OS_IOPEN(ihP);
+ IH_LOCK;
+ if (fd == INVALID_FD && (errno != EMFILE || fdLruHead == NULL) ) {
+ fdInUseCount -= 1;
+ IH_UNLOCK;
+ return NULL;
+ }
+
+ fdP = ih_attachfd_r(ihP, fd);
+ if (!fdP) {
+ opr_Assert(fd == INVALID_FD);
+ IH_UNLOCK;
+ goto ih_open_retry;
+ }
+
IH_UNLOCK;
+
return fdP;
}
return 0;
IH_LOCK;
- assert(ih_Inited);
- assert(fdInUseCount > 0);
- assert(fdP->fd_status == FD_HANDLE_INUSE);
+ opr_Assert(ih_Inited);
+ opr_Assert(fdInUseCount > 0);
+ opr_Assert(fdP->fd_status == FD_HANDLE_INUSE ||
+ fdP->fd_status == FD_HANDLE_CLOSING);
ihP = fdP->fd_ih;
* failed (this is determined by checking the ihandle for the flag
* IH_REALLY_CLOSED) or we have too many open files.
*/
- if (ihP->ih_flags & IH_REALLY_CLOSED || fdInUseCount > fdCacheSize) {
+ if (fdP->fd_status == FD_HANDLE_CLOSING ||
+ ihP->ih_flags & IH_REALLY_CLOSED || fdInUseCount > fdCacheSize) {
IH_UNLOCK;
return fd_reallyclose(fdP);
}
- /* Put this descriptor back into the cache */
- fdP->fd_status = FD_HANDLE_OPEN;
- DLL_INSERT_TAIL(fdP, fdLruHead, fdLruTail, fd_next, fd_prev);
+ fdP->fd_refcnt--;
+ if (fdP->fd_refcnt == 0) {
+ /* Put this descriptor back into the cache */
+ fdP->fd_status = FD_HANDLE_OPEN;
+ DLL_INSERT_TAIL(fdP, fdLruHead, fdLruTail, fd_next, fd_prev);
+ }
/* If this is not the only reference to the Inode then we can decrement
* the reference count, otherwise we need to call ih_release.
*/
- if (ihP->ih_refcnt > 1) {
+ if (ihP->ih_refcnt > 1)
ihP->ih_refcnt--;
- IH_UNLOCK;
- } else {
- IH_UNLOCK;
- ih_release(ihP);
- }
+ else
+ _ih_release_r(ihP);
+
+ IH_UNLOCK;
return 0;
}
return 0;
IH_LOCK;
- assert(ih_Inited);
- assert(fdInUseCount > 0);
- assert(fdP->fd_status == FD_HANDLE_INUSE);
+ opr_Assert(ih_Inited);
+ opr_Assert(fdInUseCount > 0);
+ opr_Assert(fdP->fd_status == FD_HANDLE_INUSE ||
+ fdP->fd_status == FD_HANDLE_CLOSING);
ihP = fdP->fd_ih;
closeFd = fdP->fd_fd;
+ fdP->fd_refcnt--;
- DLL_DELETE(fdP, ihP->ih_fdhead, ihP->ih_fdtail, fd_ihnext, fd_ihprev);
- DLL_INSERT_TAIL(fdP, fdAvailHead, fdAvailTail, fd_next, fd_prev);
+ if (fdP->fd_refcnt == 0) {
+ DLL_DELETE(fdP, ihP->ih_fdhead, ihP->ih_fdtail, fd_ihnext, fd_ihprev);
+ DLL_INSERT_TAIL(fdP, fdAvailHead, fdAvailTail, fd_next, fd_prev);
- fdP->fd_status = FD_HANDLE_AVAIL;
- fdP->fd_ih = NULL;
- fdP->fd_fd = INVALID_FD;
+ fdP->fd_status = FD_HANDLE_AVAIL;
+ fdP->fd_refcnt = 0;
+ fdP->fd_ih = NULL;
+ fdP->fd_fd = INVALID_FD;
+ }
/* All the file descriptor handles have been closed; reset
* the IH_REALLY_CLOSED flag indicating that ih_reallyclose
*/
if (!ihP->ih_fdhead) {
ihP->ih_flags &= ~IH_REALLY_CLOSED;
+ } else {
+ FdHandle_t *lfdP, *next;
+ int clear = 1;
+ for (lfdP = ihP->ih_fdhead; lfdP != NULL; lfdP = next) {
+ next = lfdP->fd_ihnext;
+ osi_Assert(lfdP->fd_ih == ihP);
+ if (lfdP->fd_status != FD_HANDLE_CLOSING) {
+ clear = 0;
+ break;
+ }
+ }
+ /* no *future* fd should be subjected to this */
+ if (clear)
+ ihP->ih_flags &= ~IH_REALLY_CLOSED;
}
- IH_UNLOCK;
- OS_CLOSE(closeFd);
- IH_LOCK;
- fdInUseCount -= 1;
+ if (fdP->fd_refcnt == 0) {
+ IH_UNLOCK;
+ OS_CLOSE(closeFd);
+ IH_LOCK;
+ fdInUseCount -= 1;
+ }
/* If this is not the only reference to the Inode then we can decrement
* the reference count, otherwise we need to call ih_release. */
- if (ihP->ih_refcnt > 1) {
+ if (ihP->ih_refcnt > 1)
ihP->ih_refcnt--;
- IH_UNLOCK;
- } else {
- IH_UNLOCK;
- ih_release(ihP);
- }
+ else
+ _ih_release_r(ihP);
+
+ IH_UNLOCK;
return 0;
}
streamP->str_fd = fd;
streamP->str_buflen = 0;
streamP->str_bufoff = 0;
+ streamP->str_fdoff = 0;
streamP->str_error = 0;
streamP->str_eof = 0;
streamP->str_direction = STREAM_DIRECTION_NONE;
} else if (strcmp(mode, "a+") == 0) {
fd = OS_OPEN(filename, O_RDWR | O_APPEND | O_CREAT, 0);
} else {
- assert(FALSE); /* not implemented */
+ opr_abort(); /* not implemented */
}
if (fd == INVALID_FD) {
streamP->str_bufoff = 0;
streamP->str_buflen = 0;
} else {
- assert(streamP->str_direction == STREAM_DIRECTION_READ);
+ opr_Assert(streamP->str_direction == STREAM_DIRECTION_READ);
}
bytesRead = 0;
if (streamP->str_buflen == 0) {
streamP->str_bufoff = 0;
streamP->str_buflen =
- OS_READ(streamP->str_fd, streamP->str_buffer,
- STREAM_HANDLE_BUFSIZE);
+ OS_PREAD(streamP->str_fd, streamP->str_buffer,
+ STREAM_HANDLE_BUFSIZE, streamP->str_fdoff);
if (streamP->str_buflen < 0) {
streamP->str_error = errno;
streamP->str_buflen = 0;
streamP->str_eof = 1;
break;
}
+ streamP->str_fdoff += streamP->str_buflen;
}
bytesToRead = nbytes;
streamP->str_bufoff = 0;
streamP->str_buflen = STREAM_HANDLE_BUFSIZE;
} else {
- assert(streamP->str_direction == STREAM_DIRECTION_WRITE);
+ opr_Assert(streamP->str_direction == STREAM_DIRECTION_WRITE);
}
nbytes = size * nitems;
p = (char *)ptr;
while (nbytes > 0) {
if (streamP->str_buflen == 0) {
- rc = OS_WRITE(streamP->str_fd, streamP->str_buffer,
- STREAM_HANDLE_BUFSIZE);
+ rc = OS_PWRITE(streamP->str_fd, streamP->str_buffer,
+ STREAM_HANDLE_BUFSIZE, streamP->str_fdoff);
if (rc < 0) {
streamP->str_error = errno;
bytesWritten = 0;
break;
}
+ streamP->str_fdoff += rc;
streamP->str_bufoff = 0;
streamP->str_buflen = STREAM_HANDLE_BUFSIZE;
}
/* fseek for buffered I/O handles */
int
-stream_seek(StreamHandle_t * streamP, afs_foff_t offset, int whence)
+stream_aseek(StreamHandle_t * streamP, afs_foff_t offset)
{
- int rc;
+ ssize_t rc;
int retval = 0;
if (streamP->str_direction == STREAM_DIRECTION_WRITE
&& streamP->str_bufoff > 0) {
- rc = OS_WRITE(streamP->str_fd, streamP->str_buffer,
- streamP->str_bufoff);
+ rc = OS_PWRITE(streamP->str_fd, streamP->str_buffer,
+ streamP->str_bufoff, streamP->str_fdoff);
if (rc < 0) {
streamP->str_error = errno;
retval = -1;
}
}
+ streamP->str_fdoff = offset;
streamP->str_bufoff = 0;
streamP->str_buflen = 0;
streamP->str_eof = 0;
streamP->str_direction = STREAM_DIRECTION_NONE;
- if (OS_SEEK(streamP->str_fd, offset, whence) < 0) {
- streamP->str_error = errno;
- retval = -1;
- }
return retval;
}
int
stream_flush(StreamHandle_t * streamP)
{
- int rc;
+ ssize_t rc;
int retval = 0;
if (streamP->str_direction == STREAM_DIRECTION_WRITE
&& streamP->str_bufoff > 0) {
- rc = OS_WRITE(streamP->str_fd, streamP->str_buffer,
- streamP->str_bufoff);
+ rc = OS_PWRITE(streamP->str_fd, streamP->str_buffer,
+ streamP->str_bufoff, streamP->str_fdoff);
if (rc < 0) {
streamP->str_error = errno;
retval = -1;
+ } else {
+ streamP->str_fdoff += rc;
}
streamP->str_bufoff = 0;
streamP->str_buflen = STREAM_HANDLE_BUFSIZE;
int
stream_close(StreamHandle_t * streamP, int reallyClose)
{
- int rc;
+ ssize_t rc;
int retval = 0;
- assert(streamP != NULL);
+ opr_Assert(streamP != NULL);
if (streamP->str_direction == STREAM_DIRECTION_WRITE
&& streamP->str_bufoff > 0) {
- rc = OS_WRITE(streamP->str_fd, streamP->str_buffer,
- streamP->str_bufoff);
+ rc = OS_PWRITE(streamP->str_fd, streamP->str_buffer,
+ streamP->str_bufoff, streamP->str_fdoff);
if (rc < 0) {
retval = -1;
+ } else {
+ streamP->str_fdoff += rc;
}
}
if (reallyClose) {
int closeCount, closedAll;
FdHandle_t *fdP, *head, *tail, *next;
- assert(ihP->ih_refcnt > 0);
+ opr_Assert(ihP->ih_refcnt > 0);
closedAll = 1;
DLL_INIT_LIST(head, tail);
*/
for (fdP = ihP->ih_fdhead; fdP != NULL; fdP = next) {
next = fdP->fd_ihnext;
- assert(fdP->fd_ih == ihP);
- assert(fdP->fd_status == FD_HANDLE_OPEN
- || fdP->fd_status == FD_HANDLE_INUSE);
+ opr_Assert(fdP->fd_ih == ihP);
+ opr_Assert(fdP->fd_status == FD_HANDLE_OPEN
+ || fdP->fd_status == FD_HANDLE_INUSE
+ || fdP->fd_status == FD_HANDLE_CLOSING);
if (fdP->fd_status == FD_HANDLE_OPEN) {
+ /* Note that FdHandle_t's do not count against the parent
+ * IHandle_t ref count when they are FD_HANDLE_OPEN. So, we don't
+ * need to dec the parent IHandle_t ref count for each one we pull
+ * off here. */
DLL_DELETE(fdP, ihP->ih_fdhead, ihP->ih_fdtail, fd_ihnext,
fd_ihprev);
DLL_DELETE(fdP, fdLruHead, fdLruTail, fd_next, fd_prev);
DLL_INSERT_TAIL(fdP, head, tail, fd_next, fd_prev);
} else {
closedAll = 0;
+ fdP->fd_status = FD_HANDLE_CLOSING;
ihP->ih_flags |= IH_REALLY_CLOSED;
}
}
* closed all file descriptors.
*/
if (ihP->ih_refcnt == 1 || closedAll) {
- assert(closedAll);
- assert(!ihP->ih_fdhead);
- assert(!ihP->ih_fdtail);
+ opr_Assert(closedAll);
+ opr_Assert(!ihP->ih_fdhead);
+ opr_Assert(!ihP->ih_fdtail);
}
if (head == NULL) {
for (fdP = head; fdP != NULL; fdP = fdP->fd_next) {
OS_CLOSE(fdP->fd_fd);
fdP->fd_status = FD_HANDLE_AVAIL;
+ fdP->fd_refcnt = 0;
fdP->fd_fd = INVALID_FD;
fdP->fd_ih = NULL;
closeCount++;
}
IH_LOCK;
- assert(fdInUseCount >= closeCount);
+ opr_Assert(fdInUseCount >= closeCount);
fdInUseCount -= closeCount;
/*
ihP->ih_refcnt++; /* must not disappear over unlock */
if (ihP->ih_synced) {
FdHandle_t *fdP;
+ opr_Assert(vol_io_params.sync_behavior != IH_SYNC_ALWAYS);
+ opr_Assert(vol_io_params.sync_behavior != IH_SYNC_NEVER);
+ ihP->ih_synced = 0;
IH_UNLOCK;
-
+
fdP = IH_OPEN(ihP);
- if (fdP) {
+ if (fdP) {
OS_SYNC(fdP->fd_fd);
FDH_CLOSE(fdP);
}
-
+
IH_LOCK;
}
- assert(ihP->ih_refcnt > 0);
- ihP->ih_synced = 0;
+ opr_Assert(ihP->ih_refcnt > 0);
ih_fdclose(ihP);
- if (ihP->ih_refcnt > 1) {
+ if (ihP->ih_refcnt > 1)
ihP->ih_refcnt--;
- IH_UNLOCK;
- } else {
- IH_UNLOCK;
- ih_release(ihP);
- }
+ else
+ _ih_release_r(ihP);
+
+ IH_UNLOCK;
return 0;
}
/* Release an Inode handle. All cached file descriptors for this
* inode are closed when the last reference to this handle is released
*/
-int
-ih_release(IHandle_t * ihP)
+static int
+_ih_release_r(IHandle_t * ihP)
{
int ihash;
if (!ihP)
return 0;
- IH_LOCK;
- assert(ihP->ih_refcnt > 0);
+ opr_Assert(ihP->ih_refcnt > 0);
if (ihP->ih_refcnt > 1) {
ihP->ih_refcnt--;
- IH_UNLOCK;
return 0;
}
DLL_INSERT_TAIL(ihP, ihAvailHead, ihAvailTail, ih_next, ih_prev);
- IH_UNLOCK;
return 0;
}
+/* Release an Inode handle. All cached file descriptors for this
+ * inode are closed when the last reference to this handle is released
+ */
+int
+ih_release(IHandle_t * ihP)
+{
+ int ret;
+
+ if (!ihP)
+ return 0;
+
+ IH_LOCK;
+ ret = _ih_release_r(ihP);
+ IH_UNLOCK;
+ return ret;
+}
+
/* Sync an inode to disk if its handle isn't NULL */
int
ih_condsync(IHandle_t * ihP)
return code;
}
-void
-ih_sync_all(void) {
-
- int ihash;
-
- IH_LOCK;
- for (ihash = 0; ihash < I_HANDLE_HASH_SIZE; ihash++) {
- IHandle_t *ihP, *ihPnext;
-
- ihP = ihashTable[ihash].ihash_head;
- if (ihP)
- ihP->ih_refcnt++; /* must not disappear over unlock */
- for (; ihP; ihP = ihPnext) {
-
- if (ihP->ih_synced) {
- FdHandle_t *fdP;
-
- ihP->ih_synced = 0;
- IH_UNLOCK;
-
- fdP = IH_OPEN(ihP);
- if (fdP) {
- OS_SYNC(fdP->fd_fd);
- FDH_CLOSE(fdP);
- }
-
- IH_LOCK;
- }
-
- /* when decrementing the refcount, the ihandle might disappear
- and we might not even be able to proceed to the next one.
- Hence the gymnastics putting a hold on the next one already */
- ihPnext = ihP->ih_next;
- if (ihPnext) ihPnext->ih_refcnt++;
-
- if (ihP->ih_refcnt > 1) {
- ihP->ih_refcnt--;
- } else {
- IH_UNLOCK;
- ih_release(ihP);
- IH_LOCK;
- }
-
- }
- }
- IH_UNLOCK;
-}
-
-void *
-ih_sync_thread(void *dummy) {
- while(1) {
-
-#ifdef AFS_PTHREAD_ENV
- sleep(10);
-#else /* AFS_PTHREAD_ENV */
- IOMGR_Sleep(60);
-#endif /* AFS_PTHREAD_ENV */
-
- ih_sync_all();
- }
- return NULL;
-}
-
-
/*************************************************************************
* OS specific support routines.
*************************************************************************/
}
#endif /* AFS_NAMEI_ENV */
-
-#ifndef AFS_NT40_ENV
afs_sfsize_t
-ih_size(int fd)
+ih_size(FD_t fd)
{
- struct afs_stat status;
+#ifdef AFS_NT40_ENV
+ LARGE_INTEGER size;
+ if (!GetFileSizeEx(fd, &size))
+ return -1;
+ return size.QuadPart;
+#else
+ struct afs_stat_st status;
if (afs_fstat(fd, &status) < 0)
return -1;
return status.st_size;
-}
#endif
+}
+
+#ifndef HAVE_PIO
+ssize_t
+ih_pread(int fd, void * buf, size_t count, afs_foff_t offset)
+{
+ afs_foff_t code;
+ code = OS_SEEK(fd, offset, 0);
+ if (code < 0)
+ return code;
+ return OS_READ(fd, buf, count);
+}
+
+ssize_t
+ih_pwrite(int fd, const void * buf, size_t count, afs_foff_t offset)
+{
+ afs_foff_t code;
+ code = OS_SEEK(fd, offset, 0);
+ if (code < 0)
+ return code;
+ return OS_WRITE(fd, buf, count);
+}
+#endif /* !HAVE_PIO */
+
+#ifndef AFS_NT40_ENV
+int
+ih_isunlinked(int fd)
+{
+ struct afs_stat_st status;
+ if (afs_fstat(fd, &status) < 0) {
+ return -1;
+ }
+ if (status.st_nlink < 1) {
+ return 1;
+ }
+ return 0;
+}
+#endif /* !AFS_NT40_ENV */
+
+int
+ih_fdsync(FdHandle_t *fdP)
+{
+ switch (vol_io_params.sync_behavior) {
+ case IH_SYNC_ALWAYS:
+ return OS_SYNC(fdP->fd_fd);
+ case IH_SYNC_ONCLOSE:
+ if (fdP->fd_ih) {
+ fdP->fd_ih->ih_synced = 1;
+ return 0;
+ }
+ return 1;
+ case IH_SYNC_NEVER:
+ return 0;
+ default:
+ opr_Assert(0);
+ }
+}
git://git.openafs.org / openafs.git / blobdiff