jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-19 15:30:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

memcache: add extend-entry function

Browse Source 
export directly and rewrite writevblk in terms of it

Change-Id: I181f84428158e93e9bc6008ac9226958653a9409
Reviewed-on: http://gerrit.openafs.org/8251
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
This commit is contained in:
Hartmut Reuter 2012-10-18 07:28:33 -04:00 committed by Derrick Brashear
parent df8709012b
commit f821c7e5c8
1 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/afs/afs_memcache.c
View File

@ -171,6 +171,29 @@ afs_MemReadUIO(afs_dcache_id_t *ainode, struct uio *uioP)
return code; return code;
} }
static int
_afs_MemExtendEntry(struct memCacheEntry *mceP, afs_uint32 size)
{
if (size > mceP->dataSize) {
char *oldData = mceP->data;
mceP->data = afs_osi_Alloc(size);
if (mceP->data == NULL) { /* no available memory */
mceP->data = oldData; /* revert back change that was made */
afs_warn("afs: afs_MemWriteBlk mem alloc failure (%d bytes)\n", size);
return -ENOMEM;
}
/* may overlap, but this is OK */
AFS_GUNLOCK();
memcpy(mceP->data, oldData, mceP->size);
AFS_GLOCK();
afs_osi_Free(oldData, mceP->dataSize);
mceP->dataSize = size;
}
return 0;
}
int int
afs_MemWriteBlk(struct osi_file *fP, int offset, void *src, afs_MemWriteBlk(struct osi_file *fP, int offset, void *src,
int size) int size)
@ -193,25 +216,9 @@ afs_MemWritevBlk(struct memCacheEntry *mceP, int offset,
int bytesToWrite; int bytesToWrite;
AFS_STATCNT(afs_MemWriteBlk); AFS_STATCNT(afs_MemWriteBlk);
ObtainWriteLock(&mceP->afs_memLock, 561); ObtainWriteLock(&mceP->afs_memLock, 561);
if (offset + size > mceP->dataSize) { bytesWritten = _afs_MemExtendEntry(mceP, (offset + size));
char *oldData = mceP->data; if (bytesWritten != 0)
goto out;
mceP->data = afs_osi_Alloc(size + offset);
if (mceP->data == NULL) { /* no available memory */
mceP->data = oldData; /* revert back change that was made */
ReleaseWriteLock(&mceP->afs_memLock);
afs_warn("afs: afs_MemWriteBlk mem alloc failure (%d bytes)\n",
size + offset);
return -ENOMEM;
}
/* may overlap, but this is OK */
AFS_GUNLOCK();
memcpy(mceP->data, oldData, mceP->size);
AFS_GLOCK();
afs_osi_Free(oldData, mceP->dataSize);
mceP->dataSize = size + offset;
}
AFS_GUNLOCK(); AFS_GUNLOCK();
if (mceP->size < offset) if (mceP->size < offset)
memset(mceP->data + mceP->size, 0, offset - mceP->size); memset(mceP->data + mceP->size, 0, offset - mceP->size);
@ -224,7 +231,7 @@ afs_MemWritevBlk(struct memCacheEntry *mceP, int offset,
} }
mceP->size = (offset < mceP->size) ? mceP->size : offset; mceP->size = (offset < mceP->size) ? mceP->size : offset;
AFS_GLOCK(); AFS_GLOCK();
out:
ReleaseWriteLock(&mceP->afs_memLock); ReleaseWriteLock(&mceP->afs_memLock);
return bytesWritten; return bytesWritten;
} }
@ -298,6 +305,15 @@ afs_MemCacheTruncate(struct osi_file *fP, int size)
return 0; return 0;
} }
int
afs_MemExtendEntry(struct memCacheEntry *mceP, afs_uint32 size)
{
int code = 0;
ObtainWriteLock(&mceP->afs_memLock, 560);
code = _afs_MemExtendEntry(mceP, size);
ReleaseWriteLock(&mceP->afs_memLock);
return code;
}
void void
shutdown_memcache(void) shutdown_memcache(void)