Update the flow control of data control

Change-Id: I5e06b1735e33c25c375fd0e2063d85652f487c08
Signed-off-by: Sunwook Bae <sunwook45.bae@samsung.com>

diff --git a/inc/FAppDataControlProviderManager.h b/inc/FAppDataControlProviderManager.h
index a232f23..ae7b4ef 100644 (file)
--- a/inc/FAppDataControlProviderManager.h
+++ b/inc/FAppDataControlProviderManager.h
@@ -198,7 +198,7 @@ public:
        * @exception    E_OBJ_NOT_FOUND         The data control request specified with the @c reqId does not exist.
        * @exception    E_MAX_EXCEEDED          The size of sending buffer has exceeded the maximum limit.
        * @exception    E_SYSTEM                        The method cannot proceed due to a severe system error.
-       * @remarks              The recommended data size is under 16KB because severe system performance degradation may occur for large messages. E_MAX_EXCEED may be returned for messages over 16KB size.
+       * @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.
        * @see                  Tizen::App::DataControlProviderManager::SendDataControlError()
        * @see                  Tizen::App::IMapDataControlProviderEventListener
        */
@@ -219,7 +219,7 @@ public:
        * @exception    E_OBJ_NOT_FOUND         The data control request specified with the @c reqId did not exist.
        * @exception    E_MAX_EXCEEDED          The size of sending buffer has exceeded the maximum limit.
        * @exception    E_SYSTEM                        The method cannot proceed due to a severe system error.
-       * @remarks              The recommended data size is under 16KB because severe system performance degradation may occur for large messages. E_MAX_EXCEED may be returned for messages over 16KB size.
+       * @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.
        * @see                  Tizen::App::DataControlProviderManager::SendSqlDataControlSelectResult()
        * @see                  Tizen::App::DataControlProviderManager::SendSqlDataControlInsertResult()
        * @see                  Tizen::App::DataControlProviderManager::SendSqlDataControlUpdateDeleteResult()

diff --git a/inc/FAppMapDataControl.h b/inc/FAppMapDataControl.h
index ee91c2a..a840b03 100755 (executable)
--- a/inc/FAppMapDataControl.h
+++ b/inc/FAppMapDataControl.h
@@ -93,9 +93,11 @@ 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          The size of sending buffer has exceeded the maximum limit.
+       * @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_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_EXCEED may be returned for messages over 16KB size.
+       * @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.
        */
        result GetValue(const Tizen::Base::String& dataId, const Tizen::Base::String& key, RequestId& reqId, int pageNo = 1, int countPerPage = 20);
 
@@ -120,9 +122,11 @@ 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          The size of sending buffer has exceeded the maximum limit.
+       * @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_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_EXCEED may be returned for messages over 16KB size.
+       * @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.
        */
        result AddValue(const Tizen::Base::String& dataId, const Tizen::Base::String& key, const Tizen::Base::String& value, RequestId& reqId);
 
@@ -149,9 +153,11 @@ 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          The size of sending buffer has exceeded the maximum limit.
+       * @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_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_EXCEED may be returned for messages over 16KB size.
+       * @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.
        */
        result SetValue(const Tizen::Base::String& dataId, const Tizen::Base::String& key, const Tizen::Base::String& oldValue, const Tizen::Base::String& newValue, RequestId& reqId);
 
@@ -176,9 +182,11 @@ 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          The size of sending buffer has exceeded the maximum limit.
+       * @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_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_EXCEED may be returned for messages over 16KB size.
+       * @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.
        */
        result RemoveValue(const Tizen::Base::String& dataId, const Tizen::Base::String& key, const Tizen::Base::String& value, RequestId& reqId);
 

diff --git a/inc/FAppSqlDataControl.h b/inc/FAppSqlDataControl.h
index d757aaa..9c3d38e 100755 (executable)
--- a/inc/FAppSqlDataControl.h
+++ b/inc/FAppSqlDataControl.h
@@ -101,19 +101,21 @@ public:
        * @param[in]    countPerPage            The desired maximum count of rows on a page
        * @exception    E_SUCCESS                       The method is successful.
        * @exception    E_INVALID_STATE         This instance has not been properly constructed.
