From: lokilee73 <changjoo.lee@samsung.com>
Date: Thu, 22 Mar 2018 07:32:02 +0000 (+0900)
Subject: Remove OOMADJ item in auto test
X-Git-Tag: accepted/tizen/unified/20180322.145134~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=887a81e0ca389f0c743c513baf66a3abde187f09;p=platform%2Fcore%2Fsystem%2Fdeviced.git

Remove OOMADJ item in auto test

OOMADJ function was moved to resourced.
So, it should be removed in deviced.

Change-Id: I89b05e064c70f58b5e8680b8fea55fc48786f4a2
Signed-off-by: lokilee73 <changjoo.lee@samsung.com>
---

diff --git a/src/auto-test/proc.c b/src/auto-test/proc.c
old mode 100644
new mode 100755
index f4b9b5b..532c4a1
--- a/src/auto-test/proc.c
+++ b/src/auto-test/proc.c
@@ -17,56 +17,9 @@
  */
 #include "test.h"
 
-#define METHOD_PROC_OOMADJ_SET		"oomadj_set"
-
 #define METHOD_SYSNOTI_GETREVISION	"GetRevision"
 
 
-static bool set_proc_method(const char *method, GVariant *param)
-{
-	GVariant *msg;
-	int val;
-	bool ret = FALSE;
-
-	msg = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
-						DEVICED_PATH_PROCESS,
-						DEVICED_INTERFACE_PROCESS,
-						method,
-						param);
-	if (!msg) {
-		_E("fail (%s): no reply", method);
-		return ret;
-	}
-
-	if (!dh_get_param_from_var(msg, "(i)", &val))
-		_E("fail (%s): no message", method);
-	else {
-		if ((val == -ENOTSUP) || (val == -ENOSYS)) {
-			_I("Not supported feature! (%s): %d", method, val);
-			ret = TRUE;
-		} else if (val < 0) {
-			_E("fail (%s): returned fail (%d)", method, val);
-		} else {
-			_I("success (%s): %d", method, val);
-			ret = TRUE;
-		}
-	}
-
-	g_variant_unref(msg);
-	return ret;
-}
-
-static bool set_proc_oomadj(char *type, int argc, int pid, int score_adj)
-{
-	char str_pid[10];
-	char str_score_adj[10];
-
-	snprintf(str_pid, sizeof(str_pid) - 1, "%d", pid);
-	snprintf(str_score_adj, sizeof(str_score_adj) - 1, "%d", score_adj);
-
-	return set_proc_method(METHOD_PROC_OOMADJ_SET, g_variant_new("(siss)", type, argc, str_pid, str_score_adj));
-}
-
 static bool get_sysnoti_revision()
 {
 	GVariant *msg;
@@ -105,9 +58,6 @@ void proc_test_all(int *success, int *fail)
 	int s = 0;
 	int f = 0;
 
-	(set_proc_oomadj("oomadj_set", 2, getpid(), 300))		? s++ : f++;
-	(set_proc_oomadj("oomadj_set", 2, getpid(), 100))		? s++ : f++;
-
 	(get_sysnoti_revision())	? s++ : f++;
 
 	if (NULL != success)    *success = s;
@@ -140,8 +90,6 @@ static int proc_unit(int argc, char **argv)
 		_I("start test");
 		proc_test_all(&success, &fail);
 		_I("Total: %d, Success: %d, Fail: %d", success+fail, success, fail);
-	} else if (0 == strcmp(argv[3], METHOD_PROC_OOMADJ_SET)) {
-		set_proc_oomadj(argv[4], atoi(argv[5]), atoi(argv[6]), atoi(argv[7]));
 	} else if (0 == strcmp(argv[3], METHOD_SYSNOTI_GETREVISION)) {
 		get_sysnoti_revision();
 	} else {
diff --git a/src/core/common.c b/src/core/common.c
old mode 100644
new mode 100755
index 1adb267..04ec6ac
--- a/src/core/common.c
+++ b/src/core/common.c
@@ -392,8 +392,12 @@ static int get_num_processes_on_partition(const char *part_path)
 	char *line = NULL;
 	size_t len = 0;
 	int num_processes = 0;
+	int ret = 0;
+
+	ret = asprintf(&cmd, "fuser -m %s | grep -o '[0-9]*'", part_path);
+	if (ret < 0)
+		return -1;
 
-	asprintf(&cmd, "fuser -m %s | grep -o '[0-9]*'", part_path);
 	printf("cmd=%s\n", cmd);
 	fp = popen(cmd, "r");
 	free(cmd);
@@ -424,7 +428,7 @@ void umount_partition_by_kill(const char *path, const int max_retry)
 		return;
 
 	ret = asprintf(&cmd, "mount | grep \" on %s \" | awk '{print $1}'", path);
-	if (ret == -1)
+	if (ret < 0)
 		return;
 
 	fp = popen(cmd, "r");
diff --git a/src/power/power-handler.c b/src/power/power-handler.c
index 2e7d7b9..8365070 100755
--- a/src/power/power-handler.c
+++ b/src/power/power-handler.c
@@ -86,6 +86,7 @@ static struct power_option poweroff_opt;
 static bool during_poweroff;
 static dd_list *poweroff_handles;
 
+extern void umount_partition_by_kill(const char *path, const int max_retry);
 static int get_poweroff_type_enum(char *type, enum poweroff_type *val)
 {
 	size_t len;