8nl/micro-utils
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed ps

Browse Source
This commit is contained in:
pups 2024-07-23 11:33:47 +03:00
parent c705f3b30b
commit c6e315c24c
3 changed files with 43 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libmu/proc_parser.c
View File

@ -71,15 +71,43 @@ int mu_proc_stat(const char *prog_name, const pid_t pid, struct mu_proc *proc_s)
return 1;
}
fscanf(fp, "%d %s %c %d %d %d %d %d %u %lu %lu %lu %lu %lu %lu", &proc_s->pid, proc_s->cmdline, &proc_s->state, &proc_s->ppid, &proc_s->pgrp, &proc_s->sid, &proc_s->tty, &proc_s->tpgid, &proc_s->flags, &proc_s->minflt, &proc_s->cminflt, &proc_s->majflt, &proc_s->cmajflt, &proc_s->utime, &proc_s->stime);
fscanf(fp, "%d %s %c %d %d %d %d %d %u %lu %lu %lu %lu %lu %lu", &proc_s->pid, proc_s->cmd, &proc_s->state, &proc_s->ppid, &proc_s->pgrp, &proc_s->sid, &proc_s->tty, &proc_s->tpgid, &proc_s->flags, &proc_s->minflt, &proc_s->cminflt, &proc_s->majflt, &proc_s->cmajflt, &proc_s->utime, &proc_s->stime);
fscanf(fp, "%ld %ld %ld %ld %ld %ld %llu %lu %ld", &proc_s->cutime, &proc_s->cstime, &proc_s->priority, &proc_s->nice, &proc_s->num_threads, &proc_s->itrealvalue, &proc_s->starttime, &proc_s->vsize, &proc_s->rss);
fclose(fp);
/* Remove ( and ) from string */
size_t len = strlen(proc_s->cmdline) - 1;
proc_s->cmdline[len] = '\0';
size_t len = strlen(proc_s->cmd) - 1;
proc_s->cmd[len] = '\0';
memmove(proc_s->cmd, proc_s->cmd + 1, len);
return 0;
}
int mu_proc_cmdline(const char *prog_name, const pid_t pid, struct mu_proc *proc_s) {
proc_s->cmdline[0] = '\0';
char path[PATH_MAX + 1];
snprintf(path, sizeof(path), "/proc/%d/cmdline", pid);
int fd = open(path, O_RDONLY);
if (fd < 0) {
if (prog_name)
fprintf(stderr, "%s: %s: %s\n", prog_name, path, strerror(errno));
return 1;
}
ssize_t size = read(fd, proc_s->cmdline, sizeof(proc_s->cmdline));
close(fd);
if (size == 0)
return 0;
for (ssize_t i = 0; i < size; i++) {
if (proc_s->cmdline[i] == '\0' && i != size - 1)
proc_s->cmdline[i] = ' ';
}
memmove(proc_s->cmdline, proc_s->cmdline + 1, len);
return 0;
}
@ -96,5 +124,9 @@ int mu_proc_parser(const char *prog_name, const pid_t pid, struct mu_proc *proc_
if (mu_proc_status(prog_name, pid, proc_s))
ret = 1;
/* CMDLINE */
if (mu_proc_cmdline(prog_name, pid, proc_s))
ret = 1;
return ret;
}

5
libmu/proc_parser.h
View File

@ -13,7 +13,7 @@ struct mu_proc {
/* from stat */
pid_t pid;
char cmdline[PATH_MAX + 1];
char cmd[PATH_MAX + 1];
char state;
int ppid;
int pgrp;
@ -36,6 +36,9 @@ struct mu_proc {
unsigned long long starttime;
unsigned long vsize;
long rss;
/* from cmdline */
char cmdline[PATH_MAX + 1];
};
int mu_proc_status(const char *prog_name, const pid_t pid, struct mu_proc *proc_s);

28
src/ps.c
View File

@ -13,28 +13,6 @@
static char c_flag;
static char *get_cmdline(const pid_t pid) {
static char path[PATH_MAX + 1];
snprintf(path, sizeof(path), "/proc/%d/cmdline", pid);
int fd = open(path, O_RDONLY);
if (fd < 0)
return NULL;
ssize_t size = read(fd, path, sizeof(path));
close(fd);
if (size == 0)
return NULL;
for (ssize_t i = 0; i < size; i++) {
if (path[i] == '\0' && i != size - 1)
path[i] = ' ';
}
return path;
}
static int pscan(const pid_t pid) {
struct mu_proc proc;
if (mu_proc_parser("ps", pid, &proc))
@ -56,9 +34,9 @@ static int pscan(const pid_t pid) {
char rss[MU_HUMAN_BUF_SIZE + 1];
strcpy(rss, mu_humansize(proc.vmrss * 1024, 1024));
char *prog = (c_flag) ? get_cmdline(pid) : proc.cmdline;
if (prog == NULL)
prog = proc.cmdline;
char *prog = (c_flag) ? proc.cmdline : proc.cmd;
if (prog[0] == '\0')
return 0;
printf("%6d %8s %4ld %4ld %8s %8s %2c %02um:%02us %2s\n", proc.pid, name, proc.priority, proc.nice, virt, rss, proc.state, rtime / 60, rtime % 60, prog);
return 0;