Merge "Revert "Implementation of new OOM policy"" into devel_3.0_main

diff --git a/packaging/osp-appfw.spec b/packaging/osp-appfw.spec
index ce30d96..31ac8b6 100755 (executable)
--- a/packaging/osp-appfw.spec
+++ b/packaging/osp-appfw.spec
@@ -26,7 +26,7 @@ BuildRequires:        pkgconfig(capi-network-tethering)
 BuildRequires: pkgconfig(capi-network-wifi)
 BuildRequires: pkgconfig(capi-network-wifi-direct)
 BuildRequires: pkgconfig(capi-media-sound-manager)
-BuildRequires: pkgconfig(sysman) >= 0.2.30
+BuildRequires: pkgconfig(sysman)
 BuildRequires:  pkgconfig(tapi)
 BuildRequires:  pkgconfig(alarm-service)
 BuildRequires:  pkgconfig(appsvc)

diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index b88028d..ec94998 100644 (file)
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -10,7 +10,6 @@ INCLUDE_DIRECTORIES (
        ${CMAKE_SOURCE_DIR}/src/security
        ${CMAKE_SOURCE_DIR}/src/app/inc
        inc
-       /usr/include/sysman
        )
 
 SET (${this_target}_SOURCE_FILES

diff --git a/src/server/app/FApp_AulServer.cpp b/src/server/app/FApp_AulServer.cpp
index 896b88f..267a974 100755 (executable)
--- a/src/server/app/FApp_AulServer.cpp
+++ b/src/server/app/FApp_AulServer.cpp
@@ -45,7 +45,6 @@
 #include "FApp_Types.h"
 #include "FApp_AulServer.h"
 #include "FApp_TemplateUtil.h"
-#include "oom_policy.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -222,23 +221,6 @@ _AulServer::SetOomAdj(int pid, int adj)
 }
 
 result
-_AulServer::SetOomScoreAdj(int pid, AppOomScore adj)
-{
-       result r = E_SUCCESS;
-       char buf[FILENAME_MAX];
-       FILE *fP = NULL;
-
-       snprintf(buf, FILENAME_MAX, "/proc/%d/oom_score_adj", pid);
-       fP = fopen(buf, "w");
-       SysTryReturnResult(NID_APP, fP != NULL, E_SYSTEM, "oom_adj change failed with %s.", strerror(errno));
-
-       fprintf(fP, "%d", adj);
-       fclose(fP);
-
-       return r;
-}
-
-result
 _AulServer::SetPowerOffNotiListener( void (*powerOffCb)(void *pData), void *pData)
 {
        int heyFd = heynoti_init();
@@ -350,7 +332,7 @@ int _AulServer::CreateProcess(const AppId& appId)
 
                int currentPid = getpid();
 
-               SetOomScoreAdj(currentPid, OOM_SCORE_SYS_SERVICE); // set oom_score_adj for system service
+               //SetOomAdj(currentPid, -17); // set oom_adj to -17 for system service
 
                prctl(PR_SET_PDEATHSIG, SIGTERM);
 

diff --git a/src/server/inc/FApp_AulServer.h b/src/server/inc/FApp_AulServer.h
index 64bc196..ab22aea 100755 (executable)
--- a/src/server/inc/FApp_AulServer.h
+++ b/src/server/inc/FApp_AulServer.h
@@ -26,7 +26,6 @@
 #include <bundle.h>
 #include <FOspConfig.h>
 #include <FAppTypes.h>
-#include <oom_policy.h>
 
 #define MAX_SLP_PACKAGE_ID 128
 
@@ -54,8 +53,6 @@ public:
 
        static result SetOomAdj(int pid, int adj);
 
-       static result SetOomScoreAdj(int pid, AppOomScore adj);
-
        static result SetPowerOffNotiListener(void (*powerOffCb)(void *pData), void *pData);
 
        static int GetAppType(const Tizen::Base::String& category);