Print this page
patch relling-feedback

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/stat/vmstat/vmstat.c
          +++ new/usr/src/cmd/stat/vmstat/vmstat.c
↓ open down ↓ 312 lines elided ↑ open up ↑
 313  313                  return;
 314  314          }
 315  315  
 316  316          adjprintf(" %*lu", 1, DELTA(s_sys.ss_sysinfo.runque) / sys_updates);
 317  317          adjprintf(" %*lu", 1, DELTA(s_sys.ss_sysinfo.waiting) / sys_updates);
 318  318          adjprintf(" %*lu", 1, DELTA(s_sys.ss_sysinfo.swpque) / sys_updates);
 319  319          adjprintf(" %*u", 6, pgtok((int)(DELTA(s_sys.ss_vminfo.swap_avail)
 320  320              / vm_updates)));
 321  321          adjprintf(" %*u", 5, pgtok((int)(DELTA(s_sys.ss_vminfo.freemem)
 322  322              / vm_updates)));
 323      -        adjprintf(" %*.0f", 3, swflag?
 324      -            kstat_delta(oldvm, newvm, "swapin") / etime :
      323 +        adjprintf(" %*.0f", 3, swflag? 0 :
 325  324              kstat_delta(oldvm, newvm, "pgrec") / etime);
 326      -        adjprintf(" %*.0f", 3, swflag?
 327      -            kstat_delta(oldvm, newvm, "swapout") / etime :
      325 +        adjprintf(" %*.0f", 3, swflag? 0 :
 328  326              (kstat_delta(oldvm, newvm, "hat_fault")
 329  327              + kstat_delta(oldvm, newvm, "as_fault"))
 330  328              / etime);
 331  329          adjprintf(" %*.0f", 2, pgtok(kstat_delta(oldvm, newvm, "pgpgin"))
 332  330              / etime);
 333  331          adjprintf(" %*.0f", 2, pgtok(kstat_delta(oldvm, newvm, "pgpgout"))
 334  332              / etime);
 335  333          adjprintf(" %*.0f", 2, pgtok(kstat_delta(oldvm, newvm, "dfree"))
 336  334              / etime);
 337  335          adjprintf(" %*ld", 2, pgtok(new->s_sys.ss_deficit));
↓ open down ↓ 71 lines elided ↑ open up ↑
 409  407          kstat_named_t *ksn = kstat_data_lookup(ks, name);
 410  408          if (ksn == NULL) {
 411  409                  fail(0, "kstat_data_lookup('%s', '%s') failed",
 412  410                      ks->ks_name, name);
 413  411          }
 414  412  
 415  413          (void) printf("%9llu %s\n", ksn->value.ui64, pretty);
 416  414  }
 417  415  
 418  416  static void
      417 +zero_out(char const *pretty)
      418 +{
      419 +        (void) printf("%9llu %s\n", 0, pretty);
      420 +}
      421 +
      422 +static void
 419  423  dosum(struct sys_snapshot *ss)
 420  424  {
 421  425          uint64_t total_faults;
 422  426          kstat_named_t *ksn;
 423  427          long double nchtotal;
 424  428          uint64_t nchhits;
 425  429  
 426      -        sum_out("swap ins", &ss->ss_agg_vm, "swapin");
 427      -        sum_out("swap outs", &ss->ss_agg_vm, "swapout");
 428      -        sum_out("pages swapped in", &ss->ss_agg_vm, "pgswapin");
 429      -        sum_out("pages swapped out", &ss->ss_agg_vm, "pgswapout");
      430 +        zero_out("swap ins");
      431 +        zero_out("swap outs");
      432 +        zero_out("pages swapped in");
      433 +        zero_out("pages swapped out");
 430  434  
 431  435          ksn = kstat_data_lookup(&ss->ss_agg_vm, "hat_fault");
 432  436          if (ksn == NULL) {
 433  437                  fail(0, "kstat_data_lookup('%s', 'hat_fault') failed",
 434  438                      ss->ss_agg_vm.ks_name);
 435  439          }
 436  440          total_faults = ksn->value.ui64;
 437  441          ksn = kstat_data_lookup(&ss->ss_agg_vm, "as_fault");
 438  442          if (ksn == NULL) {
 439  443                  fail(0, "kstat_data_lookup('%s', 'as_fault') failed",
↓ open down ↓ 69 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX