286
|
1 |
// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
|
0
|
2 |
// All rights reserved.
|
|
3 |
// This component and the accompanying materials are made available
|
|
4 |
// under the terms of the License "Eclipse Public License v1.0"
|
|
5 |
// which accompanies this distribution, and is available
|
|
6 |
// at the URL "http://www.eclipse.org/legal/epl-v10.html".
|
|
7 |
//
|
|
8 |
// Initial Contributors:
|
|
9 |
// Nokia Corporation - initial contribution.
|
|
10 |
//
|
|
11 |
// Contributors:
|
|
12 |
//
|
|
13 |
// Description:
|
|
14 |
//
|
|
15 |
|
286
|
16 |
|
|
17 |
#include <e32std.h>
|
|
18 |
#include "smassstorage.h"
|
|
19 |
#include "mprotocol.h"
|
|
20 |
#include "scsiprot.h" // KMaxBufSize
|
|
21 |
#include "drivemanager.h"
|
0
|
22 |
#include "usbmsshared.h"
|
|
23 |
#include "rwdrivethread.h"
|
|
24 |
|
|
25 |
|
286
|
26 |
#include "OstTraceDefinitions.h"
|
|
27 |
#ifdef OST_TRACE_COMPILER_IN_USE
|
|
28 |
#include "rwdrivethreadTraces.h"
|
|
29 |
#endif
|
0
|
30 |
|
|
31 |
|
286
|
32 |
#ifdef MSDC_MULTITHREADED
|
0
|
33 |
|
|
34 |
TBlockDesc::TBlockDesc()
|
286
|
35 |
:iBuf((TUint8 *)NULL,0,0)
|
|
36 |
{
|
|
37 |
}
|
0
|
38 |
|
|
39 |
void TBlockDesc::SetPtr(TPtr8& aDes)
|
286
|
40 |
{
|
|
41 |
iBuf.Set(aDes);
|
|
42 |
}
|
0
|
43 |
|
|
44 |
|
|
45 |
TBlockDescBuffer::TBlockDescBuffer()
|
286
|
46 |
{
|
|
47 |
iDescReadPtr = &iDesc1;
|
|
48 |
iDescWritePtr = &iDesc2;
|
|
49 |
}
|
0
|
50 |
|
|
51 |
void TBlockDescBuffer::SetUpReadBuf(TPtr8& aDes1, TPtr8& aDes2)
|
286
|
52 |
{
|
|
53 |
iDesc1.SetPtr(aDes1);
|
|
54 |
iDesc2.SetPtr(aDes2);
|
|
55 |
iDescReadPtr = &iDesc1;
|
|
56 |
iDescWritePtr = &iDesc2;
|
|
57 |
}
|
0
|
58 |
|
|
59 |
|
|
60 |
//-----------------------------------------------
|
|
61 |
|
|
62 |
/**
|
|
63 |
Construct a CThreadContext object.
|
|
64 |
|
|
65 |
@param aName The name to be assigned to this thread.
|
|
66 |
@param aThreadFunction Function to be called when thread is initially scheduled.
|
|
67 |
@param aOwner Pointer to the object owning the thread. Used as the parameter to aThreadFunction.
|
|
68 |
*/
|
|
69 |
CThreadContext* CThreadContext::NewL(const TDesC& aName,
|
286
|
70 |
TThreadFunction aThreadFunction,
|
|
71 |
TAny* aOwner)
|
|
72 |
{
|
|
73 |
CThreadContext* self = new (ELeave) CThreadContext();
|
|
74 |
CleanupStack::PushL(self);
|
|
75 |
self->ConstructL(aName, aThreadFunction, aOwner);
|
|
76 |
CleanupStack::Pop();
|
|
77 |
return self;
|
|
78 |
}
|
0
|
79 |
|
|
80 |
/**
|
|
81 |
Construct a CThreadContext object
|
|
82 |
|
|
83 |
@param aName The name to be assigned to this thread.
|
|
84 |
@param aThreadFunction Function to be called when thread is initially scheduled.
|
|
85 |
@param aOwner Pointer to the object owning the thread. Used as the parameter to aThreadFunction.
|
|
86 |
*/
|
|
87 |
void CThreadContext::ConstructL(const TDesC& aName,
|
286
|
88 |
TThreadFunction aThreadFunction,
|
|
89 |
TAny* aOwner)
|
|
90 |
{
|
|
91 |
OstTrace0(TRACE_SMASSSTORAGE_MEDIA, CTHREADCONTEXT_10, "Creating Critical Section");
|
|
92 |
User::LeaveIfError(iCritSect.CreateLocal());
|
|
93 |
OstTrace0(TRACE_SMASSSTORAGE_MEDIA, CTHREADCONTEXT_11, "Creating RThread");
|
0
|
94 |
|
286
|
95 |
TUint serial(0); // Used to retry creation of a thread in case
|
|
96 |
// one with the same name already exists
|
0
|
97 |
|
286
|
98 |
RBuf threadName;
|
|
99 |
threadName.CreateMaxL(aName.Length() + 8);
|
|
100 |
CleanupClosePushL(threadName);
|
|
101 |
threadName = aName;
|
0
|
102 |
|
286
|
103 |
TInt err;
|
|
104 |
for (;;)
|
|
105 |
{
|
|
106 |
err = iThread.Create(threadName, aThreadFunction, 0x1000, NULL, aOwner);
|
|
107 |
OstTraceData(TRACE_SMASSSTORAGE_MEDIA, CTHREADCONTEXT_13,
|
|
108 |
"CThreadContext::ConstructL Created thread %s err=%d", threadName.Ptr(), threadName.Length());
|
|
109 |
OstTrace1(TRACE_SMASSSTORAGE_MEDIA, CTHREADCONTEXT_14,
|
|
110 |
"err=%d", err);
|
|
111 |
|
0
|
112 |
|
|
113 |
// for a restart wait and retry until old thread is gone
|
286
|
114 |
if (err == KErrAlreadyExists)
|
|
115 |
{
|
|
116 |
User::After(10 * 1000); // 10 mS
|
|
117 |
threadName = aName;
|
|
118 |
threadName.AppendNumFixedWidth(serial, EDecimal, 8);
|
|
119 |
++serial;
|
|
120 |
}
|
|
121 |
else
|
|
122 |
{
|
|
123 |
break;
|
|
124 |
}
|
|
125 |
}
|
0
|
126 |
|
|
127 |
User::LeaveIfError(err);
|
|
128 |
CleanupStack::Pop(); // threadName
|
|
129 |
threadName.Close();
|
|
130 |
|
286
|
131 |
// set priority
|
|
132 |
iThread.SetPriority(EPriorityMore);
|
|
133 |
}
|
0
|
134 |
|
|
135 |
|
|
136 |
/**
|
|
137 |
Construct a CThreadContext object
|
|
138 |
*/
|
|
139 |
CThreadContext::CThreadContext()
|
286
|
140 |
:
|
|
141 |
iError(KErrNone)
|
|
142 |
{
|
|
143 |
}
|
0
|
144 |
|
|
145 |
/**
|
|
146 |
Destructor
|
|
147 |
*/
|
|
148 |
CThreadContext::~CThreadContext()
|
286
|
149 |
{
|
|
150 |
OstTrace0(TRACE_SMASSSTORAGE_MEDIA, CTHREADCONTEXT_20, "Closing Critical Section");
|
|
151 |
iCritSect.Close();
|
|
152 |
OstTrace0(TRACE_SMASSSTORAGE_MEDIA, CTHREADCONTEXT_21, "Killing ThreadContext");
|
|
153 |
iThread.Kill(0);
|
|
154 |
OstTrace0(TRACE_SMASSSTORAGE_MEDIA, CTHREADCONTEXT_22, "Closing ThreadContext");
|
|
155 |
iThread.Close();
|
|
156 |
}
|
0
|
157 |
|
|
158 |
//-----------------------------------------------
|
|
159 |
|
|
160 |
/**
|
|
161 |
Construct a CWriteDriveThread object
|
|
162 |
*/
|
|
163 |
CWriteDriveThread* CWriteDriveThread::NewL()
|
286
|
164 |
{
|
|
165 |
CWriteDriveThread* self = new (ELeave) CWriteDriveThread();
|
|
166 |
CleanupStack::PushL(self);
|
|
167 |
self->ConstructL();
|
|
168 |
CleanupStack::Pop();
|
|
169 |
return self;
|
|
170 |
}
|
0
|
171 |
|
|
172 |
/**
|
|
173 |
Construct a CWriteDriveThread object
|
|
174 |
*/
|
|
175 |
void CWriteDriveThread::ConstructL()
|
286
|
176 |
{
|
|
177 |
TBuf<16> name = _L("MassStorageWrite");
|
|
178 |
iThreadContext = CThreadContext::NewL(name, ThreadFunction, this);
|
|
179 |
// There are two free pointers to start with so initialise the semaphore with 1
|
|
180 |
User::LeaveIfError(iProducerSem.CreateLocal(1));
|
|
181 |
User::LeaveIfError(iConsumerSem.CreateLocal(0));
|
|
182 |
|
|
183 |
iThreadContext->Resume();
|
|
184 |
}
|
0
|
185 |
|
|
186 |
/**
|
|
187 |
Construct a CWriteDriveThread object
|
|
188 |
*/
|
286
|
189 |
CWriteDriveThread::CWriteDriveThread()
|
|
190 |
: iIsCommandWrite10(EFalse)
|
|
191 |
{
|
|
192 |
}
|
0
|
193 |
|
|
194 |
/**
|
|
195 |
Destructor
|
|
196 |
*/
|
|
197 |
CWriteDriveThread::~CWriteDriveThread()
|
286
|
198 |
{
|
|
199 |
delete iThreadContext;
|
|
200 |
}
|
0
|
201 |
|
|
202 |
/**
|
|
203 |
This function is called when the thread is initially scheduled.
|
|
204 |
|
|
205 |
@param aSelf Pointer to self to facilitate call to member method.
|
|
206 |
*/
|
|
207 |
TInt CWriteDriveThread::ThreadFunction(TAny* aSelf)
|
286
|
208 |
{
|
|
209 |
CWriteDriveThread* self = static_cast<CWriteDriveThread*>(aSelf);
|
|
210 |
return self->WriteToDrive();
|
|
211 |
}
|
0
|
212 |
|
|
213 |
/**
|
|
214 |
Writes the data pointed to by iDescWritePtr to the drive.
|
|
215 |
*/
|
|
216 |
TInt CWriteDriveThread::WriteToDrive()
|
286
|
217 |
{
|
|
218 |
// One-off convenience variable assignment
|
|
219 |
TBlockDesc* &desc = iThreadContext->iBuffer.iDescWritePtr;
|
0
|
220 |
|
286
|
221 |
for(;;)
|
|
222 |
{
|
|
223 |
iConsumerSem.Wait();
|
|
224 |
OstTrace0(TRACE_SMASSSTORAGE_MEDIA, CTHREADCONTEXT_30, "Waiting on Write CS...");
|
|
225 |
iThreadContext->iCritSect.Wait();
|
|
226 |
// +++ WRITE CS STARTS HERE +++
|
|
227 |
OstTrace1(TRACE_SMASSSTORAGE_MEDIA, CTHREADCONTEXT_31,
|
|
228 |
"Now using as write buffer: iBuf%d", iThreadContext->iBuffer.GetBufferNumber(&desc->iBuf));
|
|
229 |
OstTrace1(TRACE_SMASSSTORAGE_MEDIA, CTHREADCONTEXT_32,
|
|
230 |
"SCSI: writing %d bytes", desc->iBuf.Length());
|
|
231 |
// Write buffer to disk
|
|
232 |
iThreadContext->iError = iThreadContext->iDrive->Write(desc->iByteOffset, desc->iBuf,iThreadContext->iDrive->IsWholeMediaAccess());
|
0
|
233 |
|
286
|
234 |
iCallback((TUint8*) (desc->iBuf.Ptr()), iCallbackParameter);
|
|
235 |
iWriteCounter--;
|
|
236 |
__ASSERT_DEBUG(iWriteCounter >= 0, User::Panic(KUsbMsSvrPncCat, EMsThreadWriteToDrive));
|
0
|
237 |
|
286
|
238 |
OstTrace0(TRACE_SMASSSTORAGE_MEDIA, CTHREADCONTEXT_33, "Signalling Write CS");
|
|
239 |
iThreadContext->iCritSect.Signal();
|
|
240 |
// +++ WRITE CS ENDS HERE +++
|
|
241 |
iProducerSem.Signal();
|
|
242 |
}
|
|
243 |
}
|
0
|
244 |
|
|
245 |
/**
|
286
|
246 |
Initiates writing data pointed to by iReadBuf to the drive and resumes the thread. Writing
|
0
|
247 |
is completed by the ThreadFunction when the thread is resumed.
|
|
248 |
|
|
249 |
@param aDrive Drive to write to.
|
|
250 |
@param aOffset Write offset.
|
|
251 |
*/
|
|
252 |
TInt CWriteDriveThread::WriteDriveData(CMassStorageDrive* aDrive, const TInt64& aOffset, TPtrC8& aDes, ProcessWriteCompleteFunc aFunc, TAny* aPtr)
|
286
|
253 |
{
|
|
254 |
// Check error code from previous write
|
|
255 |
const TInt r = iThreadContext->iError;
|
|
256 |
if (r != KErrNone)
|
|
257 |
{
|
|
258 |
OstTrace1(TRACE_SMASSSTORAGE_MEDIA, CTHREADCONTEXT_40, "Error after previous write = %d", r);
|
|
259 |
return KErrAbort;
|
0
|
260 |
}
|
|
261 |
|
286
|
262 |
// Swap the two buffer pointers
|
|
263 |
iProducerSem.Wait();
|
|
264 |
OstTrace0(TRACE_SMASSSTORAGE_MEDIA, CTHREADCONTEXT_41, "Waiting on Write CS...");
|
|
265 |
// +++ WRITE CS STARTS HERE +++
|
|
266 |
iThreadContext->iCritSect.Wait();
|
|
267 |
|
|
268 |
// New DB First read into the iDescReadPtr pointer,
|
|
269 |
// then swap,so that write pointer points to correct location, as the ptr pointed to by iDescWritePtr is what is written from in WriteToDrive
|
|
270 |
iThreadContext->iBuffer.iDescReadPtr->iBuf.Set((TUint8*)aDes.Ptr(), aDes.Length(), KMaxBufSize);
|
0
|
271 |
|
286
|
272 |
iCallback = aFunc;
|
|
273 |
iCallbackParameter = aPtr;
|
0
|
274 |
|
286
|
275 |
iWriteCounter++;
|
|
276 |
iThreadContext->iBuffer.SwapDesc();
|
|
277 |
// Prepare variables for next write
|
|
278 |
iThreadContext->iDrive = aDrive;
|
|
279 |
iThreadContext->iBuffer.iDescWritePtr->iByteOffset = aOffset;
|
|
280 |
// +++ WRITE CS ENDS HERE +++
|
|
281 |
OstTrace0(TRACE_SMASSSTORAGE_MEDIA, CTHREADCONTEXT_42, "Signalling Write CS...");
|
|
282 |
iThreadContext->iCritSect.Signal();
|
0
|
283 |
|
286
|
284 |
iConsumerSem.Signal();
|
|
285 |
return KErrNone;
|
0
|
286 |
}
|
|
287 |
|
|
288 |
|
|
289 |
void CWriteDriveThread::WaitForWriteEmpty()
|
|
290 |
{
|
286
|
291 |
while(iWriteCounter > 0)
|
|
292 |
{
|
|
293 |
User::After(100);
|
|
294 |
}
|
0
|
295 |
}
|
|
296 |
|
|
297 |
// Check if the target address range was recently written to, this is to force a
|
286
|
298 |
// cache miss when reading from the same sectors that were just written.
|
0
|
299 |
// Optimisation note: this is only needed if the read precache was started
|
|
300 |
// before the write was completed.
|
|
301 |
TBool CWriteDriveThread::IsRecentlyWritten(TInt64 aOffset, TInt aLength)
|
|
302 |
{
|
286
|
303 |
__ASSERT_DEBUG(iWriteCounter == 0, User::Panic(KUsbMsSvrPncCat, EMsThreadIsRecentlyWritten));
|
|
304 |
if (iIsCommandWrite10) //If the previous command is Write10, then discard pre-read as the same buffers are used and will be over written by Write10
|
|
305 |
return ETrue;
|
|
306 |
if(aOffset <= iThreadContext->iBuffer.iDescReadPtr->iByteOffset &&
|
|
307 |
aOffset + aLength >= iThreadContext->iBuffer.iDescReadPtr->iByteOffset)
|
|
308 |
return ETrue;
|
|
309 |
if(aOffset >= iThreadContext->iBuffer.iDescReadPtr->iByteOffset &&
|
|
310 |
aOffset <= iThreadContext->iBuffer.iDescReadPtr->iByteOffset + iThreadContext->iBuffer.iDescReadPtr->iLength)
|
|
311 |
return ETrue;
|
|
312 |
if(aOffset <= iThreadContext->iBuffer.iDescWritePtr->iByteOffset &&
|
|
313 |
aOffset + aLength >= iThreadContext->iBuffer.iDescReadPtr->iByteOffset)
|
|
314 |
return ETrue;
|
|
315 |
if(aOffset >= iThreadContext->iBuffer.iDescWritePtr->iByteOffset &&
|
|
316 |
aOffset <= iThreadContext->iBuffer.iDescReadPtr->iByteOffset + iThreadContext->iBuffer.iDescReadPtr->iLength)
|
|
317 |
return ETrue;
|
|
318 |
return EFalse;
|
0
|
319 |
}
|
|
320 |
|
|
321 |
//-----------------------------------------------
|
|
322 |
|
|
323 |
/**
|
|
324 |
Construct a CReadDriveThread object
|
|
325 |
*/
|
|
326 |
CReadDriveThread* CReadDriveThread::NewL()
|
286
|
327 |
{
|
|
328 |
CReadDriveThread* self = new (ELeave) CReadDriveThread();
|
|
329 |
CleanupStack::PushL(self);
|
|
330 |
self->ConstructL();
|
|
331 |
CleanupStack::Pop();
|
|
332 |
return self;
|
|
333 |
}
|
0
|
334 |
|
|
335 |
/**
|
|
336 |
Construct a CReadDriveThread object
|
|
337 |
|
|
338 |
@param aName The name to be assigned to this thread.
|
|
339 |
@pram aThreadFunction Function to be called when thread is initially scheduled.
|
|
340 |
*/
|
|
341 |
void CReadDriveThread::ConstructL()
|
286
|
342 |
{
|
|
343 |
TBuf<15> name = _L("MassStorageRead");
|
|
344 |
iThreadContext = CThreadContext::NewL(name, ThreadFunction, this);
|
|
345 |
}
|
0
|
346 |
|
|
347 |
/**
|
|
348 |
Construct a CReadDriveThread object
|
|
349 |
*/
|
|
350 |
CReadDriveThread::CReadDriveThread()
|
286
|
351 |
:
|
|
352 |
iThreadRunning(EFalse)
|
|
353 |
{
|
|
354 |
}
|
0
|
355 |
|
|
356 |
/**
|
|
357 |
Destructor
|
|
358 |
*/
|
|
359 |
CReadDriveThread::~CReadDriveThread()
|
286
|
360 |
{
|
|
361 |
delete iThreadContext;
|
|
362 |
}
|
0
|
363 |
|
|
364 |
/**
|
|
365 |
This function is called when the thread is initially scheduled.
|
|
366 |
|
|
367 |
@param aSelf Pointer to self to facilitate call to member method.
|
|
368 |
*/
|
|
369 |
TInt CReadDriveThread::ThreadFunction(TAny* aSelf)
|
286
|
370 |
{
|
|
371 |
CReadDriveThread* self = static_cast<CReadDriveThread*>(aSelf);
|
|
372 |
return self->ReadFromDrive();
|
|
373 |
}
|
0
|
374 |
|
|
375 |
/**
|
|
376 |
Reads data from the drive with iOffset and iReadLength into memory pointer iReadBuffer
|
|
377 |
and suspends the thread.
|
|
378 |
*/
|
|
379 |
TInt CReadDriveThread::ReadFromDrive()
|
286
|
380 |
{
|
|
381 |
// One-off convenience variable assignment
|
|
382 |
TBlockDesc* &desc = iThreadContext->iBuffer.iDescWritePtr;
|
0
|
383 |
|
286
|
384 |
for (;;)
|
|
385 |
{
|
|
386 |
OstTrace0(TRACE_SMASSSTORAGE_MEDIA, CTHREADCONTEXT_50, "Waiting on Read CS...");
|
|
387 |
iThreadContext->iCritSect.Wait();
|
|
388 |
// +++ READ CS STARTS HERE +++
|
|
389 |
iThreadRunning = ETrue;
|
|
390 |
iCompleted = EFalse;
|
|
391 |
|
|
392 |
OstTrace1(TRACE_SMASSSTORAGE_MEDIA, CTHREADCONTEXT_51,
|
|
393 |
"\tNow using as read buffer: iBuf%d", iThreadContext->iBuffer.GetBufferNumber(&desc->iBuf));
|
|
394 |
OstTrace1(TRACE_SMASSSTORAGE_MEDIA, CTHREADCONTEXT_52,
|
|
395 |
"\tSCSI: reading %d bytes", desc->iBuf.Length());
|
0
|
396 |
|
286
|
397 |
// Fill read buffer from disk
|
|
398 |
iThreadContext->iError = iThreadContext->iDrive->Read(desc->iByteOffset,
|
|
399 |
desc->iLength,
|
|
400 |
desc->iBuf,
|
|
401 |
iThreadContext->iDrive->IsWholeMediaAccess());
|
0
|
402 |
|
286
|
403 |
iCompleted = ETrue;
|
|
404 |
iThreadRunning = EFalse;
|
|
405 |
OstTrace0(TRACE_SMASSSTORAGE_MEDIA, CTHREADCONTEXT_53, "Signalling Read CS");
|
|
406 |
// +++ READ CS ENDS HERE +++
|
|
407 |
iThreadContext->iCritSect.Signal();
|
|
408 |
// Suspend self
|
|
409 |
OstTrace0(TRACE_SMASSSTORAGE_MEDIA, CTHREADCONTEXT_54, "Suspending Read Thread");
|
|
410 |
RThread().Suspend();
|
|
411 |
}
|
|
412 |
}
|
0
|
413 |
|
|
414 |
/**
|
286
|
415 |
Client read request of a data block from the specified drive.
|
0
|
416 |
If there is no pre-read data that matches the requested Offset and Length then the drive
|
|
417 |
is read and the next pre-read is setup. If there is matching pre-read data available then
|
|
418 |
the next pre-read is setup. Finishes by resuming the thread and the ThreadFunciton runs.
|
|
419 |
|
|
420 |
@param aDrive Drive to read from.
|
|
421 |
@param aOffset Read offset
|
286
|
422 |
@param aLength Length
|
0
|
423 |
*/
|
|
424 |
TBool CReadDriveThread::ReadDriveData(CMassStorageDrive* aDrive,
|
286
|
425 |
const TInt64& aOffset,
|
|
426 |
TUint32 aLength,
|
|
427 |
TBool aIgnoreCache)
|
|
428 |
{
|
|
429 |
OstTraceExt2(TRACE_SMASSSTORAGE_MEDIADB, CTHREADCONTEXT_60, "Read10: offs %ld len %d", aOffset, aLength);
|
0
|
430 |
|
286
|
431 |
OstTrace0(TRACE_SMASSSTORAGE_MEDIA, CTHREADCONTEXT_61, "Waiting on Read CS...");
|
|
432 |
iThreadContext->iCritSect.Wait();
|
|
433 |
// +++ READ CS STARTS HERE +++
|
|
434 |
__ASSERT_DEBUG(!iThreadRunning, User::Panic(KUsbMsSvrPncCat, EMsThreadReadDriveThread));
|
0
|
435 |
|
286
|
436 |
TBlockDesc* &desc = iThreadContext->iBuffer.iDescReadPtr;
|
|
437 |
TBlockDesc* &bgDesc = iThreadContext->iBuffer.iDescWritePtr;
|
0
|
438 |
|
286
|
439 |
if ((!aIgnoreCache) &&
|
|
440 |
(iCompleted) &&
|
|
441 |
(iThreadContext->iError == KErrNone) &&
|
|
442 |
(iThreadContext->iDrive == aDrive) &&
|
|
443 |
(bgDesc->iByteOffset == aOffset) &&
|
|
444 |
(bgDesc->iLength == aLength))
|
|
445 |
{
|
|
446 |
// Good: We pre-read the correct data :-)
|
|
447 |
OstTrace0(TRACE_SMASSSTORAGE_MEDIADB, CTHREADCONTEXT_70, "Match: Using pre-read data :-) :-) :-) :-)");
|
|
448 |
}
|
|
449 |
else
|
|
450 |
{
|
|
451 |
OstTrace0(TRACE_SMASSSTORAGE_MEDIADB, CTHREADCONTEXT_71, "Not using pre-read data");
|
|
452 |
if (iThreadContext->iError != KErrNone)
|
|
453 |
{
|
|
454 |
OstTrace1(TRACE_SMASSSTORAGE_MEDIADB, CTHREADCONTEXT_72, "Pre-read failed: %d", iThreadContext->iError);
|
|
455 |
}
|
|
456 |
if (iThreadContext->iDrive != aDrive)
|
|
457 |
{
|
|
458 |
OstTraceExt2(TRACE_SMASSSTORAGE_MEDIADB, CTHREADCONTEXT_73,
|
|
459 |
"Pre-read drive mismatch: pre 0x%08x / act 0x%08x",
|
|
460 |
(TUint32)iThreadContext->iDrive, (TUint32)aDrive);
|
|
461 |
}
|
|
462 |
if (desc->iByteOffset != aOffset)
|
|
463 |
{
|
|
464 |
OstTraceExt4(TRACE_SMASSSTORAGE_MEDIADB, CTHREADCONTEXT_74,
|
|
465 |
"Pre-read offset mismatch: pre 0x%x 0x%x / act 0x%x 0x%x",
|
|
466 |
I64HIGH(desc->iByteOffset), I64LOW(desc->iByteOffset), I64HIGH(aOffset), I64LOW(aOffset));
|
|
467 |
}
|
|
468 |
if (desc->iLength != aLength)
|
|
469 |
{
|
|
470 |
OstTraceExt2(TRACE_SMASSSTORAGE_MEDIADB, CTHREADCONTEXT_75,
|
|
471 |
"Pre-read length mismatch: pre 0x%x / act 0x%x",
|
|
472 |
(TUint32)desc->iLength, aLength);
|
|
473 |
// Potential optimization: If the pre-read was OK but for more data
|
|
474 |
// than the host is now asking for, we could still satisfy that
|
|
475 |
// request from the pre-read data by shortening the buffer.
|
|
476 |
}
|
|
477 |
// No valid pre-read data was available - so we have to read it now
|
|
478 |
bgDesc->iByteOffset = aOffset;
|
|
479 |
bgDesc->iLength = aLength;
|
|
480 |
TInt err = aDrive->Read(aOffset,
|
|
481 |
aLength,
|
|
482 |
bgDesc->iBuf,
|
|
483 |
aDrive->IsWholeMediaAccess());
|
|
484 |
if (err != KErrNone)
|
|
485 |
{
|
|
486 |
OstTrace1(TRACE_SMASSSTORAGE_MEDIA, CTHREADCONTEXT_76, "Read failed, err=%d", err);
|
|
487 |
// +++ READ CS ENDS HERE +++
|
|
488 |
OstTrace0(TRACE_SMASSSTORAGE_MEDIA, CTHREADCONTEXT_77, "Signalling Read CS...");
|
|
489 |
iThreadContext->iCritSect.Signal();
|
|
490 |
return EFalse;
|
|
491 |
}
|
|
492 |
}
|
0
|
493 |
|
286
|
494 |
// Prepare thread variables for next pre-read attempt by the ReadThread
|
|
495 |
const TInt64 offs_new = aOffset + aLength;
|
|
496 |
iThreadContext->iDrive = aDrive; // same drive
|
|
497 |
desc->iByteOffset = offs_new; // next block
|
|
498 |
desc->iLength = aLength; // same length
|
|
499 |
iCompleted = EFalse;
|
|
500 |
iThreadContext->iBuffer.SwapDesc();
|
0
|
501 |
|
286
|
502 |
// +++ READ CS ENDS HERE +++
|
|
503 |
OstTrace0(TRACE_SMASSSTORAGE_MEDIA, CTHREADCONTEXT_78, "Signalling Read CS...");
|
|
504 |
iThreadContext->iCritSect.Signal();
|
|
505 |
// Start background read
|
|
506 |
OstTrace0(TRACE_SMASSSTORAGE_MEDIA, CTHREADCONTEXT_79, "Resuming Read Thread");
|
|
507 |
iThreadContext->Resume();
|
|
508 |
return ETrue;
|
|
509 |
}
|
0
|
510 |
|
|
511 |
#endif // MSDC_MULTITHREADED
|
|
512 |
|