← Back to branch summary

~ubuntu-branches/ubuntu/trusty/htop/trusty-proposed

« back to all changes in this revision

Viewing changes to CPUMeter.c

  • Committer: Package Import Robot
  • Author(s): Eugene V. Lyubimkin
  • Date: 2012-02-19 10:24:46 UTC
  • mfrom: (1.1.17)
  • Revision ID: package-import@ubuntu.com-20120219102446-3uor37shuh5qch7n
Tags: 1.0.1-1
http://bugs.debian.org/652563
http://bugs.debian.org/657675
* New upstream release.
  - Don't crash when trying to kill already finished process.
    (Closes: #652563, 657675)

Show diffs side-by-side

added added

removed removed

Lines of Context:
CPUMeter.c
6
6
*/
7
7
 
8
8
#include "CPUMeter.h"
9
 
#include "Meter.h"
10
9
 
 
10
#include "CRT.h"
11
11
#include "ProcessList.h"
12
12
 
 
13
#include <assert.h>
13
14
#include <stdlib.h>
14
15
#include <curses.h>
15
16
#include <string.h>
16
17
#include <math.h>
17
18
 
18
 
#include "debug.h"
19
 
#include <assert.h>
 
19
/*{
 
20
#include "Meter.h"
 
21
}*/
20
22
 
21
23
int CPUMeter_attributes[] = {
22
24
   CPU_NICE, CPU_NORMAL, CPU_KERNEL, CPU_IRQ, CPU_SOFTIRQ, CPU_IOWAIT, CPU_STEAL, CPU_GUEST