Attachment 260541 Details for Bug 384461 – Format service status according to terminal width

[patch] Format service status according to terminal width

clustat-name-3.patch (text/plain), 5.38 KB, created by Lon Hohberger on 2007-11-15 22:42:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lon Hohberger

Created: 2007-11-15 22:42:27 UTC

Size: 5.38 KB

patch

obsolete

>Index: clustat.c
>===================================================================
>RCS file: /cvs/cluster/cluster/rgmanager/src/utils/clustat.c,v
>retrieving revision 1.25.2.6
>diff -u -r1.25.2.6 clustat.c
>--- clustat.c	15 Aug 2007 18:41:12 -0000	1.25.2.6
>+++ clustat.c	15 Nov 2007 22:37:34 -0000
>@@ -30,6 +30,7 @@
> 
> 
> int running = 1;
>+int dimx = 80, dimy = 24;
> 
> void
> term_handler(int sig)
>@@ -55,7 +56,7 @@
> 	struct timeval tv;
> 
> 	if (msg_open(MSG_SOCKET, 0, 0, &ctx, 10) < 0) {
>-		perror("msg_open");
>+		//perror("msg_open");
> 		return;
> 	}
> 
>@@ -147,7 +148,7 @@
> 	struct timeval tv;
> 
> 	if (msg_open(MSG_SOCKET, 0, 0, &ctx, 10) < 0) {
>-		perror("msg_open");
>+		//perror("msg_open");
> 		return NULL;
> 	}
> 
>@@ -413,25 +414,39 @@
> 
> 
> void
>-_txt_rg_state(rg_state_t *rs, cluster_member_list_t *members, int flags)
>+_txt_rg_state(rg_state_t *rs, cluster_member_list_t *members, int flags,
>+	      char *fmt_buf, int ns)
> {
> 	char owner[31];
>-
>+	char owner_fmt[16];
>+	char *name = rs->rs_name, *ptr;
>+	int l;
>+
>+	ptr = strchr(rs->rs_name, ':');
>+	if (ptr) {
>+		l = (int)(ptr - rs->rs_name);
>+		if ((l == 7) &&  /* strlen("service") == 7 */
>+		    (strncmp(rs->rs_name, "service", l) == 0)) 
>+			name = ptr+1;
>+	}
> 
> 	if (rs->rs_state == RG_STATE_STOPPED ||
> 	    rs->rs_state == RG_STATE_DISABLED ||
> 	    rs->rs_state == RG_STATE_ERROR ||
> 	    rs->rs_state == RG_STATE_FAILED) {
> 
>-		snprintf(owner, sizeof(owner), "(%-.28s)",
>+		snprintf(owner_fmt, sizeof(owner_fmt), "(%%-.%ds)", ns-2);
>+		snprintf(owner, sizeof(owner), owner_fmt,
> 			 my_memb_id_to_name(members, rs->rs_last_owner));
> 	} else {
> 
>-		snprintf(owner, sizeof(owner), "%-.30s",
>+		snprintf(owner_fmt, sizeof(owner_fmt), "%%-.%ds", ns);
>+		snprintf(owner, sizeof(owner), owner_fmt,
> 			 my_memb_id_to_name(members, rs->rs_owner));
> 	}
>-	printf("  %-20.20s %-30.30s %-16.16s\n",
>-	       rs->rs_name,
>+	
>+	printf(fmt_buf,
>+	       name,
> 	       owner,
> 	       rg_state_str(rs->rs_state));
> }
>@@ -453,12 +468,12 @@
> 
> 
> void
>-txt_rg_state(rg_state_t *rs, cluster_member_list_t *members, int flags)
>+txt_rg_state(rg_state_t *rs, cluster_member_list_t *members, int flags, char *fmt_buf, int ns)
> {
> 	if (flags & RG_VERBOSE) 
> 		_txt_rg_state_v(rs, members, flags);
> 	else
>-		_txt_rg_state(rs, members, flags);
>+		_txt_rg_state(rs, members, flags, fmt_buf, ns);
> }
> 
> 
>@@ -491,11 +506,32 @@
> }
> 
> 
>+void
>+build_service_format(char *buf, int buflen, int cols, int *ns)
>+{
>+	/* Based on 80 columns */
>+	int svcsize = 30;
>+	int nodesize = 30;
>+	int statsize = 14;	/* uninitialized */
>+	int pad = 6;		/* Spaces and such; newline */
>+
>+	svcsize = (cols - (statsize + pad)) / 2;
>+	nodesize = (cols - (statsize + pad)) / 2;
>+
>+	snprintf(buf, buflen, "  %%-%d.%ds %%-%d.%ds %%-%d.%ds\n",
>+		 svcsize, svcsize, nodesize, nodesize, statsize,
>+		 statsize);
>+
>+	*ns = nodesize;
>+}
>+
>+
> int
> txt_rg_states(rg_state_list_t *rgl, cluster_member_list_t *members, 
> 	      char *svcname, int flags)
> {
>-	int x, ret = 0;
>+	int x, ret = 0, ns;
>+	char fmt_buf[80];
> 
> 	if (!rgl || !members)
> 		return -1;
>@@ -503,10 +539,13 @@
> 	if (svcname)
> 		ret = -1;
> 
>+	build_service_format(fmt_buf, sizeof(fmt_buf), dimx, &ns);
>+
> 	if (!(flags & RG_VERBOSE)) {
>-		printf("  %-20.20s %-30.30s %-14.14s\n",
>+
>+		printf(fmt_buf,
> 		       "Service Name", "Owner (Last)", "State");
>-		printf("  %-20.20s %-30.30s %-14.14s\n",
>+		printf(fmt_buf,
> 		       "------- ----", "----- ------", "-----");
> 	} else {
> 		printf("Service Information\n"
>@@ -517,7 +556,7 @@
> 		if (svcname &&
> 		    strcmp(rgl->rgl_states[x].rs_name, svcname))
> 			continue;
>-		txt_rg_state(&rgl->rgl_states[x], members, flags);
>+		txt_rg_state(&rgl->rgl_states[x], members, flags, fmt_buf, ns);
> 		if (svcname) {
> 			switch (rgl->rgl_states[x].rs_state) {
> 			case RG_STATE_STARTING:
>@@ -530,7 +569,7 @@
> 			}
> 		}
> 	}
>-	
>+
> 	return ret;
> }
> 
>@@ -605,7 +644,7 @@
> void
> txt_member_state(cman_node_t *node)
> {
>-	printf("  %-34.34s %4d ", node->cn_name,
>+	printf("  %-44.44s %4d ", node->cn_name,
> 	       node->cn_nodeid);
> 
> 	if (node->cn_member & FLAG_UP)
>@@ -626,8 +665,6 @@
> 		printf(", Quorum Disk");
> 
> 	printf("\n");
>-		
>-
> }
> 
> 
>@@ -656,8 +693,8 @@
>  		return -1;
>   	}
> 
>-	printf("  %-34.34s %-4.4s %s\n", "Member Name", "ID", "Status");
>-	printf("  %-34.34s %-4.4s %s\n", "------ ----", "----", "------");
>+	printf("  %-44.44s %-4.4s %s\n", "Member Name", "ID", "Status");
>+	printf("  %-44.44s %-4.4s %s\n", "------ ----", "----", "------");
> 
> 	for (x = 0; x < membership->cml_count; x++) {
> 		if (name && strcmp(membership->cml_members[x].cn_name, name))
>@@ -717,6 +754,7 @@
>  		return ret;
>  	if (!name || (name && svcname))
>  		ret = txt_rg_states(rgs, membership, svcname, flags);
>+
>  	return ret;
> }
> 
>@@ -832,6 +870,12 @@
> }
> 
> 
>+void
>+hang(int sig)
>+{
>+	sleep(30);
>+}
>+
> int
> main(int argc, char **argv)
> {
>@@ -916,6 +960,7 @@
> 	}
> 
> 	signal(SIGPIPE, SIG_IGN);
>+	signal(SIGSEGV, hang);
> 
> 	/* Connect & grab all our info */
> 	ch = cman_init(NULL);
>@@ -953,6 +998,10 @@
> 	signal(SIGINT, term_handler);
> 	signal(SIGTERM, term_handler);
> 
>+	setupterm((char *) 0, STDOUT_FILENO, (int *) 0);
>+	dimx = tigetnum("cols");
>+	dimy = tigetnum("lines");
>+
> 	while (1) {
> 		qs = cman_is_quorate(ch);
> 		membership = build_member_list(ch, &local_node_id);
>@@ -964,7 +1013,6 @@
> 		}
> 
> 		if (refresh_sec) {
>-			setupterm((char *) 0, STDOUT_FILENO, (int *) 0);
> 			tputs(clear_screen, lines > 0 ? lines : 1, putchar);
> 		}
> 
>@@ -990,5 +1038,6 @@
> 
> cleanup:
> 	cman_finish(ch);
>+
> 	return ret;
> }

Actions: View | Diff

Attachments on bug 384461: 260141 | 260171 | 260541 | 270041 | 270071