Revert "[IMPROVE] Implement freezing/unfreezing apps"

This reverts commit 12530133d6e0236630a10c8db36f4f0ea40cfdfc.

Change-Id: I0f04f8f49eed51fc8ddcb83dc0152811a0f20a22
Signed-off-by: Alexander Aksenov <a.aksenov@samsung.com>

diff --git a/daemon/Makefile b/daemon/Makefile
index 5f5c5da..7f93393 100644 (file)
--- a/daemon/Makefile
+++ b/daemon/Makefile
@@ -42,8 +42,7 @@ DAEMON_SRCS =                 \
        device_vconf.c          \
        device_system_info.c    \
        device_camera.c         \
-       smack.c \
-       freezing.c
+       smack.c
 
 DAEMON_OBJS = $(patsubst %.c,%.o, $(DAEMON_SRCS))
 

diff --git a/daemon/da_protocol.c b/daemon/da_protocol.c
index e3952b6..8804f74 100644 (file)
--- a/daemon/da_protocol.c
+++ b/daemon/da_protocol.c
@@ -48,7 +48,6 @@
 #include "debug.h"
 #include "md5.h"
 #include "da_data.h"
-#include "freezing.h"
 
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -649,11 +648,6 @@ enum ErrorCode stop_all_no_lock(void)
        // stop all only if it has not been called yet
        if (check_running_status(&prof_session)) {
                msg = gen_stop_msg();
-               if(thaw_subgroup()) {
-                       LOGE("Cannot thaw subgroup\n");
-                       error_code = ERR_UNKNOWN;
-                       goto stop_all_exit;
-               }
                terminate_all();
                stop_profiling();
 

diff --git a/daemon/daemon.c b/daemon/daemon.c
index e3fe0db..1d85045 100644 (file)
--- a/daemon/daemon.c
+++ b/daemon/daemon.c
@@ -63,7 +63,6 @@
 #include "input_events.h"
 #include "smack.h"
 #include "us_interaction_msg.h"
-#include "freezing.h"
 #include "debug.h"
 
 #define DA_WORK_DIR                    "/home/developer/sdk_tools/da/"
@@ -610,8 +609,7 @@ static Eina_Bool target_event_cb(void *data, Ecore_Fd_Handler *fd_handler)
  */
 static int targetServerHandler(void)
 {
-       msg_target_t log, pid_msg;
-       ssize_t recvlen;
+       msg_target_t log;
 
        int index = getEmptyTargetSlot();
        if (index == MAX_TARGET_COUNT) {
@@ -620,7 +618,7 @@ static int targetServerHandler(void)
        }
 
        manager.target[index].socket =
-               accept(manager.target_server_socket, NULL, NULL);
+           accept(manager.target_server_socket, NULL, NULL);
 
        if (manager.target[index].socket >= 0) {
                /* accept succeed */
@@ -874,17 +872,6 @@ static int kernel_handler(void)
                goto free_and_end;
        }
 
-       switch(*(enum us_interaction_k2u_msg_t *) msg->data) {
-       case US_INT_PAUSE_APPS:
-               freeze_subgroup();
-               break;
-       case US_INT_CONT_APPS:
-               thaw_subgroup();
-               break;
-       default:
-               LOGE("Unknown command\n");
-       }
-
        /* Insert your message handler here */
 
        ret = 0;

diff --git a/daemon/freezing.c b/daemon/freezing.c
deleted file mode 100644 (file)
index 9dac901..0000000
--- a/daemon/freezing.c
+++ /dev/null
@@ -1,158 +0,0 @@
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
-
-#include "freezing.h"
-#include "debug.h"
-
-#define FREEZER_SUBGROUP "/sys/fs/cgroup/freezer/swap"
-#define FREEZER_TASKS FREEZER_SUBGROUP "/tasks"
-#define FREEZER_STATE FREEZER_SUBGROUP "/freezer.state"
-
-#define US_MANAGER_TASKS "/sys/kernel/debug/swap/us_manager/tasks"
-
-static FILE *f_tasks_fd = NULL, *f_state_fd = NULL, *f_us_man_fd = NULL;
-static const char *freezer_frozen = "FROZEN";
-static const char *freezer_thawed = "THAWED";
-
-static int open_freezer_files(void)
-{
-       f_tasks_fd = fopen(FREEZER_TASKS, "w+");
-       if (f_tasks_fd == NULL)
-               return -1;
-
-       f_state_fd = fopen(FREEZER_STATE, "w");
-       if (f_state_fd == NULL)
-               return -1;
-
-       f_us_man_fd = fopen(US_MANAGER_TASKS, "r");
-       if (f_us_man_fd == NULL)
-               return -1;
-
-       return 0;
-}
-
-static int close_freezer_files(void)
-{
-       int res = 0;
-
-       if (f_tasks_fd != NULL)
-               res = fclose(f_tasks_fd);
-
-       if (f_state_fd != NULL)
-               res |= fclose(f_state_fd);
-
-       if (f_us_man_fd != NULL)
-               res |= fclose(f_us_man_fd);
-
-       return res;
-}
-
-int create_freezer_subgroup(void)
-{
-       struct stat st;
-       int res = 0;
-
-       if (stat(FREEZER_SUBGROUP, &st) == -1) {
-               res = mkdir(FREEZER_SUBGROUP, 0700);
-               if (res)
-                       return res;
-       }
-
-       res = open_freezer_files();
-
-       return res;
-}
-
-int destroy_freezer_subgroup(void)
-{
-       struct stat st;
-       int res = 0;
-
-       res = thaw_subgroup();
-       if (res)
-               return res;
-
-       res = close_freezer_files();
-       if (res)
-               return res;
-
-       if (stat(FREEZER_SUBGROUP, &st) != -1)
-               res = rmdir(FREEZER_SUBGROUP);
-
-       return res;
-}
-
-static int add_tasks_to_freezer(void)
-{
-       ssize_t res;
-       pid_t pid;
-
-       if (f_tasks_fd == NULL) {
-               LOGE("Tasks freezer subgroup file is closed\n");
-               return -1;
-       }
-
-       if (f_us_man_fd == NULL) {
-               LOGE("Us_manager tasks file is closed\n");
-               return -1;
-       }
-
-       while(fscanf(f_us_man_fd, "%u", &pid) == 1) {
-               res = fprintf(f_tasks_fd, "%u", pid);
-               if (res < 0) {
-                       LOGE("Cannot add task %u to freezer group\n", pid);
-                       return -1;
-               }
-       }
-       fflush(f_tasks_fd);
-
-       return 0;
-}
-
-int freeze_subgroup(void)
-{
-       size_t len = strlen(freezer_frozen) + 1;
-       ssize_t res;
-
-       if (f_state_fd == NULL) {
-               LOGE("Freezer.state subgroup file is closed\n");
-               return -1;
-       }
-
-       res = add_tasks_to_freezer();
-       if (res) {
-               LOGE("Cannot add tasks to freezer\n");
-               return -1;
-       }
-
-       res = fwrite(freezer_frozen, len, 1, f_state_fd);
-       if (res < 0) {
-               LOGE("Cannot set FROZEN state\n");
-               return -1;
-       }
-       fflush(f_state_fd);
-
-       return 0;
-}
-
-int thaw_subgroup(void)
-{
-       size_t len = strlen(freezer_thawed) + 1;
-       ssize_t res;
-
-       if (f_state_fd == NULL) {
-               LOGE("Freezer.state subgroup file is closed\n");
-               return -1;
-       }
-
-       res = fwrite(freezer_thawed, len, 1, f_state_fd);
-       if (res < 0) {
-               LOGE("Cannot set THAWED state\n");
-               return -1;
-       }
-       fflush(f_state_fd);
-
-       return 0;
-}

diff --git a/daemon/freezing.h b/daemon/freezing.h
deleted file mode 100644 (file)
index 0607eae..0000000
--- a/daemon/freezing.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef __FREEZING_H__
-#define __FREEZING_H__
-
-int create_freezer_subgroup(void);
-int destroy_freezer_subgroup(void);
-int freeze_subgroup(void);
-int thaw_subgroup(void);
-
-#endif /* __FREEZING_H__ */

diff --git a/daemon/main.c b/daemon/main.c
index 8e5ffbf..519c3a2 100644 (file)
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -53,7 +53,6 @@
 #include "utils.h"
 #include "smack.h"
 #include "us_interaction_msg.h"
-#include "freezing.h"
 
 #define SINGLETON_LOCKFILE                     "/tmp/da_manager.lock"
 #define PORTFILE                                       "/tmp/port.da"
@@ -478,12 +477,6 @@ int main()
        if (err)
                return 1;
 
-       err = create_freezer_subgroup();
-       if (err) {
-               LOGE("cannot create freezer subgroup");
-               return 1;
-       }
-
        //init all file descriptors
        init_system_file_descriptors();
        //daemon work
@@ -492,7 +485,6 @@ int main()
        daemonLoop();
        LOGI("daemon loop finished\n");
        stop_all();
-       destroy_freezer_subgroup();
        finalizeManager();
 
        close_system_file_descriptors();