-       * @exception    E_INVALID_ARG           Either of the following conditions has occurred:
+       * @exception    E_INVALID_ARG           Either of the following conditions has occurred: @n
        *                                                                       - The specified @c pColumnList is empty.
        *                                                                       - The specified @c pageNo parameter is less than @c 1.
        *                                                                       - The specified @c countPerPage parameter is less than @c 1.
        * @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          The size of sending buffer has exceeded the maximum limit.
+       * @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_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.
        *                               For more information on the SQL statement, see SQLite SQL documents.
-       * @remarks              The recommended data size is under 16KB because severe system performance degradation may occur for large messages. E_MAX_EXCEED may be returned for messages over 16KB size.
+       * @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.
        */
        result Select(const Tizen::Base::String& dataId, const Tizen::Base::Collection::IList* pColumnList,
                        const Tizen::Base::String* pWhere, const Tizen::Base::String *pOrder, RequestId& reqId,
@@ -142,12 +144,14 @@ 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          The size of sending buffer has exceeded the maximum limit.
+       * @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_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.
        *                               For more information on the SQL statement, see SQLite SQL documents.
-       * @remarks              The recommended data size is under 16KB because severe system performance degradation may occur for large messages. E_MAX_EXCEED may be returned for messages over 16KB size.
+       * @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.
        */
        result Insert(const Tizen::Base::String& dataId, const Tizen::Base::Collection::IMap& insertMap, RequestId& reqId);
 
@@ -177,12 +181,14 @@ 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          The size of sending buffer has exceeded the maximum limit.
+       * @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_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.
        *                               For more information on the SQL statement, see SQLITE SQL documents.
-       * @remarks              The recommended data size is under 16KB because severe system performance degradation may occur for large messages. E_MAX_EXCEED may be returned for messages over 16KB size.
+       * @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.
        */
        result Update(const Tizen::Base::String& dataId, const Tizen::Base::Collection::IMap& updateMap,
                        const Tizen::Base::String* pWhere, RequestId& reqId);
@@ -211,12 +217,14 @@ 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          The size of sending buffer has exceeded the maximum limit.
+       * @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_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.
        *                               For more information on the SQL statement, see SQLITE SQL documents.
-       * @remarks              The recommended data size is under 16KB because severe system performance degradation may occur for large messages. E_MAX_EXCEED may be returned for messages over 16KB size.
+       * @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.
        */
        result Delete(const Tizen::Base::String& dataId, const Tizen::Base::String* pWhere, RequestId& reqId);
 

diff --git a/inc/FIoRemoteMessagePort.h b/inc/FIoRemoteMessagePort.h
index 2f955a2..e263bdb 100644 (file)
--- a/inc/FIoRemoteMessagePort.h
+++ b/inc/FIoRemoteMessagePort.h
@@ -153,7 +153,7 @@ public:
         * @exception     E_OBJ_NOT_FOUND     The message port of the target application is not found.
         * @exception     E_MAX_EXCEEDED      The size of @c pMessage has exceeded the maximum limit.
         * @exception     E_SYSTEM            The method has failed due to a severe system error.
-        * @remarks       The recommended message size is under 4KB because severe system performance degradation may occur for large messages. E_MAX_EXCEED may be returned for messages over 4KB size.
+        * @remarks       The recommended message size is under 4KB because severe system performance degradation may occur for large messages. E_MAX_EXCEEDED may be returned for messages over 4KB size.
         */
        result SendMessage(const Tizen::Base::Collection::IMap* pMessage);
 
@@ -174,7 +174,7 @@ public:
         * @exception     E_OBJ_NOT_FOUND     The message port of the target application is not found.
         * @exception     E_MAX_EXCEEDED      The size of @c pMessage has exceeded the maximum limit.
         * @exception     E_SYSTEM            The method has failed due to a severe system error.
-        * @remarks       The recommended message size is under 4KB because severe system performance degradation may occur for large messages. E_MAX_EXCEED may be returned for messages over 4KB size.
+        * @remarks       The recommended message size is under 4KB because severe system performance degradation may occur for large messages. E_MAX_EXCEEDED may be returned for messages over 4KB size.
         */
        result SendMessage(const LocalMessagePort* pLocalMessagePort, const Tizen::Base::Collection::IMap* pMessage);
 

diff --git a/src/app/FApp_AppControlManager.cpp b/src/app/FApp_AppControlManager.cpp
index 626a97e..2fcfe60 100755 (executable)
--- a/src/app/FApp_AppControlManager.cpp
+++ b/src/app/FApp_AppControlManager.cpp
@@ -728,6 +728,11 @@ _AppControlManager::RemoveLaunchRequest(int req)
 {
        __launchManager.RemoveItem(req);
 }
+int
+_AppControlManager::GetLaunchRequestCount(void)
+{
+       return __launchManager.GetCount();
+}
 
 result
 _AppControlManager::RegisterRequest(service_s* service, int& req, _AppHandler& handler)

diff --git a/src/app/FApp_MapDataControlImpl.cpp b/src/app/FApp_MapDataControlImpl.cpp
index 70bf7cf..649ef7b 100644 (file)
--- a/src/app/FApp_MapDataControlImpl.cpp
+++ b/src/app/FApp_MapDataControlImpl.cpp
@@ -50,6 +50,8 @@ using namespace Tizen::Io;
 namespace Tizen { namespace App
 {
 
+static const int MAX_REQUEST_COUNT = 128;
+
 class _MapDataControlEventArg
        : public IEventArg
 {
@@ -157,18 +159,20 @@ _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;
-
-       // Proceeds the previous request
-       WaitingLoop* pLoop = WaitingLoop::GetInstance();
-       pLoop->Wait(30);
-
        if (__pMapDataControlEvent)
        {
                // reqId is system-wide id because the bundle is system-wide.
@@ -404,6 +408,10 @@ _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 9063306..1d84a2e 100644 (file)
--- a/src/app/FApp_SqlDataControlImpl.cpp
+++ b/src/app/FApp_SqlDataControlImpl.cpp
@@ -38,6 +38,8 @@
 #include <FAppISqlDataControlResponseListener.h>
 
 #include <FBaseSysLog.h>
+#include <FBaseRtWaitingLoop.h>
+
 #include <FIo_DataControlResultSetEnumerator.h>
 
 #include "FApp_AppControlManager.h"
@@ -55,6 +57,8 @@ using namespace Tizen::Io;
 namespace Tizen { namespace App
 {
 
+static const int MAX_REQUEST_COUNT = 128;
+
 class _SqlDataControlEventArg
        : public IEventArg
 {
@@ -160,14 +164,20 @@ _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.
@@ -447,6 +457,9 @@ _SqlDataControlImpl::SqlDataControlCallback(void* data, _AppArg* pArg, _AppArg*
                }
        }
 
+       // Remove the request count
+       _AppControlManager::GetInstance()->RemoveLaunchRequest(reqId);
+
        return E_SUCCESS;
 
 CATCH:

diff --git a/src/app/inc/FApp_AppControlManager.h b/src/app/inc/FApp_AppControlManager.h
index c53627a..634b5b6 100755 (executable)
--- a/src/app/inc/FApp_AppControlManager.h
+++ b/src/app/inc/FApp_AppControlManager.h
@@ -262,6 +262,10 @@ public:
 
        static result GetMimeFromExt(const Tizen::Base::String& ext, Tizen::Base::String& out);
 
+       void RemoveLaunchRequest(int req);
+
+       int GetLaunchRequestCount(void);
+
 private:
        _OSP_LOCAL_ _AppControlManager(void);
 
@@ -273,8 +277,6 @@ private:
 
        _OSP_LOCAL_ int AddLaunchRequest(_AppArg* pArg, LaunchCbType pCb, void* data, int prop = -1);
 
-       _OSP_LOCAL_ void RemoveLaunchRequest(int req);
-
 private:
        _AppControlEvent __appControlEvent;
        _RequestManagerT<_LaunchInfo> __launchManager;

diff --git a/src/app/inc/FApp_RequestManagerT.h b/src/app/inc/FApp_RequestManagerT.h
index 48952d2..ebf89da 100644 (file)
--- a/src/app/inc/FApp_RequestManagerT.h
+++ b/src/app/inc/FApp_RequestManagerT.h
@@ -151,6 +151,11 @@ public:
                return (r == E_SUCCESS) ? pItem : null;
        }
 
+       int GetCount(void) const
+       {
+               return __requestList.GetCount();
+       }
+
 private:
        _RequestManagerT(const T& rhs);