Merge branch 'develop' into feature-MAX-60

server/core/server.c

@@ -298,6 +298,37 @@ char	*stat;
 	dcb_printf(dcb, "\tCurrent no. of conns:	%d\n", server->stats.n_current);
 }
 
+/**
+ * List all servers in a tabular form to a DCB
+ *
+ */
+void
+dListServers(DCB *dcb)
+{
+SERVER	*ptr;
+char	*stat;
+
+	spinlock_acquire(&server_spin);
+	ptr = allServers;
+	if (ptr)
+	{
+		dcb_printf(dcb, "%-18s | %-15s | Port  | %-18s | Connections\n",
+			"Server", "Address", "Status");
+		dcb_printf(dcb, "-------------------------------------------------------------------------------\n");
+	}
+	while (ptr)
+	{
+		stat = server_status(ptr);
+		dcb_printf(dcb, "%-18s | %-15s | %5d | %-18s | %4d\n",
+				ptr->unique_name, ptr->name,
+				ptr->port, stat,
+				ptr->stats.n_current);
+		free(stat);
+		ptr = ptr->next;
+	}
+	spinlock_release(&server_spin);
+}
+
 /**
  * Convert a set of  server status flags to a string, the returned
  * string has been malloc'd and must be free'd by the caller

server/core/service.c

@@ -726,6 +726,72 @@ SERVER	*server = service->databases;
 	dcb_printf(dcb, "\tCurrently connected:	%d\n", service->stats.n_current);
 }
 
+/**
+ * List the defined services in a tabular format.
+ *
+ * @param dcb		DCB to print the service list to.
+ */
+void
+dListServices(DCB *dcb)
+{
+SERVICE	*ptr;
+
+	spinlock_acquire(&service_spin);
+	ptr = allServices;
+	if (ptr)
+	{
+		dcb_printf(dcb, "%-25s | %-20s | #Users | Total Sessions\n",
+			"Service Name", "Router Module");
+		dcb_printf(dcb, "--------------------------------------------------------------------------\n");
+	}
+	while (ptr)
+	{
+		dcb_printf(dcb, "%-25s | %-20s | %6d | %5d\n",
+			ptr->name, ptr->routerModule,
+			ptr->stats.n_current, ptr->stats.n_sessions);
+		ptr = ptr->next;
+	}
+	spinlock_release(&service_spin);
+}
+
+/**
+ * List the defined listeners in a tabular format.
+ *
+ * @param dcb		DCB to print the service list to.
+ */
+void
+dListListeners(DCB *dcb)
+{
+SERVICE		*ptr;
+SERV_PROTOCOL	*lptr;
+
+	spinlock_acquire(&service_spin);
+	ptr = allServices;
+	if (ptr)
+	{
+		dcb_printf(dcb, "%-20s | %-18s | %-15s | Port  | State\n",
+			"Service Name", "Protocol Module", "Address");
+		dcb_printf(dcb, "---------------------------------------------------------------------------\n");
+	}
+	while (ptr)
+	{
+		lptr = ptr->ports;
+		while (lptr)
+		{
+			dcb_printf(dcb, "%-20s | %-18s | %-15s | %5d | %s\n",
+				ptr->name, lptr->protocol, 
+				(lptr != NULL) ? lptr->address : "*",
+				lptr->port,
+				(lptr->listener->session->state == SESSION_STATE_LISTENER_STOPPED) ? "Stopped" : "Running"
+			);
+
+			lptr = lptr->next;
+		}
+		ptr = ptr->next;
+	}
+	spinlock_release(&service_spin);
+}
+
 /**
  * Update the definition of a service
  *

server/core/session.c

@@ -398,6 +398,7 @@ int	norouter = 0;
 	if (norouter)
 		printf("%d Sessions have no router session\n", norouter);
 }
+
 /**
  * Print all sessions to a DCB
  *
@@ -448,6 +449,37 @@ dprintSession(DCB *dcb, SESSION *ptr)
 	dcb_printf(dcb, "\tConnected:		%s", asctime(localtime(&ptr->stats.connect)));
 }
 
+/**
+ * List all sessions in tabular form to a DCB
+ *
+ * Designed to be called within a debugger session in order
+ * to display all active sessions within the gateway
+ *
+ * @param dcb	The DCB to print to
+ */
+void
+dListSessions(DCB *dcb)
+{
+SESSION	*ptr;
+
+	spinlock_acquire(&session_spin);
+	ptr = allSessions;
+	if (ptr)
+	{
+		dcb_printf(dcb, "Session          | Client          | State\n");
+		dcb_printf(dcb, "------------------------------------------\n");
+	}
+	while (ptr)
+	{
+		dcb_printf(dcb, "%-16p | %-15s | %s\n", ptr,
+			((ptr->client && ptr->client->remote)
+				? ptr->client->remote : ""),
+			session_state(ptr->state));
+		ptr = ptr->next;
+	}
+	spinlock_release(&session_spin);
+}
+
 /**
  * Convert a session state to a string representation
  *