--- a/genericopenlibs/cstdlib/TSTLIB/T_UCRT0P1.CPP Fri Sep 17 08:38:54 2010 +0300
+++ b/genericopenlibs/cstdlib/TSTLIB/T_UCRT0P1.CPP Mon Oct 04 02:56:42 2010 +0300
@@ -43,6 +43,10 @@
TInt err=me.Create(_L("T_UCRT0P2"),arguments);
if (err==KErrNotFound)
err=me.Create(_L("z:\\test\\T_UCRT0P2"),arguments);
+ if (err==KErrNotFound)
+ err=me.Create(_L("c:\\test\\T_UCRT0P2"),arguments);
+ if (err==KErrNotFound)
+ err=me.Create(_L("z:\\sys\\bin\\T_UCRT0P2"),arguments);
test(err==KErrNone);
//Checking that the child proces T_UCRT0P2 executes properly with no panic
--- a/genericopenlibs/cstdlib/TSTLIB/t_waitpid_launch.cpp Fri Sep 17 08:38:54 2010 +0300
+++ b/genericopenlibs/cstdlib/TSTLIB/t_waitpid_launch.cpp Mon Oct 04 02:56:42 2010 +0300
@@ -44,6 +44,10 @@
TInt err=me.Create(_L("T_WAITPID"),_L(""));
if (err==KErrNotFound)
err=me.Create(_L("z:\\test\\T_WAITPID"),_L(""));
+ if (err==KErrNotFound)
+ err=me.Create(_L("c:\\test\\T_WAITPID"),_L(""));
+ if (err==KErrNotFound)
+ err=me.Create(_L("c:\\sys\\bin\\T_WAITPID"),_L(""));
test(err==KErrNone);
//Checking that the child proces T_WAITPID executes properly with no panic
--- a/genericopenlibs/openenvcore/backend/bwins/backendu.def Fri Sep 17 08:38:54 2010 +0300
+++ b/genericopenlibs/openenvcore/backend/bwins/backendu.def Mon Oct 04 02:56:42 2010 +0300
@@ -171,3 +171,5 @@
_memmove_r @ 170 NONAME
_lstat_r @ 171 NONAME
_unsetdefaultif_r @ 172 NONAME
+ ?TZServer@CLocalSystemInterface@@QAEAAVRTz@@AAH@Z @ 173 NONAME ; class RTz & CLocalSystemInterface::TZServer(int &)
+
--- a/genericopenlibs/openenvcore/backend/bwins/backendwolibrtu.def Fri Sep 17 08:38:54 2010 +0300
+++ b/genericopenlibs/openenvcore/backend/bwins/backendwolibrtu.def Mon Oct 04 02:56:42 2010 +0300
@@ -171,3 +171,4 @@
_memmove_r @ 170 NONAME
_lstat_r @ 171 NONAME
_unsetdefaultif_r @ 172 NONAME
+ ?TZServer@CLocalSystemInterface@@QAEAAVRTz@@AAH@Z @ 173 NONAME ; class RTz & CLocalSystemInterface::TZServer(int &)
--- a/genericopenlibs/openenvcore/backend/bwins/old_backendu.def Fri Sep 17 08:38:54 2010 +0300
+++ b/genericopenlibs/openenvcore/backend/bwins/old_backendu.def Mon Oct 04 02:56:42 2010 +0300
@@ -171,3 +171,4 @@
_memmove_r @ 170 NONAME
_lstat_r @ 171 NONAME
_unsetdefaultif_r @ 172 NONAME
+ ?TZServer@CLocalSystemInterface@@QAEAAVRTz@@AAH@Z @ 173 NONAME ; class RTz & CLocalSystemInterface::TZServer(int &)
--- a/genericopenlibs/openenvcore/backend/eabi/backendu.def Fri Sep 17 08:38:54 2010 +0300
+++ b/genericopenlibs/openenvcore/backend/eabi/backendu.def Mon Oct 04 02:56:42 2010 +0300
@@ -175,3 +175,5 @@
_memmove_r @ 174 NONAME
_lstat_r @ 175 NONAME
_unsetdefaultif_r @ 176 NONAME
+ _ZN21CLocalSystemInterface8TZServerERi @ 177 NONAME
+
--- a/genericopenlibs/openenvcore/backend/eabi/backendwolibrtu.def Fri Sep 17 08:38:54 2010 +0300
+++ b/genericopenlibs/openenvcore/backend/eabi/backendwolibrtu.def Mon Oct 04 02:56:42 2010 +0300
@@ -175,3 +175,4 @@
_memmove_r @ 174 NONAME
_lstat_r @ 175 NONAME
_unsetdefaultif_r @ 176 NONAME
+ _ZN21CLocalSystemInterface8TZServerERi @ 177 NONAME
--- a/genericopenlibs/openenvcore/backend/eabi/old_backendu.def Fri Sep 17 08:38:54 2010 +0300
+++ b/genericopenlibs/openenvcore/backend/eabi/old_backendu.def Mon Oct 04 02:56:42 2010 +0300
@@ -175,3 +175,4 @@
_memmove_r @ 174 NONAME
_lstat_r @ 175 NONAME
_unsetdefaultif_r @ 176 NONAME
+ _ZN21CLocalSystemInterface8TZServerERi @ 177 NONAME
--- a/genericopenlibs/openenvcore/backend/inc/sysif.h Fri Sep 17 08:38:54 2010 +0300
+++ b/genericopenlibs/openenvcore/backend/inc/sysif.h Mon Oct 04 02:56:42 2010 +0300
@@ -36,6 +36,7 @@
#include <rpipe.h>
#include<tz.h>
+#include <e32atomics.h>
#ifdef SYMBIAN_OE_POSIX_SIGNALS
#include "signalclient.h"
@@ -114,7 +115,7 @@
*/
{
public:
- void StorePtrs(RHeap* aHeap, RFs* aFs, RSocketServ* aSs, RCommServ* aCs, RFastLock* aSsLock, RFastLock* aCsLock)
+ void StorePtrs(RHeap* aHeap, RFs* aFs, RSocketServ* aSs, RCommServ* aCs, RFastLock* aSsLock, RFastLock* aCsLock,RFastLock* aDefConnLock,RFastLock* aAESelectLock,RFastLock* aTzServerLock)
{
iHeap = aHeap;
iFs = aFs;
@@ -122,6 +123,9 @@
iCs = aCs;
iSsLock = aSsLock;
iCsLock = aCsLock;
+ iDefConnLock = aDefConnLock;
+ iAESelectLock = aAESelectLock;
+ iTzServerLock = aTzServerLock;
}
~TCLSICleanup()
@@ -132,6 +136,9 @@
iCs->Close();
iCsLock->Close();
iHeap->Close();
+ iDefConnLock->Close();
+ iAESelectLock->Close();
+ iTzServerLock->Close();
}
private:
RHeap* iHeap;
@@ -140,6 +147,9 @@
RCommServ* iCs;
RFastLock* iSsLock;
RFastLock* iCsLock;
+ RFastLock* iDefConnLock;
+ RFastLock* iAESelectLock;
+ RFastLock* iTzServerLock;
};
@@ -607,6 +617,8 @@
// default RConnection with the new settings.
TInt StartDefConnection();
+ // Helper function for doing an on-demand connection to RTz server
+ TInt OnDemandTZServerConnection();
private:
// NOTE: iCleanup should be the first member of CLSI, since iPrivateHeap
// will be destroyed from within iCleanup destructor.
@@ -683,6 +695,8 @@
// Default connection settings, set/cleared using setdefaultif
TConnPref* iDefConnPref;
RTz iTzServer;
+ RFastLock iTzServerLock;
+ TBool iIsRTzConnected;
RPointerArray<CSocketDesc> iSocketArray;
#ifdef SYMBIAN_OE_POSIX_SIGNALS
// Signal handler thread
@@ -836,10 +850,8 @@
#endif // SYMBIAN_OE_POSIX_SIGNALS
public:
- inline RTz & TZServer()
- {
- return iTzServer;
- }
+ IMPORT_C RTz & TZServer(TInt& aStatus);
+
//ipc server session
RIpcSession iIpcS;
friend class RFileDesTransferSession;
--- a/genericopenlibs/openenvcore/backend/src/corebackend/localif.cpp Fri Sep 17 08:38:54 2010 +0300
+++ b/genericopenlibs/openenvcore/backend/src/corebackend/localif.cpp Mon Oct 04 02:56:42 2010 +0300
@@ -39,6 +39,7 @@
#include "tsignalmessage.h"
#endif // SYMBIAN_OE_POSIX_SIGNALS
+
#ifdef SYMBIAN_OE_POSIX_SIGNALS
#define SIG_SIGNAL_PRESENT_IN_SIGSET(sig,set) ((set & (1ULL << (sig-1))) != 0x0000000000000000ULL)
#define SIG_ISEMPTY_SIGSET(set) (set == 0x0000000000000000ULL)
@@ -79,10 +80,42 @@
return &backend;
#endif
}
+
+EXPORT_C RTz& CLocalSystemInterface::TZServer(TInt &aStatus)
+ {
+ aStatus = OnDemandTZServerConnection();
+ return iTzServer;
+ }
+
+TInt CLocalSystemInterface::OnDemandTZServerConnection()
+ {
+ TInt v = EFalse;
+ TInt err = KErrNone;
+
+ if(__e32_atomic_load_acq32(&iIsRTzConnected))
+ return err;
+
+ iTzServerLock.Wait();
+ if (!iIsRTzConnected)
+ {
+ err = iTzServer.Connect();
+ if ( err == KErrNone )
+ {
+ err = iTzServer.ShareAuto();
+ if( err == KErrNone) {
+ v = ETrue;
+ }
+ }
+ __e32_atomic_store_rel32(&iIsRTzConnected, v);
+ }
+ iTzServerLock.Signal();
+
+ return err;
+ }
// Construction of Backend Object which is going to be singleton object for the process
EXPORT_C CLocalSystemInterface::CLocalSystemInterface() : iOpenDirList(CLocalSystemInterface::KDirGran),
-iTLDInfoList(CLocalSystemInterface::KTLDInfoListGran), iDefConnResurrect(ETrue), iDefConnPref(NULL)
+iTLDInfoList(CLocalSystemInterface::KTLDInfoListGran), iDefConnResurrect(ETrue), iDefConnPref(NULL), iIsRTzConnected(EFalse)
{
#ifdef SYMBIAN_OE_POSIX_SIGNALS
iSignalsInitialized = EFalse;
@@ -165,25 +198,17 @@
err |= iASelectLock.CreateLocal();
//Protect the iDefConnection from concurrent GetDefaultConnection calls
err |= iDefConnLock.CreateLocal();
+ //Protect the time zone server while connecting
+ err |= iTzServerLock.CreateLocal();
}
- if(err == KErrNone)
- {
- err = iTzServer.Connect();
- if(!err)
- {
- err = iTzServer.ShareAuto();
- }
- }
-
-
//Panic if any of the above operation returns with error
if (err)
{
User::Panic(KEstlibInit, err);
}
- iCleanup.StorePtrs(iPrivateHeap, &iFs, &iSs, &iCs, &iSSLock, &iCSLock);
+ iCleanup.StorePtrs(iPrivateHeap, &iFs, &iSs, &iCs, &iSSLock, &iCSLock,&iDefConnLock,&iASelectLock,&iTzServerLock);
}
@@ -194,10 +219,6 @@
{
iTLDListLock.Close();
iSessionPathLock.Close();
- // Close the aselect lock
- iASelectLock.Close();
- // Close the default connection lock
- iDefConnLock.Close();
//close the default RConnection
if(iDefConnection.SubSessionHandle() != 0)
--- a/genericopenlibs/openenvcore/libc/src/timefuncs.cpp Fri Sep 17 08:38:54 2010 +0300
+++ b/genericopenlibs/openenvcore/libc/src/timefuncs.cpp Mon Oct 04 02:56:42 2010 +0300
@@ -221,7 +221,12 @@
TDateTime tdt = time.DateTime();
//enable the cache
- CTzConverter* ctzConverter = CTzConverter::NewL(Backend()->TZServer());
+ TInt status = KErrNone;
+ RTz& rtzServer = Backend()->TZServer(status);
+ if(status != KErrNone)
+ User::Leave(status);
+
+ CTzConverter* ctzConverter = CTzConverter::NewL(rtzServer);
CleanupStack::PushL(ctzConverter);
if(ctzConverter->ConvertToLocalTime(time) == KErrNone)
@@ -243,7 +248,7 @@
CleanupStack::PushL(zoneid);
atmStruct->tm_isdst = -1;
- UpdateDstAndTznameL(Backend()->TZServer(), *zoneid, atmStruct, time, Utime, tdt, ETzWallTimeReference);
+ UpdateDstAndTznameL(rtzServer, *zoneid, atmStruct, time, Utime, tdt, ETzWallTimeReference);
CleanupStack::PopAndDestroy(zoneid);
}
@@ -280,8 +285,12 @@
return;
}
+ TInt status = KErrNone;
+ RTz& rtzServer = Backend()->TZServer(status);
+ if(status != KErrNone)
+ User::Leave(status);
- CTzConverter* ctzConverter = CTzConverter::NewL(Backend()->TZServer());
+ CTzConverter* ctzConverter = CTzConverter::NewL(rtzServer);
CleanupStack::PushL(ctzConverter);
/* Following fields are updated if successful:
* tm_wday
@@ -305,7 +314,7 @@
CleanupStack::PushL(zoneid);
aTmStruct->tm_isdst = -1;
- UpdateDstAndTznameL(Backend()->TZServer(), *zoneid, aTmStruct, oldTime, time, tdt, ETzUtcTimeReference);
+ UpdateDstAndTznameL(rtzServer, *zoneid, aTmStruct, oldTime, time, tdt, ETzUtcTimeReference);
CleanupStack::PopAndDestroy(zoneid);
}
cachetm = *aTmStruct;
--- a/genericservices/httputils/Test/IpuTestUtils/IpuTestHarness.cpp Fri Sep 17 08:38:54 2010 +0300
+++ b/genericservices/httputils/Test/IpuTestUtils/IpuTestHarness.cpp Mon Oct 04 02:56:42 2010 +0300
@@ -14,7 +14,7 @@
//
#include "IpuTestUtils.h"
-
+#include <e32consf.h>
//
// Constants
_LIT(KTestPanic, "IpuTestHarness");
@@ -29,6 +29,7 @@
//
// Default c'tor
{
+ LogRTestToFile(iTest);
iTest.Title();
iCanStartTest = ETrue;
}
--- a/genericservices/httputils/Test/IpuTestUtils/IpuTestUtils.h Fri Sep 17 08:38:54 2010 +0300
+++ b/genericservices/httputils/Test/IpuTestUtils/IpuTestUtils.h Mon Oct 04 02:56:42 2010 +0300
@@ -31,7 +31,7 @@
//Test Harness Logging
-#define KLogsDir _L("c:\\logs\\")
+#define KLogsDir _L("c:\\logs\\testexecute\\")
#define KInuLogsDirName _L("InetProtUtil")
#define KTestHeader _L("Test Results")
--- a/genericservices/httputils/Test/group/IpuTestUtils.mmp Fri Sep 17 08:38:54 2010 +0300
+++ b/genericservices/httputils/Test/group/IpuTestUtils.mmp Mon Oct 04 02:56:42 2010 +0300
@@ -30,6 +30,7 @@
#endif
LIBRARY euser.lib efsrv.lib flogger.lib
+LIBRARY charconv.lib
#ifdef WINSCW
DEFFILE IPUTESTUTILS.DEF
--- a/genericservices/taskscheduler/SCHSVR/SchTimer.cpp Fri Sep 17 08:38:54 2010 +0300
+++ b/genericservices/taskscheduler/SCHSVR/SchTimer.cpp Mon Oct 04 02:56:42 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -17,6 +17,7 @@
#include "SchTimer.h"
#include "SCHMAN.H"
#include "SCHEDULE.H"
+#include "schlogger.h"
// system includes
#include <e32property.h>
@@ -30,6 +31,8 @@
@internalComponent
*/
+_LIT(KTaskSchedulerPanic, "TaskScheduler ");
+
NONSHARABLE_CLASS(CScheduleTimer) : public CTimer
{
public:
@@ -139,10 +142,11 @@
// From CActive
void RunL();
void DoCancel();
+ TInt RunError(TInt aError);
public:
void SetPropertyL(const TUid& aCategory, TUint aKey);
-
+
private:
TUid iCategory;
TUint iKey;
@@ -404,6 +408,7 @@
CPropertyNotifier::~CPropertyNotifier()
{
Cancel();
+ iProperty.Close();
}
void CPropertyNotifier::AttachL()
@@ -416,7 +421,10 @@
void CPropertyNotifier::SetPropertyL(const TUid& aCategory, TUint aKey)
{
if (IsActive())
+ {
Cancel();
+ iProperty.Close();
+ }
iCategory = aCategory;
iKey = aKey;
AttachL();
@@ -446,7 +454,15 @@
iProperty.Cancel();
}
-
+TInt CPropertyNotifier::RunError(TInt aError)
+ {
+ if (aError)
+ {
+ LOGSTRING("CPropertyNotifier::RunL() leaves.");
+ User::Panic(KTaskSchedulerPanic, aError);
+ }
+ return KErrNone;
+ }
//
@@ -627,4 +643,14 @@
return condition;
}
-
+TInt CScheduleCriteriaManager::RunError(TInt aError)
+ {
+ if (aError)
+ {
+ LOGSTRING("CScheduleCriteriaManager::RunL() leaves.");
+ User::Panic(KTaskSchedulerPanic, aError);
+ }
+ return KErrNone;
+ }
+
+
--- a/genericservices/taskscheduler/SCHSVR/SchTimer.h Fri Sep 17 08:38:54 2010 +0300
+++ b/genericservices/taskscheduler/SCHSVR/SchTimer.h Mon Oct 04 02:56:42 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -61,7 +61,8 @@
CScheduleCriteriaManager(CTaskScheduler& aOwner);
// From CActive
void RunL();
- void DoCancel();
+ void DoCancel();
+ TInt RunError(TInt aError);
private:
void CompleteRequest();
--- a/genericservices/taskscheduler/Test/Conditions/TC_TSCH_CONDITION.mmp Fri Sep 17 08:38:54 2010 +0300
+++ b/genericservices/taskscheduler/Test/Conditions/TC_TSCH_CONDITION.mmp Mon Oct 04 02:56:42 2010 +0300
@@ -26,7 +26,7 @@
USERINCLUDE ../TSUtils
USERINCLUDE ../../INC
-LIBRARY euser.lib schsvr.lib efsrv.lib tsutils.lib
+LIBRARY euser.lib schsvr.lib efsrv.lib tsutils_tsk.lib
VENDORID 0x70000001
--- a/genericservices/taskscheduler/Test/Conditions/TC_TSCH_CONDITION_HOMETIME.mmp Fri Sep 17 08:38:54 2010 +0300
+++ b/genericservices/taskscheduler/Test/Conditions/TC_TSCH_CONDITION_HOMETIME.mmp Mon Oct 04 02:56:42 2010 +0300
@@ -26,7 +26,7 @@
USERINCLUDE ../TSUtils
USERINCLUDE ../../INC
-LIBRARY euser.lib schsvr.lib efsrv.lib tsutils.lib
+LIBRARY euser.lib schsvr.lib efsrv.lib tsutils_tsk.lib
VENDORID 0x70000001
--- a/genericservices/taskscheduler/Test/Conditions/TC_TSCH_CONDITION_UTC.mmp Fri Sep 17 08:38:54 2010 +0300
+++ b/genericservices/taskscheduler/Test/Conditions/TC_TSCH_CONDITION_UTC.mmp Mon Oct 04 02:56:42 2010 +0300
@@ -26,7 +26,7 @@
USERINCLUDE ../TSUtils
USERINCLUDE ../../INC
-LIBRARY euser.lib schsvr.lib efsrv.lib tsutils.lib
+LIBRARY euser.lib schsvr.lib efsrv.lib tsutils_tsk.lib
VENDORID 0x70000001
--- a/genericservices/taskscheduler/Test/LongRunning/T_TSLongRunning.mmp Fri Sep 17 08:38:54 2010 +0300
+++ b/genericservices/taskscheduler/Test/LongRunning/T_TSLongRunning.mmp Mon Oct 04 02:56:42 2010 +0300
@@ -27,7 +27,7 @@
USERINCLUDE ../TSUtils
USERINCLUDE ../../INC
-LIBRARY euser.lib schsvr.lib efsrv.lib tsutils.lib
+LIBRARY euser.lib schsvr.lib efsrv.lib tsutils_tsk.lib
VENDORID 0x70000001
--- a/genericservices/taskscheduler/Test/OOM/TC_TSCH_SCHSVR_OOM.mmp Fri Sep 17 08:38:54 2010 +0300
+++ b/genericservices/taskscheduler/Test/OOM/TC_TSCH_SCHSVR_OOM.mmp Mon Oct 04 02:56:42 2010 +0300
@@ -28,7 +28,7 @@
USERINCLUDE ../TSUtils
USERINCLUDE ../../INC
-LIBRARY euser.lib schsvr.lib efsrv.lib tsutils.lib
+LIBRARY euser.lib schsvr.lib efsrv.lib tsutils_tsk.lib
VENDORID 0x70000001
--- a/genericservices/taskscheduler/Test/OOM/TC_TSCH_SCHSVR_OOM_HOMETIME.mmp Fri Sep 17 08:38:54 2010 +0300
+++ b/genericservices/taskscheduler/Test/OOM/TC_TSCH_SCHSVR_OOM_HOMETIME.mmp Mon Oct 04 02:56:42 2010 +0300
@@ -27,7 +27,7 @@
USERINCLUDE ../TSUtils
USERINCLUDE ../../INC
-LIBRARY euser.lib schsvr.lib efsrv.lib tsutils.lib
+LIBRARY euser.lib schsvr.lib efsrv.lib tsutils_tsk.lib
VENDORID 0x70000001
--- a/genericservices/taskscheduler/Test/OOM/TC_TSCH_SCHSVR_OOM_UTC.mmp Fri Sep 17 08:38:54 2010 +0300
+++ b/genericservices/taskscheduler/Test/OOM/TC_TSCH_SCHSVR_OOM_UTC.mmp Mon Oct 04 02:56:42 2010 +0300
@@ -27,7 +27,7 @@
USERINCLUDE ../TSUtils
USERINCLUDE ../../INC
-LIBRARY euser.lib schsvr.lib efsrv.lib tsutils.lib
+LIBRARY euser.lib schsvr.lib efsrv.lib tsutils_tsk.lib
VENDORID 0x70000001
--- a/genericservices/taskscheduler/Test/PlatSec/TC_TSCH_PLATSEC.mmp Fri Sep 17 08:38:54 2010 +0300
+++ b/genericservices/taskscheduler/Test/PlatSec/TC_TSCH_PLATSEC.mmp Mon Oct 04 02:56:42 2010 +0300
@@ -24,7 +24,7 @@
USERINCLUDE ../TSUtils
USERINCLUDE ../../INC
-LIBRARY euser.lib schsvr.lib efsrv.lib tsutils.lib
+LIBRARY euser.lib schsvr.lib efsrv.lib tsutils_tsk.lib
// MultimediaDD is chosen at random as a specific capability to check for in some of the tests.
// WriteDeviceData is needed for presistent scheduling.
--- a/genericservices/taskscheduler/Test/PlatSec/tschsvrclient1.mmp Fri Sep 17 08:38:54 2010 +0300
+++ b/genericservices/taskscheduler/Test/PlatSec/tschsvrclient1.mmp Mon Oct 04 02:56:42 2010 +0300
@@ -31,7 +31,7 @@
USERINCLUDE ../TSUtils
USERINCLUDE ../../INC
-LIBRARY euser.lib schsvr.lib efsrv.lib tsutils.lib
+LIBRARY euser.lib schsvr.lib efsrv.lib tsutils_tsk.lib
--- a/genericservices/taskscheduler/Test/PlatSec/tschsvrclient2.mmp Fri Sep 17 08:38:54 2010 +0300
+++ b/genericservices/taskscheduler/Test/PlatSec/tschsvrclient2.mmp Mon Oct 04 02:56:42 2010 +0300
@@ -28,7 +28,7 @@
USERINCLUDE ../TSUtils
USERINCLUDE ../../INC
-LIBRARY euser.lib schsvr.lib efsrv.lib tsutils.lib
+LIBRARY euser.lib schsvr.lib efsrv.lib tsutils_tsk.lib
--- a/genericservices/taskscheduler/Test/PlatSec/tschsvrclient3.mmp Fri Sep 17 08:38:54 2010 +0300
+++ b/genericservices/taskscheduler/Test/PlatSec/tschsvrclient3.mmp Mon Oct 04 02:56:42 2010 +0300
@@ -27,7 +27,7 @@
USERINCLUDE ../TSUtils
USERINCLUDE ../../INC
-LIBRARY euser.lib schsvr.lib efsrv.lib tsutils.lib
+LIBRARY euser.lib schsvr.lib efsrv.lib tsutils_tsk.lib
--- a/genericservices/taskscheduler/Test/Robustness/TC_TSCH_ROBUSTNESS.mmp Fri Sep 17 08:38:54 2010 +0300
+++ b/genericservices/taskscheduler/Test/Robustness/TC_TSCH_ROBUSTNESS.mmp Mon Oct 04 02:56:42 2010 +0300
@@ -27,7 +27,7 @@
USERINCLUDE ../TSUtils
USERINCLUDE ../../INC
-LIBRARY euser.lib schsvr.lib efsrv.lib tsutils.lib
+LIBRARY euser.lib schsvr.lib efsrv.lib tsutils_tsk.lib
VENDORID 0x70000001
--- a/genericservices/taskscheduler/Test/ScheduledTaskTest/TU_TSCH_ScheduledTaskTest.mmp Fri Sep 17 08:38:54 2010 +0300
+++ b/genericservices/taskscheduler/Test/ScheduledTaskTest/TU_TSCH_ScheduledTaskTest.mmp Mon Oct 04 02:56:42 2010 +0300
@@ -36,7 +36,7 @@
library efsrv.lib
library estor.lib
library tzclient.lib
-library tsutils.lib
+library tsutils_tsk.lib
VENDORID 0x70000001
--- a/genericservices/taskscheduler/Test/Scheduling/TC_TSCH_SCHEDULING1.mmp Fri Sep 17 08:38:54 2010 +0300
+++ b/genericservices/taskscheduler/Test/Scheduling/TC_TSCH_SCHEDULING1.mmp Mon Oct 04 02:56:42 2010 +0300
@@ -26,7 +26,7 @@
USERINCLUDE ../TSUtils
USERINCLUDE ../../INC
-LIBRARY euser.lib schsvr.lib efsrv.lib tsutils.lib
+LIBRARY euser.lib schsvr.lib efsrv.lib tsutils_tsk.lib
VENDORID 0x70000001
--- a/genericservices/taskscheduler/Test/Scheduling/TC_TSCH_SCHEDULING1_HOMETIME.mmp Fri Sep 17 08:38:54 2010 +0300
+++ b/genericservices/taskscheduler/Test/Scheduling/TC_TSCH_SCHEDULING1_HOMETIME.mmp Mon Oct 04 02:56:42 2010 +0300
@@ -25,7 +25,7 @@
USERINCLUDE ../TSUtils
USERINCLUDE ../../INC
-LIBRARY euser.lib schsvr.lib efsrv.lib tsutils.lib
+LIBRARY euser.lib schsvr.lib efsrv.lib tsutils_tsk.lib
VENDORID 0x70000001
--- a/genericservices/taskscheduler/Test/Scheduling/TC_TSCH_SCHEDULING1_UTC.mmp Fri Sep 17 08:38:54 2010 +0300
+++ b/genericservices/taskscheduler/Test/Scheduling/TC_TSCH_SCHEDULING1_UTC.mmp Mon Oct 04 02:56:42 2010 +0300
@@ -26,7 +26,7 @@
USERINCLUDE ../TSUtils
USERINCLUDE ../../INC
-LIBRARY euser.lib schsvr.lib efsrv.lib tsutils.lib
+LIBRARY euser.lib schsvr.lib efsrv.lib tsutils_tsk.lib
VENDORID 0x70000001
--- a/genericservices/taskscheduler/Test/Scheduling/TC_TSCH_SCHEDULING2.mmp Fri Sep 17 08:38:54 2010 +0300
+++ b/genericservices/taskscheduler/Test/Scheduling/TC_TSCH_SCHEDULING2.mmp Mon Oct 04 02:56:42 2010 +0300
@@ -26,7 +26,7 @@
USERINCLUDE ../TSUtils
USERINCLUDE ../../INC
-LIBRARY euser.lib schsvr.lib efsrv.lib tsutils.lib bafl.lib
+LIBRARY euser.lib schsvr.lib efsrv.lib tsutils_tsk.lib bafl.lib
VENDORID 0x70000001
--- a/genericservices/taskscheduler/Test/Scheduling/TC_TSCH_SCHEDULING2_HOMETIME.mmp Fri Sep 17 08:38:54 2010 +0300
+++ b/genericservices/taskscheduler/Test/Scheduling/TC_TSCH_SCHEDULING2_HOMETIME.mmp Mon Oct 04 02:56:42 2010 +0300
@@ -27,7 +27,7 @@
USERINCLUDE ../TSUtils
USERINCLUDE ../../INC
-LIBRARY euser.lib schsvr.lib efsrv.lib tsutils.lib
+LIBRARY euser.lib schsvr.lib efsrv.lib tsutils_tsk.lib
VENDORID 0x70000001
--- a/genericservices/taskscheduler/Test/Scheduling/TC_TSCH_SCHEDULING2_UTC.mmp Fri Sep 17 08:38:54 2010 +0300
+++ b/genericservices/taskscheduler/Test/Scheduling/TC_TSCH_SCHEDULING2_UTC.mmp Mon Oct 04 02:56:42 2010 +0300
@@ -25,7 +25,7 @@
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
USERINCLUDE ../TSUtils
-LIBRARY euser.lib schsvr.lib efsrv.lib tsutils.lib
+LIBRARY euser.lib schsvr.lib efsrv.lib tsutils_tsk.lib
VENDORID 0x70000001
--- a/genericservices/taskscheduler/Test/TSCheduleEntryInfo2/TU_TSCH_ScheduleEntryInfo2.mmp Fri Sep 17 08:38:54 2010 +0300
+++ b/genericservices/taskscheduler/Test/TSCheduleEntryInfo2/TU_TSCH_ScheduleEntryInfo2.mmp Mon Oct 04 02:56:42 2010 +0300
@@ -33,7 +33,7 @@
library efsrv.lib
library estor.lib
library schsvr.lib
-library tsutils.lib
+library tsutils_tsk.lib
SMPSAFE
--- a/genericservices/taskscheduler/Test/TSUtils/TPropertyDefine.mmp Fri Sep 17 08:38:54 2010 +0300
+++ b/genericservices/taskscheduler/Test/TSUtils/TPropertyDefine.mmp Mon Oct 04 02:56:42 2010 +0300
@@ -24,7 +24,7 @@
MW_LAYER_SYSTEMINCLUDE_SYMBIAN
USERINCLUDE ../TSUtils
-LIBRARY euser.lib schsvr.lib efsrv.lib tsutils.lib numberconversion.lib
+LIBRARY euser.lib schsvr.lib efsrv.lib tsutils_tsk.lib numberconversion.lib
VENDORID 0x70000001
--- a/genericservices/taskscheduler/Test/TSUtils/TSUtils.mmp Fri Sep 17 08:38:54 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-TARGET tsutils.dll
-CAPABILITY All -Tcb
-
-TARGETTYPE dll
-
-SOURCEPATH .
-SOURCE thelpers.cpp
-
-USERINCLUDE .
-USERINCLUDE ../../INC
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-LIBRARY euser.lib schsvr.lib efsrv.lib
-
-DEFFILE tsutils.def
-
-
-VENDORID 0x70000001
-
-SMPSAFE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/genericservices/taskscheduler/Test/TSUtils/TSUtils_tsk.mmp Mon Oct 04 02:56:42 2010 +0300
@@ -0,0 +1,35 @@
+// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+TARGET tsutils.dll
+CAPABILITY All -Tcb
+
+TARGETTYPE dll
+
+SOURCEPATH .
+SOURCE thelpers.cpp
+
+USERINCLUDE .
+USERINCLUDE ../../INC
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
+
+LIBRARY euser.lib schsvr.lib efsrv.lib
+
+DEFFILE tsutils.def
+
+
+VENDORID 0x70000001
+
+SMPSAFE
--- a/genericservices/taskscheduler/Test/TTsTimeUnitTests/TU_TSCH_tstime.mmp Fri Sep 17 08:38:54 2010 +0300
+++ b/genericservices/taskscheduler/Test/TTsTimeUnitTests/TU_TSCH_tstime.mmp Mon Oct 04 02:56:42 2010 +0300
@@ -38,7 +38,7 @@
library efsrv.lib
library estor.lib
library tzclient.lib
-library tsutils.lib
+library tsutils_tsk.lib
--- a/genericservices/taskscheduler/Test/Testexecute/TEF_SSA_ScheduleSuite/group/TEF_SSA_ScheduleSuite.mmp Fri Sep 17 08:38:54 2010 +0300
+++ b/genericservices/taskscheduler/Test/Testexecute/TEF_SSA_ScheduleSuite/group/TEF_SSA_ScheduleSuite.mmp Mon Oct 04 02:56:42 2010 +0300
@@ -36,7 +36,7 @@
LIBRARY schsvr.lib
LIBRARY efsrv.lib
-LIBRARY tsutils.lib
+LIBRARY tsutils_tsk.lib
library tzclient.lib
library domaincli.lib
--- a/genericservices/taskscheduler/Test/Testexecute/group/te_floating_schedulesuite.iby Fri Sep 17 08:38:54 2010 +0300
+++ b/genericservices/taskscheduler/Test/Testexecute/group/te_floating_schedulesuite.iby Mon Oct 04 02:56:42 2010 +0300
@@ -21,7 +21,7 @@
#include <testexecute.iby>
file=ABI_DIR\BUILD_DIR\te_floating_scheduleSuite.exe System\libs\te_floating_scheduleSuite.exe
-file=ABI_DIR\BUILD_DIR\TSUTils.dll System\Libs\TSUtils.dll
+file=ABI_DIR\BUILD_DIR\tsutils_tsk.dll System\Libs\tsutils_tsk.dll
file=ABI_DIR\BUILD_DIR\MinimalTaskHandler.exe System\Programs\MinimalTaskHandler.exe
file=ABI_DIR\BUILD_DIR\tschsvrclient1.exe System\Programs\tschsvrclient1.exe
file=ABI_DIR\BUILD_DIR\tschsvrclient2.exe System\Programs\tschsvrclient2.exe
--- a/genericservices/taskscheduler/Test/Testexecute/group/te_floating_schedulesuite.mmp Fri Sep 17 08:38:54 2010 +0300
+++ b/genericservices/taskscheduler/Test/Testexecute/group/te_floating_schedulesuite.mmp Mon Oct 04 02:56:42 2010 +0300
@@ -47,7 +47,7 @@
LIBRARY schsvr.lib
LIBRARY efsrv.lib
-LIBRARY tsutils.lib
+LIBRARY tsutils_tsk.lib
library tzclient.lib
// WDD capability required for RTz::SetTimeZoneL()
--- a/genericservices/taskscheduler/Test/Testexecute/tef_schsvr_bursuite/group/tef_schsvr_bursuite.mmp Fri Sep 17 08:38:54 2010 +0300
+++ b/genericservices/taskscheduler/Test/Testexecute/tef_schsvr_bursuite/group/tef_schsvr_bursuite.mmp Mon Oct 04 02:56:42 2010 +0300
@@ -41,7 +41,7 @@
LIBRARY testexecutelogclient.lib
LIBRARY schsvr.lib
-LIBRARY tsutils.lib
+LIBRARY tsutils_tsk.lib
LIBRARY sbeclient.lib
LIBRARY efsrv.lib
LIBRARY bafl.lib
--- a/genericservices/taskscheduler/Test/Year2k/TC_TSCH_YEAR2000.mmp Fri Sep 17 08:38:54 2010 +0300
+++ b/genericservices/taskscheduler/Test/Year2k/TC_TSCH_YEAR2000.mmp Mon Oct 04 02:56:42 2010 +0300
@@ -26,7 +26,7 @@
USERINCLUDE ../TSUtils
USERINCLUDE ../../INC
-LIBRARY euser.lib schsvr.lib efsrv.lib tsutils.lib
+LIBRARY euser.lib schsvr.lib efsrv.lib tsutils_tsk.lib
VENDORID 0x70000001
--- a/genericservices/taskscheduler/Test/Year2k/TC_TSCH_YEAR2000_HOMETIME.mmp Fri Sep 17 08:38:54 2010 +0300
+++ b/genericservices/taskscheduler/Test/Year2k/TC_TSCH_YEAR2000_HOMETIME.mmp Mon Oct 04 02:56:42 2010 +0300
@@ -26,7 +26,7 @@
USERINCLUDE ../TSUtils
USERINCLUDE ../../INC
-LIBRARY euser.lib schsvr.lib efsrv.lib tsutils.lib
+LIBRARY euser.lib schsvr.lib efsrv.lib tsutils_tsk.lib
VENDORID 0x70000001
--- a/genericservices/taskscheduler/Test/Year2k/TC_TSCH_YEAR2000_UTC.mmp Fri Sep 17 08:38:54 2010 +0300
+++ b/genericservices/taskscheduler/Test/Year2k/TC_TSCH_YEAR2000_UTC.mmp Mon Oct 04 02:56:42 2010 +0300
@@ -26,7 +26,7 @@
USERINCLUDE ../TSUtils
USERINCLUDE ../../INC
-LIBRARY euser.lib schsvr.lib efsrv.lib tsutils.lib
+LIBRARY euser.lib schsvr.lib efsrv.lib tsutils_tsk.lib
VENDORID 0x70000001
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/genericservices/taskscheduler/Test/bmarm/tsutils_tsku.def Mon Oct 04 02:56:42 2010 +0300
@@ -0,0 +1,22 @@
+EXPORTS
+ WaitL__14STaskSemaphorei @ 1 NONAME R3UNUSED ; STaskSemaphore::WaitL(int)
+ CreateL__14STaskSemaphore @ 2 NONAME R3UNUSED ; STaskSemaphore::CreateL(void)
+ DeleteAllSchedulesL__13SchSvrHelpersR10RScheduler @ 3 NONAME R3UNUSED ; SchSvrHelpers::DeleteAllSchedulesL(RScheduler &)
+ DeleteScheduleFilesL__13SchSvrHelpers @ 4 NONAME R3UNUSED ; SchSvrHelpers::DeleteScheduleFilesL(void)
+ IsDateTheSame__13SchSvrHelpersRC5TTimeT1 @ 5 NONAME R3UNUSED ; SchSvrHelpers::IsDateTheSame(TTime const &, TTime const &)
+ IsItemRefTheSame__13SchSvrHelpersRC17TSchedulerItemRefT1 @ 6 NONAME R3UNUSED ; SchSvrHelpers::IsItemRefTheSame(TSchedulerItemRef const &, TSchedulerItemRef const &)
+ IsScheduleStateTheSame__13SchSvrHelpersRC14TScheduleStateT1 @ 7 NONAME R3UNUSED ; SchSvrHelpers::IsScheduleStateTheSame(TScheduleState const &, TScheduleState const &)
+ IsTaskInfoTheSame__13SchSvrHelpersRC9TTaskInfoT1 @ 8 NONAME R3UNUSED ; SchSvrHelpers::IsTaskInfoTheSame(TTaskInfo const &, TTaskInfo const &)
+ IsTimeTheSame__13SchSvrHelpersRC5TTimeT1 @ 9 NONAME R3UNUSED ; SchSvrHelpers::IsTimeTheSame(TTime const &, TTime const &)
+ KillProcessL__14CleanupHelpersRC7TDesC16 @ 10 NONAME R3UNUSED ; CleanupHelpers::KillProcessL(TDesC16 const &)
+ Pause__13SchSvrHelpersR5RTesti @ 11 NONAME R3UNUSED ; SchSvrHelpers::Pause(RTest &, int)
+ Rand__13SchSvrHelpersiiR6TInt64 @ 12 NONAME R3UNUSED ; SchSvrHelpers::Rand(int, int, TInt64 &)
+ RandomScheduleEntryInfo__13SchSvrHelpersR6TInt64 @ 13 NONAME R3UNUSED ; SchSvrHelpers::RandomScheduleEntryInfo(TInt64 &)
+ RegisterClientL__13SchSvrHelpersR10RScheduler @ 14 NONAME R3UNUSED ; SchSvrHelpers::RegisterClientL(RScheduler &)
+ ScheduleEntryInfo__13SchSvrHelpers13TIntervalTypeRC5TTimeiG20TTimeIntervalMinutes @ 15 NONAME ; SchSvrHelpers::ScheduleEntryInfo(TIntervalType, TTime const &, int, TTimeIntervalMinutes)
+ TaskInfo__13SchSvrHelpersRC7TDesC16ii @ 16 NONAME ; SchSvrHelpers::TaskInfo(TDesC16 const &, int, int)
+ TestCleanupL__14CleanupHelpers @ 17 NONAME R3UNUSED ; CleanupHelpers::TestCleanupL(void)
+ TimeBasedOnOffset__13SchSvrHelpersiiiiii @ 18 NONAME ; SchSvrHelpers::TimeBasedOnOffset(int, int, int, int, int, int)
+ WaitL__14STaskSemaphore @ 19 NONAME R3UNUSED ; STaskSemaphore::WaitL(void)
+ Close__14STaskSemaphore @ 20 NONAME R3UNUSED ; STaskSemaphore::Close(void)
+
--- a/genericservices/taskscheduler/Test/bmarm/tsutilsu.def Fri Sep 17 08:38:54 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-EXPORTS
- WaitL__14STaskSemaphorei @ 1 NONAME R3UNUSED ; STaskSemaphore::WaitL(int)
- CreateL__14STaskSemaphore @ 2 NONAME R3UNUSED ; STaskSemaphore::CreateL(void)
- DeleteAllSchedulesL__13SchSvrHelpersR10RScheduler @ 3 NONAME R3UNUSED ; SchSvrHelpers::DeleteAllSchedulesL(RScheduler &)
- DeleteScheduleFilesL__13SchSvrHelpers @ 4 NONAME R3UNUSED ; SchSvrHelpers::DeleteScheduleFilesL(void)
- IsDateTheSame__13SchSvrHelpersRC5TTimeT1 @ 5 NONAME R3UNUSED ; SchSvrHelpers::IsDateTheSame(TTime const &, TTime const &)
- IsItemRefTheSame__13SchSvrHelpersRC17TSchedulerItemRefT1 @ 6 NONAME R3UNUSED ; SchSvrHelpers::IsItemRefTheSame(TSchedulerItemRef const &, TSchedulerItemRef const &)
- IsScheduleStateTheSame__13SchSvrHelpersRC14TScheduleStateT1 @ 7 NONAME R3UNUSED ; SchSvrHelpers::IsScheduleStateTheSame(TScheduleState const &, TScheduleState const &)
- IsTaskInfoTheSame__13SchSvrHelpersRC9TTaskInfoT1 @ 8 NONAME R3UNUSED ; SchSvrHelpers::IsTaskInfoTheSame(TTaskInfo const &, TTaskInfo const &)
- IsTimeTheSame__13SchSvrHelpersRC5TTimeT1 @ 9 NONAME R3UNUSED ; SchSvrHelpers::IsTimeTheSame(TTime const &, TTime const &)
- KillProcessL__14CleanupHelpersRC7TDesC16 @ 10 NONAME R3UNUSED ; CleanupHelpers::KillProcessL(TDesC16 const &)
- Pause__13SchSvrHelpersR5RTesti @ 11 NONAME R3UNUSED ; SchSvrHelpers::Pause(RTest &, int)
- Rand__13SchSvrHelpersiiR6TInt64 @ 12 NONAME R3UNUSED ; SchSvrHelpers::Rand(int, int, TInt64 &)
- RandomScheduleEntryInfo__13SchSvrHelpersR6TInt64 @ 13 NONAME R3UNUSED ; SchSvrHelpers::RandomScheduleEntryInfo(TInt64 &)
- RegisterClientL__13SchSvrHelpersR10RScheduler @ 14 NONAME R3UNUSED ; SchSvrHelpers::RegisterClientL(RScheduler &)
- ScheduleEntryInfo__13SchSvrHelpers13TIntervalTypeRC5TTimeiG20TTimeIntervalMinutes @ 15 NONAME ; SchSvrHelpers::ScheduleEntryInfo(TIntervalType, TTime const &, int, TTimeIntervalMinutes)
- TaskInfo__13SchSvrHelpersRC7TDesC16ii @ 16 NONAME ; SchSvrHelpers::TaskInfo(TDesC16 const &, int, int)
- TestCleanupL__14CleanupHelpers @ 17 NONAME R3UNUSED ; CleanupHelpers::TestCleanupL(void)
- TimeBasedOnOffset__13SchSvrHelpersiiiiii @ 18 NONAME ; SchSvrHelpers::TimeBasedOnOffset(int, int, int, int, int, int)
- WaitL__14STaskSemaphore @ 19 NONAME R3UNUSED ; STaskSemaphore::WaitL(void)
- Close__14STaskSemaphore @ 20 NONAME R3UNUSED ; STaskSemaphore::Close(void)
-
--- a/genericservices/taskscheduler/Test/bwins/tsutilsU.def Fri Sep 17 08:38:54 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-EXPORTS
- ?IsDateTheSame@SchSvrHelpers@@SAHABVTTime@@0@Z @ 1 NONAME ; int SchSvrHelpers::IsDateTheSame(class TTime const &, class TTime const &)
- ?IsItemRefTheSame@SchSvrHelpers@@SAHABVTSchedulerItemRef@@0@Z @ 2 NONAME ; int SchSvrHelpers::IsItemRefTheSame(class TSchedulerItemRef const &, class TSchedulerItemRef const &)
- ?IsScheduleStateTheSame@SchSvrHelpers@@SAHABVTScheduleState@@0@Z @ 3 NONAME ; int SchSvrHelpers::IsScheduleStateTheSame(class TScheduleState const &, class TScheduleState const &)
- ?IsTaskInfoTheSame@SchSvrHelpers@@SAHABVTTaskInfo@@0@Z @ 4 NONAME ; int SchSvrHelpers::IsTaskInfoTheSame(class TTaskInfo const &, class TTaskInfo const &)
- ?IsTimeTheSame@SchSvrHelpers@@SAHABVTTime@@0@Z @ 5 NONAME ; int SchSvrHelpers::IsTimeTheSame(class TTime const &, class TTime const &)
- ?Pause@SchSvrHelpers@@SAXAAVRTest@@H@Z @ 6 NONAME ; void SchSvrHelpers::Pause(class RTest &, int)
- ?Rand@SchSvrHelpers@@SAHHHAA_J@Z @ 7 NONAME ; int SchSvrHelpers::Rand(int, int, class TInt64 &)
- ?RandomScheduleEntryInfo@SchSvrHelpers@@SA?AVTScheduleEntryInfo@@AA_J@Z @ 8 NONAME ; class TScheduleEntryInfo SchSvrHelpers::RandomScheduleEntryInfo(class TInt64 &)
- ?ScheduleEntryInfo@SchSvrHelpers@@SA?AVTScheduleEntryInfo@@W4TIntervalType@@ABVTTime@@HVTTimeIntervalMinutes@@@Z @ 9 NONAME ; class TScheduleEntryInfo SchSvrHelpers::ScheduleEntryInfo(enum TIntervalType, class TTime const &, int, class TTimeIntervalMinutes)
- ?TaskInfo@SchSvrHelpers@@SA?AVTTaskInfo@@ABVTDesC16@@HH@Z @ 10 NONAME ; class TTaskInfo SchSvrHelpers::TaskInfo(class TDesC16 const &, int, int)
- ?TimeBasedOnOffset@SchSvrHelpers@@SA?AVTDateTime@@HHHHHH@Z @ 11 NONAME ; class TDateTime SchSvrHelpers::TimeBasedOnOffset(int, int, int, int, int, int)
- ?DeleteAllSchedulesL@SchSvrHelpers@@SAXAAVRScheduler@@@Z @ 12 NONAME ; void SchSvrHelpers::DeleteAllSchedulesL(class RScheduler &)
- ?Close@STaskSemaphore@@QAEXXZ @ 13 NONAME ; void STaskSemaphore::Close(void)
- ?CreateL@STaskSemaphore@@QAEXXZ @ 14 NONAME ; void STaskSemaphore::CreateL(void)
- ?DeleteScheduleFilesL@SchSvrHelpers@@SAXXZ @ 15 NONAME ; void SchSvrHelpers::DeleteScheduleFilesL(void)
- ?KillProcess@CleanupHelpers@@SAHABVTDesC16@@@Z @ 16 NONAME ; int CleanupHelpers::KillProcess(class TDesC16 const &)
- ?RegisterClientL@SchSvrHelpers@@SAHAAVRScheduler@@@Z @ 17 NONAME ; int SchSvrHelpers::RegisterClientL(class RScheduler &)
- ?TestCleanupL@CleanupHelpers@@SAXXZ @ 18 NONAME ; void CleanupHelpers::TestCleanupL(void)
- ?WaitL@STaskSemaphore@@SAXXZ @ 19 NONAME ; void STaskSemaphore::WaitL(void)
- ?WaitL@STaskSemaphore@@SAHH@Z @ 20 NONAME ; int STaskSemaphore::WaitL(int)
- ?IsDateTheSame@SchSvrHelpers@@SAHABVTTsTime@@0@Z @ 21 NONAME ; int SchSvrHelpers::IsDateTheSame(class TTsTime const &, class TTsTime const &)
- ?IsScheduleStateTheSame@SchSvrHelpers@@SAHABVTScheduleState2@@0@Z @ 22 NONAME ; int SchSvrHelpers::IsScheduleStateTheSame(class TScheduleState2 const &, class TScheduleState2 const &)
- ?IsTimeTheSame@SchSvrHelpers@@SAHABVTTsTime@@0@Z @ 23 NONAME ; int SchSvrHelpers::IsTimeTheSame(class TTsTime const &, class TTsTime const &)
- ?RandomScheduleEntryInfoHometime@SchSvrHelpers@@SA?AVTScheduleEntryInfo2@@AA_J@Z @ 24 NONAME ; class TScheduleEntryInfo2 SchSvrHelpers::RandomScheduleEntryInfoHometime(long long &)
- ?RandomScheduleEntryInfoUtc@SchSvrHelpers@@SA?AVTScheduleEntryInfo2@@AA_J@Z @ 25 NONAME ; class TScheduleEntryInfo2 SchSvrHelpers::RandomScheduleEntryInfoUtc(long long &)
- ?ScheduleEntryInfo@SchSvrHelpers@@SA?AVTScheduleEntryInfo2@@W4TIntervalType@@ABVTTsTime@@HVTTimeIntervalMinutes@@@Z @ 26 NONAME ; class TScheduleEntryInfo2 SchSvrHelpers::ScheduleEntryInfo(enum TIntervalType, class TTsTime const &, int, class TTimeIntervalMinutes)
- ?Pause@SchSvrHelpers@@SAXH@Z @ 27 NONAME ; void SchSvrHelpers::Pause(int)
- ?IsTimeTheSameNoSeconds@SchSvrHelpers@@SAHABVTTsTime@@0@Z @ 28 NONAME ; int SchSvrHelpers::IsTimeTheSameNoSeconds(class TTsTime const &, class TTsTime const &)
- ?SetHomeTimeL@SchSvrHelpers@@SAHABVTTime@@@Z @ 29 NONAME ; int SchSvrHelpers::SetHomeTimeL(class TTime const &)
- ?SetUTCTimeL@SchSvrHelpers@@SAHABVTTime@@@Z @ 30 NONAME ; int SchSvrHelpers::SetUTCTimeL(class TTime const &)
- ?UtcTimeBasedOnOffset@SchSvrHelpers@@SA?AVTDateTime@@HHHHHH@Z @ 31 NONAME ; class TDateTime SchSvrHelpers::UtcTimeBasedOnOffset(int, int, int, int, int, int)
- ?CheckTaskFilesL@SchSvrHelpers@@SAHXZ @ 32 NONAME ; int SchSvrHelpers::CheckTaskFilesL(void)
- ?CreateTaskFilesL@SchSvrHelpers@@SAHXZ @ 33 NONAME ; int SchSvrHelpers::CreateTaskFilesL(void)
- ?RegisterNonExistentClient@SchSvrHelpers@@SAHAAVRScheduler@@@Z @ 34 NONAME ; int SchSvrHelpers::RegisterNonExistentClient(class RScheduler &)
- ?RegisterPanicingClient@SchSvrHelpers@@SAHAAVRScheduler@@@Z @ 35 NONAME ; int SchSvrHelpers::RegisterPanicingClient(class RScheduler &)
- ?LaunchTaskSchedulerL@SchSvrHelpers@@SAHXZ @ 36 NONAME ; int SchSvrHelpers::LaunchTaskSchedulerL(void)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/genericservices/taskscheduler/Test/bwins/tsutils_tskU.def Mon Oct 04 02:56:42 2010 +0300
@@ -0,0 +1,37 @@
+EXPORTS
+ ?IsDateTheSame@SchSvrHelpers@@SAHABVTTime@@0@Z @ 1 NONAME ; int SchSvrHelpers::IsDateTheSame(class TTime const &, class TTime const &)
+ ?IsItemRefTheSame@SchSvrHelpers@@SAHABVTSchedulerItemRef@@0@Z @ 2 NONAME ; int SchSvrHelpers::IsItemRefTheSame(class TSchedulerItemRef const &, class TSchedulerItemRef const &)
+ ?IsScheduleStateTheSame@SchSvrHelpers@@SAHABVTScheduleState@@0@Z @ 3 NONAME ; int SchSvrHelpers::IsScheduleStateTheSame(class TScheduleState const &, class TScheduleState const &)
+ ?IsTaskInfoTheSame@SchSvrHelpers@@SAHABVTTaskInfo@@0@Z @ 4 NONAME ; int SchSvrHelpers::IsTaskInfoTheSame(class TTaskInfo const &, class TTaskInfo const &)
+ ?IsTimeTheSame@SchSvrHelpers@@SAHABVTTime@@0@Z @ 5 NONAME ; int SchSvrHelpers::IsTimeTheSame(class TTime const &, class TTime const &)
+ ?Pause@SchSvrHelpers@@SAXAAVRTest@@H@Z @ 6 NONAME ; void SchSvrHelpers::Pause(class RTest &, int)
+ ?Rand@SchSvrHelpers@@SAHHHAA_J@Z @ 7 NONAME ; int SchSvrHelpers::Rand(int, int, class TInt64 &)
+ ?RandomScheduleEntryInfo@SchSvrHelpers@@SA?AVTScheduleEntryInfo@@AA_J@Z @ 8 NONAME ; class TScheduleEntryInfo SchSvrHelpers::RandomScheduleEntryInfo(class TInt64 &)
+ ?ScheduleEntryInfo@SchSvrHelpers@@SA?AVTScheduleEntryInfo@@W4TIntervalType@@ABVTTime@@HVTTimeIntervalMinutes@@@Z @ 9 NONAME ; class TScheduleEntryInfo SchSvrHelpers::ScheduleEntryInfo(enum TIntervalType, class TTime const &, int, class TTimeIntervalMinutes)
+ ?TaskInfo@SchSvrHelpers@@SA?AVTTaskInfo@@ABVTDesC16@@HH@Z @ 10 NONAME ; class TTaskInfo SchSvrHelpers::TaskInfo(class TDesC16 const &, int, int)
+ ?TimeBasedOnOffset@SchSvrHelpers@@SA?AVTDateTime@@HHHHHH@Z @ 11 NONAME ; class TDateTime SchSvrHelpers::TimeBasedOnOffset(int, int, int, int, int, int)
+ ?DeleteAllSchedulesL@SchSvrHelpers@@SAXAAVRScheduler@@@Z @ 12 NONAME ; void SchSvrHelpers::DeleteAllSchedulesL(class RScheduler &)
+ ?Close@STaskSemaphore@@QAEXXZ @ 13 NONAME ; void STaskSemaphore::Close(void)
+ ?CreateL@STaskSemaphore@@QAEXXZ @ 14 NONAME ; void STaskSemaphore::CreateL(void)
+ ?DeleteScheduleFilesL@SchSvrHelpers@@SAXXZ @ 15 NONAME ; void SchSvrHelpers::DeleteScheduleFilesL(void)
+ ?KillProcess@CleanupHelpers@@SAHABVTDesC16@@@Z @ 16 NONAME ; int CleanupHelpers::KillProcess(class TDesC16 const &)
+ ?RegisterClientL@SchSvrHelpers@@SAHAAVRScheduler@@@Z @ 17 NONAME ; int SchSvrHelpers::RegisterClientL(class RScheduler &)
+ ?TestCleanupL@CleanupHelpers@@SAXXZ @ 18 NONAME ; void CleanupHelpers::TestCleanupL(void)
+ ?WaitL@STaskSemaphore@@SAXXZ @ 19 NONAME ; void STaskSemaphore::WaitL(void)
+ ?WaitL@STaskSemaphore@@SAHH@Z @ 20 NONAME ; int STaskSemaphore::WaitL(int)
+ ?IsDateTheSame@SchSvrHelpers@@SAHABVTTsTime@@0@Z @ 21 NONAME ; int SchSvrHelpers::IsDateTheSame(class TTsTime const &, class TTsTime const &)
+ ?IsScheduleStateTheSame@SchSvrHelpers@@SAHABVTScheduleState2@@0@Z @ 22 NONAME ; int SchSvrHelpers::IsScheduleStateTheSame(class TScheduleState2 const &, class TScheduleState2 const &)
+ ?IsTimeTheSame@SchSvrHelpers@@SAHABVTTsTime@@0@Z @ 23 NONAME ; int SchSvrHelpers::IsTimeTheSame(class TTsTime const &, class TTsTime const &)
+ ?RandomScheduleEntryInfoHometime@SchSvrHelpers@@SA?AVTScheduleEntryInfo2@@AA_J@Z @ 24 NONAME ; class TScheduleEntryInfo2 SchSvrHelpers::RandomScheduleEntryInfoHometime(long long &)
+ ?RandomScheduleEntryInfoUtc@SchSvrHelpers@@SA?AVTScheduleEntryInfo2@@AA_J@Z @ 25 NONAME ; class TScheduleEntryInfo2 SchSvrHelpers::RandomScheduleEntryInfoUtc(long long &)
+ ?ScheduleEntryInfo@SchSvrHelpers@@SA?AVTScheduleEntryInfo2@@W4TIntervalType@@ABVTTsTime@@HVTTimeIntervalMinutes@@@Z @ 26 NONAME ; class TScheduleEntryInfo2 SchSvrHelpers::ScheduleEntryInfo(enum TIntervalType, class TTsTime const &, int, class TTimeIntervalMinutes)
+ ?Pause@SchSvrHelpers@@SAXH@Z @ 27 NONAME ; void SchSvrHelpers::Pause(int)
+ ?IsTimeTheSameNoSeconds@SchSvrHelpers@@SAHABVTTsTime@@0@Z @ 28 NONAME ; int SchSvrHelpers::IsTimeTheSameNoSeconds(class TTsTime const &, class TTsTime const &)
+ ?SetHomeTimeL@SchSvrHelpers@@SAHABVTTime@@@Z @ 29 NONAME ; int SchSvrHelpers::SetHomeTimeL(class TTime const &)
+ ?SetUTCTimeL@SchSvrHelpers@@SAHABVTTime@@@Z @ 30 NONAME ; int SchSvrHelpers::SetUTCTimeL(class TTime const &)
+ ?UtcTimeBasedOnOffset@SchSvrHelpers@@SA?AVTDateTime@@HHHHHH@Z @ 31 NONAME ; class TDateTime SchSvrHelpers::UtcTimeBasedOnOffset(int, int, int, int, int, int)
+ ?CheckTaskFilesL@SchSvrHelpers@@SAHXZ @ 32 NONAME ; int SchSvrHelpers::CheckTaskFilesL(void)
+ ?CreateTaskFilesL@SchSvrHelpers@@SAHXZ @ 33 NONAME ; int SchSvrHelpers::CreateTaskFilesL(void)
+ ?RegisterNonExistentClient@SchSvrHelpers@@SAHAAVRScheduler@@@Z @ 34 NONAME ; int SchSvrHelpers::RegisterNonExistentClient(class RScheduler &)
+ ?RegisterPanicingClient@SchSvrHelpers@@SAHAAVRScheduler@@@Z @ 35 NONAME ; int SchSvrHelpers::RegisterPanicingClient(class RScheduler &)
+ ?LaunchTaskSchedulerL@SchSvrHelpers@@SAHXZ @ 36 NONAME ; int SchSvrHelpers::LaunchTaskSchedulerL(void)
--- a/genericservices/taskscheduler/Test/eabi/tsutilsU.def Fri Sep 17 08:38:54 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-EXPORTS
- _ZN14STaskSemaphore5CloseEv @ 1 NONAME
- _ZN14STaskSemaphore5WaitLEv @ 2 NONAME
- _ZN14STaskSemaphore7CreateLEv @ 3 NONAME
- _ZN13SchSvrHelpers13IsDateTheSameERK5TTimeS2_ @ 4 NONAME
- _ZN13SchSvrHelpers13IsTimeTheSameERK5TTimeS2_ @ 5 NONAME
- _ZN13SchSvrHelpers15RegisterClientLER10RScheduler @ 6 NONAME
- _ZN13SchSvrHelpers16IsItemRefTheSameERK17TSchedulerItemRefS2_ @ 7 NONAME
- _ZN13SchSvrHelpers17IsTaskInfoTheSameERK9TTaskInfoS2_ @ 8 NONAME
- _ZN13SchSvrHelpers17ScheduleEntryInfoE13TIntervalTypeRK5TTimei20TTimeIntervalMinutes @ 9 NONAME
- _ZN13SchSvrHelpers17TimeBasedOnOffsetEiiiiii @ 10 NONAME
- _ZN13SchSvrHelpers19DeleteAllSchedulesLER10RScheduler @ 11 NONAME
- _ZN13SchSvrHelpers20DeleteScheduleFilesLEv @ 12 NONAME
- _ZN13SchSvrHelpers22IsScheduleStateTheSameERK14TScheduleStateS2_ @ 13 NONAME
- _ZN13SchSvrHelpers23RandomScheduleEntryInfoERx @ 14 NONAME
- _ZN13SchSvrHelpers4RandEiiRx @ 15 NONAME
- _ZN13SchSvrHelpers5PauseER5RTesti @ 16 NONAME
- _ZN13SchSvrHelpers8TaskInfoERK7TDesC16ii @ 17 NONAME
- _ZN14CleanupHelpers11KillProcessERK7TDesC16 @ 18 NONAME
- _ZN14CleanupHelpers12TestCleanupLEv @ 19 NONAME
- _ZN14STaskSemaphore5WaitLEi @ 20 NONAME
- _ZN13SchSvrHelpers13IsDateTheSameERK7TTsTimeS2_ @ 21 NONAME
- _ZN13SchSvrHelpers13IsTimeTheSameERK7TTsTimeS2_ @ 22 NONAME
- _ZN13SchSvrHelpers17ScheduleEntryInfoE13TIntervalTypeRK7TTsTimei20TTimeIntervalMinutes @ 23 NONAME
- _ZN13SchSvrHelpers22IsScheduleStateTheSameERK15TScheduleState2S2_ @ 24 NONAME
- _ZN13SchSvrHelpers26RandomScheduleEntryInfoUtcERx @ 25 NONAME
- _ZN13SchSvrHelpers31RandomScheduleEntryInfoHometimeERx @ 26 NONAME
- _ZN13SchSvrHelpers5PauseEi @ 27 NONAME
- _ZN13SchSvrHelpers22IsTimeTheSameNoSecondsERK7TTsTimeS2_ @ 28 NONAME
- _ZN13SchSvrHelpers11SetUTCTimeLERK5TTime @ 29 NONAME
- _ZN13SchSvrHelpers12SetHomeTimeLERK5TTime @ 30 NONAME
- _ZN13SchSvrHelpers20UtcTimeBasedOnOffsetEiiiiii @ 31 NONAME
- _ZN13SchSvrHelpers15CheckTaskFilesLEv @ 32 NONAME
- _ZN13SchSvrHelpers16CreateTaskFilesLEv @ 33 NONAME
- _ZN13SchSvrHelpers22RegisterPanicingClientER10RScheduler @ 34 NONAME
- _ZN13SchSvrHelpers25RegisterNonExistentClientER10RScheduler @ 35 NONAME
- _ZN13SchSvrHelpers20LaunchTaskSchedulerLEv @ 36 NONAME
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/genericservices/taskscheduler/Test/eabi/tsutils_tsku.def Mon Oct 04 02:56:42 2010 +0300
@@ -0,0 +1,37 @@
+EXPORTS
+ _ZN14STaskSemaphore5CloseEv @ 1 NONAME
+ _ZN14STaskSemaphore5WaitLEv @ 2 NONAME
+ _ZN14STaskSemaphore7CreateLEv @ 3 NONAME
+ _ZN13SchSvrHelpers13IsDateTheSameERK5TTimeS2_ @ 4 NONAME
+ _ZN13SchSvrHelpers13IsTimeTheSameERK5TTimeS2_ @ 5 NONAME
+ _ZN13SchSvrHelpers15RegisterClientLER10RScheduler @ 6 NONAME
+ _ZN13SchSvrHelpers16IsItemRefTheSameERK17TSchedulerItemRefS2_ @ 7 NONAME
+ _ZN13SchSvrHelpers17IsTaskInfoTheSameERK9TTaskInfoS2_ @ 8 NONAME
+ _ZN13SchSvrHelpers17ScheduleEntryInfoE13TIntervalTypeRK5TTimei20TTimeIntervalMinutes @ 9 NONAME
+ _ZN13SchSvrHelpers17TimeBasedOnOffsetEiiiiii @ 10 NONAME
+ _ZN13SchSvrHelpers19DeleteAllSchedulesLER10RScheduler @ 11 NONAME
+ _ZN13SchSvrHelpers20DeleteScheduleFilesLEv @ 12 NONAME
+ _ZN13SchSvrHelpers22IsScheduleStateTheSameERK14TScheduleStateS2_ @ 13 NONAME
+ _ZN13SchSvrHelpers23RandomScheduleEntryInfoERx @ 14 NONAME
+ _ZN13SchSvrHelpers4RandEiiRx @ 15 NONAME
+ _ZN13SchSvrHelpers5PauseER5RTesti @ 16 NONAME
+ _ZN13SchSvrHelpers8TaskInfoERK7TDesC16ii @ 17 NONAME
+ _ZN14CleanupHelpers11KillProcessERK7TDesC16 @ 18 NONAME
+ _ZN14CleanupHelpers12TestCleanupLEv @ 19 NONAME
+ _ZN14STaskSemaphore5WaitLEi @ 20 NONAME
+ _ZN13SchSvrHelpers13IsDateTheSameERK7TTsTimeS2_ @ 21 NONAME
+ _ZN13SchSvrHelpers13IsTimeTheSameERK7TTsTimeS2_ @ 22 NONAME
+ _ZN13SchSvrHelpers17ScheduleEntryInfoE13TIntervalTypeRK7TTsTimei20TTimeIntervalMinutes @ 23 NONAME
+ _ZN13SchSvrHelpers22IsScheduleStateTheSameERK15TScheduleState2S2_ @ 24 NONAME
+ _ZN13SchSvrHelpers26RandomScheduleEntryInfoUtcERx @ 25 NONAME
+ _ZN13SchSvrHelpers31RandomScheduleEntryInfoHometimeERx @ 26 NONAME
+ _ZN13SchSvrHelpers5PauseEi @ 27 NONAME
+ _ZN13SchSvrHelpers22IsTimeTheSameNoSecondsERK7TTsTimeS2_ @ 28 NONAME
+ _ZN13SchSvrHelpers11SetUTCTimeLERK5TTime @ 29 NONAME
+ _ZN13SchSvrHelpers12SetHomeTimeLERK5TTime @ 30 NONAME
+ _ZN13SchSvrHelpers20UtcTimeBasedOnOffsetEiiiiii @ 31 NONAME
+ _ZN13SchSvrHelpers15CheckTaskFilesLEv @ 32 NONAME
+ _ZN13SchSvrHelpers16CreateTaskFilesLEv @ 33 NONAME
+ _ZN13SchSvrHelpers22RegisterPanicingClientER10RScheduler @ 34 NONAME
+ _ZN13SchSvrHelpers25RegisterNonExistentClientER10RScheduler @ 35 NONAME
+ _ZN13SchSvrHelpers20LaunchTaskSchedulerLEv @ 36 NONAME
--- a/genericservices/taskscheduler/group/BLD.INF Fri Sep 17 08:38:54 2010 +0300
+++ b/genericservices/taskscheduler/group/BLD.INF Mon Oct 04 02:56:42 2010 +0300
@@ -62,7 +62,7 @@
../Test/Robustness/TC_TSCH_ROBUSTNESS.mmp
../Test/Robustness/TC_TSCH_IPC.mmp
../Test/LongRunning/T_TSLongRunning.mmp manual
-../Test/TSUtils/TSUtils.mmp support
+../Test/TSUtils/tsutils_tsk.mmp support
../Test/MinimalTaskHandler/minimaltaskhandler.mmp support
../Test/MinimalTaskHandler/faultyminimaltaskhandler.mmp support
../Test/PlatSec/tschsvrclient1.mmp support
--- a/genericservices/taskscheduler/group/SchsvrTest.iby Fri Sep 17 08:38:54 2010 +0300
+++ b/genericservices/taskscheduler/group/SchsvrTest.iby Mon Oct 04 02:56:42 2010 +0300
@@ -34,7 +34,7 @@
file=ABI_DIR\BUILD_DIR\T_TSLongRunning.exe Test\T_TSLongRunning.exe
-file=ABI_DIR\BUILD_DIR\TSUTils.dll System\Libs\TSUtils.dll
+file=ABI_DIR\BUILD_DIR\tsutils_tsk.dll System\Libs\tsutils_tsk.dll
file=ABI_DIR\BUILD_DIR\MinimalTaskHandler.exe System\Programs\MinimalTaskHandler.exe
file=ABI_DIR\BUILD_DIR\FaultyMinimalTaskHandler.exe System\Programs\FaultyMinimalTaskHandler.exe
file=ABI_DIR\BUILD_DIR\tschsvrclient1.exe System\Programs\tschsvrclient1.exe
--- a/glib/tsrc/BC/src/dir_test.c Fri Sep 17 08:38:54 2010 +0300
+++ b/glib/tsrc/BC/src/dir_test.c Mon Oct 04 02:56:42 2010 +0300
@@ -26,6 +26,7 @@
#undef G_LOG_DOMAIN
#include <stdio.h>
+#include <unistd.h>
#include <string.h>
#include <sys/stat.h>
#include "glib.h"