User interface improvements

Addition of enable/disable heartbeat, enable/disable root, list monitors,
show monitors

Better filter diagnostic output

server/core/dcb.c

@@ -1264,6 +1264,41 @@ DCB     *dcb;
 	spinlock_release(&dcbspin);
 }
 
+/** 
+ * Diagnotic routine to print client DCB data in a tabular form.
+ * 
+ * @param       pdcb    DCB to print results to
+ */
+void
+dListClients(DCB *pdcb)
+{
+DCB     *dcb;
+
+	spinlock_acquire(&dcbspin);
+	dcb = allDCBs;
+	dcb_printf(pdcb, "Client Connections\n");
+	dcb_printf(pdcb, "-----------------+------------+----------------------+------------\n");
+	dcb_printf(pdcb, " %-15s | %-10s | %-20s | %s\n", 
+			"Client", "DCB", "Service", "Session");
+	dcb_printf(pdcb, "-----------------+------------+----------------------+------------\n");
+	while (dcb)
+	{
+		if (dcb_isclient(dcb)
+			&& dcb->dcb_role == DCB_ROLE_REQUEST_HANDLER)
+		{
+			dcb_printf(pdcb, " %-15s | %10p | %-20s | %10p\n",
+				(dcb->remote ? dcb->remote : ""),
+				dcb, (dcb->session->service ?
+					dcb->session->service->name : ""), 
+				dcb->session);
+		}
+		dcb = dcb->next;
+	}
+	dcb_printf(pdcb, "-----------------+------------+----------------------+------------\n\n");
+	spinlock_release(&dcbspin);
+}
+
+
 /**
  * Diagnostic to print a DCB to another DCB
  *
@@ -1275,8 +1310,14 @@ dprintDCB(DCB *pdcb, DCB *dcb)
 {
 	dcb_printf(pdcb, "DCB: %p\n", (void *)dcb);
 	dcb_printf(pdcb, "\tDCB state: 		%s\n", gw_dcb_state2string(dcb->state));
+	if (dcb->session && dcb->session->service)
+		dcb_printf(pdcb, "\tService:            %s\n",
+					dcb->session->service->name);
 	if (dcb->remote)
 		dcb_printf(pdcb, "\tConnected to:		%s\n", dcb->remote);
+	if (dcb->user)
+		dcb_printf(pdcb, "\tUsername:                   %s\n",
+					dcb->user);
 	dcb_printf(pdcb, "\tOwning Session:   	%p\n", dcb->session);
 	if (dcb->writeq)
 		dcb_printf(pdcb, "\tQueued write data:	%d\n", gwbuf_length(dcb->writeq));

server/core/load_utils.c

@@ -378,7 +378,9 @@ MODULES	*ptr = registered;
 				: (ptr->info->status == MODULE_BETA_RELEASE
 					? "Beta"
 				: (ptr->info->status == MODULE_GA
-					? "GA" : "Unknown"))));
+					? "GA"
+				: (ptr->info->status == MODULE_EXPERIMENTAL
+					? "Experimental" : "Unknown")))));
 		dcb_printf(dcb, "\n");
 		ptr = ptr->next;
 	}

server/core/monitor.c

@@ -73,6 +73,7 @@ MONITOR	*mon;
 		return NULL;
 	}
 	mon->handle = (*mon->module->startMonitor)(NULL);
+	mon->state |= MONITOR_RUNNING;
 	spinlock_acquire(&monLock);
 	mon->next = allMonitors;
 	allMonitors = mon;
@@ -93,6 +94,7 @@ monitor_free(MONITOR *mon)
 MONITOR	*ptr;
 
 	mon->module->stopMonitor(mon->handle);
+	mon->state &= ~MONITOR_RUNNING;
 	spinlock_acquire(&monLock);
 	if (allMonitors == mon)
 		allMonitors = mon->next;
@@ -119,6 +121,7 @@ void
 monitorStart(MONITOR *monitor)
 {
 	monitor->handle = (*monitor->module->startMonitor)(monitor->handle);
+	monitor->state |= MONITOR_RUNNING;
 }
 
 /**
@@ -130,6 +133,7 @@ void
 monitorStop(MONITOR *monitor)
 {
 	monitor->module->stopMonitor(monitor->handle);
+	monitor->state &= ~MONITOR_RUNNING;
 }
 
 /**
@@ -200,6 +204,46 @@ MONITOR	*ptr;
 	spinlock_release(&monLock);
 }
 
+/**
+ * Show a single monitor
+ *
+ * @param dcb	DCB for printing output
+ */
+void
+monitorShow(DCB *dcb, MONITOR *monitor)
+{
+
+	dcb_printf(dcb, "Monitor: %p\n", monitor);
+	dcb_printf(dcb, "\tName:		%s\n", monitor->name);
+	if (monitor->module->diagnostics)
+		monitor->module->diagnostics(dcb, monitor->handle);
+}
+
+/**
+ * List all the monitors
+ *
+ * @param dcb	DCB for printing output
+ */
+void
+monitorList(DCB *dcb)
+{
+MONITOR	*ptr;
+
+	spinlock_acquire(&monLock);
+	ptr = allMonitors;
+	dcb_printf(dcb, "+----------------------+---------------------\n");
+	dcb_printf(dcb, "| %-20s | Status\n", "Monitor");
+	dcb_printf(dcb, "+----------------------+---------------------\n");
+	while (ptr)
+	{
+		dcb_printf(dcb, "| %-20s | %s\n", ptr->name,
+			ptr->state & MONITOR_RUNNING ? "Running" : "Stopped");
+		ptr = ptr->next;
+	}
+	dcb_printf(dcb, "+----------------------+---------------------\n");
+	spinlock_release(&monLock);
+}
+
 /**
  * Find a monitor by name
  *
@@ -249,6 +293,7 @@ void
 monitorSetInterval (MONITOR *mon, unsigned long interval)
 {
 	if (mon->module->setInterval != NULL) {
+		mon->interval = interval;
 		mon->module->setInterval(mon->handle, interval);
 	}
 }

server/core/server.c

@@ -292,7 +292,8 @@ char	*stat;
 		}
 	}
 	if (server->node_ts > 0) {
-		dcb_printf(dcb, "\tLast Repl Heartbeat:\t%lu\n", server->node_ts);
+		dcb_printf(dcb, "\tLast Repl Heartbeat:\t%s",
+					asctime(localtime(&server->node_ts)));
 	}
 	dcb_printf(dcb, "\tNumber of connections:	%d\n", server->stats.n_connections);
 	dcb_printf(dcb, "\tCurrent no. of conns:	%d\n", server->stats.n_current);