| CM_SCACHEFLAG_EACCESS);
scp->serverModTime = 0;
scp->dataVersion = 0;
+ scp->bufDataVersionLow = 0;
scp->bulkStatProgress = hzero;
scp->waitCount = 0;
scp->waitQueueT = NULL;
scp->fid.volume = 0;
scp->fid.unique = 0;
scp->fid.cell = 0;
+ scp->fid.hash = 0;
/* remove from dnlc */
cm_dnlcPurgedp(scp);
"invalid cm_scache_t address");
memset(scp, 0, sizeof(cm_scache_t));
scp->magic = CM_SCACHE_MAGIC;
- lock_InitializeMutex(&scp->mx, "cm_scache_t mutex");
+ lock_InitializeRWLock(&scp->rw, "cm_scache_t rw");
lock_InitializeRWLock(&scp->bufCreateLock, "cm_scache_t bufCreateLock");
#ifdef USE_BPLUS
lock_InitializeRWLock(&scp->dirlock, "cm_scache_t dirlock");
return scp;
}
+void cm_SetFid(cm_fid_t *fidp, afs_uint32 cell, afs_uint32 volume, afs_uint32 vnode, afs_uint32 unique)
+{
+ fidp->cell = cell;
+ fidp->volume = volume;
+ fidp->vnode = vnode;
+ fidp->unique = unique;
+ fidp->hash = ((cell & 0xF) << 28) | ((volume & 0x3F) << 22) | ((vnode & 0x7FF) << 11) | (unique & 0x7FF);
+}
+
/* like strcmp, only for fids */
-int cm_FidCmp(cm_fid_t *ap, cm_fid_t *bp)
+__inline int cm_FidCmp(cm_fid_t *ap, cm_fid_t *bp)
{
- if (ap->vnode != bp->vnode)
+ if (ap->hash != bp->hash)
+ return 1;
+ if (ap->vnode != bp->vnode)
return 1;
if (ap->volume != bp->volume)
return 1;
cm_data.fakeSCache.linkCount = 1;
cm_data.fakeSCache.refCount = 1;
}
- lock_InitializeMutex(&cm_data.fakeSCache.mx, "cm_scache_t mutex");
+ lock_InitializeRWLock(&cm_data.fakeSCache.rw, "cm_scache_t rw");
}
long
for ( i=0; i < cm_data.scacheHashTableSize; i++ ) {
for ( scp = cm_data.scacheHashTablep[i]; scp; scp = scp->nextp ) {
+ afs_uint32 hash;
+ hash = CM_SCACHE_HASH(&scp->fid);
if (scp->magic != CM_SCACHE_MAGIC) {
afsi_log("cm_ValidateSCache failure: scp->magic != CM_SCACHE_MAGIC");
fprintf(stderr, "cm_ValidateSCache failure: scp->magic != CM_SCACHE_MAGIC\n");
fprintf(stderr, "cm_ValidateSCache failure: scp->volp->magic != CM_VOLUME_MAGIC\n");
return -12;
}
+ if (hash != i) {
+ afsi_log("cm_ValidateSCache failure: scp hash != hash index");
+ fprintf(stderr, "cm_ValidateSCache failure: scp hash != hash index\n");
+ return -13;
+ }
}
}
for ( scp = cm_data.allSCachesp; scp;
scp = scp->allNextp ) {
if (scp->randomACLp) {
- lock_ObtainMutex(&scp->mx);
+ lock_ObtainWrite(&scp->rw);
cm_FreeAllACLEnts(scp);
- lock_ReleaseMutex(&scp->mx);
+ lock_ReleaseWrite(&scp->rw);
}
if (scp->cbServerp) {
scp->dirDataVersion = -1;
lock_FinalizeRWLock(&scp->dirlock);
#endif
- lock_FinalizeMutex(&scp->mx);
+ lock_FinalizeRWLock(&scp->rw);
lock_FinalizeRWLock(&scp->bufCreateLock);
}
lock_ReleaseWrite(&cm_scacheLock);
for ( scp = cm_data.allSCachesp; scp;
scp = scp->allNextp ) {
- lock_InitializeMutex(&scp->mx, "cm_scache_t mutex");
+ lock_InitializeRWLock(&scp->rw, "cm_scache_t rw");
lock_InitializeRWLock(&scp->bufCreateLock, "cm_scache_t bufCreateLock");
#ifdef USE_BPLUS
lock_InitializeRWLock(&scp->dirlock, "cm_scache_t dirlock");
return NULL;
}
- lock_ObtainWrite(&cm_scacheLock);
+ lock_ObtainRead(&cm_scacheLock);
for (scp=cm_data.scacheHashTablep[hash]; scp; scp=scp->nextp) {
if (cm_FidCmp(fidp, &scp->fid) == 0) {
cm_HoldSCacheNoLock(scp);
+ lock_ConvertRToW(&cm_scacheLock);
cm_AdjustScacheLRU(scp);
lock_ReleaseWrite(&cm_scacheLock);
return scp;
}
}
- lock_ReleaseWrite(&cm_scacheLock);
+ lock_ReleaseRead(&cm_scacheLock);
return NULL;
}
* assume that no one else is using the one this is returned.
*/
lock_ReleaseWrite(&cm_scacheLock);
- lock_ObtainMutex(&scp->mx);
+ lock_ObtainWrite(&scp->rw);
lock_ObtainWrite(&cm_scacheLock);
#endif
scp->fid = *fidp;
scp->volp = cm_data.rootSCachep->volp;
- cm_GetVolume(scp->volp); /* grab an additional reference */
+ if (scp->volp)
+ cm_GetVolume(scp->volp); /* grab an additional reference */
scp->dotdotFid.cell=AFS_FAKE_ROOT_CELL_ID;
scp->dotdotFid.volume=AFS_FAKE_ROOT_VOL_ID;
scp->dotdotFid.unique=1;
scp->parentVnode=0x1;
scp->group=0;
scp->dataVersion=cm_data.fakeDirVersion;
+ scp->bufDataVersionLow=cm_data.fakeDirVersion;
scp->lockDataVersion=-1; /* no lock yet */
#if not_too_dangerous
- lock_ReleaseMutex(&scp->mx);
+ lock_ReleaseWrite(&scp->rw);
#endif
*outScpp = scp;
lock_ReleaseWrite(&cm_scacheLock);
* assume that no one else is using the one this is returned.
*/
lock_ReleaseWrite(&cm_scacheLock);
- lock_ObtainMutex(&scp->mx);
+ lock_ObtainWrite(&scp->rw);
lock_ObtainWrite(&cm_scacheLock);
#endif
scp->fid = *fidp;
scp->refCount = 1;
osi_Log1(afsd_logp,"cm_GetSCache sets refCount to 1 scp 0x%x", scp);
#if not_too_dangerous
- lock_ReleaseMutex(&scp->mx);
+ lock_ReleaseWrite(&scp->rw);
#endif
/* XXX - The following fields in the cm_scache are
cm_scache_t * pscp = NULL;
lock_ObtainWrite(&cm_scacheLock);
- parent_fid = scp->fid;
- parent_fid.vnode = scp->parentVnode;
- parent_fid.unique = scp->parentUnique;
+ cm_SetFid(&parent_fid, scp->fid.cell, scp->fid.volume, scp->parentVnode, scp->parentUnique);
if (cm_FidCmp(&scp->fid, &parent_fid)) {
i = CM_SCACHE_HASH(&parent_fid);
{
cm_scache_waiter_t * w;
+ /* Do not use the queue for asynchronous store operations */
+ if (flags == CM_SCACHESYNC_ASYNCSTORE)
+ return;
+
lock_ObtainWrite(&cm_scacheLock);
if (cm_allFreeWaiters == NULL) {
w = malloc(sizeof(*w));
cm_scache_waiter_t * w;
int this_is_me;
+ /* Do not use the queue for asynchronous store operations */
+ if (flags == CM_SCACHESYNC_ASYNCSTORE)
+ return 1;
+
osi_Log0(afsd_logp, "cm_SyncOpCheckContinue checking for continuation");
lock_ObtainRead(&cm_scacheLock);
lock_ReleaseMutex(&bufp->mx);
code = cm_GetCallback(scp, userp, reqp, (flags & CM_SCACHESYNC_FORCECB)?1:0);
if (bufLocked) {
- lock_ReleaseMutex(&scp->mx);
+ lock_ReleaseWrite(&scp->rw);
lock_ObtainMutex(&bufp->mx);
- lock_ObtainMutex(&scp->mx);
+ lock_ObtainWrite(&scp->rw);
}
if (code)
return code;
if (bufLocked) lock_ReleaseMutex(&bufp->mx);
code = cm_GetAccessRights(scp, userp, reqp);
if (bufLocked) {
- lock_ReleaseMutex(&scp->mx);
+ lock_ReleaseWrite(&scp->rw);
lock_ObtainMutex(&bufp->mx);
- lock_ObtainMutex(&scp->mx);
+ lock_ObtainWrite(&scp->rw);
}
if (code)
return code;
do {
if (bufLocked)
lock_ReleaseMutex(&bufp->mx);
- osi_SleepM((LONG_PTR) &scp->flags, &scp->mx);
+ osi_SleepW((LONG_PTR) &scp->flags, &scp->rw);
if (bufLocked)
lock_ObtainMutex(&bufp->mx);
- lock_ObtainMutex(&scp->mx);
+ lock_ObtainWrite(&scp->rw);
} while (!cm_SyncOpCheckContinue(scp, flags, bufp));
smb_UpdateServerPriority();
osi_queueData_t *qdp;
cm_buf_t *tbufp;
- lock_AssertMutex(&scp->mx);
+ lock_AssertWrite(&scp->rw);
/* now, update the recorded state for RPC-type calls */
if (flags & CM_SCACHESYNC_FETCHSTATUS)
statusp->SyncCounter = 0;
statusp->dataVersionHigh = (afs_uint32)(cm_data.fakeDirVersion >> 32);
statusp->errorCode = 0;
-
- buf_ForceDataVersion(scp, scp->dataVersion, cm_data.fakeDirVersion);
}
#endif /* AFS_FREELANCE_CLIENT */
scp->unixModeBits = 0;
scp->anyAccess = 0;
scp->dataVersion = 0;
+ scp->bufDataVersionLow = 0;
if (dscp) {
scp->parentVnode = dscp->fid.vnode;
if (volp)
cm_PutVolume(volp);
}
- osi_Log3(afsd_logp, "Bad merge, scp %x, scp dv %I64d, RPC dv %I64d",
+ osi_Log3(afsd_logp, "Bad merge, scp %x, scp dv %d, RPC dv %d",
scp, scp->dataVersion, dataVersion);
/* we have a number of data fetch/store operations running
* concurrently, and we can tell which one executed last at the
cm_AddACLCache(scp, userp, statusp->CallerAccess);
}
- if ((flags & CM_MERGEFLAG_STOREDATA) && dataVersion - scp->dataVersion == 1) {
- buf_ForceDataVersion(scp, scp->dataVersion, dataVersion);
- } else if (scp->dataVersion != 0 &&
- (!(flags & CM_MERGEFLAG_DIROP) && dataVersion != scp->dataVersion ||
- (flags & CM_MERGEFLAG_DIROP) && dataVersion - scp->dataVersion > 1)) {
+ if (scp->dataVersion != 0 &&
+ (!(flags & (CM_MERGEFLAG_DIROP|CM_MERGEFLAG_STOREDATA)) && dataVersion != scp->dataVersion ||
+ (flags & (CM_MERGEFLAG_DIROP|CM_MERGEFLAG_STOREDATA)) && dataVersion - scp->dataVersion > 1)) {
/*
* We now know that all of the data buffers that we have associated
* with this scp are invalid. Subsequent operations will go faster
*
* We do not remove directory buffers if the dataVersion delta is 1 because
* those version numbers will be updated as part of the directory operation.
+ *
+ * We do not remove storedata buffers because they will still be valid.
*/
int i, j;
cm_buf_t **lbpp;
*/
if (cm_FidCmp(&scp->fid, &bp->fid) == 0 &&
lock_TryMutex(&bp->mx)) {
- if (bp->refCount == 0) {
+ if (bp->refCount == 0 &&
+ !(bp->flags & CM_BUF_READING | CM_BUF_WRITING | CM_BUF_DIRTY)) {
prevBp = bp->fileHashBackp;
bp->fileHashBackp = bp->fileHashp = NULL;
if (prevBp)
}
lock_ReleaseWrite(&buf_globalLock);
}
+
+ /* We maintain a range of buffer dataVersion values which are considered
+ * valid. This avoids the need to update the dataVersion on each buffer
+ * object during an uncontested storeData operation. As a result this
+ * merge status no longer has performance characteristics derived from
+ * the size of the file.
+ */
+ if (((flags & CM_MERGEFLAG_STOREDATA) && dataVersion - scp->dataVersion > 1) ||
+ (!(flags & CM_MERGEFLAG_STOREDATA) && scp->dataVersion != dataVersion) ||
+ scp->bufDataVersionLow == 0)
+ scp->bufDataVersionLow = dataVersion;
+
scp->dataVersion = dataVersion;
}
*/
void cm_DiscardSCache(cm_scache_t *scp)
{
- lock_AssertMutex(&scp->mx);
+ lock_AssertWrite(&scp->rw);
if (scp->cbServerp) {
cm_PutServer(scp->cbServerp);
scp->cbServerp = NULL;
#else
void cm_HoldSCacheNoLock(cm_scache_t *scp)
#endif
-{
+{
+ afs_int32 refCount;
+
osi_assertx(scp != NULL, "null cm_scache_t");
- lock_AssertWrite(&cm_scacheLock);
- scp->refCount++;
+ lock_AssertAny(&cm_scacheLock);
+ refCount = InterlockedIncrement(&scp->refCount);
#ifdef DEBUG_REFCOUNT
- osi_Log2(afsd_logp,"cm_HoldSCacheNoLock scp 0x%p ref %d",scp, scp->refCount);
- afsi_log("%s:%d cm_HoldSCacheNoLock scp 0x%p, ref %d", file, line, scp, scp->refCount);
+ osi_Log2(afsd_logp,"cm_HoldSCacheNoLock scp 0x%p ref %d",scp, refCount);
+ afsi_log("%s:%d cm_HoldSCacheNoLock scp 0x%p, ref %d", file, line, scp, refCount);
#endif
}
void cm_HoldSCache(cm_scache_t *scp)
#endif
{
+ afs_int32 refCount;
+
osi_assertx(scp != NULL, "null cm_scache_t");
- lock_ObtainWrite(&cm_scacheLock);
- scp->refCount++;
+ lock_ObtainRead(&cm_scacheLock);
+ refCount = InterlockedIncrement(&scp->refCount);
#ifdef DEBUG_REFCOUNT
- osi_Log2(afsd_logp,"cm_HoldSCache scp 0x%p ref %d",scp, scp->refCount);
- afsi_log("%s:%d cm_HoldSCache scp 0x%p ref %d", file, line, scp, scp->refCount);
+ osi_Log2(afsd_logp,"cm_HoldSCache scp 0x%p ref %d",scp, refCount);
+ afsi_log("%s:%d cm_HoldSCache scp 0x%p ref %d", file, line, scp, refCount);
#endif
- lock_ReleaseWrite(&cm_scacheLock);
+ lock_ReleaseRead(&cm_scacheLock);
}
#ifdef DEBUG_REFCOUNT
void cm_ReleaseSCacheNoLock(cm_scache_t *scp)
#endif
{
+ afs_int32 refCount;
osi_assertx(scp != NULL, "null cm_scache_t");
- lock_AssertWrite(&cm_scacheLock);
- if (scp->refCount == 0)
+ lock_AssertAny(&cm_scacheLock);
+ refCount = InterlockedDecrement(&scp->refCount);
+#ifdef DEBUG_REFCOUNT
+ if (refCount < 0)
osi_Log1(afsd_logp,"cm_ReleaseSCacheNoLock about to panic scp 0x%x",scp);
- osi_assertx(scp->refCount-- >= 0, "cm_scache_t refCount 0");
+#endif
+ osi_assertx(refCount >= 0, "cm_scache_t refCount 0");
#ifdef DEBUG_REFCOUNT
- osi_Log2(afsd_logp,"cm_ReleaseSCacheNoLock scp 0x%p ref %d",scp,scp->refCount);
- afsi_log("%s:%d cm_ReleaseSCacheNoLock scp 0x%p ref %d", file, line, scp, scp->refCount);
+ osi_Log2(afsd_logp,"cm_ReleaseSCacheNoLock scp 0x%p ref %d",scp, refCount);
+ afsi_log("%s:%d cm_ReleaseSCacheNoLock scp 0x%p ref %d", file, line, scp, refCount);
#endif
}
#else
void cm_ReleaseSCache(cm_scache_t *scp)
#endif
-{
+{
+ afs_int32 refCount;
+
osi_assertx(scp != NULL, "null cm_scache_t");
- lock_ObtainWrite(&cm_scacheLock);
- if (scp->refCount == 0)
+ lock_ObtainRead(&cm_scacheLock);
+ refCount = InterlockedDecrement(&scp->refCount);
+#ifdef DEBUG_REFCOUNT
+ if (refCount < 0)
osi_Log1(afsd_logp,"cm_ReleaseSCache about to panic scp 0x%x",scp);
- osi_assertx(scp->refCount != 0, "cm_scache_t refCount 0");
- scp->refCount--;
+#endif
+ osi_assertx(refCount >= 0, "cm_scache_t refCount 0");
#ifdef DEBUG_REFCOUNT
- osi_Log2(afsd_logp,"cm_ReleaseSCache scp 0x%p ref %d",scp,scp->refCount);
- afsi_log("%s:%d cm_ReleaseSCache scp 0x%p ref %d", file, line, scp, scp->refCount);
+ osi_Log2(afsd_logp,"cm_ReleaseSCache scp 0x%p ref %d",scp, refCount);
+ afsi_log("%s:%d cm_ReleaseSCache scp 0x%p ref %d", file, line, scp, refCount);
#endif
- lock_ReleaseWrite(&cm_scacheLock);
+ lock_ReleaseRead(&cm_scacheLock);
}
/* just look for the scp entry to get filetype */