Move /tmp/* to /run/swap/*

systemd triggers:
	- /run/swap/trigger/auxd
	- /run/swap/trigger/memd
	- /run/swap/trigger/module
	- /run/swap/trigger_shell/swap_manager

swap_manager:
	- /run/swap/manager.log
	- /run/swap/manager.lock
	- /run/swap/manager/pid
	- /run/swap/manager/port
	- /run/swap/lib.socket
	- /run/swap/ui_lib.socket

swap_auxd:
	- /run/swap/swap_auxd.socket

swap_memd:
	- /run/swap/swap_memd.socket

UIHV:
	- /run/swap/uilib.log

Change-Id: I8133edbd5be3b45df79f022a22ef304cf9c5e11b
Signed-off-by: Vyacheslav Cherkashin <v.cherkashin@samsung.com>

diff --git a/daemon/da_debug.c b/daemon/da_debug.c
index 1ffeeb1..5ccacb4 100644 (file)
--- a/daemon/da_debug.c
+++ b/daemon/da_debug.c
@@ -39,7 +39,7 @@
 #include "swap_debug.h"
 #include <errno.h>
 
-#define DEBUG_LOGFILE          "/tmp/daemonlog.da"
+#define DEBUG_LOGFILE          "/run/swap/manager.log"
 
 #if DEBUG
 static inline int close_on_exec_dup(int old, int new)

diff --git a/daemon/daemon.c b/daemon/daemon.c
index ffe25a9..10c6b39 100644 (file)
--- a/daemon/daemon.c
+++ b/daemon/daemon.c
@@ -73,7 +73,7 @@
 
 #define DA_WORK_DIR                    "/home/developer/sdk_tools/da/"
 #define DA_READELF_PATH                        "/home/developer/sdk_tools/da/readelf"
-#define SCREENSHOT_DIR                 "/tmp/da"
+#define SCREENSHOT_DIR                 "/run/swap/tmp/da"
 
 #define MAX_APP_LAUNCH_TIME            60
 #define MAX_CONNECT_TIMEOUT_TIME       5*60
@@ -206,7 +206,7 @@ static inline int get_apps_to_run()
 
 static int exec_app_case_type_tizen(const struct app_info_t *app_info)
 {
-       const char ui_viewer_log[] = "/tmp/uilib.log";
+       const char ui_viewer_log[] = "/run/swap/uilib.log";
 
        if (is_feature_enabled(FL_UI_VIEWER_PROFILING))
                if (ui_viewer_enable(app_info))

diff --git a/daemon/extern_service.c b/daemon/extern_service.c
index 07586d6..dfb0514 100644 (file)
--- a/daemon/extern_service.c
+++ b/daemon/extern_service.c
@@ -4,9 +4,9 @@
 
 
 static const int ES_TIMEOUT = 30;
-static const char CMD_AUXD_PATH[] = "/tmp/swap/auxd";
-static const char CMD_MEMD_PATH[] = "/tmp/swap/memd";
-static const char CMD_MODULE_PATH[] = "/tmp/swap/module";
+static const char CMD_AUXD_PATH[] = "/run/swap/trigger/auxd";
+static const char CMD_MEMD_PATH[] = "/run/swap/trigger/memd";
+static const char CMD_MODULE_PATH[] = "/run/swap/trigger/module";
 
 
 static int run_service(const char *path, const char *cmd,

diff --git a/daemon/main.c b/daemon/main.c
index 716e1b7..f8d5a35 100644 (file)
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -55,10 +55,10 @@
 #include "cpp/memd/memd_client_c.h"
 #include "cpp/features/feature_manager_c.h"
 
-#define SINGLETON_LOCKFILE                     "/tmp/da_manager.lock"
-#define PORTFILE                                       "/tmp/port.da"
-#define UDS_NAME                                       "/tmp/da.socket"
-#define UIS_NAME                                       "/tmp/da_ui.socket"
+#define SINGLETON_LOCKFILE                     "/run/swap/manager.lock"
+#define PORTFILE                               "/run/swap/manager/port"
+#define UDS_NAME                               "/run/swap/lib.socket"
+#define UIS_NAME                               "/run/swap/ui_lib.socket"
 
 #define INIT_PORT                              8001
 #define LIMIT_PORT                             8100
@@ -105,7 +105,7 @@ __da_manager manager =
 
 static int manager_auxd_client_init(__da_manager *m)
 {
-       const char AUXD_SOCKET_PATH[] = "/tmp/swap_auxd.socket";
+       const char AUXD_SOCKET_PATH[] = "/run/swap/swap_auxd.socket";
 
        int ret;
        struct auxd_client *c;
@@ -137,7 +137,7 @@ static void manager_auxd_client_uninit(__da_manager *m)
 
 static int manager_memd_client_init(__da_manager *m)
 {
-       const char MEMD_SOCKET_PATH[] = "/tmp/swap_memd.socket";
+       const char MEMD_SOCKET_PATH[] = "/run/swap/swap_memd.socket";
 
        int ret;
        struct memd_client *c;

diff --git a/daemon/sys_stat.c b/daemon/sys_stat.c
index 71cf4a3..5513f1a 100644 (file)
--- a/daemon/sys_stat.c
+++ b/daemon/sys_stat.c
@@ -1000,7 +1000,7 @@ static int parse_proc_smaps_file_bypid(char *path, proc_t *P)
 
        /* FIXME: rework this code (save to file, read file, remove file) */
        const int tmp_suffixlen = 6;
