External/energymech
1
0
Fork 0
mirror of https://github.com/EnergyMech/energymech.git synced 2025-12-29 16:14:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #37 from joonicks/joonix-dev

Browse Source 
cpuinfo_update
This commit is contained in:
joonicks
2018-04-04 17:44:46 +02:00
committed by GitHub
parent 21d3e67016 3bd6854e09
commit ac39ab29da
1 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/hostinfo.c
View File

@@ -98,8 +98,7 @@ int parse_proc_status(char *line)
char *cpufrom; char *cpufrom;
int sentmodel; int sentmodel;
int cpus; int physid,cpus,cores,addsiblings;
int cores;
/* /*
proton@endemic:~/energymech/src> cat /proc/loadavg proton@endemic:~/energymech/src> cat /proc/loadavg
@@ -124,12 +123,10 @@ int parse_proc_cpuinfo(char *line)
char *src,*dst; char *src,*dst;
int spc; int spc;
if (sentmodel == 0 && strncmp(line,"model name\t:",12) == 0) if (sentmodel == 0 && strncmp(line,"model name\t: ",13) == 0)
{ {
spc = 0; spc = 0;
src = line+12; src = line+13;
while(*src == ' ')
src++;
dst = omni; dst = omni;
while(*src) while(*src)
{ {
@@ -152,6 +149,24 @@ int parse_proc_cpuinfo(char *line)
to_user_q(cpufrom,"Cpu: %s\n",omni); to_user_q(cpufrom,"Cpu: %s\n",omni);
sentmodel++; sentmodel++;
} }
else
if (strncmp(line,"physical id\t: ",14) == 0)
{
spc = asc2int(line+14);
if (errno == 0 && spc != physid)
{
cpus++;
addsiblings = 1;
physid = spc;
}
}
else
if (addsiblings == 1 && strncmp(line,"siblings\t: ",11) == 0)
{
spc = asc2int(line+11);
addsiblings = 0;
cores += spc;
}
} }
/* /*
@@ -225,6 +240,8 @@ void do_cpuinfo(COMMAND_ARGS)
debug("%s\n",from); debug("%s\n",from);
cpufrom = from; cpufrom = from;
sentmodel = 0; sentmodel = 0;
physid = -1;
cpus = cores = addsiblings = 0;
readline(fd,&parse_proc_cpuinfo); // readline closes fd readline(fd,&parse_proc_cpuinfo); // readline closes fd
if ((fd = open("/proc/loadavg",O_RDONLY)) < 0) if ((fd = open("/proc/loadavg",O_RDONLY)) < 0)
@@ -248,7 +265,12 @@ void do_cpuinfo(COMMAND_ARGS)
if (!a3 || !*a3) if (!a3 || !*a3)
return; return;
to_user_q(from,"Load: %s(1m) %s(5m) %s(15m)\n",a1,a2,a3); to_user_q(from,"Load: %s(1m) %s(5m) %s(15m) [%i physical cpu%s, %i core%s]\n",
a1,a2,a3,cpus,(cpus == 1) ? "" : "s",cores,(cores == 1) ? "" : "s");
#ifdef DEBUG
debug("(do_cpuinfo) Load: %s(1m) %s(5m) %s(15m) [%i physical cpu%s, %i core%s]\n",
a1,a2,a3,cpus,(cpus == 1) ? "" : "s",cores,(cores == 1) ? "" : "s");
#endif
} }
#endif /* HOSTINFO */ #endif /* HOSTINFO */