}
afs_int32
+rxfs_storeClose(void *r, struct AFSFetchStatus *OutStatus, int *doProcessFS)
+{
+ afs_int32 code;
+ struct AFSVolSync tsync;
+ struct rxfs_storeVariables *v = (struct rxfs_storeVariables *)r;
+
+ RX_AFS_GUNLOCK();
+ code = EndRXAFS_StoreData(v->call, OutStatus, &tsync);
+ RX_AFS_GLOCK();
+ if (!code)
+ *doProcessFS = 1; /* Flag to run afs_ProcessFS() later on */
+
+ return code;
+}
+
+afs_int32
rxfs_storeDestroy(void **r, afs_int32 error)
{
afs_int32 code = error;
struct rxfs_storeVariables *v = (struct rxfs_storeVariables *)*r;
*r = NULL;
+ if (v->call) {
+ afs_int32 code2;
+ RX_AFS_GUNLOCK();
+ code2 = rx_EndCall(v->call, code);
+ RX_AFS_GLOCK();
+ if (code2)
+ code = code2;
+ }
if (v->tbuffer)
osi_FreeLargeSpace(v->tbuffer);
if (v->tiov)
rxfs_storeUfsRead,
rxfs_storeUfsWrite,
rxfs_storeStatus,
+ rxfs_storeClose,
rxfs_storeDestroy
};
rxfs_storeMemRead,
rxfs_storeMemWrite,
rxfs_storeStatus,
+ rxfs_storeClose,
rxfs_storeDestroy
};
afs_int32
-rxfs_storeInit(struct vcache *avc, struct storeOps **ops, void **rock)
+rxfs_storeInit(struct vcache *avc, struct afs_conn *tc, afs_size_t tlen,
+ afs_size_t bytes, afs_size_t base,
+ struct storeOps **ops, void **rock)
{
+ afs_int32 code;
struct rxfs_storeVariables *v;
+ struct rx_call *tcall;
+
+ if ( !tc )
+ return -1;
v = (struct rxfs_storeVariables *) osi_AllocSmallSpace(sizeof(struct rxfs_storeVariables));
if (!v)
v->InStatus.ClientModTime = avc->f.m.Date;
v->InStatus.Mask = AFS_SETMODTIME;
+ RX_AFS_GUNLOCK();
+ tcall = rx_NewCall(tc->id);
+#ifdef AFS_64BIT_CLIENT
+ if (!afs_serverHasNo64Bit(tc))
+ code = StartRXAFS_StoreData64(tcall, (struct AFSFid *) &avc->f.fid.Fid,
+ &v->InStatus, base, bytes, tlen);
+ else {
+ if (tlen > 0xFFFFFFFF) {
+ code = EFBIG;
+ }
+ else {
+ afs_int32 t1, t2, t3;
+ t1 = base;
+ t2 = bytes;
+ t3 = tlen;
+ code = StartRXAFS_StoreData(tcall, (struct AFSFid *)&avc->f.fid.Fid,
+ &v->InStatus, t1, t2, t3);
+ }
+ }
+#else /* AFS_64BIT_CLIENT */
+ code = StartRXAFS_StoreData(tcall, (struct AFSFid *)&avc->f.fid.Fid,
+ &v->InStatus, base, bytes, tlen);
+#endif /* AFS_64BIT_CLIENT */
+ RX_AFS_GLOCK();
+
if (cacheDiskType == AFS_FCACHE_TYPE_UFS) {
v->tbuffer = osi_AllocLargeSpace(AFS_LRALLOCSIZ);
if (!v->tbuffer)
}
#endif /* notdef */
}
+
+ v->call = tcall;
*rock = (void *)v;
return 0;
}
-
+extern unsigned int storeallmissing;
/*!
* Called upon store.
*
- * \param acall Ptr to the Rx call structure involved.
- * \param fP Ptr to the related file descriptor.
- * \param alen Size of the file in bytes.
+ * \param tc Ptr to the Rx connection structure involved.
+ * \param dclist pointer to the list of dcaches
* \param avc Ptr to the vcache entry.
- * \param shouldWake is it "safe" to return early from close() ?
- * \param abytesToXferP Set to the number of bytes to xfer.
- * NOTE: This parameter is only used if AFS_NOSTATS is not defined.
- * \param abytesXferredP Set to the number of bytes actually xferred.
- * NOTE: This parameter is only used if AFS_NOSTATS is not defined.
+ * \param bytes per chunk
+ * \param base where to start the store
+ * \param length number of bytes to store
+ * \param anewDV Ptr to the dataversion after store
+ * \param doProcessFS Ptr to the processFS flag
+ * \param OutStatus Ptr to the OutStatus structure
+ * \param nchunks number of chunks to store
+ * \param nomoreP pointer to the "nomore" flag
*
* \note Environment: Nothing interesting.
*/
int
-afs_CacheStoreProc(register struct rx_call *acall,
- register struct osi_file *fP,
- register afs_int32 alen, struct vcache *avc,
- int *shouldWake, afs_size_t * abytesToXferP,
- afs_size_t * abytesXferredP)
+afs_CacheStoreProc(register struct afs_conn *tc,
+ struct dcache **dclist,
+ struct vcache *avc,
+ afs_size_t bytes,
+ afs_size_t base,
+ afs_size_t length,
+ afs_hyper_t *anewDV,
+ int *doProcessFS,
+ struct AFSFetchStatus *OutStatus,
+ afs_uint32 nchunks,
+ int *nomoreP)
{
- afs_int32 code;
- afs_uint32 tlen;
- int offset = 0;
+ afs_int32 code = 0;
struct storeOps *ops;
void * rock = NULL;
+ int nomore = *nomoreP;
+ unsigned int i;
+#ifndef AFS_NOSTATS
+ struct afs_stats_xferData *xferP; /* Ptr to this op's xfer struct */
+ osi_timeval_t xferStartTime, /*FS xfer start time */
+ xferStopTime; /*FS xfer stop time */
+ afs_size_t bytesToXfer = 10000; /* # bytes to xfer */
+ afs_size_t bytesXferred = 10000; /* # bytes actually xferred */
+#endif /* AFS_NOSTATS */
+ XSTATS_DECLS;
- afs_Trace4(afs_iclSetp, CM_TRACE_STOREPROC, ICL_TYPE_POINTER, avc,
- ICL_TYPE_FID, &(avc->f.fid), ICL_TYPE_OFFSET,
- ICL_HANDLE_OFFSET(avc->f.m.Length), ICL_TYPE_INT32, alen);
- code = rxfs_storeInit(avc, &ops, &rock);
+ code = rxfs_storeInit(avc, tc, length, bytes, base, &ops, &rock);
if ( code ) {
- osi_Panic("afs_CacheStoreProc: rxfs_storeInit failed");
+ osi_Panic("afs_CacheStoreProc: rxfs_storeInit failed with %d", code);
}
- ((struct rxfs_storeVariables *)rock)->call = acall;
- AFS_STATCNT(CacheStoreProc);
+ for (i = 0; i < nchunks && !code; i++) {
+ int stored = 0;
+ struct osi_file *fP;
+ int offset = 0;
+ struct dcache *tdc = dclist[i];
+ afs_int32 alen = tdc->f.chunkBytes;
+ int *shouldwake;
+ if (!tdc) {
+ afs_warn("afs: missing dcache!\n");
+ storeallmissing++;
+ continue; /* panic? */
+ }
+ afs_Trace4(afs_iclSetp, CM_TRACE_STOREALL2, ICL_TYPE_POINTER, avc,
+ ICL_TYPE_INT32, tdc->f.chunk, ICL_TYPE_INT32, tdc->index,
+ ICL_TYPE_INT32, afs_inode2trace(&tdc->f.inode));
+ shouldwake = 0;
+ if (nomore) {
+ if (avc->asynchrony == -1) {
+ if (afs_defaultAsynchrony > (bytes - stored))
+ shouldwake = &nomore;
+ }
+ else if ((afs_uint32) avc->asynchrony >= (bytes - stored))
+ shouldwake = &nomore;
+ }
+ fP = afs_CFileOpen(&tdc->f.inode);
+
+ afs_Trace4(afs_iclSetp, CM_TRACE_STOREPROC, ICL_TYPE_POINTER, avc,
+ ICL_TYPE_FID, &(avc->f.fid), ICL_TYPE_OFFSET,
+ ICL_HANDLE_OFFSET(avc->f.m.Length), ICL_TYPE_INT32, alen);
+
+ AFS_STATCNT(CacheStoreProc);
+
+ XSTATS_START_TIME(AFS_STATS_FS_RPCIDX_STOREDATA);
+ avc->f.truncPos = AFS_NOTRUNC;
#ifndef AFS_NOSTATS
- /*
- * In this case, alen is *always* the amount of data we'll be trying
- * to ship here.
- */
- *(abytesToXferP) = alen;
- *(abytesXferredP) = 0;
+ /*
+ * In this case, alen is *always* the amount of data we'll be trying
+ * to ship here.
+ */
+ bytesToXfer = alen;
+ bytesXferred = 0;
+
+ xferP = &(afs_stats_cmfullperf.rpc.
+ fsXferTimes[AFS_STATS_FS_XFERIDX_STOREDATA]);
+ osi_GetuTime(&xferStartTime);
#endif /* AFS_NOSTATS */
- while ( alen > 0 ) {
- afs_int32 bytesread, byteswritten;
- code = (*ops->prepare)(rock, alen, &tlen);
- if ( code )
- break;
+ while ( alen > 0 ) {
+ afs_uint32 tlen;
+ afs_int32 bytesread, byteswritten;
+ code = (*ops->prepare)(rock, alen, &tlen);
+ if ( code )
+ break;
- code = (*ops->read)(rock, fP, offset, tlen, &bytesread);
- if (code)
- break;
+ code = (*ops->read)(rock, fP, offset, tlen, &bytesread);
+ if (code)
+ break;
- tlen = bytesread;
- code = (*ops->write)(rock, tlen, &byteswritten);
- if (code)
- break;
+ tlen = bytesread;
+ code = (*ops->write)(rock, tlen, &byteswritten);
+ if (code)
+ break;
#ifndef AFS_NOSTATS
- (*abytesXferredP) += byteswritten;
+ bytesXferred += byteswritten;
#endif /* AFS_NOSTATS */
- offset += tlen;
- alen -= tlen;
- /*
- * if file has been locked on server, can allow
- * store to continue
- */
- if (shouldWake && *shouldWake && ((*ops->status)(rock) == 0)) {
- *shouldWake = 0; /* only do this once */
- afs_wakeup(avc);
+ offset += tlen;
+ alen -= tlen;
+ /*
+ * if file has been locked on server, can allow
+ * store to continue
+ */
+ if (shouldwake && *shouldwake && ((*ops->status)(rock) == 0)) {
+ *shouldwake = 0; /* only do this once */
+ afs_wakeup(avc);
+ }
}
+ afs_Trace4(afs_iclSetp, CM_TRACE_STOREPROC, ICL_TYPE_POINTER, avc,
+ ICL_TYPE_FID, &(avc->f.fid), ICL_TYPE_OFFSET,
+ ICL_HANDLE_OFFSET(avc->f.m.Length), ICL_TYPE_INT32, alen);
+
+#ifndef AFS_NOSTATS
+ osi_GetuTime(&xferStopTime);
+ (xferP->numXfers)++;
+ if (!code) {
+ (xferP->numSuccesses)++;
+ afs_stats_XferSumBytes[AFS_STATS_FS_XFERIDX_STOREDATA] +=
+ bytesXferred;
+ (xferP->sumBytes) +=
+ (afs_stats_XferSumBytes[AFS_STATS_FS_XFERIDX_STOREDATA] >> 10);
+ afs_stats_XferSumBytes[AFS_STATS_FS_XFERIDX_STOREDATA] &= 0x3FF;
+ if (bytesXferred < xferP->minBytes)
+ xferP->minBytes = bytesXferred;
+ if (bytesXferred > xferP->maxBytes)
+ xferP->maxBytes = bytesXferred;
+
+ /*
+ * Tally the size of the object. Note: we tally the actual size,
+ * NOT the number of bytes that made it out over the wire.
+ */
+ if (bytesToXfer <= AFS_STATS_MAXBYTES_BUCKET0)
+ (xferP->count[0])++;
+ else if (bytesToXfer <= AFS_STATS_MAXBYTES_BUCKET1)
+ (xferP->count[1])++;
+ else if (bytesToXfer <= AFS_STATS_MAXBYTES_BUCKET2)
+ (xferP->count[2])++;
+ else if (bytesToXfer <= AFS_STATS_MAXBYTES_BUCKET3)
+ (xferP->count[3])++;
+ else if (bytesToXfer <= AFS_STATS_MAXBYTES_BUCKET4)
+ (xferP->count[4])++;
+ else if (bytesToXfer <= AFS_STATS_MAXBYTES_BUCKET5)
+ (xferP->count[5])++;
+ else if (bytesToXfer <= AFS_STATS_MAXBYTES_BUCKET6)
+ (xferP->count[6])++;
+ else if (bytesToXfer <= AFS_STATS_MAXBYTES_BUCKET7)
+ (xferP->count[7])++;
+ else
+ (xferP->count[8])++;
+
+ afs_stats_GetDiff(elapsedTime, xferStartTime, xferStopTime);
+ afs_stats_AddTo((xferP->sumTime), elapsedTime);
+ afs_stats_SquareAddTo((xferP->sqrTime), elapsedTime);
+ if (afs_stats_TimeLessThan(elapsedTime, (xferP->minTime))) {
+ afs_stats_TimeAssign((xferP->minTime), elapsedTime);
+ }
+ if (afs_stats_TimeGreaterThan(elapsedTime, (xferP->maxTime))) {
+ afs_stats_TimeAssign((xferP->maxTime), elapsedTime);
+ }
+ }
+#endif /* AFS_NOSTATS */
+
+ afs_CFileClose(fP);
+ if ((tdc->f.chunkBytes < afs_OtherCSize)
+ && (i < (nchunks - 1)) && code == 0) {
+ int bsent, tlen, sbytes =
+ afs_OtherCSize - tdc->f.chunkBytes;
+ char *tbuffer =
+ osi_AllocLargeSpace(AFS_LRALLOCSIZ);
+
+ while (sbytes > 0) {
+ tlen = (sbytes > AFS_LRALLOCSIZ ? AFS_LRALLOCSIZ : sbytes);
+ memset(tbuffer, 0, tlen);
+ RX_AFS_GUNLOCK();
+ bsent = rx_Write(((struct rxfs_storeVariables*)rock)->call,
+ tbuffer, tlen);
+ RX_AFS_GLOCK();
+
+ if (bsent != tlen) {
+ code = -33; /* XXX */
+ break;
+ }
+ sbytes -= tlen;
+ }
+ osi_FreeLargeSpace(tbuffer);
+ }
+ stored += tdc->f.chunkBytes;
+
+ /* ideally, I'd like to unlock the dcache and turn
+ * off the writing bit here, but that would
+ * require being able to retry StoreAllSegments in
+ * the event of a failure. It only really matters
+ * if user can't read from a 'locked' dcache or
+ * one which has the writing bit turned on. */
+ }
+ if (!code) {
+ code = (*ops->close)(rock, OutStatus, doProcessFS);
+ if (*doProcessFS) {
+ hadd32(*anewDV, 1);
+ }
+ XSTATS_END_TIME;
}
- afs_Trace4(afs_iclSetp, CM_TRACE_STOREPROC, ICL_TYPE_POINTER, avc,
- ICL_TYPE_FID, &(avc->f.fid), ICL_TYPE_OFFSET,
- ICL_HANDLE_OFFSET(avc->f.m.Length), ICL_TYPE_INT32, alen);
code = (*ops->destroy)(&rock, code);
+
+ *nomoreP = nomore;
return code;
}
return 0;
}
+
+afs_int32
+rxfs_fetchClose(void *r, struct vcache *avc, struct dcache * adc,
+ struct afs_FetchOutput *tsmall)
+{
+ afs_int32 code, code1 = 0;
+ struct rxfs_fetchVariables *v = (struct rxfs_fetchVariables *)r;
+
+ if (!v->call)
+ return -1;
+
+ RX_AFS_GUNLOCK();
+ code = EndRXAFS_FetchData(v->call, &tsmall->OutStatus,
+ &tsmall->CallBack,
+ &tsmall->tsync);
+ RX_AFS_GLOCK();
+
+ RX_AFS_GUNLOCK();
+ if (v->call)
+ code1 = rx_EndCall(v->call, code);
+ RX_AFS_GLOCK();
+ if (!code && code1)
+ code = code1;
+
+ v->call = NULL;
+
+ return code;
+}
+
afs_int32
rxfs_fetchDestroy(void **r, afs_int32 error)
{
rxfs_fetchMore,
rxfs_fetchUfsRead,
rxfs_fetchUfsWrite,
+ rxfs_fetchClose,
rxfs_fetchDestroy
};
rxfs_fetchMore,
rxfs_fetchMemRead,
rxfs_fetchMemWrite,
+ rxfs_fetchClose,
rxfs_fetchDestroy
};
afs_int32
-rxfs_fetchInit(register struct rx_call *acall, struct vcache *avc,
- afs_offs_t abase, afs_uint32 *length, struct dcache *adc,
+rxfs_fetchInit(register struct afs_conn *tc, struct vcache *avc,afs_offs_t base,
+ afs_uint32 size, afs_uint32 *out_length, struct dcache *adc,
struct osi_file *fP, struct fetchOps **ops, void **rock)
{
struct rxfs_fetchVariables *v;
+ int code, code1;
+ afs_int32 length_hi, length, bytes;
+#ifdef AFS_64BIT_CLIENT
+ afs_size_t tsize;
+ afs_size_t lengthFound; /* as returned from server */
+#endif /* AFS_64BIT_CLIENT */
v = (struct rxfs_fetchVariables *) osi_AllocSmallSpace(sizeof(struct rxfs_fetchVariables));
if (!v)
osi_Panic("rxfs_fetchInit: osi_AllocSmallSpace returned NULL\n");
memset(v, 0, sizeof(struct rxfs_fetchVariables));
- v->call = acall;
+ RX_AFS_GUNLOCK();
+ v->call = rx_NewCall(tc->id);
+ RX_AFS_GLOCK();
+
+#ifdef AFS_64BIT_CLIENT
+ length_hi = code = 0;
+ if (!afs_serverHasNo64Bit(tc)) {
+ tsize = size;
+ RX_AFS_GUNLOCK();
+ code = StartRXAFS_FetchData64(v->call, (struct AFSFid *)&avc->f.fid.Fid,
+ base, tsize);
+ if (code != 0) {
+ RX_AFS_GLOCK();
+ afs_Trace2(afs_iclSetp, CM_TRACE_FETCH64CODE,
+ ICL_TYPE_POINTER, avc, ICL_TYPE_INT32, code);
+ } else {
+ bytes = rx_Read(v->call, (char *)&length_hi, sizeof(afs_int32));
+ RX_AFS_GLOCK();
+ if (bytes == sizeof(afs_int32)) {
+ length_hi = ntohl(length_hi);
+ } else {
+ length_hi = 0;
+ code = rx_Error(v->call);
+ RX_AFS_GUNLOCK();
+ code1 = rx_EndCall(v->call, code);
+ RX_AFS_GLOCK();
+ v->call = NULL;
+ }
+ }
+ }
+ if (code == RXGEN_OPCODE || afs_serverHasNo64Bit(tc)) {
+ if (base > 0x7FFFFFFF) {
+ code = EFBIG;
+ } else {
+ afs_int32 pos;
+ pos = base;
+ RX_AFS_GUNLOCK();
+ if (!v->call)
+ v->call = rx_NewCall(tc->id);
+ code =
+ StartRXAFS_FetchData(v->call, (struct AFSFid *)
+ &avc->f.fid.Fid, pos,
+ size);
+ RX_AFS_GLOCK();
+ }
+ afs_serverSetNo64Bit(tc);
+ }
+ if (!code) {
+ RX_AFS_GUNLOCK();
+ bytes = rx_Read(v->call, (char *)&length, sizeof(afs_int32));
+ RX_AFS_GLOCK();
+ if (bytes == sizeof(afs_int32))
+ length = ntohl(length);
+ else {
+ code = rx_Error(v->call);
+ }
+ }
+ FillInt64(lengthFound, length_hi, length);
+ afs_Trace3(afs_iclSetp, CM_TRACE_FETCH64LENG,
+ ICL_TYPE_POINTER, avc, ICL_TYPE_INT32, code,
+ ICL_TYPE_OFFSET,
+ ICL_HANDLE_OFFSET(lengthFound));
+#else /* AFS_64BIT_CLIENT */
+ RX_AFS_GUNLOCK();
+ code = StartRXAFS_FetchData(v->call, (struct AFSFid *)&avc->f.fid.Fid,
+ base, size);
+ RX_AFS_GLOCK();
+ if (code == 0) {
+ RX_AFS_GUNLOCK();
+ bytes = rx_Read(v->call, (char *)&length, sizeof(afs_int32));
+ RX_AFS_GLOCK();
+ if (bytes == sizeof(afs_int32))
+ length = ntohl(length);
+ else
+ code = rx_Error(v->call);
+ }
+#endif /* AFS_64BIT_CLIENT */
+ if (code) {
+ osi_FreeSmallSpace(v);
+ return code;
+ }
if ( cacheDiskType == AFS_FCACHE_TYPE_UFS ) {
v->tbuffer = osi_AllocLargeSpace(AFS_LRALLOCSIZ);
else {
afs_Trace4(afs_iclSetp, CM_TRACE_MEMFETCH, ICL_TYPE_POINTER, avc,
ICL_TYPE_POINTER, fP, ICL_TYPE_OFFSET,
- ICL_HANDLE_OFFSET(abase), ICL_TYPE_INT32, *length);
+ ICL_HANDLE_OFFSET(base), ICL_TYPE_INT32, length);
/*
* We need to alloc the iovecs on the heap so that they are "pinned"
* rather than declare them on the stack - defect 11272
*/
- v->iov =
- (struct iovec *)osi_AllocSmallSpace(sizeof(struct iovec) *
+ v->iov = (struct iovec *)osi_AllocSmallSpace(sizeof(struct iovec) *
RX_MAXIOVECS);
if (!v->iov)
osi_Panic("afs_CacheFetchProc: osi_AllocSmallSpace for iovecs returned NULL\n");
*ops = (struct fetchOps *) &rxfs_fetchMemOps;
}
*rock = (void *)v;
+ *out_length = length;
return 0;
}
* Routine called on fetch; also tells people waiting for data
* that more has arrived.
*
- * \param acall Ptr to the Rx call structure.
+ * \param tc Ptr to the Rx connection structure.
* \param fP File descriptor for the cache file.
* \param abase Base offset to fetch.
* \param adc Ptr to the dcache entry for the file, write-locked.
* \param avc Ptr to the vcache entry for the file.
- * \param abytesToXferP Set to the number of bytes to xfer.
- * NOTE: This parameter is only used if AFS_NOSTATS is not defined.
- * \param abytesXferredP Set to the number of bytes actually xferred.
- * NOTE: This parameter is only used if AFS_NOSTATS is not defined.
+ * \param size Amount of data that should be fetched.
+ * \param tsmall Ptr to the afs_FetchOutput structure.
*
* \note Environment: Nothing interesting.
*/
int
-afs_CacheFetchProc(register struct rx_call *acall,
- register struct osi_file *fP, afs_size_t abase,
- struct dcache *adc, struct vcache *avc,
- afs_size_t * abytesToXferP, afs_size_t * abytesXferredP,
- afs_int32 lengthFound)
+afs_CacheFetchProc(register struct afs_conn *tc,
+ register struct osi_file *fP, afs_size_t abase,
+ struct dcache *adc, struct vcache *avc,
+ afs_int32 size,
+ struct afs_FetchOutput *tsmall)
{
register afs_int32 code;
afs_uint32 length;
int moredata = 0;
register int offset = 0;
+ XSTATS_DECLS;
+#ifndef AFS_NOSTATS
+ struct afs_stats_xferData *xferP; /* Ptr to this op's xfer struct */
+ osi_timeval_t xferStartTime, /*FS xfer start time */
+ xferStopTime; /*FS xfer stop time */
+ afs_size_t bytesToXfer = 0, bytesXferred = 0;
+#endif
+
AFS_STATCNT(CacheFetchProc);
- length = lengthFound;
+ XSTATS_START_TIME(AFS_STATS_FS_RPCIDX_FETCHDATA);
+
+ code = rxfs_fetchInit(tc, avc, abase, size, &length, adc, fP, &ops, &rock);
- if ( cacheDiskType != AFS_FCACHE_TYPE_UFS ) {
- }
#ifndef AFS_NOSTATS
- (*abytesToXferP) = 0;
- (*abytesXferredP) = 0;
+ xferP =
+ &(afs_stats_cmfullperf.rpc.fsXferTimes[AFS_STATS_FS_XFERIDX_FETCHDATA]);
+ osi_GetuTime(&xferStartTime);
#endif /* AFS_NOSTATS */
adc->validPos = abase;
- code = rxfs_fetchInit(acall, avc, abase, &length, adc, fP,
- (struct fetchOps **)&ops, (char**)&rock);
if ( !code ) do {
if (moredata) {
code = (*ops->more)(rock, &length, &moredata);
moredata = 0;
}
#ifndef AFS_NOSTATS
- (*abytesToXferP) += length;
+ bytesToXfer += length;
#endif /* AFS_NOSTATS */
while (length > 0) {
#ifdef RX_KERNEL_TRACE
"after rx_Read");
#endif
#ifndef AFS_NOSTATS
- (*abytesXferredP) += bytesread;
+ bytesXferred += bytesread;
#endif /* AFS_NOSTATS */
if ( code ) {
afs_Trace3(afs_iclSetp, CM_TRACE_FETCH64READ,
}
code = 0;
} while (moredata);
+ if (!code)
+ code = (*ops->close)(rock, avc, adc, tsmall);
(*ops->destroy)(&rock, code);
+
+#ifndef AFS_NOSTATS
+ osi_GetuTime(&xferStopTime);
+ (xferP->numXfers)++;
+ if (!code) {
+ (xferP->numSuccesses)++;
+ afs_stats_XferSumBytes[AFS_STATS_FS_XFERIDX_FETCHDATA] += bytesXferred;
+ (xferP->sumBytes) +=
+ (afs_stats_XferSumBytes[AFS_STATS_FS_XFERIDX_FETCHDATA] >> 10);
+ afs_stats_XferSumBytes[AFS_STATS_FS_XFERIDX_FETCHDATA] &= 0x3FF;
+ if (bytesXferred < xferP->minBytes)
+ xferP->minBytes = bytesXferred;
+ if (bytesXferred > xferP->maxBytes)
+ xferP->maxBytes = bytesXferred;
+
+ /*
+ * Tally the size of the object. Note: we tally the actual size,
+ * NOT the number of bytes that made it out over the wire.
+ */
+ if (bytesToXfer <= AFS_STATS_MAXBYTES_BUCKET0)
+ (xferP->count[0])++;
+ else if (bytesToXfer <= AFS_STATS_MAXBYTES_BUCKET1)
+ (xferP->count[1])++;
+ else if (bytesToXfer <= AFS_STATS_MAXBYTES_BUCKET2)
+ (xferP->count[2])++;
+ else if (bytesToXfer <= AFS_STATS_MAXBYTES_BUCKET3)
+ (xferP->count[3])++;
+ else if (bytesToXfer <= AFS_STATS_MAXBYTES_BUCKET4)
+ (xferP->count[4])++;
+ else if (bytesToXfer <= AFS_STATS_MAXBYTES_BUCKET5)
+ (xferP->count[5])++;
+ else if (bytesToXfer <= AFS_STATS_MAXBYTES_BUCKET6)
+ (xferP->count[6])++;
+ else if (bytesToXfer <= AFS_STATS_MAXBYTES_BUCKET7)
+ (xferP->count[7])++;
+ else
+ (xferP->count[8])++;
+
+ afs_stats_GetDiff(elapsedTime, xferStartTime, xferStopTime);
+ afs_stats_AddTo((xferP->sumTime), elapsedTime);
+ afs_stats_SquareAddTo((xferP->sqrTime), elapsedTime);
+ if (afs_stats_TimeLessThan(elapsedTime, (xferP->minTime))) {
+ afs_stats_TimeAssign((xferP->minTime), elapsedTime);
+ }
+ if (afs_stats_TimeGreaterThan(elapsedTime, (xferP->maxTime))) {
+ afs_stats_TimeAssign((xferP->maxTime), elapsedTime);
+ }
+ }
+#endif
+ XSTATS_END_TIME;
return code;
}
git://git.openafs.org / openafs.git / blobdiff