jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-20 16:00:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libafs: initialize free dcache list for memcache

Browse Source 
reuse the disk cache dcache creation code for memcache, then
call it to prime the list

Change-Id: If63268aa1a89c9642236f944e1ac8328d68aeba5
Reviewed-on: http://gerrit.openafs.org/7446
Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Tested-by: Derrick Brashear <shadow@dementix.org>
This commit is contained in:
Derrick Brashear 2012-05-25 09:40:54 -04:00
parent a8e35e9fd7
commit 9bb876f682
2 changed files with 73 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

137
src/afs/afs_dcache.c
View File

@ -2937,7 +2937,6 @@ afs_wakeup(struct vcache *avc)
return 0;
}
/*!
* Given a file name and inode, set up that file to be an
* active member in the AFS cache. This also involves checking
@ -2971,56 +2970,61 @@ afs_InitCacheFile(char *afile, ino_t ainode)
ObtainWriteLock(&tdc->lock, 621);
ObtainWriteLock(&afs_xdcache, 622);
if (afile) {
code = afs_LookupInodeByPath(afile, &tdc->f.inode.ufs, NULL);
if (code) {
ReleaseWriteLock(&afs_xdcache);
ReleaseWriteLock(&tdc->lock);
afs_PutDCache(tdc);
return code;
}
if (!afile && !ainode) {
tfile = NULL;
fileIsBad = 1;
} else {
/* Add any other 'complex' inode types here ... */
if (afile) {
code = afs_LookupInodeByPath(afile, &tdc->f.inode.ufs, NULL);
if (code) {
ReleaseWriteLock(&afs_xdcache);
ReleaseWriteLock(&tdc->lock);
afs_PutDCache(tdc);
return code;
}
} else {
/* Add any other 'complex' inode types here ... */
#if !defined(AFS_LINUX26_ENV) && !defined(AFS_CACHE_VNODE_PATH)
tdc->f.inode.ufs = ainode;
tdc->f.inode.ufs = ainode;
#else
osi_Panic("Can't init cache with inode numbers when complex inodes are "
"in use\n");
osi_Panic("Can't init cache with inode numbers when complex inodes are "
"in use\n");
#endif
}
fileIsBad = 0;
if ((tdc->f.states & DWriting) || tdc->f.fid.Fid.Volume == 0)
fileIsBad = 1;
tfile = osi_UFSOpen(&tdc->f.inode);
code = afs_osi_Stat(tfile, &tstat);
if (code)
osi_Panic("initcachefile stat");
}
fileIsBad = 0;
if ((tdc->f.states & DWriting) || tdc->f.fid.Fid.Volume == 0)
fileIsBad = 1;
tfile = osi_UFSOpen(&tdc->f.inode);
code = afs_osi_Stat(tfile, &tstat);
if (code)
osi_Panic("initcachefile stat");
/*
* If file size doesn't match the cache info file, it's probably bad.
*/
if (tdc->f.chunkBytes != tstat.size)
fileIsBad = 1;
/*
* If file size doesn't match the cache info file, it's probably bad.
*/
if (tdc->f.chunkBytes != tstat.size)
fileIsBad = 1;
/*
* If file changed within T (120?) seconds of cache info file, it's
* probably bad. In addition, if slot changed within last T seconds,
* the cache info file may be incorrectly identified, and so slot
* may be bad.
*/
if (cacheInfoModTime < tstat.mtime + 120)
fileIsBad = 1;
if (cacheInfoModTime < tdc->f.modTime + 120)
fileIsBad = 1;
/* In case write through is behind, make sure cache items entry is
* at least as new as the chunk.
*/
if (tdc->f.modTime < tstat.mtime)
fileIsBad = 1;
}
tdc->f.chunkBytes = 0;
/*
* If file changed within T (120?) seconds of cache info file, it's
* probably bad. In addition, if slot changed within last T seconds,
* the cache info file may be incorrectly identified, and so slot
* may be bad.
*/
if (cacheInfoModTime < tstat.mtime + 120)
fileIsBad = 1;
if (cacheInfoModTime < tdc->f.modTime + 120)
fileIsBad = 1;
/* In case write through is behind, make sure cache items entry is
* at least as new as the chunk.
*/
if (tdc->f.modTime < tstat.mtime)
fileIsBad = 1;
if (fileIsBad) {
tdc->f.fid.Fid.Volume = 0; /* not in the hash table */
if (tstat.size != 0)
if (tfile && tstat.size != 0)
osi_UFSTruncate(tfile, 0);
tdc->f.states &= ~(DRO|DBackup|DRW);
afs_DCMoveBucket(tdc, 0, 0);
@ -3057,7 +3061,8 @@ afs_InitCacheFile(char *afile, ino_t ainode)
afs_indexUnique[index] = tdc->f.fid.Fid.Unique;
} /*File is not bad */
osi_UFSClose(tfile);
if (tfile)
osi_UFSClose(tfile);
tdc->f.states &= ~DWriting;
tdc->dflags &= ~DFEntryMod;
/* don't set f.modTime; we're just cleaning up */
@ -3114,29 +3119,6 @@ afs_dcacheInit(int afiles, int ablocks, int aDentries, int achunk, int aflags)
if (!aDentries)
aDentries = DDSIZE;
if (aflags & AFSCALL_INIT_MEMCACHE) {
/*
* Use a memory cache instead of a disk cache
*/
cacheDiskType = AFS_FCACHE_TYPE_MEM;
afs_cacheType = &afs_MemCacheOps;
afiles = (afiles < aDentries) ? afiles : aDentries; /* min */
ablocks = afiles * (AFS_FIRSTCSIZE / 1024);
/* ablocks is reported in 1K blocks */
code = afs_InitMemCache(afiles, AFS_FIRSTCSIZE, aflags);
if (code != 0) {
afs_warn("afsd: memory cache too large for available memory.\n");
afs_warn("afsd: AFS files cannot be accessed.\n\n");
dcacheDisabled = 1;
afiles = ablocks = 0;
} else
afs_warn("Memory cache: Allocating %d dcache entries...",
aDentries);
} else {
cacheDiskType = AFS_FCACHE_TYPE_UFS;
afs_cacheType = &afs_UfsCacheOps;
}
if (aDentries > 512)
afs_dhashsize = 2048;
/* initialize hash tables */
@ -3211,6 +3193,29 @@ afs_dcacheInit(int afiles, int ablocks, int aDentries, int achunk, int aflags)
afs_stats_cmperf.cacheBucket2_Discarded = 0;
afs_DCSizeInit();
QInit(&afs_DLRU);
if (aflags & AFSCALL_INIT_MEMCACHE) {
/*
* Use a memory cache instead of a disk cache
*/
cacheDiskType = AFS_FCACHE_TYPE_MEM;
afs_cacheType = &afs_MemCacheOps;
afiles = (afiles < aDentries) ? afiles : aDentries; /* min */
ablocks = afiles * (AFS_FIRSTCSIZE / 1024);
/* ablocks is reported in 1K blocks */
code = afs_InitMemCache(afiles, AFS_FIRSTCSIZE, aflags);
if (code != 0) {
afs_warn("afsd: memory cache too large for available memory.\n");
afs_warn("afsd: AFS files cannot be accessed.\n\n");
dcacheDisabled = 1;
afiles = ablocks = 0;
} else
afs_warn("Memory cache: Allocating %d dcache entries...",
aDentries);
} else {
cacheDiskType = AFS_FCACHE_TYPE_UFS;
afs_cacheType = &afs_UfsCacheOps;
}
}
/*!

3
src/afs/afs_memcache.c
View File

@ -53,7 +53,8 @@ afs_InitMemCache(int blkCount, int blkSize, int flags)
#if defined(AFS_HAVE_VXFS)
afs_InitDualFSCacheOps((struct vnode *)0);
#endif
for (index = 0; index < blkCount; index++)
afs_InitCacheFile(NULL, 0);
return 0;
nomem: