1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
|
--- wmcube.c.orig 2000-10-23 20:11:47 UTC
+++ wmcube.c
@@ -42,7 +42,6 @@
#include <sys/ioctl.h>
#include <sys/socket.h>
-#include <utmp.h>
#include <dirent.h>
#include <X11/Xlib.h>
@@ -125,6 +124,7 @@ float lum_vector[3] = { 0, 0, 100 }; // Lightsource v
#ifdef FREEBSD
static kvm_t *kd;
static struct nlist nlst[] = { {"_cp_time"}, {0} };
+static int cp_time_mib[2];
#endif
int main(int argc, char **argv)
@@ -913,7 +913,7 @@ int loadobj(char *filename) {
exit(0);
}
- fscanf(fp,"%s",tmp);
+ fscanf(fp,"%63s",tmp);
if (strcmp(tmp,"WMCUBE_COORDINATES") != 0) {
printf("\nError in objectfile: it must start with WMCUBE_COORDINATES\n\n");
@@ -921,7 +921,7 @@ int loadobj(char *filename) {
exit(0);
}
- fscanf(fp,"%s",tmp);
+ fscanf(fp,"%63s",tmp);
counter = atoi(tmp);
while ((strcmp(tmp,"WMCUBE_LINES") != 0) && (strcmp(tmp,"WMCUBE_PLANES") != 0)) {
@@ -938,7 +938,7 @@ int loadobj(char *filename) {
fclose(fp);
exit(0);
}
- fscanf(fp,"%s",tmp);
+ fscanf(fp,"%63s",tmp);
if (feof(fp)) {
printf("\nError in objectfile: you must have a section WMCUBE_LINES or WMCUBE_PLANES\n\n");
@@ -1224,9 +1224,14 @@ int calc_cpu_total()
#include <nlist.h>
#include <fcntl.h>
#include <sys/dkstat.h>
+#include <sys/sysctl.h>
int init_calc_cpu()
{
+ size_t len = 2;
+ if (sysctlnametomib("kern.cp_time", cp_time_mib, &len) == 0)
+ return 0;
+ printf("\nWarning: unable to sysctl kern.cp_time\n\n");
if ((kd = kvm_open(NULL, NULL, NULL, O_RDONLY, "kvm_open")) == NULL)
{
@@ -1249,6 +1254,13 @@ int calc_cpu_total() {
int cpu,nice,system,idle;
unsigned long int cpu_time[CPUSTATES];
+ if (cp_time_mib[0] != 0) {
+ size_t cpu_time_len = sizeof (cpu_time);
+ if (sysctl(cp_time_mib, 2, cpu_time, &cpu_time_len, NULL, 0) < 0) {
+ printf("\nError sysctl\n\n");
+ exit(0);
+ }
+ } else
if (kvm_read(kd, nlst[0].n_value, &cpu_time, sizeof(cpu_time))
!= sizeof(cpu_time))
{
|
