Changeset 5619:16fe78ec277c in roaraudio for roard

Timestamp:

08/09/12 00:01:15 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Implemented watchdog (Closes: #291)

Location:

roard

Files:

• lib.c (modified) (2 diffs)
• loop.c (modified) (1 diff)
• roard.c (modified) (5 diffs)

roard/lib.c

@@ -34 +34 @@
  ROAR_WARN("lib_run_bg(cmd='%s', ...): This function should never be called. Contact devels.");
 
- child = fork();
+ child = roar_fork(NULL);
 
  if ( child == -1 ) {
@@ -47 +47 @@
 
  // we are the child.
- // first we need to close a lot of open files!
+
+ // first stop the watchdog.
+ roar_watchdog_stop();
+
+ // then we need to close a lot of open files!
 
  // before we do this we need to keep backups of our handles:

roard/loop.c

@@ -62 +62 @@
 
   ROAR_DBG("main_loop(*): looping...");
+
+  roar_watchdog_trigger();
 
 #ifdef ROAR_SUPPORT_LISTEN

roard/roard.c

@@ -224 +224 @@
         "                         give multible times for being more realtime\n"
         " --memlock LEVEL       - Set default memory locking level to LEVEL\n"
+        " --watchdog            - Enable watchdog\n"
+        " --watchdog-time TIME  - Set watchdog time to TIME (in ms)\n"
 #ifdef ROAR_HAVE_CHROOT
         " --chroot DIR          - chroots to the given dir\n"
@@ -1428 +1430 @@
  int    daemon       = 0;
 #endif
+ int_least32_t watchdog_time = 0; // -1: default, 0: disabled, > 0: user set time.
  int    realtime     = 0;
  int    sysclocksync = 0;
@@ -1700 +1703 @@
    _CKHAVEARGS(1);
    g_config->memlock_level = memlock_str2level(argv[++i]);
+  } else if ( strcmp(k, "--watchdog") == 0 ) {
+   if ( watchdog_time == 0 )
+    watchdog_time = -1;
+  } else if ( strcmp(k, "--watchdog-time") == 0 ) {
+   _CKHAVEARGS(1);
+    watchdog_time = atoi(argv[++i]);
   } else if ( strcmp(k, "--chroot") == 0 ) {
    _CKHAVEARGS(1);
@@ -2581 +2590 @@
   close(ROAR_STDERR);
 
-  if ( fork() )
+  if ( roar_fork(NULL) )
    ROAR_U_EXIT(0);
 
@@ -2591 +2600 @@
  }
 #endif
+
+ if ( watchdog_time ) {
+  if ( watchdog_time == -1 )
+   watchdog_time = 5000;
+  roar_watchdog_start(ROAR_WATCHDOG_CONF_DEFAULTS, watchdog_time, NULL);
+ }
 
 #if defined(ROAR_HAVE_SETUID) && defined(ROAR_HAVE_IO_POSIX)