Skip to content

cgroups: move const calc expression out of loop #388

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GermanAizek wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −13
Open

cgroups: move const calc expression out of loop #388

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 16 additions & 13 deletions cgroups.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,7 @@ walkcgroup(char *dirname, struct cgchainer *cparent, int parentseq,
// --------------------------------------------
//
dirp = opendir(".");
const int fullnamelen_below = upperlen + namelen;

while ( (entp = readdir(dirp)) )
{
Expand All @@ -388,7 +389,7 @@ walkcgroup(char *dirname, struct cgchainer *cparent, int parentseq,
if (entp->d_type == DT_DIR)
procsbelow += walkcgroup(entp->d_name,
ccp, ccp->cstat->gen.sequence,
hash, upperlen+namelen, depth+1);
hash, fullnamelen_below, depth+1);
}

closedir(dirp);
Expand Down Expand Up @@ -1216,13 +1217,14 @@ mergecgrouplist(struct cglinesel **cgroupselp, int newdepth,
//
for (ic=im=0; ic < ncgroups; ic++)
{
struct cgchainer * const cgp = *(cgchainerp+ic);
int cgroupnprocs;

// take next cgroup and add it to the merged list
//
if ( cgroupfilter((*(cgchainerp+ic))->cstat, newdepth, showresource) )
if ( cgroupfilter(cgp->cstat, newdepth, showresource) )
{
(cgroupsel+im)->cgp = *(cgchainerp+ic);
(cgroupsel+im)->cgp = cgp;
(cgroupsel+im)->tsp = NULL;

im++;
Expand All @@ -1234,14 +1236,13 @@ mergecgrouplist(struct cglinesel **cgroupselp, int newdepth,
// pass the stub to the previous valid entry
// of this level
//
if ( (*(cgchainerp+ic))->stub)
if ( cgp->stub)
{
int j;
const int depth = cgp->cstat->gen.depth;

for (j=im-1; j > 0; j--)
{
int depth = (*(cgchainerp+ic))->cstat->gen.depth;

if (depth > (cgroupsel+j)->cgp->cstat->gen.depth)
{
break;
Expand Down Expand Up @@ -1269,14 +1270,14 @@ mergecgrouplist(struct cglinesel **cgroupselp, int newdepth,
if (!nprocs) // ignore processes anyhow?
continue;

cgroupnprocs = (*(cgchainerp+ic))->cstat->gen.nprocs;
cgroupnprocs = cgp->cstat->gen.nprocs;

if (!cgroupnprocs) // no processes in this cgroup?
continue;

for (ip=0, is=im; ip < cgroupnprocs; ip++)
{
int pid = (*(cgchainerp+ic))->proclist[ip];
int pid = cgp->proclist[ip];
int hash = pid&PIDMASK;

// search for tstat struct relate to this PID via hashlist
Expand All @@ -1292,7 +1293,7 @@ mergecgrouplist(struct cglinesel **cgroupselp, int newdepth,
if (newdepth == 9 ||
pidcur->tstat->mem.vmem > 0 )
{
(cgroupsel+im)->cgp = *(cgchainerp+ic);
(cgroupsel+im)->cgp = cgp;
(cgroupsel+im)->tsp = pidcur->tstat;

im++;
Expand Down Expand Up @@ -1691,6 +1692,8 @@ mergelevel(struct cgsorter *cgparent, struct cgchainer **cgpp,
break;

default:
const int use_vlinemask_bit = depth < CGRMAXDEPTH;
const unsigned long vlinemask_bit = use_vlinemask_bit ? (1ULL << depth) : 0;
for (i=0, j=0; i < cgparent->nrchild; i++, j++)
{
cgs = *((cgparent->sortlist)+i);
Expand All @@ -1701,17 +1704,17 @@ mergelevel(struct cgsorter *cgparent, struct cgchainer **cgpp,
{
(*(cgpp+j))->stub = 1; // no more entries on this level

if (depth < CGRMAXDEPTH)
vlinemask &= ~(1ULL << depth);
if (use_vlinemask_bit)
vlinemask &= ~vlinemask_bit;

(*(cgpp+j))->vlinemask = vlinemask;
}
else
{
(*(cgpp+j))->stub = 0; // more entries on this level

if (depth < CGRMAXDEPTH)
vlinemask |= 1ULL << depth;
if (use_vlinemask_bit)
vlinemask |= vlinemask_bit;

(*(cgpp+j))->vlinemask = vlinemask;
}
Expand Down