From: Sunwook Bae Date: Sun, 31 Mar 2013 08:06:59 +0000 (+0900) Subject: Backout 128 limits in DataControl X-Git-Tag: accepted/tizen_2.1/20130425.034849~191 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e0e3240114c08edf7a996573ad75a533b7d14ecb;p=platform%2Fframework%2Fnative%2Fappfw.git Backout 128 limits in DataControl Change-Id: Ic48c3fcda2b751dbfc52350c7b1e9282683a6271 Signed-off-by: Sunwook Bae --- diff --git a/inc/FAppMapDataControl.h b/inc/FAppMapDataControl.h index a840b03..b44f55f 100755 --- a/inc/FAppMapDataControl.h +++ b/inc/FAppMapDataControl.h @@ -93,9 +93,7 @@ public: * @exception E_ILLEGAL_ACCESS Either of the following conditions has occurred: @n * - Access is denied due to insufficient permission. * - The application using this method is not signed with the same certificate of provider application. @b Since: @b 2.1 - * @exception E_MAX_EXCEEDED Either of the following conditions has occurred: @n - * - The size of sending buffer has exceeded the maximum limit. - * - The number of sending requests has exceeded the maximum limit. + * @exception E_MAX_EXCEEDED The size of sending buffer has exceeded the maximum limit. * @exception E_SYSTEM A system error has occurred. * @remarks The recommended data size is under 16KB because severe system performance degradation may occur for large messages. E_MAX_EXCEEDED may be returned for messages over 16KB size. */ @@ -122,9 +120,7 @@ public: * @exception E_ILLEGAL_ACCESS Either of the following conditions has occurred: @n * - Access is denied due to insufficient permission. * - The application using this method is not signed with the same certificate of provider application. @b Since: @b 2.1 - * @exception E_MAX_EXCEEDED Either of the following conditions has occurred: @n - * - The size of sending buffer has exceeded the maximum limit. - * - The number of sending requests has exceeded the maximum limit. + * @exception E_MAX_EXCEEDED The size of sending buffer has exceeded the maximum limit. * @exception E_SYSTEM A system error has occurred. * @remarks The recommended data size is under 16KB because severe system performance degradation may occur for large messages. E_MAX_EXCEEDED may be returned for messages over 16KB size. */ @@ -153,9 +149,7 @@ public: * @exception E_ILLEGAL_ACCESS Either of the following conditions has occurred: @n * - Access is denied due to insufficient permission. * - The application using this method is not signed with the same certificate of provider application. @b Since: @b 2.1 - * @exception E_MAX_EXCEEDED Either of the following conditions has occurred: @n - * - The size of sending buffer has exceeded the maximum limit. - * - The number of sending requests has exceeded the maximum limit. + * @exception E_MAX_EXCEEDED The size of sending buffer has exceeded the maximum limit. * @exception E_SYSTEM A system error has occurred. * @remarks The recommended data size is under 16KB because severe system performance degradation may occur for large messages. E_MAX_EXCEEDED may be returned for messages over 16KB size. */ @@ -182,9 +176,7 @@ public: * @exception E_ILLEGAL_ACCESS Either of the following conditions has occurred: @n * - Access is denied due to insufficient permission. * - The application using this method is not signed with the same certificate of provider application. @b Since: @b 2.1 - * @exception E_MAX_EXCEEDED Either of the following conditions has occurred: @n - * - The size of sending buffer has exceeded the maximum limit. - * - The number of sending requests has exceeded the maximum limit. + * @exception E_MAX_EXCEEDED The size of sending buffer has exceeded the maximum limit. * @exception E_SYSTEM A system error has occurred. * @remarks The recommended data size is under 16KB because severe system performance degradation may occur for large messages. E_MAX_EXCEEDED may be returned for messages over 16KB size. */ diff --git a/inc/FAppSqlDataControl.h b/inc/FAppSqlDataControl.h index 9c3d38e..fbc4a61 100755 --- a/inc/FAppSqlDataControl.h +++ b/inc/FAppSqlDataControl.h @@ -108,9 +108,7 @@ public: * @exception E_ILLEGAL_ACCESS Either of the following conditions has occurred: @n * - Access is denied due to insufficient permission. * - The application using this method is not signed with the same certificate of provider application. @b Since: @b 2.1 - * @exception E_MAX_EXCEEDED Either of the following conditions has occurred: @n - * - The size of sending buffer has exceeded the maximum limit. - * - The number of sending requests has exceeded the maximum limit. + * @exception E_MAX_EXCEEDED The size of sending buffer has exceeded the maximum limit. * @exception E_SYSTEM A system error has occurred. * @remarks If the value specified in the @c pWhere is string, the value must be wrapped in * single quotes. Otherwise it is not needed to wrap the numeric value in single quotes. @@ -144,9 +142,7 @@ public: * @exception E_ILLEGAL_ACCESS Either of the following conditions has occurred: @n * - Access is denied due to insufficient permission. * - The application using this method is not signed with the same certificate of provider application. @b Since: @b 2.1 - * @exception E_MAX_EXCEEDED Either of the following conditions has occurred: @n - * - The size of sending buffer has exceeded the maximum limit. - * - The number of sending requests has exceeded the maximum limit. + * @exception E_MAX_EXCEEDED The size of sending buffer has exceeded the maximum limit. * @exception E_SYSTEM A system error has occurred. * @remarks If the value specified in the @c insertMap is string, the value must be wrapped in * single quotes. Otherwise it is not needed to wrap the numeric value in single quotes. @@ -181,9 +177,7 @@ public: * @exception E_ILLEGAL_ACCESS Either of the following conditions has occurred: @n * - Access is denied due to insufficient permission. * - The application using this method is not signed with the same certificate of provider application. @b Since: @b 2.1 - * @exception E_MAX_EXCEEDED Either of the following conditions has occurred: @n - * - The size of sending buffer has exceeded the maximum limit. - * - The number of sending requests has exceeded the maximum limit. + * @exception E_MAX_EXCEEDED The size of sending buffer has exceeded the maximum limit. * @exception E_SYSTEM A system error has occurred. * @remarks If the value specified in the @c pWhere or @c updateMap is string, the value must be wrapped in * single quotes. Otherwise it is not needed to wrap the numeric value in single quotes. @@ -217,9 +211,7 @@ public: * @exception E_ILLEGAL_ACCESS Either of the following conditions has occurred: @n * - Access is denied due to insufficient permission. * - The application using this method is not signed with the same certificate of provider application. @b Since: @b 2.1 - * @exception E_MAX_EXCEEDED Either of the following conditions has occurred: @n - * - The size of sending buffer has exceeded the maximum limit. - * - The number of sending requests has exceeded the maximum limit. + * @exception E_MAX_EXCEEDED The size of sending buffer has exceeded the maximum limit. * @exception E_SYSTEM A system error has occurred. * @remarks If the value specified in the @c pWhere is string, the value must be wrapped in * single quotes. Otherwise it is not needed to wrap the numeric value in single quotes. diff --git a/src/app/FApp_MapDataControlImpl.cpp b/src/app/FApp_MapDataControlImpl.cpp index 649ef7b..1b86d02 100644 --- a/src/app/FApp_MapDataControlImpl.cpp +++ b/src/app/FApp_MapDataControlImpl.cpp @@ -33,7 +33,6 @@ #include #include -#include #include "FApp_AppControlManager.h" #include "FApp_MapDataControlImpl.h" @@ -50,8 +49,6 @@ using namespace Tizen::Io; namespace Tizen { namespace App { -static const int MAX_REQUEST_COUNT = 128; - class _MapDataControlEventArg : public IEventArg { @@ -159,20 +156,14 @@ _MapDataControlImpl::StartMapDataControl(int type, const IList* pDataList, int* { result r = E_SUCCESS; - int req = -1; - _AppControlManager* pAppManagerImpl = _AppControlManager::GetInstance(); - - // Check the request count of DataControl operation - int count = pAppManagerImpl->GetLaunchRequestCount(); - SysLog(NID_APP, "Current launch request count: %d", count); - - SysTryReturnResult(NID_APP, count < MAX_REQUEST_COUNT, E_MAX_EXCEEDED, "The number of requests has exceeded the maximum limit."); - _AppArg* pArg = new(std::nothrow) _AppArg; // XXX: pArg will be released in _AppManagerImpl::LaunchApp(). SysTryReturnResult(NID_APP, pArg != null, E_OUT_OF_MEMORY, "The memory is insufficient."); pArg->Construct(*this, static_cast <_DataControlRequestType>(type), pDataList); + _AppControlManager* pAppManagerImpl = _AppControlManager::GetInstance(); + int req = -1; + if (__pMapDataControlEvent) { // reqId is system-wide id because the bundle is system-wide. @@ -408,10 +399,6 @@ _MapDataControlImpl::MapDataControlCallback(void* data, _AppArg* pArg, _AppArg* } } - // Remove the request count - SysLog(NID_APP, "Remove a launch request: reqId: %d", reqId); - _AppControlManager::GetInstance()->RemoveLaunchRequest(reqId); - return E_SUCCESS; CATCH: diff --git a/src/app/FApp_SqlDataControlImpl.cpp b/src/app/FApp_SqlDataControlImpl.cpp index 1d84a2e..9063306 100644 --- a/src/app/FApp_SqlDataControlImpl.cpp +++ b/src/app/FApp_SqlDataControlImpl.cpp @@ -38,8 +38,6 @@ #include #include -#include - #include #include "FApp_AppControlManager.h" @@ -57,8 +55,6 @@ using namespace Tizen::Io; namespace Tizen { namespace App { -static const int MAX_REQUEST_COUNT = 128; - class _SqlDataControlEventArg : public IEventArg { @@ -164,20 +160,14 @@ _SqlDataControlImpl::StartSqlDataControl(int type, const IList* pDataList, int* { result r = E_SUCCESS; - int req = -1; - _AppControlManager* pAppManagerImpl = _AppControlManager::GetInstance(); - - // Check the request count of DataControl operation - int count = pAppManagerImpl->GetLaunchRequestCount(); - SysLog(NID_APP, "Current launch request count: %d", count); - - SysTryReturnResult(NID_APP, count < MAX_REQUEST_COUNT, E_MAX_EXCEEDED, "The number of requests has exceeded the maximum limit."); - _AppArg* pArg = new (std::nothrow) _AppArg; // XXX: pArg will be released in _AppManagerImpl::LaunchApp(). SysTryReturnResult(NID_APP, pArg != null, E_OUT_OF_MEMORY, "insufficient memory"); pArg->Construct(*this, static_cast <_DataControlRequestType>(type), pDataList); + _AppControlManager* pAppManagerImpl = _AppControlManager::GetInstance(); + int req = -1; + if (__pSqlDataControlEvent) { // reqId is system-wide id because the bundle is system-wide. @@ -457,9 +447,6 @@ _SqlDataControlImpl::SqlDataControlCallback(void* data, _AppArg* pArg, _AppArg* } } - // Remove the request count - _AppControlManager::GetInstance()->RemoveLaunchRequest(reqId); - return E_SUCCESS; CATCH: