Print this page


Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/prstat/prstat.c
          +++ new/usr/src/cmd/prstat/prstat.c
↓ open down ↓ 18 lines elided ↑ open up ↑
  19   19   * CDDL HEADER END
  20   20   */
  21   21  
  22   22  /*
  23   23   * Copyright (c) 2013 Gary Mills
  24   24   *
  25   25   * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  26   26   * Use is subject to license terms.
  27   27   *
  28   28   * Portions Copyright 2009 Chad Mynhier
  29      - * Copyright 2012 Joyent, Inc.  All rights reserved.
  30   29   */
  31   30  
  32   31  #include <sys/types.h>
  33   32  #include <sys/resource.h>
  34   33  #include <sys/loadavg.h>
  35   34  #include <sys/time.h>
  36   35  #include <sys/pset.h>
  37   36  #include <sys/vm_usage.h>
  38   37  #include <zone.h>
  39   38  #include <libzonecfg.h>
↓ open down ↓ 217 lines elided ↑ open up ↑
 257  256  static void
 258  257  list_getsize(list_t *list)
 259  258  {
 260  259          id_info_t *id;
 261  260          vmusage_t *results, *next;
 262  261          vmusage_t *match;
 263  262          size_t nres = 0;
 264  263          size_t i;
 265  264          uint_t flags = 0;
 266  265          int ret;
 267      -        size_t physmem;
      266 +        size_t physmem = sysconf(_SC_PHYS_PAGES) * pagesize;
 268  267  
 269      -        if (!(opts.o_outpmode & OPT_VMUSAGE))
 270      -                return;
 271      -
 272      -        physmem = sysconf(_SC_PHYS_PAGES) * pagesize;
 273      -
 274  268          /*
 275  269           * Determine what swap/rss results to calculate.  getvmusage() will
 276  270           * prune results returned to non-global zones automatically, so
 277  271           * there is no need to pass different flags when calling from a
 278  272           * non-global zone.
 279  273           *
 280  274           * Currently list_getsize() is only called with a single flag.  This
 281  275           * is because -Z, -J, -T, and -a are mutually exclusive.  Regardless
 282  276           * of this, we handle multiple flags.
 283  277           */
↓ open down ↓ 1129 lines elided ↑ open up ↑
1413 1407  
1414 1408          (void) setlocale(LC_ALL, "");
1415 1409          (void) textdomain(TEXT_DOMAIN);
1416 1410          Progname(argv[0]);
1417 1411          lwpid_init();
1418 1412          fd_init(Setrlimit());
1419 1413  
1420 1414          pagesize = sysconf(_SC_PAGESIZE);
1421 1415  
1422 1416          while ((opt = getopt(argc, argv,
1423      -            "vVcd:HmarRLtu:U:n:p:C:P:h:s:S:j:k:TJWz:Z")) != (int)EOF) {
     1417 +            "vcd:HmarRLtu:U:n:p:C:P:h:s:S:j:k:TJWz:Z")) != (int)EOF) {
1424 1418                  switch (opt) {
1425 1419                  case 'r':
1426 1420                          opts.o_outpmode |= OPT_NORESOLVE;
1427 1421                          break;
1428 1422                  case 'R':
1429 1423                          opts.o_outpmode |= OPT_REALTIME;
1430 1424                          break;
1431 1425                  case 'c':
1432 1426                          opts.o_outpmode &= ~OPT_TERMCAP;
1433 1427                          opts.o_outpmode &= ~OPT_FULLSCREEN;
↓ open down ↓ 59 lines elided ↑ open up ↑
1493 1487                          while (p = strtok(NULL, ", "))
1494 1488                                  add_uid(&euid_tbl, p);
1495 1489                          break;
1496 1490                  case 'U':
1497 1491                          if ((p = strtok(optarg, ", ")) == NULL)
1498 1492                                  Die(gettext("invalid argument for -U\n"));
1499 1493                          add_uid(&ruid_tbl, p);
1500 1494                          while (p = strtok(NULL, ", "))
1501 1495                                  add_uid(&ruid_tbl, p);
1502 1496                          break;
1503      -                case 'V':
1504      -                        opts.o_outpmode |= OPT_VMUSAGE;
1505      -                        break;
1506 1497                  case 'p':
1507 1498                          fill_table(&pid_tbl, optarg, 'p');
1508 1499                          break;
1509 1500                  case 'C':
1510 1501                          fill_set_table(optarg);
1511 1502                          opts.o_outpmode |= OPT_PSETS;
1512 1503                          break;
1513 1504                  case 'P':
1514 1505                          fill_table(&cpu_tbl, optarg, 'P');
1515 1506                          break;
↓ open down ↓ 207 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX