Compare commits

..

No commits in common. "master" and "1.1" have entirely different histories.

3 changed files with 57 additions and 117 deletions

41
COPYING
View file

@ -1,12 +1,12 @@
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
the GNU Lesser General Public License instead.) You can apply it to
the GNU Library General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
GNU GENERAL PUBLIC LICENSE
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
@ -225,7 +225,7 @@ impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
NO WARRANTY
NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
@ -303,16 +303,17 @@ the "copyright" line and a pointer to where the full notice is found.
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; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) year name of author
Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
@ -335,5 +336,5 @@ necessary. Here is a sample; alter the names:
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Lesser General
library. If this is what you want to do, use the GNU Library General
Public License instead of this License.

129
smem
View file

@ -8,7 +8,7 @@
# the GNU General Public License version 2 or later, incorporated
# herein by reference.
import re, os, sys, pwd, optparse, errno, tarfile
import re, os, sys, pwd, grp, optparse, errno, tarfile
warned = False
@ -17,11 +17,10 @@ class procdata(object):
self._ucache = {}
self._gcache = {}
self.source = source and source or ""
self._memdata = None
def _list(self):
return os.listdir(self.source + "/proc")
def _read(self, f):
return open(self.source + '/proc/' + f).read()
return file(self.source + '/proc/' + f).read()
def _readlines(self, f):
return self._read(f).splitlines(True)
def _stat(self, f):
@ -34,9 +33,7 @@ class procdata(object):
def mapdata(self, pid):
return self._readlines('%s/smaps' % pid)
def memdata(self):
if self._memdata is None:
self._memdata = self._readlines('meminfo')
return self._memdata
return self._readlines('meminfo')
def version(self):
return self._readlines('version')[0]
def pidname(self, pid):
@ -94,12 +91,12 @@ class tardata(procdata):
def _readlines(self, f):
return self.tar.extractfile(f).readlines()
def piduser(self, p):
t = self.tar.getmember("%d" % p)
t = self.tar.getmember("%d/" % p)
if t.uname:
self._ucache[t.uid] = t.uname
return t.uid
def pidgroup(self, p):
t = self.tar.getmember("%d" % p)
t = self.tar.getmember("%d/" % p)
if t.gname:
self._gcache[t.gid] = t.gname
return t.gid
@ -143,15 +140,13 @@ def pidmaps(pid):
maps = {}
start = None
seen = False
empty = True
for l in src.mapdata(pid):
empty = False
f = l.split()
if f[-1] == 'kB':
if f[0].startswith('Pss'):
seen = True
maps[start][f[0][:-1].lower()] = int(f[1])
elif '-' in f[0] and ':' not in f[0]: # looks like a mapping range
else:
start, end = f[0].split('-')
start = int(start, 16)
name = "<anonymous>"
@ -161,7 +156,7 @@ def pidmaps(pid):
offset=int(f[2], 16),
device=f[3], inode=f[4], name=name)
if not empty and not seen and not warned:
if not seen and not warned:
sys.stderr.write('warning: kernel does not appear to support PSS measurement\n')
warned = True
if not options.sort:
@ -170,7 +165,7 @@ def pidmaps(pid):
if options.mapfilter:
f = {}
for m in maps:
if not filters(options.mapfilter, m, lambda x: maps[x]['name']):
if not filter(options.mapfilter, m, lambda x: maps[x]['name']):
f[m] = maps[m]
return f
@ -218,16 +213,14 @@ def fromunits(x):
def pidusername(pid):
return src.username(src.piduser(pid))
def showamount(a, total):
def showamount(a):
if options.abbreviate:
return units(a * 1024)
elif options.percent:
if total == 0:
return 'N/A'
return "%.2f%%" % (100.0 * a / total)
return "%.2f%%" % (100.0 * a / totalmem())
return a
def filters(opt, arg, *sources):
def filter(opt, arg, *sources):
if not opt:
return False
@ -240,7 +233,7 @@ def pidtotals(pid):
maps = pidmaps(pid)
t = dict(size=0, rss=0, pss=0, shared_clean=0, shared_dirty=0,
private_clean=0, private_dirty=0, referenced=0, swap=0)
for m in maps:
for m in maps.iterkeys():
for k in t:
t[k] += maps[m].get(k, 0)
@ -252,8 +245,8 @@ def pidtotals(pid):
def processtotals(pids):
totals = {}
for pid in pids:
if (filters(options.processfilter, pid, src.pidname, src.pidcmd) or
filters(options.userfilter, pid, pidusername)):
if (filter(options.processfilter, pid, src.pidname, src.pidcmd) or
filter(options.userfilter, pid, pidusername)):
continue
try:
p = pidtotals(pid)
@ -273,7 +266,7 @@ def showpids():
return pidusername(p)
fields = dict(
pid=('PID', lambda n: n, '% 5s', lambda x: len(pt),
pid=('PID', lambda n: n, '% 5s', lambda x: len(p),
'process ID'),
user=('User', showuser, '%-8s', lambda x: len(dict.fromkeys(x)),
'owner of process'),
@ -301,13 +294,13 @@ def showpids():
def maptotals(pids):
totals = {}
for pid in pids:
if (filters(options.processfilter, pid, src.pidname, src.pidcmd) or
filters(options.userfilter, pid, pidusername)):
if (filter(options.processfilter, pid, src.pidname, src.pidcmd) or
filter(options.userfilter, pid, pidusername)):
continue
try:
maps = pidmaps(pid)
seen = {}
for m in maps:
for m in maps.iterkeys():
name = maps[m]['name']
if name not in totals:
t = dict(size=0, rss=0, pss=0, shared_clean=0,
@ -366,8 +359,8 @@ def showmaps():
def usertotals(pids):
totals = {}
for pid in pids:
if (filters(options.processfilter, pid, src.pidname, src.pidcmd) or
filters(options.userfilter, pid, pidusername)):
if (filter(options.processfilter, pid, src.pidname, src.pidcmd) or
filter(options.userfilter, pid, pidusername)):
continue
try:
maps = pidmaps(pid)
@ -383,7 +376,7 @@ def usertotals(pids):
else:
t = totals[user]
for m in maps:
for m in maps.iterkeys():
for k in t:
t[k] += maps[m].get(k, 0)
@ -463,44 +456,11 @@ def showsystem():
showtable(range(len(l)), fields, columns.split(), options.sort or 'order')
def showfields(fields, f):
if type(f) in (list, set):
print("unknown fields: " + " ".join(f))
else:
print("unknown field %s" % f)
print("known fields:")
for l in sorted(fields):
print("%-8s %s" % (l, fields[l][-1]))
def autosize(columns, fields, rows):
colsizes = {}
for c in columns:
sizes = [1]
if not options.no_header:
sizes.append(len(fields[c][0]))
if (options.abbreviate or options.percent) and 'a' in fields[c][2]:
sizes.append(7)
else:
for r in rows:
sizes.append(len(str(fields[c][1](r))))
colsizes[c] = max(sizes)
overflowcols = set(["command", "map"]) & set(columns)
if len(overflowcols) > 0:
overflowcol = overflowcols.pop()
totnoflow = sum(colsizes.values()) - colsizes[overflowcol]
try:
ttyrows, ttycolumns = os.popen('stty size', 'r').read().split()
ttyrows, ttycolumns = int(ttyrows), int(ttycolumns)
except:
ttyrows, ttycolumns = (24, 80)
maxflowcol = ttycolumns - totnoflow - len(columns)
maxflowcol = max(maxflowcol, 10)
colsizes[overflowcol] = min(colsizes[overflowcol], maxflowcol)
return colsizes
if f != list:
print "unknown field", f
print "known fields:"
for l in sorted(fields.keys()):
print "%-8s %s" % (l, fields[l][-1])
def showtable(rows, fields, columns, sort):
header = ""
@ -516,31 +476,17 @@ def showtable(rows, fields, columns, sort):
if options.bar:
columns.append(options.bar)
mt = totalmem()
st = memory()['swaptotal']
missing = set(columns) - set(fields)
if len(missing) > 0:
showfields(fields, missing)
sys.exit(-1)
if options.autosize:
colsizes = autosize(columns, fields, rows)
else:
colsizes = {}
for n in columns:
if n not in fields:
showfields(fields, n)
sys.exit(-1)
f = fields[n][2]
if 'a' in f:
if n == 'swap':
formatter.append(lambda x: showamount(x, st))
else:
formatter.append(lambda x: showamount(x, mt))
formatter.append(showamount)
f = f.replace('a', 's')
else:
formatter.append(lambda x: x)
if n in colsizes:
f = re.sub(r"[0-9]+", str(colsizes[n]), f)
format += f + " "
header += f % fields[n][0] + " "
@ -559,10 +505,10 @@ def showtable(rows, fields, columns, sort):
return
if not options.no_header:
print(header)
print header
for k,r in l:
print(format % tuple([f(v) for f,v in zip(formatter, r)]))
print format % tuple([f(v) for f,v in zip(formatter, r)])
if options.totals:
# totals
@ -574,8 +520,8 @@ def showtable(rows, fields, columns, sort):
else:
t.append("")
print("-" * len(header))
print(format % tuple([f(v) for f,v in zip(formatter, t)]))
print "-" * len(header)
print format % tuple([f(v) for f,v in zip(formatter, t)])
def showpie(l, sort):
try:
@ -664,8 +610,6 @@ parser.add_option("-c", "--columns", type="str",
help="columns to show")
parser.add_option("-t", "--totals", action="store_true",
help="show totals")
parser.add_option("-a", "--autosize", action="store_true",
help="size columns to fit terminal size")
parser.add_option("-R", "--realmem", type="str",
help="amount of physical RAM")
@ -725,8 +669,7 @@ try:
showsystem()
else:
showpids()
except IOError:
_, e, _ = sys.exc_info()
except IOError, e:
if e.errno == errno.EPIPE:
pass
except KeyboardInterrupt:

4
smem.8
View file

@ -95,10 +95,6 @@ User filter regular expression.
.SS OUTPUT FORMATTING
.TP
.B \-a, \-\-autosize
Size columns to fit terminal size.
.TP
.BI "\-c " COLUMNS ", \-\-columns=" COLUMNS
Columns to show.