Changeset 4784:7aa703c721af in roaraudio for libroar

Timestamp:

03/10/11 23:59:16 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support for trap-policy:die and updated to a good message for policy:warn

Location:

libroar

Files:

• config.c (modified) (1 diff)
• debug.c (modified) (1 diff)
• trap.c (modified) (3 diffs)

libroar/config.c

@@ -255 +255 @@
     config->trap_policy = ROAR_TRAP_STOP;
 #endif
+   } else if ( !strcmp(v, "die") ) {
+    config->trap_policy = ROAR_TRAP_DIE;
    } else {
     ROAR_WARN("roar_libroar_config_parse(*): Unknown trap policy: %s", v);

libroar/debug.c

@@ -139 +139 @@
 }
 
-void roar_debug_msg(int type, unsigned long int line, char * file, char * prefix, char * format, ...) {
+void roar_debug_msg(int type, unsigned long int line, const char * file, const char * prefix, const char * format, ...) {
  struct roar_vio_calls * vio;
  va_list ap;

libroar/trap.c

@@ -87 +87 @@
 }
 
-void roar_strap_impl(const unsigned int group, const char * name, unsigned int line, const char * file) {
+void roar_strap_impl(const unsigned int group, const char * name, unsigned int line, const char * file, const char * prefix) {
 #ifdef ROAR_SUPPORT_TRAP
  struct roar_libroar_config * config = roar_libroar_get_config();
@@ -99 +99 @@
    break;
   case ROAR_TRAP_WARN:
-    ROAR_WARN("roar_strap_impl(group=%u(\"%s\"), name='%s', line=%u, file='%s') = (void)",
+    ROAR_DBG("roar_strap_impl(group=%u(\"%s\"), name='%s', line=%u, file='%s') = (void)",
                group, roar_trap_get_groupname(group), name, line, file);
+    roar_debug_msg(ROAR_DEBUG_TYPE_WARNING, line, file, prefix, "Trap %s of group %s.",
+                   name, roar_trap_get_groupname(group));
    break;
   case ROAR_TRAP_ABORT:
@@ -115 +117 @@
    break;
 #endif
+  case ROAR_TRAP_DIE:
+    roar_debug_msg(ROAR_DEBUG_TYPE_WARNING, line, file, prefix, "Trap %s of group %s, terminating program.",
+                   name, roar_trap_get_groupname(group));
+#ifdef SIGKILL
+    raise(SIGKILL);
+#else
+    abort();
+#endif
+   break;
  }
 #else