refactoring system-server code structure

make some directory depending on the type of device
 :core(main), battery, bs, cpu, mmc, cpu, proc, ta, time, usb and vibrator
each "c" file move into suitable directory

Signed-off-by: jy910.yun <jy910.yun@samsung.com>
Change-Id: Id4ce8696dbc168f3882c6ed1e777559bf59d35c8

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f6f6a9f..1892dae 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,28 +6,28 @@ SET(DEVICED_NAME deviced)
 SET(VERSION 0.1.0)
 
 SET(SRCS
-       ss_main.c
-       ss_sysnoti.c
-       ss_launch.c
-       ss_queue.c
-       ss_core.c
-       ss_sig_handler.c
-       ss_log.c
-       ss_device_change_handler.c
-       ss_predefine.c
-       ss_noti.c
-       ss_lowbat_handler.c
-       ss_lowmem_handler.c
-       ss_pmon_handler.c
-       ss_mmc_handler.c
-       ss_usb_handler.c
-       ss_ta_handler.c
-       ss_bs.c
-       ss_procmgr.c
-       ss_timemgr.c
-       ss_cpu_handler.c
-       ss_common.c
-       ss_vibrator.c)
+       src/core/main.c
+       src/core/sysnoti.c
+       src/core/launch.c
+       src/core/queue.c
+       src/core/core.c
+       src/core/sig-handler.c
+       src/core/log.c
+       src/core/device-change-handler.c
+       src/core/predefine.c
+       src/core/noti.c
+       src/battery/lowbat-handler.c
+       src/proc/lowmem-handler.c
+       src/proc/pmon-handler.c
+       src/mmc/mmc-handler.c
+       src/usb/usb-handler.c
+       src/ta/ta-handler.c
+       src/bs/bs.c
+       src/proc/procmgr.c
+       src/time/time-handler.c
+       src/cpu/cpu-handler.c
+       src/core/common.c
+       src/vibrator/vibrator.c)
 
 # libdeviced
 SET(DEVICED_SRCS
@@ -36,12 +36,12 @@ SET(DEVICED_SRCS
 SET(DEVICED_HEADERS
        src/deviced/dd-battery.h)
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src)
 
 # libdeviced
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/deviced)
 
-SET(MOVINAND_FORMAT movi_format.sh)
+SET(MOVINAND_FORMAT scripts/movi_format.sh)
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs REQUIRED
@@ -67,9 +67,7 @@ ENDFOREACH(flag)
 
 # libdeviced
 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden")
-
 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -g -fno-omit-frame-pointer -finstrument-functions")
-
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 MESSAGE("FLAGS: ${CMAKE_C_FLAGS}")
@@ -108,8 +106,8 @@ INSTALL(FILES ${MOVINAND_FORMAT} DESTINATION bin)
 INSTALL(FILES ${UDEV_RULES} DESTINATION ${UDEV_RULES_PATH})
 INSTALL(FILES system-server.conf DESTINATION /etc/dbus-1/system.d)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/packaging/system-server.rule DESTINATION /opt/etc/smack/accesses.d)
-INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/mmc-smack-label DESTINATION bin)
-INSTALL(PROGRAMS shutdown.sh DESTINATION /usr/lib/system-server)
+INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/scripts/mmc-smack-label DESTINATION bin)
+INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/scripts/shutdown.sh DESTINATION /usr/lib/system-server)
 
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/system-server.service DESTINATION /usr/lib/systemd/system)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/system-server.socket  DESTINATION /usr/lib/systemd/system)

diff --git a/packaging/system-server.changes b/packaging/system-server.changes
index d048d0a..31be7ce 100644 (file)
--- a/packaging/system-server.changes
+++ b/packaging/system-server.changes
@@ -1,3 +1,6 @@
+* Mon Oct 27 2013 Jiyoung Yun <jy910.yun@samsung.com> accepted/tizen/20130912.195534@09ee5a9
+- refactoring system-server code structure
+
 * Thu Aug 22 2013 Maciej Wereski <m.wereski@partner.samsung.com> accepted/tizen/20130710.221248@1177917
 - Move rc.shutdown from system-plugin-slp
 

diff --git a/mmc-smack-label b/scripts/mmc-smack-label
similarity index 100%
rename from mmc-smack-label
rename to scripts/mmc-smack-label

