--- a/kerneltest/e32test/smpsoak/t_smpsoak.cpp Thu Aug 19 11:14:22 2010 +0300
+++ b/kerneltest/e32test/smpsoak/t_smpsoak.cpp Tue Aug 31 16:34:26 2010 +0300
@@ -120,7 +120,7 @@
const TDesC* CSMPSoakThread::KDeviceTable[] =
{
&KDevices, &KDevLdd1, &KDevLdd1Name, &KDevLdd2, &KDevLdd2Name, &KDevLdd3, &KDevLdd3Name,
- &KDevLdd4, &KDevLdd4Name, &KDevLdd5, &KDevLdd5Name, NULL
+ &KDevLdd4, &KDevLdd4Name, NULL
};
//Constructor
@@ -412,6 +412,7 @@
TInt CSMPSoakThread::DoSMPStressMemoryThread()
{
RTest test(_L("SMPStressMemoryThread"));
+ test.Start(_L("SMPStressMemoryThread"));
TMemory *memoryTablePtr;
TChunkInfo chunkTable[KNumChunks];
@@ -477,6 +478,8 @@
}
User::After(gPeriod);
}
+ test.End();
+ test.Close();
return 0x00;
}
//Device Thread : will do device associated operation
@@ -491,6 +494,7 @@
TInt CSMPSoakThread::DoSMPStressDeviceThread()
{
RTest test(_L("SMPStressDeviceThread"));
+ test.Start(_L("SMPStressDeviceThread"));
RTimer timer;
RFs session;
@@ -539,7 +543,11 @@
RDevice device;
TInt r = User::LoadLogicalDevice(*ptrDevices[i]);
- test(r == KErrNone || r == KErrAlreadyExists);
+ if (r != KErrNone && r != KErrAlreadyExists)
+ {
+ test.Printf(_L("LDD %S not present\n"), ptrDevices[i]);
+ continue;
+ }
test_KErrNone(device.Open(*ptrDevices[i+1]));
@@ -562,6 +570,8 @@
}
timer.Close();
PRINT((_L("SMPStressDeviceThread MyTimer.Cancel() called\n")));
+ test.End();
+ test.Close();
return 0x00;
}
//Spin Thread : will do thread sync
@@ -576,6 +586,7 @@
TInt CSMPSoakThread::DoSMPStressSpinThread()
{
RTest test(_L("SMPStressSpinThread"));
+ test.Start(_L("SMPStressSpinThread"));
TTime startTime;
TTime endTime;
@@ -596,6 +607,8 @@
break;
User::After(gPeriod);
}
+ test.End();
+ test.Close();
return 0x00;
}
//Timer Thread : Timer operation and thread sync
@@ -610,6 +623,7 @@
TInt CSMPSoakThread::DoSMPStressTimerThread()
{
RTest test(_L("SMPStressTimerThread"));
+ test.Start(_L("SMPStressTimerThread"));
PRINT (_L("SMPStressTimerThread\n"));
RTimer timer;
@@ -630,6 +644,8 @@
}
timer.Cancel();
PRINT((_L("SMPStressTimerThread MyTimer.Cancel() called\n")));
+ test.End();
+ test.Close();
return 0x00;
}
// CActive class to monitor KeyStrokes from User