}
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;
}
/*!
* Called upon store.
*
- * \param acall Ptr to the Rx call structure involved.
+ * \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 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
- * \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.
*
* \note Environment: Nothing interesting.
*/
int
-afs_CacheStoreProc(register struct rx_call *acall,
+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_size_t * abytesToXferP,
- afs_size_t * abytesXferredP)
+ int *nomoreP)
{
afs_int32 code = 0;
- afs_uint32 tlen;
struct storeOps *ops;
void * rock = NULL;
- struct osi_file *fP;
- int *shouldwake;
int nomore = *nomoreP;
- struct dcache *tdc;
- int stored = 0;
unsigned int i;
- afs_int32 alen;
+#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;
- 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;
for (i = 0; i < nchunks && !code; i++) {
+ int stored = 0;
+ struct osi_file *fP;
int offset = 0;
- tdc = dclist[i];
- alen = tdc->f.chunkBytes;
+ 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));
+ 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)) {
+ if (afs_defaultAsynchrony > (bytes - stored))
shouldwake = &nomore;
- }
- } else if ((afs_uint32) avc->asynchrony >=
- (bytes - stored)) {
- shouldwake = &nomore;
}
+ else if ((afs_uint32) avc->asynchrony >= (bytes - stored))
+ shouldwake = &nomore;
}
fP = afs_CFileOpen(&tdc->f.inode);
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;
+ 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_uint32 tlen;
afs_int32 bytesread, byteswritten;
code = (*ops->prepare)(rock, alen, &tlen);
if ( code )
if (code)
break;
#ifndef AFS_NOSTATS
- (*abytesXferredP) += byteswritten;
+ bytesXferred += byteswritten;
#endif /* AFS_NOSTATS */
offset += tlen;
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) {
osi_AllocLargeSpace(AFS_LRALLOCSIZ);
while (sbytes > 0) {
- tlen =
- (sbytes >
- AFS_LRALLOCSIZ ? AFS_LRALLOCSIZ :
- sbytes);
+ tlen = (sbytes > AFS_LRALLOCSIZ ? AFS_LRALLOCSIZ : sbytes);
memset(tbuffer, 0, tlen);
RX_AFS_GUNLOCK();
- bsent = rx_Write(acall, tbuffer, tlen);
+ bsent = rx_Write(((struct rxfs_storeVariables*)rock)->call,
+ tbuffer, tlen);
RX_AFS_GLOCK();
if (bsent != tlen) {
* 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;
+ }
code = (*ops->destroy)(&rock, code);
*nomoreP = nomore;
git://git.openafs.org / openafs.git / blobdiff