root/foundation-apps/grosview-maxx/ready-for-linux-cpu-2.6.diff

Revision 2, 2.4 KB (checked in by emasson, 3 years ago)

initial import for the community edition

  • linux/cpumeter.cc 

    diff -Nur a/linux/cpumeter.cc b/linux/cpumeter.cc
    a b  
    1919#define MAX_PROCSTAT_LENGTH 4096 
    2020 
    2121CPUMeter::CPUMeter(XOSView *parent, const char *cpuID) 
    22 : FieldMeterGraph( parent, 4, toUpper(cpuID), "USR/NICE/SYS/FREE" ) { 
     22: FieldMeterGraph( parent, 7, toUpper(cpuID), "US/NI/SY/ID/WA/HI/SI" ) { 
    2323  _lineNum = findLine(cpuID); 
    2424  for ( int i = 0 ; i < 2 ; i++ ) 
    25     for ( int j = 0 ; j < 4 ; j++ ) 
     25    for ( int j = 0 ; j < 7 ; j++ ) 
    2626      cputime_[i][j] = 0; 
    2727  cpuindex_ = 0; 
    2828 
    … …  
    3838  setfieldcolor( 1, parent_->getResource( "cpuNiceColor" ) ); 
    3939  setfieldcolor( 2, parent_->getResource( "cpuSystemColor" ) ); 
    4040  setfieldcolor( 3, parent_->getResource( "cpuFreeColor" ) ); 
     41  setfieldcolor( 4, parent_->getResource( "cpuWaitColor" ) ); 
     42  setfieldcolor( 5, parent_->getResource( "cpuInterruptColor" ) ); 
     43  setfieldcolor( 6, parent_->getResource( "cpuSoftIntColor" ) ); 
    4144  priority_ = atoi (parent_->getResource( "cpuPriority" ) ); 
    4245  dodecay_ = parent_->isResourceTrue( "cpuDecay" ); 
    4346  useGraph_ = parent_->isResourceTrue( "cpuGraph" ); 
    … …  
    6972  stats >>tmp >>cputime_[cpuindex_][0] 
    7073              >>cputime_[cpuindex_][1] 
    7174              >>cputime_[cpuindex_][2] 
    72               >>cputime_[cpuindex_][3]; 
     75              >>cputime_[cpuindex_][3] 
     76              >>cputime_[cpuindex_][4] 
     77              >>cputime_[cpuindex_][5] 
     78              >>cputime_[cpuindex_][6]; 
    7379 
    7480  int oldindex = (cpuindex_+1)%2; 
    75   for ( int i = 0 ; i < 4 ; i++ ){ 
     81  for ( int i = 0 ; i < 7 ; i++ ){ 
    7682    fields_[i] = cputime_[cpuindex_][i] - cputime_[oldindex][i]; 
    7783    total_ += fields_[i]; 
    7884  } 

  • linux/cpumeter.h 

    diff -Nur a/linux/cpumeter.h b/linux/cpumeter.h
    a b  
    2525  static const char *cpuStr(int num); 
    2626protected: 
    2727  int _lineNum; 
    28   long cputime_[2][4]; 
     28  long cputime_[2][7]; 
    2929  int cpuindex_; 
    3030 
    3131  void getcputime(void); 

  • Xdefaults.in 

    diff -Nur a/Xdefaults.in b/Xdefaults.in
    a b  
    6969xosview*cpuNiceColor:       yellow 
    7070xosview*cpuSystemColor:     orange 
    7171xosview*cpuInterruptColor:  red 
     72xosview*cpuSoftIntColor:    red 
    7273xosview*cpuWaitColor:       lightblue 
    7374xosview*cpuFreeColor:       aquamarine 
    7475xosview*cpuPriority:        1 
Note: See TracBrowser for help on using the browser.