| 31 |
|
int c; |
| 32 |
|
|
| 33 |
|
int delay = 1; |
| 34 |
< |
cpu_percent_t *cpu_percent; |
| 34 |
> |
sg_cpu_percents *cpu_percent; |
| 35 |
|
|
| 36 |
|
while ((c = getopt(argc, argv, "d:")) != -1){ |
| 37 |
|
switch (c){ |
| 42 |
|
} |
| 43 |
|
|
| 44 |
|
/* Initialise statgrab */ |
| 45 |
< |
statgrab_init(); |
| 45 |
> |
sg_init(); |
| 46 |
|
|
| 47 |
|
/* Drop setuid/setgid privileges. */ |
| 48 |
< |
if (statgrab_drop_privileges() != 0) { |
| 48 |
> |
if (sg_drop_privileges() != 0) { |
| 49 |
|
perror("Error. Failed to drop privileges"); |
| 50 |
|
return 1; |
| 51 |
|
} |
| 52 |
|
|
| 53 |
|
/* Throw away the first reading as thats averaged over the machines uptime */ |
| 54 |
< |
cpu_percent = cpu_percent_usage(); |
| 54 |
> |
cpu_percent = sg_get_cpu_percents(); |
| 55 |
|
|
| 56 |
|
/* Clear the screen ready for display the cpu usage */ |
| 57 |
|
printf("\033[2J"); |
| 58 |
|
|
| 59 |
< |
while( (cpu_percent = cpu_percent_usage()) != NULL){ |
| 59 |
> |
while( (cpu_percent = sg_get_cpu_percents()) != NULL){ |
| 60 |
|
printf("\033[2;2H%-12s : %6.2f", "User CPU", cpu_percent->user); |
| 61 |
|
printf("\033[3;2H%-12s : %6.2f", "Kernel CPU", cpu_percent->kernel); |
| 62 |
|
printf("\033[4;2H%-12s : %6.2f", "IOWait CPU", cpu_percent->iowait); |
