emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

library: Cygwin only has 4 cpu numbers

Browse Source 
Old library never checked how many matches there were meaning that
both 8-number and 4-number cpu lines would work.
This commit is contained in:
Craig Small 2022-05-26 17:53:43 +10:00
parent 723b418cd4
commit e47af25534
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
proc/stat.c
View File

@ -601,7 +601,11 @@ static int stat_read_failed (
sum_ptr->numa_node = STAT_NODE_INVALID; // mark as invalid sum_ptr->numa_node = STAT_NODE_INVALID; // mark as invalid
// now value the cpu summary tics from line #1 // now value the cpu summary tics from line #1
#ifdef __CYGWIN__
if (4 > sscanf(bp, "cpu %llu %llu %llu %llu %llu %llu %llu %llu %llu %llu"
#else
if (8 > sscanf(bp, "cpu %llu %llu %llu %llu %llu %llu %llu %llu %llu %llu" if (8 > sscanf(bp, "cpu %llu %llu %llu %llu %llu %llu %llu %llu %llu %llu"
#endif
, &sum_ptr->new.user, &sum_ptr->new.nice, &sum_ptr->new.system , &sum_ptr->new.user, &sum_ptr->new.nice, &sum_ptr->new.system
, &sum_ptr->new.idle, &sum_ptr->new.iowait, &sum_ptr->new.irq , &sum_ptr->new.idle, &sum_ptr->new.iowait, &sum_ptr->new.irq
, &sum_ptr->new.sirq, &sum_ptr->new.stolen , &sum_ptr->new.sirq, &sum_ptr->new.stolen
@ -630,7 +634,11 @@ reap_em_again:
cpu_ptr->numa_node = STAT_NODE_INVALID; cpu_ptr->numa_node = STAT_NODE_INVALID;
cpu_ptr->count = 1; cpu_ptr->count = 1;
#ifdef __CYGWIN__
if (4 > (rc = sscanf(bp, "cpu%d %llu %llu %llu %llu %llu %llu %llu %llu %llu %llu"
#else
if (8 > (rc = sscanf(bp, "cpu%d %llu %llu %llu %llu %llu %llu %llu %llu %llu %llu" if (8 > (rc = sscanf(bp, "cpu%d %llu %llu %llu %llu %llu %llu %llu %llu %llu %llu"
#endif
, &cpu_ptr->id , &cpu_ptr->id
, &cpu_ptr->new.user, &cpu_ptr->new.nice, &cpu_ptr->new.system , &cpu_ptr->new.user, &cpu_ptr->new.nice, &cpu_ptr->new.system
, &cpu_ptr->new.idle, &cpu_ptr->new.iowait, &cpu_ptr->new.irq , &cpu_ptr->new.idle, &cpu_ptr->new.iowait, &cpu_ptr->new.irq