Skip SetMemoryMode in offline mode

SetMemoryMode is unnecessarily performed during mic build
so skip SetMemoryMode operation in offline mode

Change-Id: I4ab061f097aa488abbcac4d37e23e06fdb182700
Signed-off-by: Ilho Kim <ilho159.kim@samsung.com>

diff --git a/src/server/database/cert_set_db_handler.cc b/src/server/database/cert_set_db_handler.cc
index d89d027..179789a 100644 (file)
--- a/src/server/database/cert_set_db_handler.cc
+++ b/src/server/database/cert_set_db_handler.cc
@@ -25,8 +25,9 @@
 namespace pkgmgr_server {
 namespace database {
 
-CertSetDBHandler::CertSetDBHandler(uid_t uid, int pid)
-    : AbstractDBHandler(uid, pid), uid_(uid), handle_(nullptr) {}
+CertSetDBHandler::CertSetDBHandler(uid_t uid, int pid, bool is_offline)
+    : AbstractDBHandler(uid, pid), uid_(uid),
+      is_offline_(is_offline), handle_(nullptr) {}
 
 CertSetDBHandler::~CertSetDBHandler() {}
 
@@ -43,7 +44,8 @@ int CertSetDBHandler::Execute() {
   if (!Connect())
     return PMINFO_R_ERROR;
 
-  DBHandleProvider::GetInst(uid_).SetMemoryMode(GetPID());
+  if (!is_offline_)
+    DBHandleProvider::GetInst(uid_).SetMemoryMode(GetPID());
   sqlite3* conn = GetConnection().front().first;
 
   return certinfo_internal_set(conn, handle_->pkgid, handle_, uid_);

diff --git a/src/server/database/cert_set_db_handler.hh b/src/server/database/cert_set_db_handler.hh
index 51dcd9a..e45db18 100644 (file)
--- a/src/server/database/cert_set_db_handler.hh
+++ b/src/server/database/cert_set_db_handler.hh
@@ -34,13 +34,14 @@ namespace database {
 
 class EXPORT_API CertSetDBHandler : public AbstractDBHandler{
  public:
-  CertSetDBHandler(uid_t uid, int pid);
+  CertSetDBHandler(uid_t uid, int pid, bool is_offline = false);
   ~CertSetDBHandler();
   void SetCertHandle (pkgmgr_certinfo_x* cert_info);
   int Execute() override;
 
  private:
   uid_t uid_;
+  bool is_offline_;
   pkgmgr_certinfo_x* handle_;
 };
 

diff --git a/src/server/database/pkg_set_db_handler.cc b/src/server/database/pkg_set_db_handler.cc
index 73cb138..f6840d7 100644 (file)
--- a/src/server/database/pkg_set_db_handler.cc
+++ b/src/server/database/pkg_set_db_handler.cc
@@ -27,8 +27,8 @@
 namespace pkgmgr_server {
 namespace database {
 
-PkgSetDBHandler::PkgSetDBHandler(uid_t uid, int pid)
-    : AbstractDBHandler(uid, pid), uid_(uid) {}
+PkgSetDBHandler::PkgSetDBHandler(uid_t uid, int pid, bool is_offline)
+    : AbstractDBHandler(uid, pid), uid_(uid), is_offline_(is_offline) {}
 
 PkgSetDBHandler::~PkgSetDBHandler() {}
 
@@ -56,7 +56,9 @@ int PkgSetDBHandler::Execute() {
   if (!Connect())
     return PMINFO_R_ERROR;
 
-  DBHandleProvider::GetInst(uid_).SetMemoryMode(GetPID());
+  if (!is_offline_)
+    DBHandleProvider::GetInst(uid_).SetMemoryMode(GetPID());
+
   std::vector<std::pair<sqlite3*, uid_t>> conn_list = GetConnection();
   sqlite3* conn = conn_list.front().first;
   int ret = 0;

diff --git a/src/server/database/pkg_set_db_handler.hh b/src/server/database/pkg_set_db_handler.hh
index 2d99c46..8524f20 100644 (file)
--- a/src/server/database/pkg_set_db_handler.hh
+++ b/src/server/database/pkg_set_db_handler.hh
@@ -38,7 +38,7 @@ namespace database {
 
 class EXPORT_API PkgSetDBHandler : public AbstractDBHandler{
  public:
-  PkgSetDBHandler(uid_t uid, int pid);
+  PkgSetDBHandler(uid_t uid, int pid, bool is_offline = false);
   ~PkgSetDBHandler();
   void SetPkgInfo(package_x* package);
   void SetPkgID(std::string pkgid);
@@ -50,6 +50,7 @@ class EXPORT_API PkgSetDBHandler : public AbstractDBHandler{
   std::string pkgid_;
   package_x* package_ = nullptr;
   uid_t uid_;
+  bool is_offline_;
   pkgmgr_common::PkgWriteType write_type_ = pkgmgr_common::PkgWriteType::None;
   std::vector<std::vector<std::string>> result_;
 };

diff --git a/src/server/request_handler/request_handler_direct_access.cc b/src/server/request_handler/request_handler_direct_access.cc
index 3fa03e8..cfdf403 100644 (file)
--- a/src/server/request_handler/request_handler_direct_access.cc
+++ b/src/server/request_handler/request_handler_direct_access.cc
@@ -55,11 +55,11 @@ extern "C" EXPORT_API void* _request_handler_direct_access(int req_type,
       break;
     case pkgmgr_common::ReqType::SET_PKG_INFO:
       handler.reset(
-          new pkgmgr_server::request_handler::SetPkginfoRequestHandler());
+          new pkgmgr_server::request_handler::SetPkginfoRequestHandler(true));
       break;
     case pkgmgr_common::ReqType::SET_CERT_INFO:
       handler.reset(
-          new pkgmgr_server::request_handler::SetCertRequestHandler());
+          new pkgmgr_server::request_handler::SetCertRequestHandler(true));
       break;
     case pkgmgr_common::ReqType::GET_CERT_INFO:
       handler.reset(

diff --git a/src/server/request_handler/set_cert_request_handler.cc b/src/server/request_handler/set_cert_request_handler.cc
index 32c360a..6c105f7 100644 (file)
--- a/src/server/request_handler/set_cert_request_handler.cc
+++ b/src/server/request_handler/set_cert_request_handler.cc
@@ -40,7 +40,7 @@ bool SetCertRequestHandler::HandleRequest(unsigned char* data, int size,
     return false;
   }
 
-  psd::CertSetDBHandler db(parcel->GetUid(), GetPID());
+  psd::CertSetDBHandler db(parcel->GetUid(), GetPID(), is_offline_);
   db.SetLocale(locale);
   db.SetCertHandle(const_cast<pkgmgr_certinfo_x*>(parcel->GetCertInfo()));
 

diff --git a/src/server/request_handler/set_cert_request_handler.hh b/src/server/request_handler/set_cert_request_handler.hh
index dae2054..828b3de 100644 (file)
--- a/src/server/request_handler/set_cert_request_handler.hh
+++ b/src/server/request_handler/set_cert_request_handler.hh
@@ -19,12 +19,15 @@ namespace request_handler {
 
 class EXPORT_API SetCertRequestHandler : public AbstractRequestHandler {
  public:
+  SetCertRequestHandler(bool is_offline = false) :
+      AbstractRequestHandler(), is_offline_(is_offline) {}
   bool HandleRequest(unsigned char* data, int size,
       const std::string& locale) override;
 
   std::vector<uint8_t> ExtractResult() override;
 
  private:
+  bool is_offline_;
   std::shared_ptr<pkgmgr_common::parcel::ResultParcelable> result_;
 };
 

diff --git a/src/server/request_handler/set_pkginfo_request_handler.cc b/src/server/request_handler/set_pkginfo_request_handler.cc
index d7a8f8b..d8dd915 100644 (file)
--- a/src/server/request_handler/set_pkginfo_request_handler.cc
+++ b/src/server/request_handler/set_pkginfo_request_handler.cc
@@ -42,7 +42,7 @@ bool SetPkginfoRequestHandler::HandleRequest(unsigned char* data, int size,
     return false;
   }
 
-  psd::PkgSetDBHandler db(parcel->GetUid(), GetPID());
+  psd::PkgSetDBHandler db(parcel->GetUid(), GetPID(), is_offline_);
   db.SetLocale(locale);
   db.SetWriteType(parcel->GetWriteType());
 

diff --git a/src/server/request_handler/set_pkginfo_request_handler.hh b/src/server/request_handler/set_pkginfo_request_handler.hh
index 8006920..94aa5a4 100644 (file)
--- a/src/server/request_handler/set_pkginfo_request_handler.hh
+++ b/src/server/request_handler/set_pkginfo_request_handler.hh
@@ -19,12 +19,15 @@ namespace request_handler {
 
 class EXPORT_API SetPkginfoRequestHandler : public AbstractRequestHandler {
  public:
+  SetPkginfoRequestHandler(bool is_offline = false) :
+      AbstractRequestHandler(), is_offline_(is_offline) {}
   bool HandleRequest(unsigned char* data, int size,
       const std::string& locale) override;
 
   std::vector<uint8_t> ExtractResult() override;
 
  private:
+  bool is_offline_;
   std::shared_ptr<pkgmgr_common::parcel::ResultParcelable> result_;
 };