Hello community, here is the log from the commit of package lcrash checked in at Sat Jan 12 02:15:48 CET 2008. -------- --- lcrash/lcrash.changes 2007-12-13 11:49:19.000000000 +0100 +++ /mounts/work_src_done/STABLE/lcrash/lcrash.changes 2008-01-10 15:21:01.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Jan 10 15:10:24 CET 2008 - bwalle@suse.de + +- update to update SVN version 1420 + o Fix timestamp problem in zfcp dbf view. + o Implement -N/--noverify option for lcrash + o Use page size of s390 dump header (#343799) + +------------------------------------------------------------------- Old: ---- lkcdutils-svn-r1415.tar.bz2 New: ---- lkcdutils-svn-r1420.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lcrash.spec ++++++ --- /var/tmp/diff_new_pack.a31871/_old 2008-01-12 02:13:34.000000000 +0100 +++ /var/tmp/diff_new_pack.a31871/_new 2008-01-12 02:13:34.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package lcrash (Version 7.0.1_1415) +# spec file for package lcrash (Version 7.0.1_1420) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -19,8 +19,8 @@ BuildRequires: glib2-devel popt-devel zlib-devel BuildRequires: bison flex module-init-tools ncurses-devel Summary: Linux Kernel Crash Dump (LKCD) Utilities -Version: 7.0.1_1415 -Release: 3 +Version: 7.0.1_1420 +Release: 1 %define sourcename lkcdutils %define svnversion %(echo %{version} | cut -d _ -f 2) %define tarversion svn-r%{svnversion} @@ -151,6 +151,11 @@ %doc ./docs/lcrash/lcrash-howto/lcrash.pdf %changelog +* Thu Jan 10 2008 - bwalle@suse.de +- update to update SVN version 1420 + o Fix timestamp problem in zfcp dbf view. + o Implement -N/--noverify option for lcrash + o Use page size of s390 dump header (#343799) * Thu Dec 13 2007 - bwalle@suse.de - add sanity check for mapfile (#333794) * Mon Dec 10 2007 - bwalle@suse.de ++++++ lkcdutils-svn-r1415.tar.bz2 -> lkcdutils-svn-r1420.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lkcdutils-svn-r1415/lcrash/cmds/cmd_dbf_s390.c new/lkcdutils-svn-r1420/lcrash/cmds/cmd_dbf_s390.c --- old/lkcdutils-svn-r1415/lcrash/cmds/cmd_dbf_s390.c 2007-11-05 13:45:26.000000000 +0100 +++ new/lkcdutils-svn-r1420/lcrash/cmds/cmd_dbf_s390.c 2007-12-12 14:55:51.000000000 +0100 @@ -1,5 +1,5 @@ /* - * $Id: cmd_dbf_s390.c 1412 2007-11-05 12:45:26Z holzheu $ + * $Id: cmd_dbf_s390.c 1418 2007-12-12 13:55:51Z holzheu $ * * This file is part of lcrash, an analysis tool for Linux memory dumps. * @@ -1206,7 +1206,7 @@ uint8_t data[]; } __attribute__ ((packed)); -static int dbf_stck(char *, const char *, unsigned long long); +static int dbf_stck(char *, const char *, uint64_t); static int dbf_tag(char *, const char *, const char *); static int dbf_view(char *, const char *, const char *, ...); static int dbf_view_dump(char *, const char *, char *, int, int, int); @@ -1760,7 +1760,7 @@ int size = VAL32(dump->size); int i = 0; if (!is_tag(dump->tag, "dump")) { - i += dbf_stck(buf+i, "timestamp", entry->id.stck); + i += dbf_stck(buf+i, "timestamp", KL_GET_UINT64(&entry->id)); i += dbf_view(buf+i, "cpu", "%02i", entry->id.fields.cpuid); } else { i += dbf_view_dump(buf+i, NULL, (char*) dump->data, size, @@ -1807,20 +1807,14 @@ return i; } -int dbf_stck(char *buf, const char *label, unsigned long long stck) +int dbf_stck(char *buf, const char *label, uint64_t todval) { - unsigned long long sec; - struct timespec xtime; - int i = 0; + struct timeval xtime; + int i; - stck -= 0x8126d60e46000000LL - (0x3c26700LL * 1000000 * 4096); - sec = stck >> 12; - sec/=1000000; - xtime.tv_sec = sec; - stck -= (sec * 1000000) << 12; - xtime.tv_nsec = ((stck * 1000) >> 12); - i += sprintf(buf+i, "%-24s%011lu:%06lu\n", label, xtime.tv_sec, - xtime.tv_nsec); + kl_s390tod_to_timeval(todval, &xtime); + i = sprintf(buf, "%-24s%011lu:%06lu\n", label, xtime.tv_sec, + xtime.tv_usec); return i; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lkcdutils-svn-r1415/lcrash/main.c new/lkcdutils-svn-r1420/lcrash/main.c --- old/lkcdutils-svn-r1415/lcrash/main.c 2007-08-30 14:07:55.000000000 +0200 +++ new/lkcdutils-svn-r1420/lcrash/main.c 2008-01-10 14:49:55.000000000 +0100 @@ -1,5 +1,5 @@ /* - * $Id: main.c 1408 2007-08-30 12:07:55Z bwalle $ + * $Id: main.c 1419 2008-01-10 13:49:55Z bwalle $ * * This file is part of lcrash, an analysis tool for Linux memory dumps. * @@ -49,10 +49,11 @@ {"dso", required_argument, 0, 'l'}, /* shared (dso) library */ {"extratypes", required_argument, 0, 'x'}, /* extra types file */ {"version", no_argument, 0, 'v'}, /* version info */ + {"noverify", no_argument, 0, 'N'}, /* noverify */ {0, 0, 0, 0} }; -#define OPTSTRING "a:d:ef:g:hI:iM:m:n:o:prs:t:x:T:vl:" +#define OPTSTRING "a:d:ef:g:hI:iM:m:n:o:prs:t:x:T:vl:N" extern char *optarg; extern int optind, opterr, optopt; @@ -103,6 +104,7 @@ " -f, --failsafe RELEASE start lcrash in failsafe way\n"\ " (i.e. omit certain checks and initializations)\n"\ " RELEASE is Linux release of dump (E.g. '2.6.18')\n"\ +" -N, --noverify Disable some checks\n"\ " -g, --debug LEVEL debug level for lcrash\n"\ " -h, --help display this help\n"\ " -I PATH path for include files (for libsial)\n"\ @@ -256,6 +258,9 @@ bounds = atoi(optarg); lc_flags |= LC_BOUNDS_FLG; break; + case 'N': + kl_flags |= KL_NOVERIFY_FLG; + break; case 'o': /* output of digested kerntypes */ if(strlen(optarg) >= LCRASH_OPT_MAX){ fprintf(KL_ERRORFP, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lkcdutils-svn-r1415/lcrash/man/lcrash.1 new/lkcdutils-svn-r1420/lcrash/man/lcrash.1 --- old/lkcdutils-svn-r1415/lcrash/man/lcrash.1 2005-02-28 22:57:15.000000000 +0100 +++ new/lkcdutils-svn-r1420/lcrash/man/lcrash.1 2008-01-10 14:49:55.000000000 +0100 @@ -94,6 +94,10 @@ start lcrash in failsafe way (i.e. omit certain checks and initializations) .TE .TP +.B -n, --noverify +don't execute some checks +.TE +.TP .BI "-g, --debug " LEVEL debug level for lcrash .TE diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lkcdutils-svn-r1415/lib/libklib/kl_savedump.c new/lkcdutils-svn-r1420/lib/libklib/kl_savedump.c --- old/lkcdutils-svn-r1415/lib/libklib/kl_savedump.c 2005-08-05 21:09:22.000000000 +0200 +++ new/lkcdutils-svn-r1420/lib/libklib/kl_savedump.c 2008-01-10 15:06:22.000000000 +0100 @@ -1,5 +1,5 @@ /* - * $Id: kl_savedump.c 1225 2005-08-05 19:09:22Z troyhebe $ + * $Id: kl_savedump.c 1420 2008-01-10 14:06:22Z bwalle $ * * This file is part of libklib. * A library which provides access to Linux system kernel dumps. @@ -653,8 +653,8 @@ kl_compress_fn_t compress_fn = kl_compress_gzip; kl_dump_page_t dp; char dump_page_buf[KL_DUMP_BUFFER_SIZE]; - char buf[KL_DUMP_PAGE_SIZE]; - char dpcpage[KL_DUMP_PAGE_SIZE]; + char *buf = NULL; + char *dpcpage = NULL; uint64_t mem_loc; uint32_t buf_loc = 0; int size; @@ -677,6 +677,22 @@ "from dump file!\n"); rc = 0; goto out; } + + KL_DUMP_PAGE_SIZE = s390_dh.page_size; + KL_DUMP_PAGE_MASK = ~((uint64_t)KL_DUMP_PAGE_SIZE-1); + KL_DUMP_PAGE_SHIFT = 12; + while ((KL_DUMP_PAGE_SIZE >> KL_DUMP_PAGE_SHIFT) != 1) { + KL_DUMP_PAGE_SHIFT++; + } + + buf = malloc(KL_DUMP_PAGE_SIZE); + if (!buf) + goto out; + + dpcpage = malloc(KL_DUMP_PAGE_SIZE); + if (!dpcpage) + goto out; + kl_s390sa_to_reg_header(&s390_dh,&dh); /* write dump header */ @@ -752,6 +768,9 @@ dp.flags = 0x0; write(fout, dump_page_buf, sizeof(kl_dump_page_t)); out: + free(buf); + free(dpcpage); + return rc; #else return 0; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org