10195501441
/
OS2021_Project1.Shell
3
3
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

test mytop on MINIX

master
10195501441 3 years ago
parent
dbacf0bdfa
commit
1c8c35f655
2 changed files with 523 additions and 4 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +472
    -3
      yeeshell.c
  2. +51
    -1
      yeeshell.h

+ 472
- 3
yeeshell.c View File

@ -1,20 +1,53 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
#include <string.h> #include <string.h>
#include <dirent.h> #include <dirent.h>
#include <signal.h> #include <signal.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/wait.h>
#include <sys/stat.h>
#include <sys/ioc_tty.h>
#include <sys/times.h>
#include <sys/types.h>
#include <sys/time.h>
#include <sys/select.h>
#include <curses.h>
#include <timers.h>
#include <limits.h>
#include <termcap.h>
#include <termios.h>
#include <time.h>
#include <assert.h>
#include <minix/com.h>
#include <minix/config.h>
#include <minix/type.h>
#include <minix/endpoint.h>
#include <minix/const.h>
#include <minix/u64.h>
#include <paths.h>
#include <minix/procfs.h>
#include "yeeshell.h" #include "yeeshell.h"
/* record cmdline history */ /* record cmdline history */
char *history[CMDLINE_HISTORY_MAX_QUANTITY]; char *history[CMDLINE_HISTORY_MAX_QUANTITY];
int cmdline_amount = 0; int cmdline_amount = 0;
/* mytop CPU part */
struct proc *proc = NULL, *prev_proc = NULL;
int nr_total;
unsigned int nr_procs, nr_tasks;
/* name of cpu cycle types, in the order they appear in /psinfo. */
const char *cputimenames[] = {"user", "ipc", "kernelcall"};
int blockedverbose = 0;
int main() int main()
{ {
char *cmdline = NULL, *pwd = NULL; char *cmdline = NULL, *pwd = NULL;
@ -423,4 +456,440 @@ int mytop_memory()
int mytop_CPU() int mytop_CPU()
{ {
pid_t pid;
if ((pid = fork()) == 0)
{
printf("fork error\n");
return;
}
if (pid == 0)
{
int cputimemode = 1;
getkinfo();
print_memory();
get_procs();
if (prev_proc == NULL)
get_procs();
print_procs(prev_proc, proc, cputimemode);
exit(0);
}
return 1;
}
void getkinfo(void)
{
FILE *fp;
if ((fp = fopen("kinfo", "r")) == NULL)
{
fprintf(stderr, "opening " _PATH_PROC "kinfo failed\n");
exit(1);
}
if (fscanf(fp, "%u %u", &nr_procs, &nr_tasks) != 2)
{
fprintf(stderr, "reading from " _PATH_PROC "kinfo failed\n");
exit(1);
}
fclose(fp);
nr_total = (int)(nr_procs + nr_tasks);
}
void get_procs(void)
{
struct proc *p;
int i;
p = prev_proc;
prev_proc = proc;
proc = p;
if (proc == NULL)
{
proc = malloc(nr_total * sizeof(proc[0]));
if (proc == NULL)
{
fprintf(stderr, "Out of memory!\n");
exit(1);
}
}
for (i = 0; i < nr_total; i++)
proc[i].p_flags = 0;
parse_dir();
}
void parse_dir(void)
{
DIR *p_dir;
struct dirent *p_ent;
pid_t pid;
char *end;
if ((p_dir = opendir(".")) == NULL)
{
perror("opendir on " _PATH_PROC);
exit(1);
}
for (p_ent = readdir(p_dir); p_ent != NULL; p_ent = readdir(p_dir))
{
pid = strtol(p_ent->d_name, &end, 10);
if (!end[0] && pid != 0)
parse_file(pid);
}
closedir(p_dir);
}
void parse_file(pid_t pid)
{
char path[PATH_MAX], name[256], type, state;
int version, endpt, effuid;
unsigned long cycles_hi, cycles_lo;
FILE *fp;
struct proc *p;
int slot;
int i;
sprintf(path, "%d/psinfo", pid);
if ((fp = fopen(path, "r")) == NULL)
return;
if (fscanf(fp, "%d", &version) != 1)
{
fclose(fp);
return;
}
if (version != PSINFO_VERSION)
{
fputs("procfs version mismatch!\n", stderr);
exit(1);
}
if (fscanf(fp, " %c %d", &type, &endpt) != 2)
{
fclose(fp);
return;
}
slot = SLOT_NR(endpt);
if (slot < 0 || slot >= nr_total)
{
fprintf(stderr, "top: unreasonable endpoint number %d\n", endpt);
fclose(fp);
return;
}
p = &proc[slot];
if (type == TYPE_TASK)
p->p_flags |= IS_TASK;
else if (type == TYPE_SYSTEM)
p->p_flags |= IS_SYSTEM;
p->p_endpoint = endpt;
p->p_pid = pid;
if (fscanf(fp, " %255s %c %d %d %lu %*u %lu %lu",
name, &state, &p->p_blocked, &p->p_priority,
&p->p_user_time, &cycles_hi, &cycles_lo) != 7)
{
fclose(fp);
return;
}
strncpy(p->p_name, name, sizeof(p->p_name) - 1);
p->p_name[sizeof(p->p_name) - 1] = 0;
if (state != STATE_RUN)
p->p_flags |= BLOCKED;
p->p_cpucycles[0] = make64(cycles_lo, cycles_hi);
p->p_memory = 0L;
if (!(p->p_flags & IS_TASK))
{
int j;
if ((j = fscanf(fp, " %lu %*u %*u %*c %*d %*u %u %*u %d %*c %*d %*u",
&p->p_memory, &effuid, &p->p_nice)) != 3)
{
fclose(fp);
return;
}
p->p_effuid = effuid;
}
else
p->p_effuid = 0;
for (i = 1; i < CPUTIMENAMES; i++)
{
if (fscanf(fp, " %lu %lu",
&cycles_hi, &cycles_lo) == 2)
{
p->p_cpucycles[i] = make64(cycles_lo, cycles_hi);
}
else
{
p->p_cpucycles[i] = 0;
}
}
if ((p->p_flags & IS_TASK))
{
if (fscanf(fp, " %lu", &p->p_memory) != 1)
{
p->p_memory = 0;
}
}
p->p_flags |= USED;
fclose(fp);
}
void print_procs(int maxlines, struct proc *proc1, struct proc *proc2, int cputimemode)
{
int p, nprocs;
u64_t idleticks = 0;
u64_t kernelticks = 0;
u64_t systemticks = 0;
u64_t userticks = 0;
u64_t total_ticks = 0;
int blockedseen = 0;
static struct tp *tick_procs = NULL;
if (tick_procs == NULL)
{
tick_procs = malloc(nr_total * sizeof(tick_procs[0]));
if (tick_procs == NULL)
{
fprintf(stderr, "Out of memory!\n");
exit(1);
}
}
for (p = nprocs = 0; p < nr_total; p++)
{
u64_t uticks;
if (!(proc2[p].p_flags & USED))
continue;
tick_procs[nprocs].p = proc2 + p;
tick_procs[nprocs].ticks = cputicks(&proc1[p], &proc2[p], cputimemode);
uticks = cputicks(&proc1[p], &proc2[p], 1);
total_ticks = total_ticks + uticks;
if (p - NR_TASKS == IDLE)
{
idleticks = uticks;
continue;
}
if (p - NR_TASKS == KERNEL)
{
kernelticks = uticks;
}
if (!(proc2[p].p_flags & IS_TASK))
{
if (proc2[p].p_flags & IS_SYSTEM)
systemticks = systemticks + tick_procs[nprocs].ticks;
else
userticks = userticks + tick_procs[nprocs].ticks;
}
nprocs++;
}
if (total_ticks == 0)
return;
qsort(tick_procs, nprocs, sizeof(tick_procs[0]), cmp_procs);
printf("CPU states: %6.2f%% user, ", 100.0 * userticks / total_ticks);
printf("%6.2f%% system, ", 100.0 * systemticks / total_ticks);
printf("%6.2f%% kernel, ", 100.0 * kernelticks / total_ticks);
printf("%6.2f%% idle", 100.0 * idleticks / total_ticks);
#define NEWLINE \
do \
{ \
printf("\n"); \
if (--maxlines <= 0) \
{ \
return; \
} \
} while (0)
NEWLINE;
printf("CPU time displayed ('%c' to cycle): %s; ",
TIMECYCLEKEY, cputimemodename(cputimemode));
printf(" sort order ('%c' to cycle): %s", ORDERKEY, ordername(order));
NEWLINE;
NEWLINE;
printf(" PID USERNAME PRI NICE SIZE STATE TIME CPU COMMAND");
NEWLINE;
for (p = 0; p < nprocs; p++)
{
struct proc *pr;
int level = 0;
pr = tick_procs[p].p;
if ((pr->p_flags & IS_TASK) && pr->p_pid != KERNEL)
{
/* skip old kernel tasks as they don't run anymore */
continue;
}
/* If we're in blocked verbose mode, indicate start of
* blocked processes.
*/
if (blockedverbose && (pr->p_flags & BLOCKED) && !blockedseen)
{
NEWLINE;
printf("Blocked processes:");
NEWLINE;
blockedseen = 1;
}
print_proc(&tick_procs[p], total_ticks);
NEWLINE;
if (!blockedverbose)
continue;
/* Traverse dependency chain if blocked. */
while (pr->p_flags & BLOCKED)
{
endpoint_t dep = NONE;
struct tp *tpdep;
level += 5;
if ((dep = pr->p_blocked) == NONE)
{
printf("not blocked on a process");
NEWLINE;
break;
}
if (dep == ANY)
break;
tpdep = lookup(dep, tick_procs, nprocs);
pr = tpdep->p;
printf("%*s> ", level, "");
print_proc(tpdep, total_ticks);
NEWLINE;
}
}
}
u64_t cputicks(struct proc *p1, struct proc *p2, int timemode)
{
int i;
u64_t t = 0;
for (i = 0; i < CPUTIMENAMES; i++)
{
if (!CPUTIME(timemode, i))
continue;
if (p1->p_endpoint == p2->p_endpoint)
{
t = t + p2->p_cpucycles[i] - p1->p_cpucycles[i];
}
else
{
t = t + p2->p_cpucycles[i];
}
}
return t;
}
char *cputimemodename(int cputimemode)
{
static char name[100];
int i;
name[0] = '\0';
for (i = 0; i < CPUTIMENAMES; i++)
{
if (CPUTIME(cputimemode, i))
{
assert(strlen(name) +
strlen(cputimenames[i]) <
sizeof(name));
strcat(name, cputimenames[i]);
strcat(name, " ");
}
}
return name;
}
void print_proc(struct tp *tp, u64_t total_ticks)
{
int euid = 0;
static struct passwd *who = NULL;
static int last_who = -1;
char *name = "";
int ticks;
struct proc *pr = tp->p;
printf("%5d ", pr->p_pid);
euid = pr->p_effuid;
name = pr->p_name;
if (last_who != euid || !who)
{
who = getpwuid(euid);
last_who = euid;
}
if (who && who->pw_name)
printf("%-8s ", who->pw_name);
else if (!(pr->p_flags & IS_TASK))
printf("%8d ", pr->p_effuid);
else
printf(" ");
printf(" %2d ", pr->p_priority);
if (!(pr->p_flags & IS_TASK))
{
printf(" %3d ", pr->p_nice);
}
else
printf(" ");
printf("%6ldK", (pr->p_memory + 512) / 1024);
printf("%6s", (pr->p_flags & BLOCKED) ? "" : "RUN");
ticks = pr->p_user_time;
printf(" %3u:%02u ", (ticks / system_hz / 60), (ticks / system_hz) % 60);
printf("%6.2f%% %s", 100.0 * tp->ticks / total_ticks, name);
}
struct tp *lookup(endpoint_t who, struct tp *tptab, int np)
{
int t;
for (t = 0; t < np; t++)
if (who == tptab[t].p->p_endpoint)
return &tptab[t];
fprintf(stderr, "lookup: tp %d (0x%x) not found.\n", who, who);
abort();
return NULL;
} }

+ 51
- 1
yeeshell.h View File

@ -15,6 +15,44 @@
#define REDIRECT_OUT 1 /* redirect output */ #define REDIRECT_OUT 1 /* redirect output */
#define REDIRECT_IN 2 /* redirect input */ #define REDIRECT_IN 2 /* redirect input */
#define _PATH_PROC "/proc/"
#define SLOT_NR(e) (_ENDPOINT_P(e) + nr_tasks)
#define TIMECYCLEKEY 't'
#define ORDERKEY 'o'
#define USED 0x1
#define IS_TASK 0x2
#define IS_SYSTEM 0x4
#define BLOCKED 0x8
#define CPUTIMENAMES (sizeof(cputimenames) / sizeof(cputimenames[0]))
#define CPUTIME(m, i) (m & (1L << (i)))
/* process info */
struct proc
{
int p_flags;
endpoint_t p_endpoint;
pid_t p_pid;
u64_t p_cpucycles[CPUTIMENAMES];
int p_priority;
endpoint_t p_blocked;
time_t p_user_time;
vir_bytes p_memory;
uid_t p_effuid;
int p_nice;
char p_name[PROC_NAME_LEN + 1];
};
struct tp
{
struct proc *p;
u64_t ticks;
};
/* readline - Get the command line */ /* readline - Get the command line */
char *readline(); char *readline();
@ -43,4 +81,16 @@ int execute(char *cmdline, char **args);
int built_in(char **args); int built_in(char **args);
int builtin_cd(char **args); int builtin_cd(char **args);
int builtin_history(char **args); int builtin_history(char **args);
int builtin_mytop();
int builtin_mytop();
int mytop_memory();
/*********** mytop_CPU part ***********/
void getkinfo(void);
void get_procs(void);
void parse_dir(void);
void parse_file(pid_t pid);
void print_procs(int maxlines, struct proc *proc1, struct proc *proc2, int cputimemode);
u64_t cputicks(struct proc *p1, struct proc *p2, int timemode);
char *cputimemodename(int cputimemode);
void print_proc(struct tp *tp, u64_t total_ticks);
struct tp *lookup(endpoint_t who, struct tp *tptab, int np);

Write Preview
Loading…
Cancel
Save