Enlightenment CVS committal
Author : kwo
Project : e16
Module : epplets
Dir : e16/epplets/epplets
Modified Files:
E-Cpu.c
Log Message:
Back out changes 1.18->1.20 which mess up E-Cpu (for me, among others).
===================================================================
RCS file: /cvs/e/e16/epplets/epplets/E-Cpu.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- E-Cpu.c 31 Mar 2006 22:56:17 -0000 1.21
+++ E-Cpu.c 31 Mar 2006 23:20:38 -0000 1.22
@@ -16,7 +16,6 @@
int cpus = 0;
double *prev_val = NULL;
double *prev_val_nice = NULL;
-double *prev_val_total = NULL;
int *load_val = NULL;
Window win;
RGB_buf buf;
@@ -239,35 +238,35 @@
for (i = 0; i < cpus; i++)
{
char sUserCPU[64];
- char sNiceCPU[64];
- char sSystemCPU[64];
- char sTotalCPU[64];
- double val, val2, val_nice, val2_nice, val_total, val2_total;
+ char sNiceCPU[64];
+ double val, val2, val_nice, val2_nice;
fgets(s, 255, f);
- sscanf(s, "%*s %s %s %s %s",
- sUserCPU, sNiceCPU, sSystemCPU, sTotalCPU);
+ sscanf(s, "%*s %s %s %*s %*s", sUserCPU, sNiceCPU);
- val = atof(sUserCPU);
+ val = atof(sUserCPU);
val_nice = atof(sNiceCPU);
- val_total = atof(sTotalCPU);
- val2_total = val_total - prev_val_total[i];
val2 = val - prev_val[i];
- val2_nice = val_nice - prev_val_nice[i];
- val2_total += val2 + val2_nice;
-
- val2 = (100 * val2) / val2_total;
- val2_nice = (100 * val2_nice) / val2_total;
-
prev_val[i] = val;
- prev_val_nice[i] = val_nice;
- prev_val_total[i] = val_total;
+ val2 *= 10;
+ if (val2 > 100)
+ val2 = 100;
+
+ val2_nice = val_nice - prev_val_nice[i];
+ prev_val_nice[i] = val_nice;
+ val2_nice *= 10;
+ if (val2_nice > 100)
+ val2_nice = 100;
+
+ if (include_nice)
+ load_val[i] = val2 + val2_nice;
+ else
+ load_val[i] = val2;
+
+ if (load_val[i] > 100)
+ load_val[i] = 100;
- if (include_nice) load_val[i] = val2 + val2_nice;
- else load_val[i] = val2;
-
- if (load_val[i] > 100) load_val[i] = 100;
}
fclose(f);
}
@@ -452,7 +451,6 @@
load_val = malloc(sizeof(int) * cpus);
prev_val = malloc(sizeof(double) * cpus);
prev_val_nice = malloc(sizeof(double) * cpus);
- prev_val_total = malloc(sizeof(double) * cpus);
Epplet_Init("E-Cpu", "0.1", "Enlightenment CPU Epplet",
3, 3, argc, argv, 0);
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
