Changeset 5763:83d26dff8492 in roaraudio

Timestamp:

11/21/12 03:54:14 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Moved notify debugging support out of roard into plugin debug-notify.

Files:

• ChangeLog (modified) (1 diff)
• plugins/universal/Makefile (modified) (1 diff)
• plugins/universal/debug-notify.c (added)
• roard/roard.c (modified) (3 diffs)

ChangeLog

@@ -11 +11 @@
         * Improved env API.
         * Added support for configureable memmgr backend (Closes: #334)
+        * Moved notify debugging support out of roard into plugin debug-notify.
 
 v. 1.0beta7 - Tue Oct 23 2012 23:28 CEST

plugins/universal/Makefile

@@ -3 +3 @@
 
 TARGETS_PROTO=protocol-echo$(SHARED_SUFFIX) protocol-daytime$(SHARED_SUFFIX) protocol-discard$(SHARED_SUFFIX) tic-tac-toe$(SHARED_SUFFIX) protocol-http$(SHARED_SUFFIX)
-TARGETS_MISC=plugin-info$(SHARED_SUFFIX) helloworld$(SHARED_SUFFIX)
+TARGETS_MISC=plugin-info$(SHARED_SUFFIX) helloworld$(SHARED_SUFFIX) debug-notify$(SHARED_SUFFIX)
 TARGETS=$(TARGETS_MISC) $(TARGETS_PROTO)
 
 #DEFINES        = -DDEBUG
+DEFINES+= -DROAR_DBG_PREFIX=\"'$(shell basename $+ .c)'\"
 INCLUDE = -I../../include -I../..
 CFLAGS += -g -Wall $(Wextra) $(OPTI_O) $(DEFINES) $(INCLUDE) $(INCPATH) $(SHARED_CF) $(fPIC)

roard/roard.c

@@ -104 +104 @@
 #endif
 
-void dbg_notify_cb(struct roar_notify_core * core, struct roar_event * event, void * userdata) {
- char buf[1024] = "";
- char estr[1024] = "/* ROAR_??? */";
- char ttstr[1024] = "/* ROAR_OT_??? */";
- const char * ttname;
- uint32_t ev = ROAR_EVENT_GET_TYPE(event);
- int i;
-
- ttname = roar_ot2str(event->target_type);
- if ( ttname != NULL ) {
-  snprintf(ttstr, sizeof(ttstr)-1, "/* ROAR_OT_%s */", ttname);
-  buf[sizeof(ttstr)-1] = 0;
-  for (i = 0; ttstr[i] != 0; i++)
-   if ( islower(ttstr[i]) )
-    ttstr[i] = toupper(ttstr[i]);
- }
-
- if ( ev == ROAR_NOTIFY_SPECIAL ) {
-  snprintf(estr, sizeof(estr)-1, "/* ROAR_NOTIFY_SPECIAL */");
- } else if ( ROAR_NOTIFY_IS_CMD(ev) ) {
-  if ( command_get_name(ROAR_NOTIFY_EVENT2CMD(ev), &ttname) == -1 ) {
-   snprintf(estr, sizeof(estr)-1, "/* ROAR_NOTIFY_CMD2EVENT(%lu) */", (long unsigned int)ROAR_NOTIFY_EVENT2CMD(ev));
-  } else {
-   snprintf(estr, sizeof(estr)-1, "/* ROAR_NOTIFY_CMD2EVENT(ROAR_CMD_%s) */", ttname);
-   for (i = 0; estr[i] != 0; i++)
-    if ( islower(estr[i]) )
-     estr[i] = toupper(estr[i]);
-  }
- } else if ( ROAR_NOTIFY_IS_EGRP(ev) ) {
-  snprintf(estr, sizeof(estr)-1, "/* ROAR_NOTIFY_EGRP2EVENT(%lu) */", (long unsigned int)ROAR_NOTIFY_EVENT2EGRP(ev));
- } else if ( ROAR_NOTIFY_IS_OE(ev) ) {
-  switch (ev) {
-   // OE basics:
-   case ROAR_OE_BASICS_CHANGE_STATE:
-     snprintf(estr, sizeof(estr)-1, "/* ROAR_OE_BASICS_CHANGE_STATE */");
-    break;
-   case ROAR_OE_BASICS_CHANGE_FLAGS:
-     snprintf(estr, sizeof(estr)-1, "/* ROAR_OE_BASICS_CHANGE_FLAGS */");
-    break;
-   case ROAR_OE_BASICS_NEW:
-     snprintf(estr, sizeof(estr)-1, "/* ROAR_OE_BASICS_NEW */");
-    break;
-   case ROAR_OE_BASICS_DELETE:
-     snprintf(estr, sizeof(estr)-1, "/* ROAR_OE_BASICS_DELETE */");
-    break;
-   // OE Streams:
-   case ROAR_OE_STREAM_CHANGE_VOLUME:
-     snprintf(estr, sizeof(estr)-1, "/* ROAR_OE_STREAM_CHANGE_VOLUME */");
-    break;
-   case ROAR_OE_STREAM_XRUN:
-     snprintf(estr, sizeof(estr)-1, "/* ROAR_OE_STREAM_XRUN */");
-    break;
-   case ROAR_OE_STREAM_META_UPDATE:
-     snprintf(estr, sizeof(estr)-1, "/* ROAR_OE_STREAM_META_UPDATE */");
-    break;
-   // OE Default:
-   default:
-     snprintf(estr, sizeof(estr)-1, "/* ROAR_NOTIFY_OE2EVENT(%lu) */", (long unsigned int)ROAR_NOTIFY_EVENT2OE(ev));
-    break;
-  }
- } else if ( ROAR_NOTIFY_IS_USER(ev) ) {
-  snprintf(estr, sizeof(estr)-1, "/* ROAR_NOTIFY_USER2EVENT(%lu) */", (long unsigned int)ROAR_NOTIFY_EVENT2USER(ev));
- }
-
- buf[sizeof(estr)-1] = 0;
-
- if ( event->flags & ROAR_EVENT_FLAG_PROXYEVENT ) {
-  snprintf(buf, sizeof(buf)-1, ".event_proxy=0x%.8x%s, ", (int)event->event_proxy, estr);
-  buf[sizeof(buf)-1] = 0;
- }
-
- ROAR_INFO("dbg_notify_cb(core=%p, event=%p{.flags=0x%.8x, event=0x%.8x%s, %s.emitter=%i, .target=%i, .target_type=%i%s, .arg0=%i, .arg1=%i, .arg2=%p}, userdata=%p) = (void)",
-           0 /* always print: minlevel = 0 */,
-           core, event,
-           (int)event->flags,
-           (int)event->event,
-           (event->flags & ROAR_EVENT_FLAG_PROXYEVENT ? "" : estr),
-           buf,
-           event->emitter,
-           event->target,
-           event->target_type,
-           ttstr,
-           event->arg0,
-           event->arg1,
-           event->arg2,
-           userdata);
-}
-
-void dbg_notify_cb_register (void) {
- struct roar_event event;
-
- memset(&event, 0, sizeof(event));
-
- event.event = ROAR_EGRP_ANY_EVENT;
-
- event.emitter = -1;
- event.target = -1;
- event.target_type = -1;
-
- roar_notify_core_subscribe(NULL, &event, dbg_notify_cb, NULL);
-}
-
 #ifdef ROAR_HAVE_MAIN_ARGS
 void usage (void) {
@@ -1557 +1455 @@
  }
 
-#ifdef DEBUG
- // enable early in case we have DEBUG set.
- dbg_notify_cb_register();
-#endif
-
  rolestack_init();
 
@@ -2389 +2282 @@
 #endif
 
-#ifndef DEBUG
- // notify dbg if requested, if in DEBUG mode
- // do not able because it got enabled early.
- if ( g_verbose >= 4 )
-  dbg_notify_cb_register();
-#endif
+ // if g_verbose is high we load external debugging modules.
+ if ( g_verbose >= 4 ) {
+  if ( plugins_load("debug-notify", NULL) == -1 ) {
+   ROAR_WARN("main(*): Can not load debugger plugin: %s", roar_error2str(roar_error));
+  }
+ }
 
  if ( af_mode != AF_MODE_NONE ) {