-       char tmp_path[] = "/tmp/swap_smaps_XXXXXX.smaps";
+       char tmp_path[] = "/run/swap/tmp/swap_smaps_XXXXXX.smaps";
        bool ret = save_request_to_tmpfile(path_smaps, tmp_path, tmp_suffixlen);
        if (!ret) {
                LOGE("Cannot save smaps to tmpfile\n");

diff --git a/daemon/threads.c b/daemon/threads.c
index eb1c60d..da4954b 100644 (file)
--- a/daemon/threads.c
+++ b/daemon/threads.c
@@ -157,7 +157,7 @@ static void send_screenshot_msg(const char *path, uint32_t angle,
 static void processing_app_msg_image(const void *data, size_t len)
 {
        const int suffixlen = 4; /* ".png" */
-       char path[] = "/tmp/screenshot_XXXXXX.png";
+       char path[] = "/run/swap/tmp/screenshot_XXXXXX.png";
        uint32_t angle;
        const char *sh_data;
 
@@ -193,7 +193,7 @@ static void processing_app_msg_image(const void *data, size_t len)
 static void processing_ui_screenshot(const void *data, size_t len)
 {
        const int suffixlen = 4; /* ".png" */
-       char path[] = "/tmp/ui_screenshot_XXXXXX.png";
+       char path[] = "/run/swap/tmp/ui_screenshot_XXXXXX.png";
        enum ErrorCode err_code;
        const char *sh_data = data + 4;
        const size_t sh_len = len - 4;
@@ -236,7 +236,7 @@ static void send_uihv_data_msg(const char *path, size_t path_len)
 
 static void processing_uihv_data_common(const void *data, size_t len)
 {
-       char path[] = "/tmp/uihv_data_XXXXXX";
+       char path[] = "/run/swap/tmp/uihv_data_XXXXXX";
 
        if (!save_data_to_tmpfile(path, 0, data, len))
                send_uihv_data_msg(path, sizeof(path));

diff --git a/scripts/da_manager_systemd.sh b/scripts/da_manager_systemd.sh
index 5888b58..fd41e70 100644 (file)
--- a/scripts/da_manager_systemd.sh
+++ b/scripts/da_manager_systemd.sh
@@ -4,12 +4,12 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 
 
 TIMEOUT=30
-EXEC_PATH=/tmp/swap_manager
-ERROR_PATH=/tmp/swap_manager_error
+EXEC_PATH=/run/swap/trigger_shell/swap_manager
+ERROR_PATH=/run/swap/trigger_shell/swap_manager_error
 
 manager_pid()
 {
-       /bin/cat /tmp/swap_manager.pid 2> /dev/null
+       /bin/cat /run/swap/manager/pid 2> /dev/null
 }
 
 

diff --git a/src/auxd/src/main.cpp b/src/auxd/src/main.cpp
index d2807da..7a024f1 100644 (file)
--- a/src/auxd/src/main.cpp
+++ b/src/auxd/src/main.cpp
@@ -35,7 +35,7 @@
 
 
 static const int CONNECT_TIMEOUT = 10 * 1000;
-static const char SOCKET_PATH[] = "/tmp/swap_auxd.socket";
+static const char SOCKET_PATH[] = "/run/swap/swap_auxd.socket";
 
 
 static void do_aux_tizen_app_launch(const AUXD::LaunchRequest &request,

diff --git a/src/memd/src/main.cpp b/src/memd/src/main.cpp
index ae1849a..7f167d6 100644 (file)
--- a/src/memd/src/main.cpp
+++ b/src/memd/src/main.cpp
@@ -33,7 +33,7 @@
 
 
 static const int CONNECT_TIMEOUT = 10 * 1000;
-static const char SOCKET_PATH[] = "/tmp/swap_memd.socket";
+static const char SOCKET_PATH[] = "/run/swap/swap_memd.socket";
 
 
 static bool read_file(const char *filename, std::string &out)

diff --git a/systemd/swap.conf b/systemd/swap.conf
index 1f7ff8b..68e2a40 100644 (file)
--- a/systemd/swap.conf
+++ b/systemd/swap.conf
@@ -1,15 +1,31 @@
-# setup /tmp/da
-d /tmp/da 0777 system_fw system_fw -
-t /tmp/da - - - - security.SMACK64=_
+# setup /run/swap
+d /run/swap 1777 system_fw system_fw
+t /run/swap - - - - security.SMACK64=System::Run
 
-# setup /tmp/port.da
-f /tmp/port.da 0644 system_fw system_fw -
-t /tmp/port.da - - - - security.SMACK64=System::Shared
+# setup /run/swap/tmp
+d /run/swap/tmp 1777 system_fw system_fw
+t /run/swap/tmp - - - - security.SMACK64=*
 
-# setup /tmp/swap_manager.pid
-f /tmp/swap_manager.pid 0644 system_fw system_fw -
-t /tmp/swap_manager.pid - - - - security.SMACK64=System::Shared
+# setup /run/swap/tmp/da
+d /run/swap/tmp/da 0777 system_fw system_fw -
+t /run/swap/tmp/da - - - - security.SMACK64=*
 
-# setup /tmp/swap/
-d /tmp/swap 0777 system_fw system_fw -
-t /tmp/swap - - - - security.SMACK64=System::Privileged
+# setup /run/swap/manager
+d /run/swap/manager 0755 system_fw system_fw -
+t /run/swap/manager - - - - security.SMACK64=System::Shared
+
+# setup /run/swap/manager/port
+f /run/swap/manager/port 0644 system_fw system_fw -
+t /run/swap/manager/port - - - - security.SMACK64=System::Shared
+
+# setup /run/swap/manager/pid
+f /run/swap/manager/pid 0644 system_fw system_fw -
+t /run/swap/manager/pid - - - - security.SMACK64=System::Shared
+
+# setup /run/swap/trigger
+d /run/swap/trigger 0777 system_fw system_fw -
+t /run/swap/trigger - - - - security.SMACK64=System::Privileged
+
+# setup /run/swap/trigger_shell
+d /run/swap/trigger_shell 0777 system_fw system_fw -
+t /run/swap/trigger_shell - - - - security.SMACK64=*

diff --git a/systemd/swap_auxd.path b/systemd/swap_auxd.path
index 99f4b5d..cd181bb 100644 (file)
--- a/systemd/swap_auxd.path
+++ b/systemd/swap_auxd.path
@@ -2,7 +2,7 @@
 Description=swap_auxd trigger
 
 [Path]
-PathExists=/tmp/swap/auxd
+PathExists=/run/swap/trigger/auxd
 
 [Install]
 WantedBy=multi-user.target

diff --git a/systemd/swap_auxd.service b/systemd/swap_auxd.service
index 603a44e..0fbf6b3 100644 (file)
--- a/systemd/swap_auxd.service
+++ b/systemd/swap_auxd.service
@@ -11,7 +11,7 @@ SmackProcessLabel=System
 Sockets=swap_auxd.socket
 
 ExecStart=/usr/bin/swap_auxd
-ExecStartPost=/bin/rm -f /tmp/swap/auxd
+ExecStartPost=/bin/rm -f /run/swap/trigger/auxd
 
 StandardOutput=journal+console
 StandardError=journal+console

diff --git a/systemd/swap_auxd.socket b/systemd/swap_auxd.socket
index 1b2c255..d1cbb07 100644 (file)
--- a/systemd/swap_auxd.socket
+++ b/systemd/swap_auxd.socket
@@ -2,7 +2,7 @@
 Description=swap_auxd socket
 
 [Socket]
-ListenStream=/tmp/swap_auxd.socket
+ListenStream=/run/swap/swap_auxd.socket
 SmackLabelIPIn=*
 SmackLabelIPOut=@
 

diff --git a/systemd/swap_manager.path b/systemd/swap_manager.path
index 5f3e027..6433d35 100644 (file)
--- a/systemd/swap_manager.path
+++ b/systemd/swap_manager.path
@@ -2,7 +2,7 @@
 Description=swap_manager trigger
 
 [Path]
-PathExists=/tmp/swap_manager
+PathExists=/run/swap/trigger_shell/swap_manager
 
 [Install]
 WantedBy=multi-user.target

diff --git a/systemd/swap_manager.service b/systemd/swap_manager.service
index 416ab39..3e95591 100644 (file)
--- a/systemd/swap_manager.service
+++ b/systemd/swap_manager.service
@@ -12,7 +12,7 @@ Group=system_fw
 SmackProcessLabel=System
 Sockets=swap_manager.socket
 
-ExecStartPre=/bin/rm -f /tmp/swap_manager_error
+ExecStartPre=/bin/rm -f /run/swap/trigger_shell/swap_manager_error
 ExecStart=/usr/bin/swap_manager
-ExecStartPost=/bin/sh -c '/bin/echo $MAINPID > /tmp/swap_manager.pid; /bin/rm -f /tmp/swap_manager'
-ExecStopPost=/bin/sh -c '/bin/echo "" > /tmp/swap_manager.pid; /bin/rm -f /tmp/swap_manager'
+ExecStartPost=/bin/sh -c '/bin/echo $MAINPID > /run/swap/manager/pid; /bin/rm -f /run/swap/trigger_shell/swap_manager'
+ExecStopPost=/bin/sh -c '/bin/echo "" > /run/swap/manager/pid; /bin/rm -f /run/swap/trigger_shell/swap_manager'

diff --git a/systemd/swap_manager.socket b/systemd/swap_manager.socket
index 5da1034..2d58245 100644 (file)
--- a/systemd/swap_manager.socket
+++ b/systemd/swap_manager.socket
@@ -1,19 +1,19 @@
 [Unit]
 Description=swap_manager sockets
 
-# da.socket
+# lib.socket
 [Socket]
 SocketUser=owner
 SocketGroup=users
-ListenStream=/tmp/da.socket
+ListenStream=/run/swap/lib.socket
 SmackLabelIPIn=*
 SmackLabelIPOut=@
 
-# da_ui.socket
+# ui_lib.socket
 [Socket]
 SocketUser=owner
 SocketGroup=users
-ListenStream=/tmp/da_ui.socket
+ListenStream=/run/swap/ui_lib.socket
 SmackLabelIPIn=*
 SmackLabelIPOut=@
 

diff --git a/systemd/swap_memd.path b/systemd/swap_memd.path
index d27491a..af1e459 100644 (file)
--- a/systemd/swap_memd.path
+++ b/systemd/swap_memd.path
@@ -2,7 +2,7 @@
 Description=swap_memd trigger
 
 [Path]
-PathExists=/tmp/swap/memd
+PathExists=/run/swap/trigger/memd
 
 [Install]
 WantedBy=multi-user.target

diff --git a/systemd/swap_memd.service b/systemd/swap_memd.service
index 8c7fd1a..219ac7e 100644 (file)
--- a/systemd/swap_memd.service
+++ b/systemd/swap_memd.service
@@ -11,7 +11,7 @@ SmackProcessLabel=System
 Sockets=swap_memd.socket
 
 ExecStart=/usr/bin/swap_memd
-ExecStartPost=/bin/rm -f /tmp/swap/memd
+ExecStartPost=/bin/rm -f /run/swap/trigger/memd
 
 StandardOutput=journal+console
 StandardError=journal+console

diff --git a/systemd/swap_memd.socket b/systemd/swap_memd.socket
index d922bd5..f9b7ad4 100644 (file)
--- a/systemd/swap_memd.socket
+++ b/systemd/swap_memd.socket
@@ -2,7 +2,7 @@
 Description=swap_memd socket
 
 [Socket]
-ListenStream=/tmp/swap_memd.socket
+ListenStream=/run/swap/swap_memd.socket
 SmackLabelIPIn=*
 SmackLabelIPOut=@
 

diff --git a/systemd/swap_module.path b/systemd/swap_module.path
index 449e2f5..34730e6 100644 (file)
--- a/systemd/swap_module.path
+++ b/systemd/swap_module.path
@@ -2,7 +2,7 @@
 Description=The SWAP modules trigger
 
 [Path]
-PathExists=/tmp/swap/module
+PathExists=/run/swap/trigger/module
 
 [Install]
 WantedBy=multi-user.target

diff --git a/systemd/swap_module.service b/systemd/swap_module.service
index 7592b1d..e83b0c7 100644 (file)
--- a/systemd/swap_module.service
+++ b/systemd/swap_module.service
@@ -7,6 +7,6 @@ User=system_fw
 Group=system_fw
 SmackProcessLabel=System::Privileged
 
-# $(/bin/cat /tmp/swap/module) - get command
-ExecStart=/bin/sh -c '/usr/bin/swap_module.sh $(/bin/cat /tmp/swap/module)'
-ExecStopPost=/bin/rm -f /tmp/swap/module
+# $(/bin/cat /run/swap/trigger/module) - get command
+ExecStart=/bin/sh -c '/usr/bin/swap_module.sh $(/bin/cat /run/swap/trigger/module)'
+ExecStopPost=/bin/rm -f /run/swap/trigger/module

diff --git a/ui_viewer/ui_viewer_lib.c b/ui_viewer/ui_viewer_lib.c
index 0523f38..7f995a2 100644 (file)
--- a/ui_viewer/ui_viewer_lib.c
+++ b/ui_viewer/ui_viewer_lib.c
@@ -45,7 +45,7 @@
 #include "ui_viewer_data.h"
 #include "ui_viewer_screenshot.h"
 
-static const char socket_name[] = "/tmp/da_ui.socket";
+static const char socket_name[] = "/run/swap/ui_lib.socket";
 
 int            g_timerfd = 0;
 long           g_total_alloc_size = 0;

diff --git a/ui_viewer/ui_viewer_utils.c b/ui_viewer/ui_viewer_utils.c
index c61f24d..cd98e71 100644 (file)
--- a/ui_viewer/ui_viewer_utils.c
+++ b/ui_viewer/ui_viewer_utils.c
@@ -44,7 +44,7 @@
 #include "ui_viewer_data.h"
 
 
-static const char log_filename[] = "/tmp/uilib.log";
+static const char log_filename[] = "/run/swap/uilib.log";
 static pthread_mutex_t log_lock = PTHREAD_MUTEX_INITIALIZER;
 static pid_t gPid = -1;
 static __thread pid_t          gTid = -1;

diff --git a/ui_viewer/ui_viewer_utils.h b/ui_viewer/ui_viewer_utils.h
index e5a28a9..056143b 100644 (file)
--- a/ui_viewer/ui_viewer_utils.h
+++ b/ui_viewer/ui_viewer_utils.h
@@ -36,7 +36,7 @@
 #include "ui_viewer_data.h"
 
 #define DA_LOG_MAX             4096
-#define TMP_DIR "/tmp/da"
+#define TMP_DIR "/run/swap/tmp/da"
 
 #define __unused __attribute__((unused))