From owner-svn-ports-head@FreeBSD.ORG Tue Jan 22 22:17:28 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 7166E2EB; Tue, 22 Jan 2013 22:17:28 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 592799A8; Tue, 22 Jan 2013 22:17:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0MMHS8x035317; Tue, 22 Jan 2013 22:17:28 GMT (envelope-from matthew@svn.freebsd.org) Received: (from matthew@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0MMHSwb035315; Tue, 22 Jan 2013 22:17:28 GMT (envelope-from matthew@svn.freebsd.org) Message-Id: <201301222217.r0MMHSwb035315@svn.freebsd.org> From: Matthew Seaman Date: Tue, 22 Jan 2013 22:17:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r310838 - in head/databases/mytop: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jan 2013 22:17:28 -0000 Author: matthew Date: Tue Jan 22 22:17:27 2013 New Revision: 310838 URL: http://svnweb.freebsd.org/changeset/ports/310838 Log: Make the width if the Id field dynamic. PR: ports/175476 Submitted by: ccn Modified: head/databases/mytop/Makefile head/databases/mytop/files/patch-mytop (contents, props changed) Modified: head/databases/mytop/Makefile ============================================================================== --- head/databases/mytop/Makefile Tue Jan 22 22:01:17 2013 (r310837) +++ head/databases/mytop/Makefile Tue Jan 22 22:17:27 2013 (r310838) @@ -3,7 +3,7 @@ PORTNAME= mytop PORTVERSION= 1.6 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= databases MASTER_SITES= http://jeremy.zawodny.com/mysql/mytop/ Modified: head/databases/mytop/files/patch-mytop ============================================================================== --- head/databases/mytop/files/patch-mytop Tue Jan 22 22:01:17 2013 (r310837) +++ head/databases/mytop/files/patch-mytop Tue Jan 22 22:17:27 2013 (r310838) @@ -118,7 +118,7 @@ $FreeBSD$ if ($t_delta); - print "\n\n"; + print "\n"; -+ + + my @master_status = Hashes("show master status"); + if (@master_status) + { @@ -130,7 +130,7 @@ $FreeBSD$ + $lines_left--; + } + } - ++ + my @slave_status = Hashes("show slave status"); + if (@slave_status) + { @@ -156,30 +156,46 @@ $FreeBSD$ $lines_left--; } -@@ -905,19 +952,19 @@ +@@ -904,32 +951,22 @@ + ## Threads ## - #my $sz = $width - 52; +- #my $sz = $width - 52; - my @sz = (8, 9, 15, 10, 9, 6); -+ my @sz = (9, 9, 15, 10, 9, 6); - my $used = scalar(@sz) + Sum(@sz); - my $free = $width - $used; - - print BOLD(); - +- my $used = scalar(@sz) + Sum(@sz); +- my $free = $width - $used; +- +- print BOLD(); +- - printf "%8s %9s %15s %10s %9s %6s %-${free}s\n", -+ printf "%9s %9s %15s %10s %9s %6s %-${free}s\n", - 'Id','User','Host/IP','DB','Time', 'Cmd', 'Query or State'; +- 'Id','User','Host/IP','DB','Time', 'Cmd', 'Query or State'; +- +- print RESET(); +- +- ## Id User Host DB +- printf "%8s %9s %15s %10s %9s %6s %-${free}s\n", +- '--','----','-------','--','----', '---', '----------'; +- + $lines_left -= 2; - print RESET(); + my $proc_cmd = "show full processlist"; - ## Id User Host DB -- printf "%8s %9s %15s %10s %9s %6s %-${free}s\n", -+ printf "%9s %9s %15s %10s %9s %6s %-${free}s\n", - '--','----','-------','--','----', '---', '----------'; + my @data = Hashes($proc_cmd); - $lines_left -= 2; -@@ -952,8 +999,11 @@ ++ my $max_id = 0; ++ + foreach my $thread (@data) + { + last if not $lines_left; + ++ if ($max_id < $thread->{Id}) { ++ $max_id = $thread->{Id}; ++ } ++ + ## Drop Domain Name, unless it looks like an IP address. If + ## it's an IP, we'll strip the port number because it's rarely + ## interesting. +@@ -952,8 +989,11 @@ { $thread->{Host} =~ s/:\d+$//; my $host = gethostbyaddr(inet_aton($thread->{Host}), AF_INET); @@ -193,16 +209,40 @@ $FreeBSD$ } ## Fix possible undefs -@@ -1044,7 +1094,7 @@ +@@ -990,6 +1030,23 @@ + + } + ++ #my $sz = $width - 52; ++ my $max_id_size = length $max_id; ++ my @sz = ($max_id_size, 9, 15, 10, 9, 6); ++ my $used = scalar(@sz) + Sum(@sz); ++ my $free = $width - $used; ++ ++ print BOLD(); ++ ++ printf "%${max_id_size}s %9s %15s %10s %9s %6s %-${free}s\n", ++ 'Id','User','Host/IP','DB','Time', 'Cmd', 'Query or State'; ++ ++ print RESET(); ++ ++ ## Id User Host DB ++ printf "%${max_id_size}s %9s %15s %10s %9s %6s %-${free}s\n", ++ '--','----','-------','--','----', '---', '----------'; ++ + ## Sort by idle time (closest thing to CPU usage I can think of). + + my @sorted; +@@ -1044,7 +1101,7 @@ print GREEN() if $thread->{Command} eq 'Connect'; } - printf "%8d %9.9s %15.15s %10.10s %9d %6.6s %-${free}.${free}s\n", -+ printf "%9d %9.9s %15.15s %10.10s %9d %6.6s %-${free}.${free}s\n", ++ printf "%${max_id_size}d %9.9s %15.15s %10.10s %9d %6.6s %-${free}.${free}s\n", $thread->{Id}, $thread->{User}, $thread->{Host}, $thread->{db}, $thread->{Time}, $thread->{Command}, $smInfo; -@@ -1099,8 +1149,8 @@ +@@ -1099,8 +1156,8 @@ my @data = Hashes("SHOW INNODB STATUS"); open P, "|$config{pager}" or die "$!";