Skip to content

atophide: move const calc expression out of loop #390

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
Open

atophide: move const calc expression out of loop #390

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
28 changes: 16 additions & 12 deletions atophide.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ static int getrawsstat(int, struct sstat *, int);
static int getrawtstat(int, struct tstat *, int, int);

static void testcompval(int, char *);
static void anonymize(struct sstat *, struct tstat *, int);
static void anonymize(struct sstat *, struct tstat *, int, int);
static char *findstandin(struct standin **, unsigned long *, char *, char *);

// command names that will not be anonymized (in alphabetical order)
Expand Down Expand Up @@ -311,7 +311,7 @@ main(int argc, char *argv[])
// anonymize command lines and hostname
//
if (anonflag)
anonymize(&sstat, tstatp, rr.ndeviat);
anonymize(&sstat, tstatp, rr.ndeviat, numallowedcoms);

// write record header, system-level stats, process-level stats,
// cgroup-level stats and pidlist
Expand Down Expand Up @@ -355,10 +355,14 @@ static struct standin *cmdhead;
static unsigned long cmdsequence;

static void
anonymize(struct sstat *ssp, struct tstat *tsp, int ntask)
anonymize(struct sstat *ssp, struct tstat *tsp, int ntask, int numallowedcoms)
{
int i, r, numallowedcoms = sizeof allowedcoms/sizeof(char *);
int i, r;
char *standin, *p;
const size_t lvm_name_size = sizeof ssp->dsk.lvm[0].name;
const size_t nfs_mountdev_size = sizeof ssp->nfs.nfsmounts.nfsmnt[0].mountdev;
const size_t gen_name_size = sizeof tsp->gen.name;
const size_t gen_cmdline_size = sizeof tsp->gen.cmdline;

// anonimize system-level stats
//
Expand All @@ -372,8 +376,8 @@ anonymize(struct sstat *ssp, struct tstat *tsp, int ntask)
standin = findstandin(&lvmhead, &lvmsequence,
"logvol", ssp->dsk.lvm[i].name);

memset(ssp->dsk.lvm[i].name, '\0', sizeof ssp->dsk.lvm[i].name);
safe_strcpy(ssp->dsk.lvm[i].name, standin, sizeof ssp->dsk.lvm[i].name);
memset(ssp->dsk.lvm[i].name, '\0', lvm_name_size);
safe_strcpy(ssp->dsk.lvm[i].name, standin, lvm_name_size);
}

// anonimize system-level stats
Expand All @@ -385,9 +389,9 @@ anonymize(struct sstat *ssp, struct tstat *tsp, int ntask)
"nfsmnt", ssp->nfs.nfsmounts.nfsmnt[i].mountdev);

memset(ssp->nfs.nfsmounts.nfsmnt[i].mountdev, '\0',
sizeof ssp->nfs.nfsmounts.nfsmnt[i].mountdev);
nfs_mountdev_size);
safe_strcpy(ssp->nfs.nfsmounts.nfsmnt[i].mountdev, standin,
sizeof ssp->nfs.nfsmounts.nfsmnt[i].mountdev);
nfs_mountdev_size);
}

// anonymize process-level stats
Expand Down Expand Up @@ -426,11 +430,11 @@ anonymize(struct sstat *ssp, struct tstat *tsp, int ntask)
standin = findstandin(&cmdhead, &cmdsequence,
"prog", tsp->gen.name);

memset(tsp->gen.name, '\0', sizeof tsp->gen.name);
safe_strcpy(tsp->gen.name, standin, sizeof tsp->gen.name);
memset(tsp->gen.name, '\0', gen_name_size);
safe_strcpy(tsp->gen.name, standin, gen_name_size);

memset(tsp->gen.cmdline, '\0', sizeof tsp->gen.cmdline);
safe_strcpy(tsp->gen.cmdline, standin, sizeof tsp->gen.cmdline);
memset(tsp->gen.cmdline, '\0', gen_cmdline_size);
safe_strcpy(tsp->gen.cmdline, standin, gen_cmdline_size);
}
}
}
Expand Down