Commit graph

65 commits

Author SHA1 Message Date
Oren Tirosh
8f2294477c py3: do not use "except Exception, e:" syntax
If catching the exception is done with "except Exception as e:" this
will work only from 2.6. To maintain backward compatibility with 2.4 I
have used sys.exc_info(). A bit of a wart, but it works.
2015-05-15 12:52:02 -05:00
Oren Tirosh
0deddadf88 py3: add () to print statements
It's a function call in 3.x and redundant parentheses around an
expression on 2.x. This works fine as long as all prints have just a
single argument. One print statement with two arguments was changed to
use % formatting instead.
2015-05-15 12:50:59 -05:00
Oren Tirosh
afc19f79b6 py3: stop using iterkeys() 2015-05-15 12:49:06 -05:00
Cybjit
272cb17cf9 smem: allow column auto-sizing 2014-11-18 20:01:16 -06:00
Cybjit
29fc357a31 showfields: complain about sets 2014-11-18 16:26:12 -06:00
Matt Mackall
02dabc0b86 rename filter to filters to make 2to3 happy 2014-07-15 01:33:26 -05:00
Matt Mackall
834dc815c8 switch file() to open() 2014-05-22 17:04:26 -05:00
Matt Mackall
02bda05e5b handle division by zero with no swap
Reported by Stefan Praszalowicz
2013-05-08 14:21:28 -05:00
Matt Mackall
9e788b26c6 drop unused import of grp 2013-04-22 17:21:03 -05:00
Lo?c Minier
f8dee1586a avoid bogus warning on PSS measurement with empty smaps files 2013-03-27 20:01:07 -07:00
Matt Mackall
2346c2b075 fix handling of new fields in smaps
reported by Loic Minier
2013-02-22 14:03:46 -06:00
Jani Monoses
e570a14243 drop trailing slashes when looking up user/group in tar snapshots 2012-11-08 14:25:42 -06:00
Paul Townsend
cf3da2ba2e Fix percentage display for swap 2011-12-08 15:59:19 -06:00
Paul Townsend
9bba73fa6d Count only filtered pids
If '-t' is specified and a filter such as '-U me' is specified, the
pid total displayed is the total number of pids instead of the number
of filtered pids.
2011-12-05 22:42:38 -06:00
Matt Mackall
ac741c5ce9 cache meminfo data 2011-12-05 14:55:39 -06:00
Matt Mackall
d4406341a4 Be more forgiving of environment errors for memory and user views 2011-11-30 14:57:25 -06:00
Paul Townsend
5d5d2dd183 Sort the output by "rss" when no "Pss" present in smaps. 2011-08-22 16:10:00 -05:00
Paul Townsend
76959e6b68 Properly convert uid/gid to string 2011-08-22 16:09:51 -05:00
Paul Townsend
323e6491c4 Grab uid info from /proc/<pid>/ stat 2011-08-22 16:09:17 -05:00
Paul Townsend
bc48175929 Catch KeyError on uid and gid conversion 2011-08-17 17:16:21 -04:00
Matt Mackall
0245f382ba Use /usr/bin/env to locate Python 2011-08-17 16:31:34 -05:00
Matt Mackall
0279ad465a Actively detect PSS support
Rather than checking the kernel version, look for PSS field when
parsing smaps data and issue a warning.

(based on a suggestion by Paul Townsend)
2011-08-17 13:49:33 -05:00
Matt Mackall
4cb161ea45 read process uid/gid from task rather than cmdline 2011-06-10 08:58:26 -05:00
Matt Mackall
27fe66a83c Add support for terabytes 2011-05-26 09:17:28 -05:00
Tim Bird
7b68171f07 Fix bug in pie chart logic
I was getting an error with pie charts on some systems
with very small memory usage.

