Hello community, here is the log from the commit of package latencytop for openSUSE:Factory checked in at 2012-09-14 12:44:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/latencytop (Old) and /work/SRC/openSUSE:Factory/.latencytop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "latencytop", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/latencytop/latencytop.changes 2011-09-23 02:07:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.latencytop.new/latencytop.changes 2012-09-14 12:44:27.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Sep 13 00:05:33 CEST 2012 - [email protected] + +- add patch to behave like 'vmstat 1' + +------------------------------------------------------------------- New: ---- latencytop-incremental-man.patch latencytop-incremental-output.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ latencytop.spec ++++++ --- /var/tmp/diff_new_pack.DyIzGQ/_old 2012-09-14 12:44:33.000000000 +0200 +++ /var/tmp/diff_new_pack.DyIzGQ/_new 2012-09-14 12:44:33.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package latencytop (Version 0.5) +# spec file for package latencytop # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,18 +15,20 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: latencytop -BuildRequires: gtk2-devel ncurses-devel pkgconfig +BuildRequires: gtk2-devel +BuildRequires: ncurses-devel +BuildRequires: pkgconfig +Summary: Kernel latency measuring tool License: GPL-2.0 Group: System/Monitoring -Summary: Kernel latency measuring tool Version: 0.5 -Release: 3 +Release: 0 Source: latencytop-%{version}.tar.bz2 Patch: latencytop-warning-fixes.diff +Patch1: latencytop-incremental-output.patch +Patch2: latencytop-incremental-man.patch Url: http://www.latencytop.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -40,6 +42,8 @@ %prep %setup -q %patch -p1 +%patch1 -p2 +%patch2 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" ++++++ latencytop-incremental-man.patch ++++++ Index: latencytop-0.5/latencytop.8 =================================================================== --- latencytop-0.5.orig/latencytop.8 +++ latencytop-0.5/latencytop.8 @@ -15,7 +15,7 @@ latencytop \- a tool for developers to visualize system latencies .SH SYNOPSIS .B latencytop -.RI [ --unknown ] " " [ processes ... ] +.RI [ --unknown ] " " [ -c ] " " [ processes ... ] .SH DESCRIPTION This manual page documents briefly the .B latencytop @@ -46,6 +46,8 @@ If you press \fBf\fP then \fBLatencyTop\ currently waiting for an \fBfsync\fP to finish. Pressing \fBf\fP again returns you to the normal operating mode of \fBLatencyTop\fP. +\fB-c\fP this commandline argument produces incremental and textual output that is suitable for reporting latency issues + .SH SEE ALSO .BR powertop (1) .br ++++++ latencytop-incremental-output.patch ++++++ >From bb054222fc0b5ec11941bff8fd2c7e544bd9ddc8 Mon Sep 17 00:00:00 2001 From: Chris Mason <[email protected]> Date: Wed, 10 Feb 2010 11:48:02 -0500 Subject: [PATCH] Add latencytop -c to dump process information to the console This adds something similar to vmstat 1 to latencytop, where it simply does a text dump of all the process latency information to the console every 10 seconds. Back traces are included in the dump. Signed-off-by: Chris Mason <[email protected]> --- src/Makefile | 2 +- src/latencytop.c | 38 +++++++--- src/latencytop.h | 1 + src/text_dump.c | 199 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 227 insertions(+), 13 deletions(-) create mode 100644 src/text_dump.c diff --git a/src/Makefile b/src/Makefile index de24551..1ff9740 100644 --- a/src/Makefile +++ b/src/Makefile @@ -6,7 +6,7 @@ SBINDIR = /usr/sbin XCFLAGS = -W -g `pkg-config --cflags glib-2.0` -D_FORTIFY_SOURCE=2 -Wno-sign-compare LDF = -Wl,--as-needed `pkg-config --libs glib-2.0` -lncursesw -OBJS= latencytop.o text_display.o translate.o fsync.o +OBJS= latencytop.o text_display.o text_dump.o translate.o fsync.o ifdef HAS_GTK_GUI XCFLAGS += `pkg-config --cflags gtk+-2.0` -DHAS_GTK_GUI diff --git a/src/latencytop.c b/src/latencytop.c index f516f53..fe252d0 100644 --- a/src/latencytop.c +++ b/src/latencytop.c @@ -111,6 +111,10 @@ static void fixup_reason(struct latency_line *line, char *c) *(c2++) = 0; } else strncpy(line->reason, c2, 1024); + + c2 = strchr(line->reason, '\n'); + if (c2) + *c2=0; } void parse_global_list(void) @@ -538,19 +542,13 @@ static void cleanup_sysctl(void) int main(int argc, char **argv) { int i, use_gtk = 0; + int console_dump = 0; enable_sysctl(); enable_fsync_tracer(); atexit(cleanup_sysctl); -#ifdef HAS_GTK_GUI - if (preinitialize_gtk_ui(&argc, &argv)) - use_gtk = 1; -#endif - if (!use_gtk) - preinitialize_text_ui(&argc, &argv); - - for (i = 1; i < argc; i++) + for (i = 1; i < argc; i++) { if (strcmp(argv[i],"-d") == 0) { init_translations("latencytop.trans"); parse_global_list(); @@ -558,6 +556,17 @@ int main(int argc, char **argv) dump_global_to_console(); return EXIT_SUCCESS; } + if (strcmp(argv[i],"-c") == 0) + console_dump = 1; + } + +#ifdef HAS_GTK_GUI + if (!console_dump && preinitialize_gtk_ui(&argc, &argv)) + use_gtk = 1; +#endif + if (!console_dump && !use_gtk) + preinitialize_text_ui(&argc, &argv); + for (i = 1; i < argc; i++) if (strcmp(argv[i], "--unknown") == 0) { noui = 1; @@ -579,12 +588,17 @@ int main(int argc, char **argv) sleep(5); fprintf(stderr, "."); } + + if (console_dump) { + start_text_dump(); + } else { #ifdef HAS_GTK_GUI - if (use_gtk) - start_gtk_ui(); - else + if (use_gtk) + start_gtk_ui(); + else #endif - start_text_ui(); + start_text_ui(); + } prune_unused_procs(); delete_list(); diff --git a/src/latencytop.h b/src/latencytop.h index 79775ac..f3e0934 100644 --- a/src/latencytop.h +++ b/src/latencytop.h @@ -50,6 +50,7 @@ extern void start_gtk_ui(void); extern void preinitialize_text_ui(int *argc, char ***argv); extern void start_text_ui(void); +extern void start_text_dump(void); extern char *translate(char *line); extern void init_translations(char *filename); diff --git a/src/text_dump.c b/src/text_dump.c new file mode 100644 index 0000000..76fc7b1 --- /dev/null +++ b/src/text_dump.c @@ -0,0 +1,199 @@ +/* + * Copyright 2008, Intel Corporation + * + * This file is part of LatencyTOP + * + * This program file is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program in a file named COPYING; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + * + * Authors: + * Arjan van de Ven <[email protected]> + * Chris Mason <[email protected]> + */ + +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> +#include <string.h> +#include <sys/types.h> +#include <sys/time.h> +#include <dirent.h> +#include <time.h> +#include <wchar.h> +#include <ctype.h> + +#include <glib.h> + +#include "latencytop.h" + +static GList *cursor_e = NULL; +static int done = 0; + +static void print_global_list(void) +{ + GList *item; + struct latency_line *line; + int i = 1; + + printf("Globals: Cause Maximum Percentage\n"); + item = g_list_first(lines); + while (item && i < 10) { + line = item->data; + item = g_list_next(item); + + if (line->max*0.001 < 0.1) + continue; + printf("%s", line->reason); + printf("\t%5.1f msec %5.1f %%\n", + line->max * 0.001, + (line->time * 100 +0.0001) / total_time); + i++; + } +} + +static void print_one_backtrace(char *trace) +{ + char *p; + int pos; + int after; + int tabs = 0; + + if (!trace || !trace[0]) + return; + pos = 16; + while(*trace && *trace == ' ') + trace++; + + if (!trace[0]) + return; + + while(*trace) { + p = strchr(trace, ' '); + if (p) { + pos += p - trace + 1; + *p = '\0'; + } + if (!tabs) { + /* we haven't printed anything yet */ + printf("\t\t"); + tabs = 1; + } else if (pos > 79) { + /* + * we have printed something our line is going to be + * long + */ + printf("\n\t\t"); + pos = 16 + p - trace + 1; + } + printf("%s ", trace); + if (!p) + break; + + trace = p + 1; + if (trace && pos > 70) { + printf("\n"); + tabs = 0; + pos = 16; + } + } + printf("\n"); +} + +static void print_procs() +{ + struct process *proc; + GList *item; + double total; + + printf("Process details:\n"); + item = g_list_first(procs); + while (item) { + int printit = 0; + GList *item2; + struct latency_line *line; + proc = item->data; + item = g_list_next(item); + + total = 0.0; + + item2 = g_list_first(proc->latencies); + while (item2) { + line = item2->data; + item2 = g_list_next(item2); + total = total + line->time; + } + item2 = g_list_first(proc->latencies); + while (item2) { + char *p; + char *backtrace; + line = item2->data; + item2 = g_list_next(item2); + if (line->max*0.001 < 0.1) + continue; + if (!printit) { + printf("Process %s (%i) ", proc->name, proc->pid); + printf("Total: %5.1f msec\n", total*0.001); + printit = 1; + } + printf("\t%s", line->reason); + printf("\t%5.1f msec %5.1f %%\n", + line->max * 0.001, + (line->time * 100 +0.0001) / total + ); + print_one_backtrace(line->backtrace); + } + + } +} + +static int done_yet(int time, struct timeval *p1) +{ + int seconds; + int usecs; + struct timeval p2; + gettimeofday(&p2, NULL); + seconds = p2.tv_sec - p1->tv_sec; + usecs = p2.tv_usec - p1->tv_usec; + + usecs += seconds * 1000000; + if (usecs > time * 1000000) + return 1; + return 0; +} + +void signal_func(int foobie) +{ + done = 1; +} + +void start_text_dump(void) +{ + struct timeval now; + struct tm *tm; + signal(SIGINT, signal_func); + signal(SIGTERM, signal_func); + + while (!done) { + gettimeofday(&now, NULL); + printf("=============== %s", asctime(localtime(&now.tv_sec))); + update_list(); + print_global_list(); + print_procs(); + if (done) + break; + sleep(10); + } +} + -- 1.6.5.2 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
