diff options
| author | Hyotaek Shim <hyotaek.shim@samsung.com> | 2018-03-22 16:49:50 +0900 |
|---|---|---|
| committer | Hyotaek Shim <hyotaek.shim@samsung.com> | 2018-03-22 16:49:50 +0900 |
| commit | 03399522d3b434f410c701d5ccbe19ce22e5f355 (patch) | |
| tree | 2e6fcadd6920899c7c5d26293468f1938f753e1d | |
| parent | 887a81e0ca389f0c743c513baf66a3abde187f09 (diff) | |
| download | deviced-03399522d3b434f410c701d5ccbe19ce22e5f355.tar.gz deviced-03399522d3b434f410c701d5ccbe19ce22e5f355.tar.bz2 deviced-03399522d3b434f410c701d5ccbe19ce22e5f355.zip | |
Removed BuildRequires: pkgconfig(argos_watchdog)
Change-Id: I5eb0781aaa8a09039d37f6c8264315a891b050d0
Signed-off-by: Hyotaek Shim <hyotaek.shim@samsung.com>
| -rwxr-xr-x | CMakeLists.txt | 1 | ||||
| -rwxr-xr-x | packaging/deviced.spec | 1 | ||||
| -rw-r--r-- | src/core/main.c | 10 | ||||
| -rw-r--r-- | systemd/deviced.service | 1 |
4 files changed, 2 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d5cb322..9d15cb93 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -170,7 +170,6 @@ SET(PKG_MODULES hwcommon mount capi-system-info - argos_watchdog libsystemd ) diff --git a/packaging/deviced.spec b/packaging/deviced.spec index b5a3b0be..3d66f2fd 100755 --- a/packaging/deviced.spec +++ b/packaging/deviced.spec @@ -28,7 +28,6 @@ BuildRequires: pkgconfig(eventsystem) BuildRequires: pkgconfig(libtzplatform-config) BuildRequires: pkgconfig(hwcommon) BuildRequires: pkgconfig(capi-system-info) -BuildRequires: pkgconfig(argos_watchdog) BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libinput) BuildRequires: pkgconfig(capi-system-sensor) diff --git a/src/core/main.c b/src/core/main.c index 55b70116..a664c320 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -20,7 +20,6 @@ #include <stdio.h> #include <fcntl.h> #include <sys/reboot.h> -#include <argos.h> #include <systemd/sd-daemon.h> #include <glib.h> @@ -63,9 +62,7 @@ static void sig_usr1(int signo) void watchdog_notify(void) { - int ret = aw_notify(); - if (ret < 0) - _E("aw_notify failed(%d)", ret); + sd_notify(0, "WATCHDOG=1"); } static void deviced_dbus_name_acquired(GDBusConnection *connection, const gchar *name, gpointer user_data) @@ -107,11 +104,6 @@ static int deviced_main(int argc, char **argv) signal(SIGUSR1, sig_usr1); timer = g_timeout_add_seconds_full(G_PRIORITY_HIGH, WATCHDOG_TIMEOUT, watchdog_cb, NULL, NULL); - if (timer) { - ret = aw_register(WATCHDOG_TIMEOUT * 2); - if (ret < 0) - _E("aw_register failed"); - } /* g_main_loop */ g_main_loop_run(mainloop); diff --git a/systemd/deviced.service b/systemd/deviced.service index f3b48b97..9396821a 100644 --- a/systemd/deviced.service +++ b/systemd/deviced.service @@ -9,6 +9,7 @@ Restart=always RestartSec=0 KillSignal=SIGUSR1 NotifyAccess=main +WatchdogSec=30s [Install] WantedBy=multi-user.target |