$ smem -S data.tar --pie=command
Traceback (most recent call last):
  File "/usr/local/bin/smem", line 636, in <module>
    showpids()
  File "/usr/local/bin/smem", line 246, in showpids
    showtable(pt.keys(), fields, columns.split(), options.sort or 'pss')
  File "/usr/local/bin/smem", line 455, in showtable
    showpie(l, sort)
  File "/usr/local/bin/smem", line 498, in showpie
    while values and (t + values[-1 - c] < (tm * .02) or
IndexError: list index out of range

I traced it to a bug in showpie, where there's some confused
usage of a list index and list popping.

In showpie, c is used to index into the values in a while
loop that removes entries from the end of a sorted list,
and aggregates their values for use in an "other" entry,
added to the list before display.

Moving (and using) the index is wrong because the list is being
chopped from the end as we go.  This warps the value of 'other',
but under normal circumstances would probably not be noticeable
because these items have very small values.
However, if several items are popped, and the list is very short,
it can result in the list index error above.

Also, truncating the values and labels in the subsequent
conditional is redundant with the pop in the loop.

Below is a patch to fix these problems.
 -- Tim

---
 smem |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
2011-02-16 16:12:50 -06:00
Hynek Cernoch
e2c5ced39a Clean up some tabs 2010-12-13 22:33:05 +01:00
Hynek Cernoch
fc150ea960 Give hint about uncompressed kernels 2010-12-13 22:33:05 +01:00
Hynek Cernoch
455466fb67 Fixed bug in realmem option 2010-12-13 22:33:05 +01:00
Yves Goergen
c082952423 Avoid tracebacks on disappearing processes 2011-02-16 16:01:38 -06:00
Matt Mackall
d3d782beb0 Fix _ucache some more 2009-07-06 15:20:41 -05:00
Matt Mackall
dbe27ffe29 Fix references to _ucache and _gcache 2009-07-06 15:20:05 -05:00
Matt Mackall
7650aa076d tar source: use usernames and groupnames from tarfile if available 2009-06-23 17:01:12 -05:00
Matt Mackall
c8bb8425b2 Make system memory reporting more robust
- totalmem should return kB when provided manually
- firmware size never goes below zero
- add comments
- calculate kernel portion of cached by subtracting mapped rather than
  anonymous
- get rid of sum() bits for silly column totals
2009-05-27 18:12:00 -05:00
Matt Mackall
dac4809c06 be less picky about tar directories 2009-05-22 17:29:51 -05:00
Tim Bird
67aee6e39d Kernel version >= 2.6.27 check
Jeff Schroeder wrote:
> Awesome tool! I learned about this from the LWN article and
> immediately (stupidly) tried it out on a centos 5 host. Here is a
> patch to add a kernel version check.

This is a nice fix, but the version check should be done against
the proc data being used (which is not necessarily that of the
local kernel).  This required moving kernel_version_check to
after where the src data is read.
2009-05-22 12:41:07 -05:00
Ademar de Souza Reis Jr
b2041ff9b6 Fix broken -n option
[ademar@optimus smem]$ ./smem -n
Traceback (most recent call last):
  File "./smem", line 624, in <module>
  ...
2009-05-21 11:46:37 -03:00
???
04b9f552f4 [PATCH] invalid "-K" value cause smem ended with IndexError exception
I do "smem -w -K a.txt -R 2048M" and got following error:
zhichyu@w-shpd-zcyu:~/sftw4ubuntu$ smem-0.1/smem -w -K a.txt -R 2048M
size: 'a.txt': No such file
Traceback (most recent call last):
  File "smem-0.1/smem", line 607, in <module>
    showsystem()
  File "smem-0.1/smem", line 361, in showsystem
    k = kernelsize()
  File "smem-0.1/smem", line 77, in kernelsize
    d = os.popen("size %s" % options.kernel).readlines()[1]
IndexError: list index out of range

The root cause is that os.popen("size a.txt") returns only one line.
If the user provides an invalid kernel image file path, I think it's
better to assume the image size is zero than raise an exception.
2009-05-14 22:22:44 -05:00
???
4865bf2967 [PATCH] physical memory size computing error
There are two minor bugs on physical memory size computing:
(1) fromunits() returns wrong value for "2001844kB", which consists of
more than one digits.
(2) memory()['memtotal'] is in kB. If "--realmem" is not provided at
CLI, totalmem() returns number in MB and the "firmware/hardware"
amount will be minus. totalmem() needs to always return value in kB.

Here is how to test this patch:
(1) Do "smem -w" , the "firmware/hardware" amount should not be minus.
(2) Do "smem -w -R 2001844kB" (change 2001844kB per your PC, note to
keep it in kB unit) , the "firmware/hardware" amount should not be
minus.

Here's a patch to fix these issues.
2009-05-14 22:08:38 -05:00
Jeff Schroeder
52848c0efb Kernel version >= 2.6.27 check
Awesome tool! I learned about this from the LWN article and
immediately (stupidly) tried it out on a centos 5 host. Here is a
patch to add a kernel version check.
2009-04-30 20:04:20 -05:00
Matt Mackall
aab32ae9de Add GPLv2+ license and copyright notice 2009-04-30 11:57:52 -05:00
Matt Mackall
8adb875a88 catch keyboard interrupts 2009-04-07 15:14:11 -07:00
Matt Mackall
cd9a831067 Add x labels to bar chart 2009-04-07 15:10:28 -07:00
Matt Mackall
49fe263577 allow -c list, fix bar colors 2009-04-07 14:59:41 -07:00
Matt Mackall
983598c5b0 fix-ups for system view 2009-04-07 11:19:47 -07:00
Matt Mackall
90f16294c7 Add -w system reporting mode 2009-04-07 01:46:22 -07:00
Matt Mackall
88cd5c32e6 Add basic bar chart support 2009-04-07 00:24:39 -07:00
Matt Mackall
37546c5021 break pie chart into separate function 2009-04-06 23:19:46 -07:00
Matt Mackall
a7879677dd add column help 2009-04-06 23:11:36 -07:00
Matt Mackall
589c0de53f change count to pids in map view 2009-04-06 22:50:44 -07:00
Matt Mackall
000c1e0689 Add reading from alternate directory and tarball and example capture script 2009-04-06 22:48:01 -07:00