[svn-commits] mmichelson: branch group/CCSS r224925 - /team/group/CCSS/main/ccss.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Tue Oct 20 18:47:10 2009
New Revision: 224925

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=224925
Log:
More stuff in the CLI command now, like caller and called extensions/devices.

Still needs more work. One thing in particular that will be nice is to print
the type of service requested of each device.


Modified:
    team/group/CCSS/main/ccss.c

Modified: team/group/CCSS/main/ccss.c
URL: http://svnview.digium.com/svn/asterisk/team/group/CCSS/main/ccss.c?view=diff&rev=224925&r1=224924&r2=224925
==============================================================================
--- team/group/CCSS/main/ccss.c (original)
+++ team/group/CCSS/main/ccss.c Tue Oct 20 18:47:10 2009
@@ -2745,12 +2745,27 @@
 	return cc_state_to_string_map[state].state_string;
 }
 
+static void cc_cli_print_monitor_stats(struct ast_cc_monitor *monitor, int fd)
+{
+	struct ast_cc_monitor_link *link_iter;
+	if (monitor->interface->monitor_class != AST_CC_ROOT_MONITOR) {
+		ast_cli(fd, "\t\t|-->%s", monitor->interface->name);
+	}
+	AST_LIST_TRAVERSE(&monitor->child_links, link_iter, next_child) {
+		cc_cli_print_monitor_stats(link_iter->child, fd);
+	}
+}
+
 static int print_stats_cb(void *obj, void *arg, int flags)
 {
 	int *cli_fd = arg;
 	struct cc_core_instance *core_instance = obj;
 
-	ast_cli(*cli_fd, "%d\t%s\n", core_instance->core_id, cc_state_to_string(core_instance->current_state));
+	ast_cli(*cli_fd, "%d\t\t%s\t\t%s\n", core_instance->core_id, core_instance->agent->interface,
+			cc_state_to_string(core_instance->current_state));
+	if (core_instance->monitor) {
+		cc_cli_print_monitor_stats(core_instance->monitor, *cli_fd);
+	}
 	return 0;
 }
 
@@ -2763,8 +2778,8 @@
 		ast_cli(*cli_fd, "There are currently no active call completion transactions\n");
 	} else {
 		ast_cli(*cli_fd, "%d Call completion transactions\n", count);
-		ast_cli(*cli_fd, "Core ID\tStatus\n");
-		ast_cli(*cli_fd, "--------------------------\n");
+		ast_cli(*cli_fd, "Core ID\t\tCaller\t\t\t\tStatus\n");
+		ast_cli(*cli_fd, "----------------------------------------------------------------------------\n");
 		ao2_t_callback(cc_core_instances, OBJ_NODATA, print_stats_cb, cli_fd, "Printing stats to CLI");
 	}
 	ast_free(cli_fd);