jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-22 08:50:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

afs-getcell-pioctl-should-be-able-to-provide-complete-list-20020731

Browse Source 
don't use the LRUq since it can make us miss cells. don't use the existant
index because it includes cell aliases
This commit is contained in:
Derrick Brashear 2002-07-31 23:15:16 +00:00
parent f063c0db21
commit f2ab9fd440
6 changed files with 40 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/afs/afs.h
View File

@ -201,6 +201,7 @@ struct cell {
u_short vlport; /* volume server port */
short states; /* state flags */
short cellIndex; /* relative index number per cell */
short realcellIndex; /* as above but ignoring aliases */
time_t timeout; /* data expire time, if non-zero */
char *realName; /* who this cell is an alias for */
};

37
src/afs/afs_cell.c
View File

@ -46,9 +46,9 @@ RCSID("$Header$");
afs_rwlock_t afs_xcell; /* allocation lock for cells */
struct afs_q CellLRU;
afs_int32 afs_cellindex=0;
afs_int32 afs_realcellindex=0;
afs_uint32 afs_nextCellNum = 0x100;
/* Local variables. */
struct cell *afs_rootcell = 0;
@ -420,6 +420,31 @@ struct cell *afs_GetCellByIndex(cellindex, locktype, refresh)
} /*afs_GetCellByIndex*/
struct cell *afs_GetRealCellByIndex(cellindex, locktype, refresh)
register afs_int32 cellindex;
afs_int32 locktype;
afs_int32 refresh;
{
register struct cell *tc;
register struct afs_q *cq, *tq;
AFS_STATCNT(afs_GetCellByIndex);
ObtainWriteLock(&afs_xcell,102);
for (cq = CellLRU.next; cq != &CellLRU; cq = tq) {
tc = QTOC(cq); tq = QNext(cq);
if (tc->realcellIndex == cellindex) {
QRemove(&tc->lruq);
QAdd(&CellLRU, &tc->lruq);
ReleaseWriteLock(&afs_xcell);
if (refresh) afs_RefreshCell(tc);
return tc;
}
}
ReleaseWriteLock(&afs_xcell);
return (struct cell *) 0;
} /*afs_GetRealCellByIndex*/
afs_int32 afs_NewCell(acellName, acellHosts, aflags, linkedcname, fsport, vlport, timeout, aliasFor)
int aflags;
char *acellName;
@ -487,6 +512,11 @@ afs_int32 afs_NewCell(acellName, acellHosts, aflags, linkedcname, fsport, vlport
tc->vlport = (vlport ? vlport : AFS_VLPORT);
afs_stats_cmperf.numCellsVisible++;
newc++;
if (!aflags & CAlias) {
tc->realcellIndex = afs_realcellindex++;
} else {
tc->realcellIndex = -1;
}
}
if (aflags & CLinkedCell) {
@ -516,7 +546,10 @@ afs_int32 afs_NewCell(acellName, acellHosts, aflags, linkedcname, fsport, vlport
tc->timeout = timeout;
/* Allow converting an alias into a real cell */
if (!(aflags & CAlias)) tc->states &= ~CAlias;
if (!(aflags & CAlias)) {
tc->states &= ~CAlias;
tc->realcellIndex = afs_realcellindex++;
}
memset((char *)tc->cellHosts, 0, sizeof(tc->cellHosts));
if (aflags & CAlias) {

13
src/afs/afs_pioctl.c
View File

@ -2392,17 +2392,7 @@ static PListCells(avc, afun, areq, ain, aout, ainSize, aoutSize)
memcpy((char *)&whichCell, tp, sizeof(afs_int32));
tp += sizeof(afs_int32);
ObtainReadLock(&afs_xcell);
for (cq = CellLRU.next; cq != &CellLRU; cq = tq) {
tcell = QTOC(cq); tq = QNext(cq);
if (tcell->states & CAlias) {
tcell = 0;
continue;
}
if (whichCell == 0) break;
tcell = 0;
whichCell--;
}
tcell = afs_GetRealCellByIndex(whichCell, READ_LOCK, 0);
if (tcell) {
cp = aout;
memset(cp, 0, MAXCELLHOSTS * sizeof(afs_int32));
@ -2416,7 +2406,6 @@ static PListCells(avc, afun, areq, ain, aout, ainSize, aoutSize)
cp += strlen(tcell->cellName)+1;
*aoutSize = cp - aout;
}
ReleaseReadLock(&afs_xcell);
if (tcell) return 0;
else return EDOM;
}

1
src/afs/afs_stats.h
View File

@ -455,6 +455,7 @@ struct afs_CMCallStats {
afs_int32 C_afs_GetCell; /* afs_resource.c*/
afs_int32 C_afs_GetCellByIndex; /* afs_resource.c*/
afs_int32 C_afs_GetCellByName; /* afs_resource.c*/
afs_int32 C_afs_GetRealCellByIndex; /* afs_resource.c*/
afs_int32 C_afs_NewCell; /* afs_resource.c*/
afs_int32 C_afs_GetUser; /* afs_resource.c*/
afs_int32 C_afs_PutUser; /* afs_resource.c*/

1
src/venus/kdump.c
View File

@ -3950,6 +3950,7 @@ void print_cmstats(cmp)
printf("\t%10d afs_GetCell\n", cmp->callInfo.C_afs_GetCell);
printf("\t%10d afs_GetCellByIndex\n", cmp->callInfo.C_afs_GetCellByIndex);
printf("\t%10d afs_GetCellByName\n", cmp->callInfo.C_afs_GetCellByName);
printf("\t%10d afs_GetRealCellByIndex\n", cmp->callInfo.C_afs_GetRealCellByIndex);
printf("\t%10d afs_NewCell\n", cmp->callInfo.C_afs_NewCell);
printf("\t%10d CheckVLDB\n", cmp->callInfo.C_CheckVLDB);
printf("\t%10d afs_GetVolume\n", cmp->callInfo.C_afs_GetVolume);

1
src/xstat/xstat_cm_test.c
View File

@ -451,6 +451,7 @@ print_cmCallStats()
printf("\t%10d afs_GetCell\n", cmp->callInfo.C_afs_GetCell);
printf("\t%10d afs_GetCellByIndex\n", cmp->callInfo.C_afs_GetCellByIndex);
printf("\t%10d afs_GetCellByName\n", cmp->callInfo.C_afs_GetCellByName);
printf("\t%10d afs_GetRealCellByIndex\n", cmp->callInfo.C_afs_GetRealCellByIndex);
printf("\t%10d afs_NewCell\n", cmp->callInfo.C_afs_NewCell);
printf("\t%10d CheckVLDB\n", cmp->callInfo.C_CheckVLDB);
printf("\t%10d afs_GetVolume\n", cmp->callInfo.C_afs_GetVolume);