From mboxrd@z Thu Jan 1 00:00:00 1970 From: Don Slutz Subject: [PATCH v5 04/17] xenctx: Add command line options -b (--bytes-per-line) and -l (--lines) Date: Thu, 20 Mar 2014 15:06:52 -0400 Message-ID: <1395342425-16260-5-git-send-email-dslutz@verizon.com> References: <1395342425-16260-1-git-send-email-dslutz@verizon.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1395342425-16260-1-git-send-email-dslutz@verizon.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: Ian Campbell , Stefano Stabellini , George Dunlap , Ian Jackson , Don Slutz , Jan Beulich List-Id: xen-devel@lists.xenproject.org -b , --bytes-per-line change the number of bytes per line output for Stack. (default 32) Note: rounded to native size (4 or 8 bytes). -l , --lines change the number of lines output for Stack. (default 5) Can be specified as MAX. Note: Fewer lines will be output if Stack limit reached. Signed-off-by: Don Slutz --- v5: Add defaults to disply. Accept MAX for -l. tools/xentrace/xenctx.c | 79 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 67 insertions(+), 12 deletions(-) diff --git a/tools/xentrace/xenctx.c b/tools/xentrace/xenctx.c index caa8899..f540b61 100644 --- a/tools/xentrace/xenctx.c +++ b/tools/xentrace/xenctx.c @@ -23,12 +23,16 @@ #include #include #include +#include #include "xenctrl.h" #include #include #include +#define DEFAULT_BYTES_PER_LINE 32 +#define DEFAULT_LINES 5 + static struct xenctx { xc_interface *xc_handle; int domid; @@ -36,6 +40,8 @@ static struct xenctx { int stack_trace; int disp_all; int multiple_pages; + int bytes_per_line; + int lines; int all_vcpus; int self_paused; xc_dominfo_t dominfo; @@ -62,6 +68,8 @@ typedef uint64_t guest_word_t; #define FMT_64B_WORD "%016lx" #endif +#define MAX_BYTES_PER_LINE 128 + struct symbol { guest_word_t address; char *name; @@ -663,25 +671,33 @@ static int print_stack(vcpu_guest_context_any_t *ctx, int vcpu, int width) guest_word_t *p; int i; + if ( width ) + xenctx.bytes_per_line = ((xenctx.bytes_per_line + width - 1) / width) * width; stack_limit = ((stack_pointer(ctx) + XC_PAGE_SIZE) & ~((guest_word_t) XC_PAGE_SIZE - 1)); if ( xenctx.multiple_pages > 1 ) stack_limit += (xenctx.multiple_pages - 1) * XC_PAGE_SIZE; printf("\n"); - printf("Stack:\n"); - for (i=1; i<5 && stack < stack_limit; i++) { - while(stack < stack_limit && stack < stack_pointer(ctx) + i*32) { - p = map_page(ctx, vcpu, stack); - if (!p) - return -1; - word = read_stack_word(p, width); - printf(" "); - print_stack_word(word, width); - stack += width; + if ( xenctx.lines ) + { + printf("Stack:\n"); + for (i = 1; i < xenctx.lines + 1 && stack < stack_limit; i++) + { + while ( stack < stack_limit && + stack < stack_pointer(ctx) + i * xenctx.bytes_per_line ) + { + p = map_page(ctx, vcpu, stack); + if ( !p ) + return -1; + word = read_stack_word(p, width); + printf(" "); + print_stack_word(word, width); + stack += width; + } + printf("\n"); } printf("\n"); } - printf("\n"); if(xenctx.stack_trace) printf("Stack Trace:\n"); @@ -840,19 +856,30 @@ static void usage(void) printf(" -n PAGES, --display-stack-pages=PAGES\n"); printf(" Display N pages from the stack pointer.\n"); printf(" Note: use with caution (easy to get garbage).\n"); + printf(" -b , --bytes-per-line \n"); + printf(" change the number of bytes per line output for Stack.\n"); + printf(" (default %d) Note: rounded to native size (4 or 8 bytes).\n", + DEFAULT_BYTES_PER_LINE); + printf(" -l , --lines \n"); + printf(" change the number of lines output for Stack. (default %d)\n", + DEFAULT_LINES); + printf(" Can be specified as MAX. Note: Fewer lines will be output\n"); + printf(" if Stack limit reached.\n"); } int main(int argc, char **argv) { int ch; int ret; - static const char *sopts = "fs:hak:SCn:"; + static const char *sopts = "fs:hak:SCn:b:l:"; static const struct option lopts[] = { {"stack-trace", 0, NULL, 'S'}, {"symbol-table", 1, NULL, 's'}, {"frame-pointers", 0, NULL, 'f'}, {"kernel-start", 1, NULL, 'k'}, {"display-stack-pages", 0, NULL, 'n'}, + {"bytes-per-line", 1, NULL, 'b'}, + {"lines", 1, NULL, 'l'}, {"all", 0, NULL, 'a'}, {"all-vcpus", 0, NULL, 'C'}, {"help", 0, NULL, 'h'}, @@ -862,6 +889,9 @@ int main(int argc, char **argv) int vcpu = 0; + xenctx.bytes_per_line = DEFAULT_BYTES_PER_LINE; + xenctx.lines = DEFAULT_LINES; + while ((ch = getopt_long(argc, argv, sopts, lopts, NULL)) != -1) { switch(ch) { case 'f': @@ -879,6 +909,31 @@ int main(int argc, char **argv) case 'n': xenctx.multiple_pages = strtol(optarg, NULL, 0); break; + case 'b': + xenctx.bytes_per_line = strtol(optarg, NULL, 0); + if ( xenctx.bytes_per_line < 4 || + xenctx.bytes_per_line > MAX_BYTES_PER_LINE ) + { + fprintf(stderr, + "%s: Unsupported value for --bytes-per-line. Needs to be 4 <= <= %d\n", + argv[0], MAX_BYTES_PER_LINE); + exit(-1); + } + break; + case 'l': + if ( !strcmp(optarg, "all") || !strcmp(optarg, "ALL") || + !strcmp(optarg, "max") || !strcmp(optarg, "MAX") ) + xenctx.lines = INT_MAX; + else + xenctx.lines = strtol(optarg, NULL, 0); + if ( xenctx.lines < 0 ) + { + fprintf(stderr, + "%s: Unsupported value for --lines. Needs to be >= 0\n", + argv[0]); + exit(-1); + } + break; case 'C': xenctx.all_vcpus = 1; break; -- 1.8.4