ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/CMSDIST/xrootd-readv2.patch
Revision: 1.2
Committed: Mon Nov 22 09:06:56 2010 UTC (14 years, 5 months ago) by gowdy
Branch: MAIN
CVS Tags: builder_2011-09-25_13-08-30_CmsTC, builder_2011-09-22_19-07-05_CmsTC, builder_2011-09-21_19-43-30_CmsTC, builder_2011-09-21_10-25-16_CmsTC, builder_2011-09-20_13-03-45_CmsTC, builder_2011-09-20_12-03-56_CmsTC, builder_2011-08-11_12-11-35_CmsTC, DBS_2_1_6-pre1, builder_2011-06-23_18-03-57_CmsTC, builder_2011-05-20_16-46-52_crab-server, builder_2011-05-16_23-03-55_CmsTC, builder_2011-03-31_13-06-26_crab-server, builder_2011-03-28_17-53-57_crab-server, builder_2011-02-28_14-23-32_wmagent, CmsTC_0_0_4, CMSSW_3_9_9_patch1, apFor399p1v0, CMSSW_3_9_9, apFor399v0, CmsTC_0_0_3, CmsTC_0_0_2, builder_2011-02-09_14-27-53_crab-server, CMSSW_3_9_8_patch2, apFor398p2v0, builder_2011-02-08_23-13-23_cmsweb, HG1102d, builder_2011-02-08_07-34-50_cmsweb, HG1102c, CMSSW_3_9_8_patch1, apFor398p1v0, builder_2011-02-03_23-45-44_CmsTC, builder_2011-02-03_19-04-46_PHEDEX-combined-agents, CMSSW_3_9_8, builder_2011-02-02_21-14-00_cmsweb, apFor398v0, builder_2011-02-02_16-24-27_T0Mon, builder_2011-02-01_18-11-58_cmsweb, builder_2011-01-31_16-44-33_dbs-client, builder_2011-01-31_15-26-15_T0DataSvc, smFor398a, smFor398, builder_2011-01-25_14-26-56_cmsweb, builder_2011-01-20_18-59-54_cmsweb, CMSSW_3_10_1, HG1102b, smFor3101, CMSSW_3_10_0_pre9G493, sm110117, fwFor3100xdaq11b4online, CMSSW_3_8_7_patch2, sjgFor387p2b, sjgFor387p2, eskFor3XYpreZ, CMSSW_3_11_0_pre3, smFor3110pre3a, smFor3110pre3, pe20101230-311XAB, CMSSW_3_11_0_pre2, pe20101229-for311X, fwFor311pre2, CMSSW_3_10_0, CMSSW_3_9_7, smFor3100c, apFor397v0, CMSSW_3_9_6, pe20101221a-for3100p9io, smFor3100b, apFor396v0, smFor3100a, smFor3100, pe20101217b-for3100p9io, pe20101217a-for3100p9io, CMSSW_3_8_7_patch1, CMSSW_3_11_0_pre1, fwFor311pre1, smFor3100pre9G493, CMSSW_3_10_0_pre9r52706b, pe20101215-for3100p9r52706b, CMSSW_3_10_0_pre9, smFor3100pre9a, smFor3100pre9, CMSSW_3_9_5_patch2, apFor395p2v0, CMSSW_3_10_0_pre8, smFor3100pre8, smFor310X-101207, smFor310X-101206b, smFor310X-101206ab, smFor310X-101206a, smFor310X-101206, pe20101206-for3100pre7r52706b, CMSSW_3_10_0_pre7g494c1, CMSSW_3_9_5_patch1, apFor395p1v0, apFor392p1v0, smFor3100pre7G494C1a, pe20101203-root52706b, dsr20101201fwlite387, CMSSW_3_10_0_pre7io, azFor3100pre7io-a, smFor3100pre7io-a, azFor3100pre7io-Updated, smFor3100pre7G494C1, azFor3100pre7io, smFor3100pre7io, CMSSW_3_10_0_pre7, smFor3100pre7, smFor310X-101130, CMSSW_3_8_7, smFor310X-101129, dsr20101129fwlite394, CMSSW_3_9_5, CMSSW_3_10_0_pre6, smFor3100pre6, apFor395v0, sjg101126b, sjg101126a, CMSSW_3_9_4, smFor310X-101123, apFor394v0, smFor39X-101123, sjg101122b
Changes since 1.1: +7 -7 lines
Log Message: 
fix whitespace

File Contents

# User Rev Content
1 gowdy 1.2 --- xrootd-20090727.1318/src/XrdClient/XrdClient.cc.orig 2010-11-22 09:53:58.000000000 +0100
2     +++ xrootd-20090727.1318/src/XrdClient/XrdClient.cc 2010-11-22 09:58:22.000000000 +0100
3 gowdy 1.1 @@ -701,9 +701,29 @@
4 gowdy 1.2 i++;
5 gowdy 1.1 }
6 gowdy 1.2
7 gowdy 1.1 - res = XrdClientReadV::ReqReadV(fConnModule, fHandle, buf+bytesread,
8 gowdy 1.2 - reqvect, startitem, i-startitem,
9     - fConnModule->GetParallelStreamToUse(reqsperstream) );
10 gowdy 1.1 + if (i-startitem == 1) {
11     + if (buf) {
12     + // Synchronous
13     + res = Read(buf, reqvect[startitem].offset, reqvect[startitem].len);
14     +
15     + } else {
16     + // Asynchronous, res stays the same
17     + Read_Async(reqvect[startitem].offset, reqvect[startitem].len);
18     + res = reqvect[startitem].len;
19     + }
20     + } else {
21     + if (buf) {
22     +
23     + res = XrdClientReadV::ReqReadV(fConnModule, fHandle, buf+bytesread,
24     + reqvect, startitem, i-startitem,
25     + fConnModule->GetParallelStreamToUse(reqsperstream) );
26     + }
27     + else {
28     + res = XrdClientReadV::ReqReadV(fConnModule, fHandle, 0,
29     + reqvect, startitem, i-startitem,
30     + fConnModule->GetParallelStreamToUse(reqsperstream) );
31     + }
32     + }
33 gowdy 1.2
34 gowdy 1.1 // The next bunch of chunks to request starts from here
35     startitem = i;