Changeset 4784:7aa703c721af in roaraudio
- Timestamp:
- 03/10/11 23:59:16 (13 years ago)
- Branch:
- default
- Phase:
- public
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
include/libroar/debug.h
r4708 r4784 74 74 void roar_debug_msg_simple(const char *format, ...); 75 75 76 void roar_debug_msg(int type, unsigned long int line, c har * file, char * prefix,char * format, ...);76 void roar_debug_msg(int type, unsigned long int line, const char * file, const char * prefix, const char * format, ...); 77 77 78 78 #endif -
include/libroar/trap.h
r4782 r4784 40 40 41 41 #ifdef ROAR_SUPPORT_TRAP 42 #define roar_strap(group,name) roar_strap_impl((group),(name), __LINE__, __FILE__ )42 #define roar_strap(group,name) roar_strap_impl((group),(name), __LINE__, __FILE__, ROAR_DBG_PREFIX) 43 43 #else 44 44 #define roar_strap(group,name) … … 59 59 ROAR_TRAP_ABORT, 60 60 ROAR_TRAP_KILL, 61 ROAR_TRAP_STOP 61 ROAR_TRAP_STOP, 62 ROAR_TRAP_DIE 62 63 }; 63 64 … … 66 67 unsigned int roar_trap_get_groupid(const char * name); 67 68 68 void roar_strap_impl(const unsigned int group, const char * name, unsigned int line, const char * file );69 void roar_strap_impl(const unsigned int group, const char * name, unsigned int line, const char * file, const char * prefix); 69 70 70 71 #endif -
libroar/config.c
r4779 r4784 255 255 config->trap_policy = ROAR_TRAP_STOP; 256 256 #endif 257 } else if ( !strcmp(v, "die") ) { 258 config->trap_policy = ROAR_TRAP_DIE; 257 259 } else { 258 260 ROAR_WARN("roar_libroar_config_parse(*): Unknown trap policy: %s", v); -
libroar/debug.c
r4708 r4784 139 139 } 140 140 141 void roar_debug_msg(int type, unsigned long int line, c har * file, char * prefix,char * format, ...) {141 void roar_debug_msg(int type, unsigned long int line, const char * file, const char * prefix, const char * format, ...) { 142 142 struct roar_vio_calls * vio; 143 143 va_list ap; -
libroar/trap.c
r4782 r4784 87 87 } 88 88 89 void roar_strap_impl(const unsigned int group, const char * name, unsigned int line, const char * file ) {89 void roar_strap_impl(const unsigned int group, const char * name, unsigned int line, const char * file, const char * prefix) { 90 90 #ifdef ROAR_SUPPORT_TRAP 91 91 struct roar_libroar_config * config = roar_libroar_get_config(); … … 99 99 break; 100 100 case ROAR_TRAP_WARN: 101 ROAR_ WARN("roar_strap_impl(group=%u(\"%s\"), name='%s', line=%u, file='%s') = (void)",101 ROAR_DBG("roar_strap_impl(group=%u(\"%s\"), name='%s', line=%u, file='%s') = (void)", 102 102 group, roar_trap_get_groupname(group), name, line, file); 103 roar_debug_msg(ROAR_DEBUG_TYPE_WARNING, line, file, prefix, "Trap %s of group %s.", 104 name, roar_trap_get_groupname(group)); 103 105 break; 104 106 case ROAR_TRAP_ABORT: … … 115 117 break; 116 118 #endif 119 case ROAR_TRAP_DIE: 120 roar_debug_msg(ROAR_DEBUG_TYPE_WARNING, line, file, prefix, "Trap %s of group %s, terminating program.", 121 name, roar_trap_get_groupname(group)); 122 #ifdef SIGKILL 123 raise(SIGKILL); 124 #else 125 abort(); 126 #endif 127 break; 117 128 } 118 129 #else
Note: See TracChangeset
for help on using the changeset viewer.