diff --git a/movi_format.sh b/scripts/movi_format.sh
similarity index 100%
rename from movi_format.sh
rename to scripts/movi_format.sh

diff --git a/shutdown.sh b/scripts/shutdown.sh
similarity index 100%
rename from shutdown.sh
rename to scripts/shutdown.sh

diff --git a/ss_lowbat_handler.c b/src/battery/lowbat-handler.c
similarity index 98%
rename from ss_lowbat_handler.c
rename to src/battery/lowbat-handler.c
index 5f97290..07b30bd 100755 (executable)
--- a/ss_lowbat_handler.c
+++ b/src/battery/lowbat-handler.c
@@ -21,13 +21,13 @@
 #include <vconf.h>
 #include <sysman.h>
 #include <fcntl.h>
+#include <device-node.h>
 
-#include "ss_log.h"
-#include "ss_launch.h"
-#include "ss_noti.h"
-#include "ss_queue.h"
-#include "device-node.h"
-#include "include/ss_data.h"
+#include "core/log.h"
+#include "core/launch.h"
+#include "core/noti.h"
+#include "core/queue.h"
+#include "core/data.h"
 
 #define BAT_MON_INTERVAL               30
 #define BAT_MON_INTERVAL_MIN           2

diff --git a/ss_bs.c b/src/bs/bs.c
similarity index 99%
rename from ss_bs.c
rename to src/bs/bs.c
index 20a2c3e..33ec8cd 100644 (file)
--- a/ss_bs.c
+++ b/src/bs/bs.c
@@ -30,8 +30,8 @@
 #include <dirent.h>
 #include <Ecore_File.h>
 
-#include "ss_log.h"
-#include "ss_launch.h"
+#include "core/log.h"
+#include "core/launch.h"
 
 #define CRASH_PID_MAX 7
 #define CRASH_MODE_MAX 2

diff --git a/ss_bs.h b/src/bs/bs.h
similarity index 90%
rename from ss_bs.h
rename to src/bs/bs.h
index b7cc77f..c4ca9ce 100644 (file)
--- a/ss_bs.h
+++ b/src/bs/bs.h
@@ -15,9 +15,9 @@
  */
 
 
-#ifndef __SS_BS_H__
-#define __SS_BS_H__
+#ifndef __BS_H__
+#define __BS_H__
 
 int ss_bs_init(void);
 
-#endif /* __SS_BS_H__ */
+#endif /* __BS_H__ */

diff --git a/ss_common.c b/src/core/common.c
similarity index 100%
rename from ss_common.c
rename to src/core/common.c

diff --git a/src/core/common.h b/src/core/common.h
new file mode 100644 (file)
index 0000000..6f1c2d7
--- /dev/null
+++ b/src/core/common.h
@@ -0,0 +1,7 @@
+#ifndef __COMMON_H__
+#define __COMMON_H__
+
+FILE * open_proc_oom_adj_file(int pid, const char *mode);
+
+#endif /* __COMMON_H__ */
+

diff --git a/ss_core.c b/src/core/core.c
similarity index 96%
rename from ss_core.c
rename to src/core/core.c
index a5fb577..3474d2c 100644 (file)
--- a/ss_core.c
+++ b/src/core/core.c
@@ -16,11 +16,11 @@
 
 
 #include <sysman.h>
