~ubuntu-branches/ubuntu/oneiric/sysstat/oneiric

« back to all changes in this revision

Viewing changes to sa_wrap.c

  • Committer: Bazaar Package Importer
  • Author(s): Robert Luberda
  • Date: 2009-09-27 09:04:11 UTC
  • mfrom: (1.1.16 upstream) (2.1.6 sid)
  • Revision ID: james.westby@ubuntu.com-20090927090411-sc9wb4a1vbr69s7i
Tags: 9.0.5-1
* New upstream release.
* Add an override for `init.d-script-possible-missing-stop' lintian's 
  warning.

Show diffs side-by-side

added added

removed removed

Lines of Context:
164
164
                = (struct stats_cpu *) a->_buf0;
165
165
        
166
166
        /* Read CPU statistics */
167
 
        read_stat_cpu(st_cpu, *a->nr, &record_hdr.uptime, &record_hdr.uptime0);
 
167
        read_stat_cpu(st_cpu, a->nr, &record_hdr.uptime, &record_hdr.uptime0);
168
168
        
169
169
        return;
170
170
}
208
208
                = (struct stats_irq *) a->_buf0;
209
209
 
210
210
        /* Read interrupts stats */
211
 
        read_stat_irq(st_irq, *a->nr);
 
211
        read_stat_irq(st_irq, a->nr);
212
212
        
213
213
        return;
214
214
}
353
353
 
354
354
        /* Try to read stats from /proc/diskstats, /proc/partitions or /proc/stat */
355
355
        if (HAS_DISKSTATS(flags)) {
356
 
                read_diskstats_disk(st_disk, *a->nr, COLLECT_PARTITIONS(a->opt_flags));
 
356
                read_diskstats_disk(st_disk, a->nr, COLLECT_PARTITIONS(a->opt_flags));
357
357
        }
358
358
        else if (HAS_PPARTITIONS(flags)) {
359
 
                read_partitions_disk(st_disk, *a->nr);
 
359
                read_partitions_disk(st_disk, a->nr);
360
360
        }
361
361
        else {
362
 
                read_stat_disk(st_disk, *a->nr);
 
362
                read_stat_disk(st_disk, a->nr);
363
363
        }
364
364
 
365
365
        return;
382
382
                = (struct stats_serial *) a->_buf0;
383
383
 
384
384
        /* Read serial lines stats */
385
 
        read_tty_driver_serial(st_serial, *a->nr);
 
385
        read_tty_driver_serial(st_serial, a->nr);
386
386
        
387
387
        return;
388
388
}
426
426
                = (struct stats_net_dev *) a->_buf0;
427
427
 
428
428
        /* Read network interfaces stats */
429
 
        read_net_dev(st_net_dev, *a->nr);
 
429
        read_net_dev(st_net_dev, a->nr);
430
430
        
431
431
        return;
432
432
}
448
448
                = (struct stats_net_edev *) a->_buf0;
449
449
 
450
450
        /* Read network interfaces errors stats */
451
 
        read_net_edev(st_net_edev, *a->nr);
 
451
        read_net_edev(st_net_edev, a->nr);
452
452
        
453
453
        return;
454
454
}
822
822
                = (struct stats_pwr_cpufreq *) a->_buf0;
823
823
 
824
824
        /* Read CPU frequency stats */
825
 
        read_cpuinfo(st_pwr_cpufreq, *a->nr);
 
825
        read_cpuinfo(st_pwr_cpufreq, a->nr);
826
826
        
827
827
        return;
828
828
}