patch relling-feedback

*** 318,332 ****
          adjprintf(" %*lu", 1, DELTA(s_sys.ss_sysinfo.swpque) / sys_updates);
          adjprintf(" %*u", 6, pgtok((int)(DELTA(s_sys.ss_vminfo.swap_avail)
              / vm_updates)));
          adjprintf(" %*u", 5, pgtok((int)(DELTA(s_sys.ss_vminfo.freemem)
              / vm_updates)));
!         adjprintf(" %*.0f", 3, swflag?
!             kstat_delta(oldvm, newvm, "swapin") / etime :
              kstat_delta(oldvm, newvm, "pgrec") / etime);
!         adjprintf(" %*.0f", 3, swflag?
!             kstat_delta(oldvm, newvm, "swapout") / etime :
              (kstat_delta(oldvm, newvm, "hat_fault")
              + kstat_delta(oldvm, newvm, "as_fault"))
              / etime);
          adjprintf(" %*.0f", 2, pgtok(kstat_delta(oldvm, newvm, "pgpgin"))
              / etime);
--- 318,330 ----
          adjprintf(" %*lu", 1, DELTA(s_sys.ss_sysinfo.swpque) / sys_updates);
          adjprintf(" %*u", 6, pgtok((int)(DELTA(s_sys.ss_vminfo.swap_avail)
              / vm_updates)));
          adjprintf(" %*u", 5, pgtok((int)(DELTA(s_sys.ss_vminfo.freemem)
              / vm_updates)));
!         adjprintf(" %*.0f", 3, swflag? 0 :
              kstat_delta(oldvm, newvm, "pgrec") / etime);
!         adjprintf(" %*.0f", 3, swflag? 0 :
              (kstat_delta(oldvm, newvm, "hat_fault")
              + kstat_delta(oldvm, newvm, "as_fault"))
              / etime);
          adjprintf(" %*.0f", 2, pgtok(kstat_delta(oldvm, newvm, "pgpgin"))
              / etime);
*** 414,434 ****
  
          (void) printf("%9llu %s\n", ksn->value.ui64, pretty);
  }
  
  static void
  dosum(struct sys_snapshot *ss)
  {
          uint64_t total_faults;
          kstat_named_t *ksn;
          long double nchtotal;
          uint64_t nchhits;
  
!         sum_out("swap ins", &ss->ss_agg_vm, "swapin");
!         sum_out("swap outs", &ss->ss_agg_vm, "swapout");
!         sum_out("pages swapped in", &ss->ss_agg_vm, "pgswapin");
!         sum_out("pages swapped out", &ss->ss_agg_vm, "pgswapout");
  
          ksn = kstat_data_lookup(&ss->ss_agg_vm, "hat_fault");
          if (ksn == NULL) {
                  fail(0, "kstat_data_lookup('%s', 'hat_fault') failed",
                      ss->ss_agg_vm.ks_name);
--- 412,438 ----
  
          (void) printf("%9llu %s\n", ksn->value.ui64, pretty);
  }
  
  static void
+ zero_out(char const *pretty)
+ {
+         (void) printf("%9llu %s\n", 0, pretty);
+ }
+ 
+ static void
  dosum(struct sys_snapshot *ss)
  {
          uint64_t total_faults;
          kstat_named_t *ksn;
          long double nchtotal;
          uint64_t nchhits;
  
!         zero_out("swap ins");
!         zero_out("swap outs");
!         zero_out("pages swapped in");
!         zero_out("pages swapped out");
  
          ksn = kstat_data_lookup(&ss->ss_agg_vm, "hat_fault");
          if (ksn == NULL) {
                  fail(0, "kstat_data_lookup('%s', 'hat_fault') failed",
                      ss->ss_agg_vm.ks_name);