-#include "include/ss_data.h"
-#include "ss_queue.h"
-#include "ss_log.h"
-#include "ss_predefine.h"
-#include "ss_core.h"
+#include "data.h"
+#include "queue.h"
+#include "log.h"
+#include "predefine.h"
+#include "core.h"
 
 enum ss_core_cmd_type {
        SS_CORE_ACT_RUN,

diff --git a/ss_core.h b/src/core/core.h
similarity index 87%
rename from ss_core.h
rename to src/core/core.h
index d35e345..34f5501 100644 (file)
--- a/ss_core.h
+++ b/src/core/core.h
@@ -15,13 +15,13 @@
  */
 
 
-#ifndef __SS_CORE_H__
-#define __SS_CORE_H__
+#ifndef __CORE_H__
+#define __CORE_H__
 
-#include "include/ss_data.h"
+#include "data.h"
 
 int ss_core_action_run();
 int ss_core_action_clear(int pid);
 int ss_core_init(struct ss_main_data *ad);
 
-#endif /* __SS_CORE_H__ */
+#endif /* __CORE_H__ */

diff --git a/include/ss_data.h b/src/core/data.h
similarity index 97%
rename from include/ss_data.h
rename to src/core/data.h
index 0a08245..bc6ecb2 100644 (file)
--- a/include/ss_data.h
+++ b/src/core/data.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __SS_DATA_H__
-#define __SS_DATA_H__
+#ifndef __DATA_H__
+#define __DATA_H__
 
 #include <Ecore.h>
 #include <unistd.h>
@@ -108,4 +108,4 @@ struct ss_main_data {
        int noti_fd;
 };
 
-#endif /* __SS_DATA_H__ */
+#endif /* __DATA_H__ */

diff --git a/ss_device_change_handler.c b/src/core/device-change-handler.c
similarity index 99%
rename from ss_device_change_handler.c
rename to src/core/device-change-handler.c
index 9129a24..36ec7a7 100755 (executable)
--- a/ss_device_change_handler.c
+++ b/src/core/device-change-handler.c
@@ -31,14 +31,14 @@
 #include <bundle.h>
 #include <dirent.h>
 #include <libudev.h>
-#include "ss_queue.h"
-#include "ss_log.h"
-#include "ss_device_handler.h"
-#include "device-node.h"
-#include "ss_noti.h"
-#include "include/ss_data.h"
+#include <device-node.h>
+#include "queue.h"
+#include "log.h"
+#include "device-handler.h"
+#include "noti.h"
+#include "data.h"
 #include "sys_pci_noti/sys_pci_noti.h"
-#include "ss_predefine.h"
+#include "predefine.h"
 #define BUFF_MAX               255
 #define SYS_CLASS_INPUT                "/sys/class/input"
 #define USBCON_EXEC_PATH       PREFIX"/bin/usb-server"

diff --git a/ss_device_handler.h b/src/core/device-handler.h
similarity index 89%
rename from ss_device_handler.h
rename to src/core/device-handler.h
index d31f46b..7ebafd3 100644 (file)
--- a/ss_device_handler.h
+++ b/src/core/device-handler.h
@@ -15,10 +15,10 @@
  */
 
 
-#ifndef __SS_DEVICE_HANDLER_H__
-#define __SS_DEVICE_HANDLER_H__
+#ifndef __DEVICE_HANDLER_H__
+#define __DEVICE_HANDLER_H__
 
-#include "include/ss_data.h"
+#include "data.h"
 
 /* MMC functions */
 int ss_mmc_init();
@@ -46,4 +46,4 @@ int ss_ta_init();
 /* device change init */
 int ss_device_change_init(struct ss_main_data *ad);
 
-#endif /* __SS_DEVICE_HANDLER_H__ */
+#endif /* __DEVICE_HANDLER_H__ */

diff --git a/ss_launch.c b/src/core/launch.c
similarity index 99%
rename from ss_launch.c
rename to src/core/launch.c
index 24b77c8..aeab227 100644 (file)
--- a/ss_launch.c
+++ b/src/core/launch.c
@@ -25,8 +25,8 @@
 #include <stdlib.h>
 
 #include "vconf-keys.h"
-#include "ss_log.h"
-#include "ss_launch.h"
+#include "log.h"
+#include "launch.h"
 
 #define MAX_ARGS 255
 

diff --git a/ss_launch.h b/src/core/launch.h
similarity index 91%
rename from ss_launch.h
rename to src/core/launch.h
index 209d383..e69fc83 100644 (file)
--- a/ss_launch.h
+++ b/src/core/launch.h
@@ -15,8 +15,8 @@
  */
 
 
-#ifndef __SS_LAUNCH_H__
-#define __SS_LAUNCH_H__
+#ifndef __LAUNCH_H__
+#define __LAUNCH_H__
 
 #define SS_LAUNCH_NICE          0x0002
 
@@ -24,4 +24,4 @@ int ss_launch_if_noexist(const char *execpath, const char *arg, ...);
 int ss_launch_evenif_exist(const char *execpath, const char *arg, ...);
 int ss_launch_after_kill_if_exist(const char *execpath, const char *arg, ...);
 
-#endif /* __SS_LAUNCH_H__ */
+#endif /* __LAUNCH_H__ */

diff --git a/ss_log.c b/src/core/log.c
similarity index 100%
rename from ss_log.c
rename to src/core/log.c

diff --git a/ss_log.h b/src/core/log.h
similarity index 98%
rename from ss_log.h
rename to src/core/log.h
index db769d0..4cc97c6 100644 (file)
--- a/ss_log.h
+++ b/src/core/log.h
@@ -15,8 +15,8 @@
  */
 
 
-#ifndef __SS_LOG_H__
-#define __SS_LOG_H__
+#ifndef __LOG_H__
+#define __LOG_H__
 
 #include <stdio.h>
 

diff --git a/ss_main.c b/src/core/main.c
similarity index 87%
rename from ss_main.c
rename to src/core/main.c
index d103b50..abd8917 100644 (file)
--- a/ss_main.c
+++ b/src/core/main.c
@@ -20,20 +20,20 @@
 #include <heynoti.h>
 #include <sys/reboot.h>
 
-#include "ss_log.h"
-#include "ss_core.h"
-#include "ss_sig_handler.h"
-#include "ss_device_handler.h"
-#include "ss_pmon_handler.h"
-#include "ss_sysnoti.h"
-#include "ss_noti.h"
-#include "ss_queue.h"
-#include "ss_predefine.h"
-#include "ss_bs.h"
-#include "ss_procmgr.h"
-#include "ss_timemgr.h"
-#include "ss_cpu_handler.h"
-#include "include/ss_data.h"
+#include "log.h"
+#include "core.h"
+#include "sig-handler.h"
+#include "device-handler.h"
+#include "proc/pmon-handler.h"
+#include "sysnoti.h"
+#include "noti.h"
+#include "queue.h"
+#include "predefine.h"
+#include "bs/bs.h"
+#include "proc/procmgr.h"
+#include "time/time-handler.h"
+#include "cpu/cpu-handler.h"
+#include "data.h"
 
 static void fini(struct ss_main_data *ad)
 {

diff --git a/ss_noti.c b/src/core/noti.c
similarity index 98%
rename from ss_noti.c
rename to src/core/noti.c
index c9ed285..9de6a7c 100644 (file)
--- a/ss_noti.c
+++ b/src/core/noti.c
@@ -16,7 +16,7 @@
 
 
 #include <heynoti.h>
-#include "ss_log.h"
+#include "log.h"
 
 static int noti_fd;
 

diff --git a/ss_noti.h b/src/core/noti.h
similarity index 91%
rename from ss_noti.h
rename to src/core/noti.h
index 8040035..025e616 100644 (file)
--- a/ss_noti.h
+++ b/src/core/noti.h
@@ -15,12 +15,12 @@
  */
 
 
-#ifndef __SS_NOTI_H__
-#define __SS_NOTI_H__
+#ifndef __NOTI_H__
+#define __NOTI_H__
 
 int ss_noti_getfd(void);
 int ss_noti_send(char *filename);
 int ss_noti_add(const char *noti, void (*cb) (void *), void *data);
 int ss_noti_init(void);
 
-#endif /* __SS_NOTI_H__ */
+#endif /* __NOTI_H__ */

diff --git a/ss_predefine.c b/src/core/predefine.c
similarity index 98%
rename from ss_predefine.c
rename to src/core/predefine.c
index 82980e0..50e2660 100644 (file)
--- a/ss_predefine.c
+++ b/src/core/predefine.c
@@ -32,17 +32,17 @@
 #include <sys/time.h>
 #include <mntent.h>
 #include <sys/mount.h>
-
-#include "ss_log.h"
-#include "ss_launch.h"
-#include "ss_queue.h"
-#include "ss_device_handler.h"
-#include "device-node.h"
-#include "ss_predefine.h"
-#include "ss_procmgr.h"
-#include "ss_vibrator.h"
-#include "include/ss_data.h"
-#include "ss_common.h"
+#include <device-node.h>
+
+#include "log.h"
+#include "launch.h"
+#include "queue.h"
+#include "device-handler.h"
+#include "predefine.h"
+#include "proc/procmgr.h"
+#include "vibrator/vibrator.h"
+#include "data.h"
+#include "common.h"
 
 #define PREDEFINE_SO_DIR               PREFIX"/lib/ss_predefine/"
 

diff --git a/ss_predefine.h b/src/core/predefine.h
similarity index 90%
rename from ss_predefine.h
rename to src/core/predefine.h
index 1548ec7..eb7bed9 100644 (file)
--- a/ss_predefine.h
+++ b/src/core/predefine.h
@@ -15,8 +15,8 @@
  */
 
 
-#ifndef __SS_PREDEFINE_H__
-#define __SS_PREDEFINE_H__
+#ifndef __PREDEFINE_H__
+#define __PREDEFINE_H__
 #include <bundle.h>
 
 int call_predefine_action(int argc, char **argv);
@@ -24,4 +24,4 @@ void ss_predefine_internal_init(void);
 int is_power_off(void);
 void predefine_pm_change_state(unsigned int s_bits);
 int predefine_control_launch(char *popup_name, bundle *b);
-#endif /* __SS_PREDEFINE_H__ */
+#endif /* __PREDEFINE_H__ */

diff --git a/ss_queue.c b/src/core/queue.c
similarity index 98%
rename from ss_queue.c
rename to src/core/queue.c
index 4269d10..d8f0bce 100644 (file)
--- a/ss_queue.c
+++ b/src/core/queue.c
@@ -17,10 +17,10 @@
 
 #include <sysman.h>
 #include <dlfcn.h>
-#include "include/ss_data.h"
-#include "ss_core.h"
-#include "ss_queue.h"
-#include "ss_log.h"
+#include "data.h"
+#include "core.h"
+#include "queue.h"
+#include "log.h"
 
 #define SS_PREDEFINE_ACT_FUNC_STR              "ss_predefine_action"
 #define SS_IS_ACCESSIBLE_FUNC_STR              "ss_is_accessible"

diff --git a/ss_queue.h b/src/core/queue.h
similarity index 94%
rename from ss_queue.h
rename to src/core/queue.h
index 6b9d899..e7778ab 100644 (file)
--- a/ss_queue.h
+++ b/src/core/queue.h
@@ -15,10 +15,10 @@
  */
 
 
-#ifndef __SS_QUEUE_H__
-#define __SS_QUEUE_H__
+#ifndef __QUEUE_H__
+#define __QUEUE_H__
 
-#include "ss_sysnoti.h"
+#include "sysnoti.h"
 
 struct ss_action_entry {
        int owner_pid;
@@ -63,4 +63,4 @@ int ss_run_queue_del_bypid(int pid);
 
 void ss_queue_init();
 
-#endif /* __SS_QUEUE_H__ */
+#endif /* __QUEUE_H__ */

diff --git a/ss_sig_handler.c b/src/core/sig-handler.c
similarity index 98%
rename from ss_sig_handler.c
rename to src/core/sig-handler.c
index b81dc55..0e5c3f1 100644 (file)
--- a/ss_sig_handler.c
+++ b/src/core/sig-handler.c
@@ -18,7 +18,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include "ss_core.h"
+#include "core.h"
 
 #define PRT_TRACE_ERR(format, args...) do { \
        char buf[255];\

diff --git a/ss_sig_handler.h b/src/core/sig-handler.h
similarity index 87%
rename from ss_sig_handler.h
rename to src/core/sig-handler.h
index 08ab66f..2b4e4de 100644 (file)
--- a/ss_sig_handler.h
+++ b/src/core/sig-handler.h
@@ -15,9 +15,9 @@
  */
 
 
-#ifndef __SS_SIG_HANDLER_H__
-#define __SS_SIG_HANDLER_H__
+#ifndef __SIG_HANDLER_H__
+#define __SIG_HANDLER_H__
 
 void ss_signal_init(void);
 
-#endif /*  __SS_SIG_HANDLER_H__ */
+#endif /*  __SIG_HANDLER_H__ */

diff --git a/ss_sysnoti.c b/src/core/sysnoti.c
similarity index 99%
rename from ss_sysnoti.c
rename to src/core/sysnoti.c
index ec93479..a1f740c 100755 (executable)
--- a/ss_sysnoti.c
+++ b/src/core/sysnoti.c
@@ -22,9 +22,9 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/stat.h>
-#include "include/ss_data.h"
-#include "ss_log.h"
-#include "ss_queue.h"
+#include "data.h"
+#include "log.h"
+#include "queue.h"
 
 #define SYSNOTI_SOCKET_PATH "/tmp/sn"
 #define RETRY_READ_COUNT       5

diff --git a/ss_sysnoti.h b/src/core/sysnoti.h
similarity index 90%
rename from ss_sysnoti.h
rename to src/core/sysnoti.h
index e76d156..2095038 100644 (file)
--- a/ss_sysnoti.h
+++ b/src/core/sysnoti.h
@@ -15,8 +15,8 @@
  */
 
 
-#ifndef __SS_SYSNOTI_H__
-#define __SS_SYSNOTI_H__
+#ifndef __SYSNOTI_H__
+#define __SYSNOTI_H__
 
 #define SYSMAN_MAXARG  16
 
@@ -31,4 +31,4 @@ struct sysnoti {
 
 int ss_sysnoti_init(void);
 
-#endif /* __SS_SYSNOTI_H__ */
+#endif /* __SYSNOTI_H__ */

diff --git a/ss_cpu_handler.c b/src/cpu/cpu-handler.c
similarity index 99%
rename from ss_cpu_handler.c
rename to src/cpu/cpu-handler.c
index e9a808e..53eec05 100644 (file)
--- a/ss_cpu_handler.c
+++ b/src/cpu/cpu-handler.c
@@ -16,11 +16,11 @@
 
 
 #include <fcntl.h>
+#include <device-node.h>
+#include <vconf.h>
 
-#include "device-node.h"
-#include "ss_log.h"
-#include "include/ss_data.h"
-#include "vconf.h"
+#include "core/log.h"
+#include "core/data.h"
 
 #define DEFAULT_MAX_CPU_FREQ           1200000
 #define DEFAULT_MIN_CPU_FREQ           100000

diff --git a/ss_cpu_handler.h b/src/cpu/cpu-handler.h
similarity index 92%
rename from ss_cpu_handler.h
rename to src/cpu/cpu-handler.h
index 7c72eb7..9ff9f56 100644 (file)
--- a/ss_cpu_handler.h
+++ b/src/cpu/cpu-handler.h
@@ -15,8 +15,8 @@
  */
 
 
-#ifndef __SS_CPU_HANDLER_H__
-#define __SS_CPU_HANDLER_H__
+#ifndef __CPU_HANDLER_H__
+#define __CPU_HANDLER_H__
 
 int ss_cpu_handler_init(void);
 

diff --git a/ss_mmc_handler.c b/src/mmc/mmc-handler.c
similarity index 99%
rename from ss_mmc_handler.c
rename to src/mmc/mmc-handler.c
index 126175d..831dc0b 100644 (file)
--- a/ss_mmc_handler.c
+++ b/src/mmc/mmc-handler.c
@@ -25,9 +25,9 @@
 #include <dirent.h>
 #include <sys/statfs.h>
 #include <bundle.h>
-#include "ss_log.h"
-#include "ss_device_handler.h"
-#include "ss_predefine.h"
+#include "core/log.h"
+#include "core/device-handler.h"
+#include "core/predefine.h"
 
 #define VCONFKEY_INTERNAL_PRIVATE_MMC_ID       "db/private/sysman/mmc_device_id"
 

diff --git a/ss_lowmem_handler.c b/src/proc/lowmem-handler.c
similarity index 98%
rename from ss_lowmem_handler.c
rename to src/proc/lowmem-handler.c
index fb6db58..c76b605 100644 (file)
--- a/ss_lowmem_handler.c
+++ b/src/proc/lowmem-handler.c
@@ -24,12 +24,12 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/shm.h>
+#include <device-node.h>
 
-#include "device-node.h"
-#include "ss_log.h"
-#include "ss_noti.h"
-#include "ss_queue.h"
-#include "include/ss_data.h"
+#include "core/log.h"
+#include "core/noti.h"
+#include "core/queue.h"
+#include "core/data.h"
 
 #define DELETE_SM              "sh -c "PREFIX"/bin/delete.sm"
 

diff --git a/ss_pmon_handler.c b/src/proc/pmon-handler.c
similarity index 98%
rename from ss_pmon_handler.c
rename to src/proc/pmon-handler.c
index c5476be..6371556 100644 (file)
--- a/ss_pmon_handler.c
+++ b/src/proc/pmon-handler.c
@@ -21,12 +21,12 @@
 #include <limits.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <device-node.h>
 
-#include "device-node.h"
-#include "ss_log.h"
-#include "ss_launch.h"
-#include "include/ss_data.h"
-#include "ss_common.h"
+#include "core/log.h"
+#include "core/launch.h"
+#include "core/data.h"
+#include "core/common.h"
 
 #define PMON_PERMANENT_DIR     "/tmp/permanent"
 

diff --git a/ss_pmon_handler.h b/src/proc/pmon-handler.h
similarity index 84%
rename from ss_pmon_handler.h
rename to src/proc/pmon-handler.h
index 70c7fe4..0eed81b 100644 (file)
--- a/ss_pmon_handler.h
+++ b/src/proc/pmon-handler.h
@@ -15,11 +15,11 @@
  */
 
 
-#ifndef __SS_PMON_HANDLER_H__
-#define __SS_PMON_HANDLER_H__
+#ifndef __PMON_HANDLER_H__
+#define __PMON_HANDLER_H__
 
-#include "include/ss_data.h"
+#include "core/data.h"
 
 int ss_pmon_init(struct ss_main_data *ad);
 
-#endif /* __SS_PMON_HANDLER_H__ */
+#endif /* __PMON_HANDLER_H__ */

diff --git a/ss_procmgr.c b/src/proc/procmgr.c
similarity index 99%
rename from ss_procmgr.c
rename to src/proc/procmgr.c
index de789eb..d951760 100755 (executable)
--- a/ss_procmgr.c
+++ b/src/proc/procmgr.c
@@ -23,9 +23,9 @@
 #include <device-node.h>
 
 #include <sysman.h>
-#include "include/ss_data.h"
-#include "ss_queue.h"
-#include "ss_log.h"
+#include "core/data.h"
+#include "core/queue.h"
+#include "core/log.h"
 
 #define LIMITED_BACKGRD_NUM 15
 #define MAX_BACKGRD_OOMADJ (OOMADJ_BACKGRD_UNLOCKED + LIMITED_BACKGRD_NUM)

diff --git a/ss_procmgr.h b/src/proc/procmgr.h
similarity index 90%
rename from ss_procmgr.h
rename to src/proc/procmgr.h
index d874e51..1e47671 100644 (file)
--- a/ss_procmgr.h
+++ b/src/proc/procmgr.h
@@ -15,12 +15,12 @@
  */
 
 
-#ifndef __SS_PROCMGR_H__
-#define __SS_PROCMGR_H__
+#ifndef __PROCMGR_H__
+#define __PROCMGR_H__
 
 int ss_process_manager_init(void);
 
 int get_app_oomadj(int pid, int *oomadj);
 int set_app_oomadj(int pid, int new_oomadj);
 
-#endif /* __SS_PROCMGR_H__ */
+#endif /* __PROCMGR_H__ */

diff --git a/ss_ta_handler.c b/src/ta/ta-handler.c
similarity index 94%
rename from ss_ta_handler.c
rename to src/ta/ta-handler.c
index ac1e38a..d28349a 100644 (file)
--- a/ss_ta_handler.c
+++ b/src/ta/ta-handler.c
@@ -18,10 +18,10 @@
 #include <pmapi.h>
 #include <vconf.h>
 #include <sysman.h>
+#include <device-node.h>
 
-#include "device-node.h"
-#include "ss_log.h"
-#include "include/ss_data.h"
+#include "core/log.h"
+#include "core/data.h"
 
 #define RETRY  3
 

diff --git a/ss_timemgr.c b/src/time/time-handler.c
similarity index 98%
rename from ss_timemgr.c
rename to src/time/time-handler.c
index cecbbb1..367554b 100644 (file)
--- a/ss_timemgr.c
+++ b/src/time/time-handler.c
@@ -25,9 +25,9 @@
 #include <vconf.h>
 
 #include <sysman.h>
-#include "include/ss_data.h"
-#include "ss_queue.h"
-#include "ss_log.h"
+#include "core/data.h"
+#include "core/queue.h"
+#include "core/log.h"
 
 #include <time.h>
 #include <sys/ioctl.h>

diff --git a/ss_timemgr.h b/src/time/time-handler.h
similarity index 89%
rename from ss_timemgr.h
rename to src/time/time-handler.h
index 223f31e..6bcd49a 100644 (file)
--- a/ss_timemgr.h
+++ b/src/time/time-handler.h
@@ -15,9 +15,9 @@
  */
 
 
-#ifndef __SS_TIMEMGR_H__
-#define __SS_TIMEMGR_H__
+#ifndef __TIMEMGR_H__
+#define __TIMEMGR_H__
 
 int ss_time_manager_init(void);
 
-#endif /* __SS_TIMEMGR_H__ */
+#endif /* __TIMEMGR_H__ */

diff --git a/ss_usb_handler.c b/src/usb/usb-handler.c
similarity index 93%
rename from ss_usb_handler.c
rename to src/usb/usb-handler.c
index 815aca7..f2b1238 100644 (file)
--- a/ss_usb_handler.c
+++ b/src/usb/usb-handler.c
@@ -18,11 +18,11 @@
 #include <pmapi.h>
 #include <vconf.h>
 #include <sysman.h>
+#include <device-node.h>
 
-#include "ss_log.h"
-#include "device-node.h"
-#include "ss_launch.h"
-#include "include/ss_data.h"
+#include "core/log.h"
+#include "core/launch.h"
+#include "core/data.h"
 
 #define USBCON_EXEC_PATH       PREFIX"/bin/usb-server"
 #define RETRY                  3

diff --git a/ss_vibrator.c b/src/vibrator/vibrator.c
similarity index 98%
rename from ss_vibrator.c
rename to src/vibrator/vibrator.c
index 9d5c7c8..30ca3cd 100644 (file)
--- a/ss_vibrator.c
+++ b/src/vibrator/vibrator.c
@@ -18,9 +18,9 @@
 #include <glib.h>
 #include <device-node.h>
 
-#include "ss_log.h"
-#include "ss_predefine.h"
-#include "include/ss_data.h"
+#include "core/log.h"
+#include "core/predefine.h"
+#include "core/data.h"
 
 #ifndef MERGE_BTW_APPLICATIONS
 #define MERGE_BTW_APPLICATIONS
@@ -309,4 +309,4 @@ int haptic_def_predefine_action(int argc, char **argv)
        }
 
        return -1;
-}
\ No newline at end of file
+}

diff --git a/ss_vibrator.h b/src/vibrator/vibrator.h
similarity index 89%
rename from ss_vibrator.h
rename to src/vibrator/vibrator.h
index 43c98c5..b6b8638 100644 (file)
--- a/ss_vibrator.h
+++ b/src/vibrator/vibrator.h
@@ -15,9 +15,9 @@
  */
 
 
-#ifndef __SS_VIBRATOR_H__
-#define __SS_VIBRATOR_H__
+#ifndef __VIBRATOR_H__
+#define __VIBRATOR_H__
 
 int haptic_def_predefine_action(int argc, char **argv);
 
-#endif /* __SS_VIBRATOR_H__ */
+#endif /* __VIBRATOR_H__ */

diff --git a/ss_common.h b/ss_common.h
deleted file mode 100644 (file)
index a7af544..0000000
--- a/ss_common.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _SS_COMMON_H
-#define _SS_COMMON_H
-
-FILE * open_proc_oom_adj_file(int pid, const char *mode);
-
-#endif /* _SS_COMMON_H */
-

diff --git a/sys_pci_noti/sys_pci_noti.c b/sys_pci_noti/sys_pci_noti.c
index 919b82d..56ff61a 100755 (executable)
--- a/sys_pci_noti/sys_pci_noti.c
+++ b/sys_pci_noti/sys_pci_noti.c
@@ -21,7 +21,7 @@
 #include <vconf.h>
 #include <syspopup_caller.h>
 #include <notification.h>
-#include "ss_log.h"
+#include "core/log.h"
 #include "sys_pci_noti.h"
 
 static void show_tickernoti(char *msg)
@@ -80,4 +80,4 @@ int main(int argc, char *argv[])
        }
 
        return 0;
-}
\ No newline at end of file
+}