Changeset 5619:16fe78ec277c in roaraudio for libroar

Timestamp:

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

Author:

phi

Branch:

default

Phase:

public

Message:

Implemented watchdog (Closes: #291)

Location:

libroar

Files:

• Makefile (modified) (1 diff)
• basic.c (modified) (2 diffs)
• cdrom.c (modified) (1 diff)
• libroar.c (modified) (3 diffs)
• pinentry.c (modified) (2 diffs)
• socket.c (modified) (2 diffs)
• vio_cmd.c (modified) (2 diffs)
• watchdog.c (added)

libroar/Makefile

@@ -11 +11 @@
 PASSWORD=passwordapi.o pinentry.o sshaskpass.o
 CRYPTO=crypto.o random.o $(HASHES) crc.o
-OBJS=libroar.o config.o debug.o error.o basic.o stream.o client.o simple.o auth.o socket.o ctl.o buffer.o meta.o file.o acl.o cdrom.o $(PASSWORD) $(VIO) stack.o slp.o nnode.o roardl.o plugincontainer.o roarx11.o beep.o proto.o env.o keyval.o vs.o ltm.o notify.o notify_proxy.o asyncctl.o enumdev.o serverinfo.o $(CRYPTO) authfile.o caps.o roarfloat.o base64.o trap.o memmgr.o time.o kstore.o uuid.o
+OBJS=libroar.o config.o debug.o error.o basic.o stream.o client.o simple.o auth.o socket.o ctl.o buffer.o meta.o file.o acl.o cdrom.o $(PASSWORD) $(VIO) stack.o slp.o nnode.o roardl.o plugincontainer.o roarx11.o beep.o proto.o env.o keyval.o vs.o ltm.o notify.o notify_proxy.o asyncctl.o enumdev.o serverinfo.o $(CRYPTO) authfile.o caps.o roarfloat.o base64.o trap.o memmgr.o time.o kstore.o uuid.o watchdog.o
 
 #DEFINES        = -DDEBUG

libroar/basic.c

@@ -91 +91 @@
   return -1;
  } else if ( r == 0 ) { // we are the child
+  roar_watchdog_stop();
+
   close(socks[0]);
 
@@ -113 +115 @@
   // we are still alive?
   ROAR_ERR("_start_server(*): alive after exec(), that's bad!");
-  _exit(1);
+  ROAR_U_EXIT(1);
  } else { // we are the parent
   close(socks[1]);

libroar/cdrom.c

@@ -36 +36 @@
 #include "libroar.h"
 
-#define ROAR_CDROM_ERROR_NORETURN(format, args...) ROAR_ERR(format, ## args); _exit(3)
+#define ROAR_CDROM_ERROR_NORETURN(format, args...) ROAR_ERR(format, ## args); ROAR_U_EXIT(3)
 
 #if BYTE_ORDER == BIG_ENDIAN

libroar/libroar.c

@@ -107 +107 @@
  struct timespec left;
 
- if ( t > (uint_least32_t)1000000 ) {
+ if ( t >= (uint_least32_t)1000000 ) {
   tv.tv_sec  = t/(uint_least32_t)1000000;
   t         -= tv.tv_sec*(uint_least32_t)1000000;
@@ -321 +321 @@
     errname = "Memory double freed";
    break;
+  case ROAR_FATAL_ERROR_WATCHDOG:
+    errname = "Watchdog Timeout";
+   break;
   default:
     errname = "<unknown error code, BAD>";
@@ -332 +335 @@
 #endif
  abort();
+#ifdef ROAR_HAVE_U_EXIT
+ ROAR_U_EXIT(1);
+#endif
 
  while(1);

libroar/pinentry.c

@@ -99 +99 @@
    break;
   case 0:
+    roar_watchdog_stop();
+
     close(in[0]);
     close(out[1]);
@@ -105 +107 @@
 
     if ( dup2(out[0], ROAR_STDIN) == -1 )
-     _exit(1);
+     ROAR_U_EXIT(1);
 
     if ( dup2(in[1], ROAR_STDOUT) == -1 )
-     _exit(1);
+     ROAR_U_EXIT(1);
 
     execlp(ROAR_HAVE_BIN_PINENTRY, "RoarAudio", "--display", display, "--ttytype", term, "--ttyname", tty, NULL);
 
-    _exit(1);
+    ROAR_U_EXIT(1);
    break;
  }

libroar/socket.c

@@ -1176 +1176 @@
   return -1;
  } else if ( r == 0 ) { // we are the child
+  roar_watchdog_stop();
+
   close(socks[0]);
 
@@ -1189 +1191 @@
   // we are still alive?
   ROAR_ERR("roar_socket_open_ssh(*): alive after exec(), that's bad!");
-  _exit(1);
+  ROAR_U_EXIT(1);
  } else { // we are the parent
   close(socks[1]);

libroar/vio_cmd.c

@@ -172 +172 @@
    break;
   case 0:
+    roar_watchdog_stop();
+
     close(in[0]);
     close(out[1]);
@@ -178 +180 @@
 
     if ( dup2(out[0], ROAR_STDIN) == -1 )
-     _exit(1);
+     ROAR_U_EXIT(1);
 
     if ( dup2(in[1], ROAR_STDOUT) == -1 )
-     _exit(1);
+     ROAR_U_EXIT(1);
 
     execlp("/bin/sh", "/bin/sh", "-c", child->cmd, (_LIBROAR_GOOD_CAST char*)NULL);
 
-    _exit(1);
+    ROAR_U_EXIT(1);
    break;
  }