# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1273847940 -10800 # Node ID b23410e29e22d73fe1c743a6b9f45b04eb3d9c1c # Parent 11c66574c2a2953664ee3329436a386835e2f74a Revision: 201019 Kit: 201019 diff -r 11c66574c2a2 -r b23410e29e22 authorisation/userpromptservice/database/source/upsdb.cpp --- a/authorisation/userpromptservice/database/source/upsdb.cpp Mon May 03 14:11:52 2010 +0300 +++ b/authorisation/userpromptservice/database/source/upsdb.cpp Fri May 14 17:39:00 2010 +0300 @@ -20,7 +20,7 @@ /** @file @internalTechnology - @prototype + @released */ #include "upsdbw.h" diff -r 11c66574c2a2 -r b23410e29e22 authorisation/userpromptservice/database/source/upsdbcompact.cpp --- a/authorisation/userpromptservice/database/source/upsdbcompact.cpp Mon May 03 14:11:52 2010 +0300 +++ b/authorisation/userpromptservice/database/source/upsdbcompact.cpp Fri May 14 17:39:00 2010 +0300 @@ -20,7 +20,7 @@ /** @file @internalTechnology - @prototype + @released */ #include "upsdbw.h" diff -r 11c66574c2a2 -r b23410e29e22 authorisation/userpromptservice/database/source/upsdbw.cpp --- a/authorisation/userpromptservice/database/source/upsdbw.cpp Mon May 03 14:11:52 2010 +0300 +++ b/authorisation/userpromptservice/database/source/upsdbw.cpp Fri May 14 17:39:00 2010 +0300 @@ -20,7 +20,7 @@ /** @file @internalTechnology - @prototype + @released */ #include "upsdbw.h" diff -r 11c66574c2a2 -r b23410e29e22 authorisation/userpromptservice/database/test/tupsdb/source/tupsdbbase.cpp --- a/authorisation/userpromptservice/database/test/tupsdb/source/tupsdbbase.cpp Mon May 03 14:11:52 2010 +0300 +++ b/authorisation/userpromptservice/database/test/tupsdb/source/tupsdbbase.cpp Fri May 14 17:39:00 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of the License "Eclipse Public License v1.0" @@ -348,7 +348,7 @@ } -RPointerArray CUpsDbBaseStep::GetDecisionsL(CDecisionDbW &aUpsDb, CDecisionFilter &aFilter, TBool aCancel) +void CUpsDbBaseStep::GetDecisionsL(CDecisionDbW &aUpsDb, CDecisionFilter &aFilter, TBool aCancel, RPointerArray& aRecordList) /** Get a set of decision records from the database. Uses multiple records lookup method (RDbView). Prints the consumed time to perform this operation. @@ -363,7 +363,6 @@ dbView->EvaluateView(iWaiter->iStatus); TInt num = 0; - RPointerArray recordList; if(aCancel) { dbView->Cancel(); @@ -371,18 +370,16 @@ } else { - iWaiter->WaitActiveL(KErrNone); - CleanupClosePushL(recordList); + iWaiter->WaitActiveL(KErrNone); CDecisionRecord *record = NULL; while((record = dbView->NextDecisionL()) != NULL) { CleanupStack::PushL(record); num++; - recordList.AppendL(record); + aRecordList.AppendL(record); CleanupStack::Pop(record); } - CleanupStack::Pop(&recordList); } //Timer is stopped @@ -391,8 +388,6 @@ INFO_PRINTF3(_L("%d records retrieved in %Ld microseconds."), num, elapsedTime); CleanupStack::PopAndDestroy(dbView); - - return recordList; } @@ -555,7 +550,7 @@ CDecisionRecord *record = NULL; CDecisionFilter *filter = NULL; - RPointerArray recordList; + RPointerArray recordList; TBuf8 bufFp; TBuf8 bufCe; TBuf bufDes; @@ -572,16 +567,16 @@ InsertRecordL(aUpsDb,*record); filter = CreateFilterLC(flag,clientId,evaluatorId,serviceId,serverId,bufFp,bufCe,policyVersion,recordId,bufDes,result,evaluatorInfo,EEqual); - recordList = GetDecisionsL(aUpsDb,*filter,EFalse); + CleanupResetAndDestroyPushL(recordList); + GetDecisionsL(aUpsDb, *filter, EFalse, recordList); if(recordList.Count() != 1) { SetTestStepResult(EFail); + CleanupStack::PopAndDestroy(3, record); break; - } - recordList.Close(); - CleanupStack::PopAndDestroy(2,record); - } - + } + CleanupStack::PopAndDestroy(3, record); + } } diff -r 11c66574c2a2 -r b23410e29e22 authorisation/userpromptservice/database/test/tupsdb/source/tupsdbperformance.cpp --- a/authorisation/userpromptservice/database/test/tupsdb/source/tupsdbperformance.cpp Mon May 03 14:11:52 2010 +0300 +++ b/authorisation/userpromptservice/database/test/tupsdb/source/tupsdbperformance.cpp Fri May 14 17:39:00 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of the License "Eclipse Public License v1.0" @@ -107,40 +107,41 @@ filter->SetClientSid(clientId,EEqual); INFO_PRINTF2(_L("Lookup for ClientSid=%d"),clientId.iUid); - - RPointerArray recordList = GetDecisionsL(*decisionDb,*filter,EFalse); - recordList.Reset(); - CleanupStack::PopAndDestroy(filter); + RPointerArray recordList; + CleanupResetAndDestroyPushL(recordList); + + GetDecisionsL(*decisionDb, *filter, EFalse, recordList); + CleanupStack::PopAndDestroy(2, filter); //Get a set of decision records with EvaluatorId TUid evaluatorId = TUid::Uid(iRetrieveNum%iEvaluatorNum + 1000000 + iRecordNum); filter = CDecisionFilter::NewLC(); filter->SetEvaluatorId(evaluatorId,EEqual); - + CleanupResetAndDestroyPushL(recordList); INFO_PRINTF2(_L("Lookup for EvaluatorId=%d"),evaluatorId.iUid); - GetDecisionsL(*decisionDb,*filter,EFalse); - CleanupStack::PopAndDestroy(filter); + GetDecisionsL(*decisionDb, *filter, EFalse, recordList); + CleanupStack::PopAndDestroy(2, filter); //Get a set of decision records with ServiceId TUid serviceId = TUid::Uid(iRetrieveNum%iServiceNum + 10000 + iRecordNum); filter = CDecisionFilter::NewLC(); filter->SetServiceId(serviceId,EEqual); - + CleanupResetAndDestroyPushL(recordList); INFO_PRINTF2(_L("Lookup for ServiceId=%d"),serviceId.iUid); - GetDecisionsL(*decisionDb,*filter,EFalse); - CleanupStack::PopAndDestroy(filter); + GetDecisionsL(*decisionDb, *filter, EFalse, recordList); + CleanupStack::PopAndDestroy(2, filter); //Get a set of decision records with ServerSid TUid serverId = TUid::Uid(iRetrieveNum%iServerNum + 100000 + iRecordNum); filter = CDecisionFilter::NewLC(); filter->SetServerSid(serverId,EEqual); - + CleanupResetAndDestroyPushL(recordList); INFO_PRINTF2(_L("Lookup for ServerSid=%d"),serverId.iUid); - GetDecisionsL(*decisionDb,*filter,EFalse); - CleanupStack::PopAndDestroy(filter); + GetDecisionsL(*decisionDb, *filter, EFalse, recordList); + CleanupStack::PopAndDestroy(2, filter); //Lookup for Fingerprint TBuf8bufFP; @@ -151,11 +152,11 @@ filter = CDecisionFilter::NewLC(); filter->SetFingerprintL(md5FP->Hash(bufFP),EEqual); - + CleanupResetAndDestroyPushL(recordList); INFO_PRINTF1(_L("Lookup for a Fingerprint")); - GetDecisionsL(*decisionDb,*filter,EFalse); - CleanupStack::PopAndDestroy(filter); + GetDecisionsL(*decisionDb, *filter, EFalse, recordList); + CleanupStack::PopAndDestroy(2, filter); //Lookup for ClientEntity TBuf8bufCE; @@ -166,11 +167,11 @@ filter = CDecisionFilter::NewLC(); filter->SetClientEntityL(md5CE->Hash(bufCE),EEqual); - + CleanupResetAndDestroyPushL(recordList); INFO_PRINTF1(_L("Lookup for a ClientEntity")); - GetDecisionsL(*decisionDb,*filter,EFalse); - CleanupStack::PopAndDestroy(filter); + GetDecisionsL(*decisionDb, *filter, EFalse, recordList); + CleanupStack::PopAndDestroy(2, filter); //Get a single record md5FP->Reset(); diff -r 11c66574c2a2 -r b23410e29e22 authorisation/userpromptservice/database/test/tupsdb/source/tupsdbstep.cpp --- a/authorisation/userpromptservice/database/test/tupsdb/source/tupsdbstep.cpp Mon May 03 14:11:52 2010 +0300 +++ b/authorisation/userpromptservice/database/test/tupsdb/source/tupsdbstep.cpp Fri May 14 17:39:00 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of the License "Eclipse Public License v1.0" @@ -449,23 +449,23 @@ upsDb = CDecisionDbW::NewL(iDbLocation,iFs); CleanupStack::PushL(upsDb); - RPointerArray recordList = GetDecisionsL(*upsDb,*filter,iCancel); + RPointerArray recordList; + CleanupResetAndDestroyPushL(recordList); + GetDecisionsL(*upsDb, *filter, iCancel, recordList); TInt recNum; recNum = recordList.Count(); if(recNum) - { - CleanupClosePushL(recordList); + { OpenDecisionFileL(EFileWrite); for(TInt i=0; i #include #include "upscommon.h" +#include using namespace UserPromptService; @@ -113,7 +114,7 @@ CDecisionRecord *GetDecisionLC(CDecisionDbW &aUpsDb, CDecisionFilter &aFilter); //Get a set of decision records from the database - RPointerArray GetDecisionsL(CDecisionDbW &aUpsDb, CDecisionFilter &aFilter, TBool aCancel); + void GetDecisionsL(CDecisionDbW &aUpsDb, CDecisionFilter &aFilter, TBool aCancel, RPointerArray& aRecordList); //Delete a set of records void RemoveDecisionsL(CDecisionDbW &aUpsDb, CDecisionFilter &aFilter); diff -r 11c66574c2a2 -r b23410e29e22 authorisation/userpromptservice/server/source/upsclient/upsclientserver.cpp --- a/authorisation/userpromptservice/server/source/upsclient/upsclientserver.cpp Mon May 03 14:11:52 2010 +0300 +++ b/authorisation/userpromptservice/server/source/upsclient/upsclientserver.cpp Fri May 14 17:39:00 2010 +0300 @@ -20,7 +20,7 @@ /** @file @internalTechnology - @prototype + @released */ #include #include diff -r 11c66574c2a2 -r b23410e29e22 authorisation/userpromptservice/test/inc_private/tups_notifiertypes.h --- a/authorisation/userpromptservice/test/inc_private/tups_notifiertypes.h Mon May 03 14:11:52 2010 +0300 +++ b/authorisation/userpromptservice/test/inc_private/tups_notifiertypes.h Fri May 14 17:39:00 2010 +0300 @@ -20,7 +20,7 @@ /** @file @internalTechnology - @prototype + @released */ #ifndef TUPSNOTIFIERTYPES_H diff -r 11c66574c2a2 -r b23410e29e22 contentmgmt/contentaccessfwfordrm/inc/cafhelper.h --- a/contentmgmt/contentaccessfwfordrm/inc/cafhelper.h Mon May 03 14:11:52 2010 +0300 +++ b/contentmgmt/contentaccessfwfordrm/inc/cafhelper.h Fri May 14 17:39:00 2010 +0300 @@ -20,7 +20,7 @@ @file @publishedPartner -@prototype +@released */ #ifndef __CAFHELPER_H__ @@ -39,7 +39,7 @@ of the dll,using which the appropriate error handling APIs can be called. @publishedPartner - @prototype + @released */ NONSHARABLE_CLASS(CCAFHelper) : public CBase diff -r 11c66574c2a2 -r b23410e29e22 contentmgmt/contentaccessfwfordrm/inc/cafhelperinterface.h --- a/contentmgmt/contentaccessfwfordrm/inc/cafhelperinterface.h Mon May 03 14:11:52 2010 +0300 +++ b/contentmgmt/contentaccessfwfordrm/inc/cafhelperinterface.h Fri May 14 17:39:00 2010 +0300 @@ -20,7 +20,7 @@ @file @publishedPartner -@prototype +@released */ #ifndef __CAFHELPERINTERFACE_H__ @@ -44,7 +44,7 @@ implementing this interface class as a dll which is enforced to be named as cafhelper.dll. @publishedPartner - @prototype + @released */ class MCAFHelperInterface diff -r 11c66574c2a2 -r b23410e29e22 crypto/weakcryptospi/source/bigint/stackinteger.h --- a/crypto/weakcryptospi/source/bigint/stackinteger.h Mon May 03 14:11:52 2010 +0300 +++ b/crypto/weakcryptospi/source/bigint/stackinteger.h Fri May 14 17:39:00 2010 +0300 @@ -35,7 +35,7 @@ * allocated memory. * If you are not sure which integer you want, you want an RInteger. * @internalComponent - * @prototype + * @released * @see RInteger */ template diff -r 11c66574c2a2 -r b23410e29e22 cryptomgmtlibs/securitycommonutils/inc/cleanuputils.h --- a/cryptomgmtlibs/securitycommonutils/inc/cleanuputils.h Mon May 03 14:11:52 2010 +0300 +++ b/cryptomgmtlibs/securitycommonutils/inc/cleanuputils.h Fri May 14 17:39:00 2010 +0300 @@ -21,7 +21,7 @@ /** @file @internalTechnology - @prototype + @released */ #ifndef CLEANUPUTILS_H diff -r 11c66574c2a2 -r b23410e29e22 cryptomgmtlibs/securitycommonutils/inc/ipcstream.inl --- a/cryptomgmtlibs/securitycommonutils/inc/ipcstream.inl Mon May 03 14:11:52 2010 +0300 +++ b/cryptomgmtlibs/securitycommonutils/inc/ipcstream.inl Fri May 14 17:39:00 2010 +0300 @@ -21,7 +21,7 @@ /** @file @internalTechnology - @prototype + @released */ #ifndef IPCSTREAM_INL diff -r 11c66574c2a2 -r b23410e29e22 cryptomgmtlibs/securitycommonutils/inc/securityutils.h --- a/cryptomgmtlibs/securitycommonutils/inc/securityutils.h Mon May 03 14:11:52 2010 +0300 +++ b/cryptomgmtlibs/securitycommonutils/inc/securityutils.h Fri May 14 17:39:00 2010 +0300 @@ -20,7 +20,7 @@ /** @file @publishedPartner - @prototype + @released */ #ifndef SECURITYUTILS_H diff -r 11c66574c2a2 -r b23410e29e22 cryptomgmtlibs/securitycommonutils/inc/streamingarray.h --- a/cryptomgmtlibs/securitycommonutils/inc/streamingarray.h Mon May 03 14:11:52 2010 +0300 +++ b/cryptomgmtlibs/securitycommonutils/inc/streamingarray.h Fri May 14 17:39:00 2010 +0300 @@ -20,7 +20,7 @@ /** @file @internalTechnology - @prototype + @released */ #ifndef STREAMINGARRAY_H diff -r 11c66574c2a2 -r b23410e29e22 cryptomgmtlibs/securitycommonutils/inc/streamingarray.inl --- a/cryptomgmtlibs/securitycommonutils/inc/streamingarray.inl Mon May 03 14:11:52 2010 +0300 +++ b/cryptomgmtlibs/securitycommonutils/inc/streamingarray.inl Fri May 14 17:39:00 2010 +0300 @@ -20,7 +20,7 @@ /** @file @internalTechnology - @prototype + @released */ #ifndef STREAMINGARRAY_INL diff -r 11c66574c2a2 -r b23410e29e22 cryptomgmtlibs/securitytestfw/test/autotesting/hosts --- a/cryptomgmtlibs/securitytestfw/test/autotesting/hosts Mon May 03 14:11:52 2010 +0300 +++ b/cryptomgmtlibs/securitytestfw/test/autotesting/hosts Fri May 14 17:39:00 2010 +0300 @@ -1,2 +1,2 @@ -10.253.27.175 cam-ocsptest01.intra -10.253.27.175 cam-OCSPTEST01.prod.ad.symbian.intra +10.225.90.30 cam-ocsptest01.intra +10.225.90.30 cam-OCSPTEST01.prod.ad.symbian.intra diff -r 11c66574c2a2 -r b23410e29e22 cryptoservices/filebasedcertificateandkeystores/Inc/CFSTokenTypeClient.h --- a/cryptoservices/filebasedcertificateandkeystores/Inc/CFSTokenTypeClient.h Mon May 03 14:11:52 2010 +0300 +++ b/cryptoservices/filebasedcertificateandkeystores/Inc/CFSTokenTypeClient.h Fri May 14 17:39:00 2010 +0300 @@ -20,7 +20,7 @@ /** @file @publishedPartner - @prototype + @released */ #ifndef __CFSTOKENTYPECLIENT_H__ diff -r 11c66574c2a2 -r b23410e29e22 cryptoservices/filebasedcertificateandkeystores/Inc/keystore_errs.h --- a/cryptoservices/filebasedcertificateandkeystores/Inc/keystore_errs.h Mon May 03 14:11:52 2010 +0300 +++ b/cryptoservices/filebasedcertificateandkeystores/Inc/keystore_errs.h Fri May 14 17:39:00 2010 +0300 @@ -20,7 +20,7 @@ /** @file @publishedPartner - @prototype + @released */ #ifndef KEYSTORE_ERRS_H diff -r 11c66574c2a2 -r b23410e29e22 cryptoservices/filebasedcertificateandkeystores/source/keystore/Server/keystorecenrepconfig.cpp --- a/cryptoservices/filebasedcertificateandkeystores/source/keystore/Server/keystorecenrepconfig.cpp Mon May 03 14:11:52 2010 +0300 +++ b/cryptoservices/filebasedcertificateandkeystores/source/keystore/Server/keystorecenrepconfig.cpp Fri May 14 17:39:00 2010 +0300 @@ -21,7 +21,7 @@ /** @file - @prototype + @released @internalComponent */ diff -r 11c66574c2a2 -r b23410e29e22 cryptoservices/filebasedcertificateandkeystores/source/keystore/Server/keystorecenrepconfig.h --- a/cryptoservices/filebasedcertificateandkeystores/source/keystore/Server/keystorecenrepconfig.h Mon May 03 14:11:52 2010 +0300 +++ b/cryptoservices/filebasedcertificateandkeystores/source/keystore/Server/keystorecenrepconfig.h Fri May 14 17:39:00 2010 +0300 @@ -20,7 +20,7 @@ /** @file - @prototype + @released @internalComponent */