Skip to content

netatop: use const ptr struct for micro-op and readability #393

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

netatop: use const ptr struct for micro-op and readability #393

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion atop.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ void netatop_gettask(pid_t, char, struct tstat *);
unsigned int netatop_exitstore(void);
void netatop_exiterase(void);
void netatop_exithash(char);
void netatop_exitfind(unsigned long, struct tstat *, struct tstat *);
void netatop_exitfind(unsigned long, struct tstat *, const struct tstat *);

void netatop_bpf_ipopen(void);
void netatop_bpf_probe(void);
Expand Down
8 changes: 4 additions & 4 deletions netatopbpfif.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@

static int netsock = -1;

static void fill_networkcnt(struct tstat *, struct tstat *,
struct taskcount *);
static void fill_networkcnt(struct tstat *, const struct tstat *,
const struct taskcount *);
void my_handler(int);

int len;
Expand Down Expand Up @@ -154,7 +154,7 @@ netatop_bpf_gettask()
void
netatop_bpf_exitfind(unsigned long key, struct tstat *dev, struct tstat *pre)
{
struct taskcount *tc = g_hash_table_lookup(ghash_net, &key);
const struct taskcount *tc = g_hash_table_lookup(ghash_net, &key);
/*
** correct PID found
*/
Expand All @@ -173,7 +173,7 @@ netatop_bpf_exitfind(unsigned long key, struct tstat *dev, struct tstat *pre)
}

static void
fill_networkcnt(struct tstat *dev, struct tstat *pre, struct taskcount *tc)
fill_networkcnt(struct tstat *dev, const struct tstat *pre, const struct taskcount *tc)
{
dev->net.tcpsnd = tc->tcpsndpacks - pre->net.tcpsnd;
dev->net.tcpssz = tc->tcpsndbytes - pre->net.tcpssz;
Expand Down
8 changes: 4 additions & 4 deletions netatopif.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ static struct exitstore *exitall;
static int exitnum;
static char exithash;

static void fill_networkcnt(struct tstat *, struct tstat *,
struct exitstore *);
static void fill_networkcnt(struct tstat *, const struct tstat *,
const struct exitstore *);

/*
** open a raw socket to the IP layer (root privs required)
Expand Down Expand Up @@ -464,7 +464,7 @@ netatop_exithash(char hashtype)
** update counters in tstat struct
*/
void
netatop_exitfind(unsigned long key, struct tstat *dev, struct tstat *pre)
netatop_exitfind(unsigned long key, struct tstat *dev, const struct tstat *pre)
{
int h = HASHCALC(key);
struct exitstore *esp;
Expand Down Expand Up @@ -524,7 +524,7 @@ netatop_exitfind(unsigned long key, struct tstat *dev, struct tstat *pre)
}

static void
fill_networkcnt(struct tstat *dev, struct tstat *pre, struct exitstore *esp)
fill_networkcnt(struct tstat *dev, const struct tstat *pre, const struct exitstore *esp)
{
dev->net.tcpsnd = esp->npt.tc.tcpsndpacks - pre->net.tcpsnd;
dev->net.tcpssz = esp->npt.tc.tcpsndbytes - pre->net.tcpssz;
Expand Down
2 changes: 1 addition & 1 deletion photoproc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ photoproc(struct tstat *tasklist, int maxtask)
procwchan(curtask);

if (supportflags & NETATOPBPF) {
struct taskcount *tc = g_hash_table_lookup(ghash_net, &(curtask->gen.tgid));
const struct taskcount *tc = g_hash_table_lookup(ghash_net, &(curtask->gen.tgid));
if (tc) {
// printf("%d %d %d %d %d\n",curtask->gen.tgid, tc->tcpsndpacks, tc->tcprcvpacks, tc->udpsndpacks, tc->udprcvpacks);
curtask->net.tcpsnd = tc->tcpsndpacks;
Expand Down