View | Details | Raw Unified | Return to bug 18951
Collapse All | Expand All

(-)machine.c (-13 / +8 lines)
Lines 737-762 Link Here
737
    4	/* stop			*/
737
    4	/* stop			*/
738
};
738
};
739
 
739
 
740
#define CMP(a,b) ( (a) == (b) ? 0 : (a) < (b) ? -1 : 1 )
740
741
741
#define ORDERKEY_PCTCPU \
742
#define ORDERKEY_PCTCPU \
742
  if (lresult = (long) PP(p2, p_pctcpu) - (long) PP(p1, p_pctcpu), \
743
  if ((result = CMP(PP(p2, p_pctcpu),PP(p1, p_pctcpu))) == 0)
743
     (result = lresult > 0 ? 1 : lresult < 0 ? -1 : 0) == 0)
744
744
745
#define ORDERKEY_CPTICKS \
745
#define ORDERKEY_CPTICKS \
746
  if ((result = PP(p2, p_runtime) - PP(p1, p_runtime)) == 0)
746
  if ((result = CMP(PP(p2, p_runtime),PP(p1, p_runtime))) == 0)
747
747
748
#define ORDERKEY_STATE \
748
#define ORDERKEY_STATE \
749
  if ((result = sorted_state[(unsigned char) PP(p2, p_stat)] - \
749
  if ((result = CMP(sorted_state[(unsigned char) PP(p2, p_stat)], \
750
                sorted_state[(unsigned char) PP(p1, p_stat)]) == 0)
750
                sorted_state[(unsigned char) PP(p1, p_stat)])) == 0)
751
751
752
#define ORDERKEY_PRIO \
752
#define ORDERKEY_PRIO \
753
  if ((result = PP(p2, p_priority) - PP(p1, p_priority)) == 0)
753
  if ((result = CMP(PP(p2, p_priority),PP(p1, p_priority))) == 0)
754
754
755
#define ORDERKEY_RSSIZE \
755
#define ORDERKEY_RSSIZE \
756
  if ((result = VP(p2, vm_rssize) - VP(p1, vm_rssize)) == 0) 
756
  if ((result = CMP(VP(p2, vm_rssize),VP(p1, vm_rssize))) == 0) 
757
757
758
#define ORDERKEY_MEM \
758
#define ORDERKEY_MEM \
759
  if ( (result = PROCSIZE(p2) - PROCSIZE(p1)) == 0 )
759
  if ((result = CMP(PROCSIZE(p2),PROCSIZE(p1))) == 0 )
760
760
761
/* compare_cpu - the comparison function for sorting by cpu percentage */
761
/* compare_cpu - the comparison function for sorting by cpu percentage */
762
762
Lines 774-780 Link Here
774
    register struct kinfo_proc *p1;
774
    register struct kinfo_proc *p1;
775
    register struct kinfo_proc *p2;
775
    register struct kinfo_proc *p2;
776
    register int result;
776
    register int result;
777
    register pctcpu lresult;
778
777
779
    /* remove one level of indirection */
778
    /* remove one level of indirection */
780
    p1 = *(struct kinfo_proc **) pp1;
779
    p1 = *(struct kinfo_proc **) pp1;
Lines 816-822 Link Here
816
    register struct kinfo_proc *p1;
815
    register struct kinfo_proc *p1;
817
    register struct kinfo_proc *p2;
816
    register struct kinfo_proc *p2;
818
    register int result;
817
    register int result;
819
    register pctcpu lresult;
820
818
821
    /* remove one level of indirection */
819
    /* remove one level of indirection */
822
    p1 = *(struct kinfo_proc **) pp1;
820
    p1 = *(struct kinfo_proc **) pp1;
Lines 845-851 Link Here
845
    register struct kinfo_proc *p1;
843
    register struct kinfo_proc *p1;
846
    register struct kinfo_proc *p2;
844
    register struct kinfo_proc *p2;
847
    register int result;
845
    register int result;
848
    register pctcpu lresult;
849
846
850
    /* remove one level of indirection */
847
    /* remove one level of indirection */
851
    p1 = *(struct kinfo_proc **) pp1;
848
    p1 = *(struct kinfo_proc **) pp1;
Lines 874-880 Link Here
874
    register struct kinfo_proc *p1;
871
    register struct kinfo_proc *p1;
875
    register struct kinfo_proc *p2;
872
    register struct kinfo_proc *p2;
876
    register int result;
873
    register int result;
877
    register pctcpu lresult;
878
  
874
  
879
    /* remove one level of indirection */
875
    /* remove one level of indirection */
880
    p1 = *(struct kinfo_proc **) pp1;
876
    p1 = *(struct kinfo_proc **) pp1;
Lines 903-909 Link Here
903
    register struct kinfo_proc *p1;
899
    register struct kinfo_proc *p1;
904
    register struct kinfo_proc *p2;
900
    register struct kinfo_proc *p2;
905
    register int result;
901
    register int result;
906
    register pctcpu lresult;
907
902
908
    /* remove one level of indirection */
903
    /* remove one level of indirection */
909
    p1 = *(struct kinfo_proc **) pp1;
904
    p1 = *(struct kinfo_proc **) pp1;

Return to bug 18951