sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Use of isemptyp() macro instead of testing RTS_SLOT_FREE flag

Browse source 
- some code used to test if only this flag is set, some if also this flag is
  set. This change unifies the test
This commit is contained in:
Tomas Hruby 2009-11-12 08:35:26 +00:00
parent f98bea8f67
commit 37a7e1b76b
7 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
commands/ps/ps.c
View file

@ -495,7 +495,7 @@ int endpoints;
return -1; return -1;
} }
if ((ps_proc[p_ki].p_rts_flags == RTS_SLOT_FREE) if (isemptyp(&ps_proc[p_ki])
&& !(ps_mproc[p_nr].mp_flags & IN_USE)) { && !(ps_mproc[p_nr].mp_flags & IN_USE)) {
return -1; return -1;
} }

4
commands/simple/dumpcore.c
View file

@ -81,7 +81,7 @@ int dumpcore(endpoint_t proc_e)
for(proc_s = 0; proc_s < SLOTS; proc_s++) for(proc_s = 0; proc_s < SLOTS; proc_s++)
if(proc[proc_s].p_endpoint == proc_e && if(proc[proc_s].p_endpoint == proc_e &&
!(proc[proc_s].p_rts_flags & RTS_SLOT_FREE)) !isemptyp(&proc[proc_s]))
break; break;
if(proc_s >= SLOTS) { if(proc_s >= SLOTS) {
@ -94,7 +94,7 @@ int dumpcore(endpoint_t proc_e)
return 1; return 1;
} }
if(proc[proc_s].p_rts_flags & RTS_SLOT_FREE) { if(isemptyp(&proc[proc_s])) {
printf( "slot %d is no process (internal error).\n", printf( "slot %d is no process (internal error).\n",
proc_s); proc_s);
return 1; return 1;

6
commands/simple/top.c
View file

@ -86,10 +86,10 @@ int print_proc_summary(struct proc *proc)
for(p = 0; p < PROCS; p++) { for(p = 0; p < PROCS; p++) {
if(p - NR_TASKS == IDLE) if(p - NR_TASKS == IDLE)
continue; continue;
if(proc[p].p_rts_flags & RTS_SLOT_FREE) if(isemptyp(&proc[p]))
continue; continue;
alive++; alive++;
if(proc[p].p_rts_flags & ~RTS_SLOT_FREE) if(!proc_is_runnable(&proc[p]))
sleeping++; sleeping++;
else else
running++; running++;
@ -128,7 +128,7 @@ void print_procs(int maxlines,
if(dt < 1) return; if(dt < 1) return;
for(p = nprocs = 0; p < PROCS; p++) { for(p = nprocs = 0; p < PROCS; p++) {
if(proc2[p].p_rts_flags & RTS_SLOT_FREE) if(isemptyp(&proc2[p]))
continue; continue;
tick_procs[nprocs].p = proc2 + p; tick_procs[nprocs].p = proc2 + p;
if(proc1[p].p_endpoint == proc2[p].p_endpoint) { if(proc1[p].p_endpoint == proc2[p].p_endpoint) {

2
kernel/arch/i386/memory.c
View file

@ -472,7 +472,7 @@ PUBLIC int vm_lookup(struct proc *proc, vir_bytes virtual, vir_bytes *physical,
vmassert(proc); vmassert(proc);
vmassert(physical); vmassert(physical);
vmassert(!(proc->p_rts_flags & RTS_SLOT_FREE)); vmassert(!isemptyp(proc));
if(!HASPT(proc)) { if(!HASPT(proc)) {
*physical = virtual; *physical = virtual;

4
kernel/arch/i386/protect.c
View file

@ -315,7 +315,7 @@ for (rp = BEG_PROC_ADDR; rp < END_PROC_ADDR; ++rp) {
int privilege; int privilege;
int cs, ds; int cs, ds;
if (RTS_ISSET(rp, RTS_SLOT_FREE)) if (isemptyp(rp))
continue; continue;
if( (iskernelp(rp))) if( (iskernelp(rp)))
@ -456,7 +456,7 @@ PUBLIC int prot_set_kern_seg_limit(vir_bytes limit)
/* Increase kernel processes too. */ /* Increase kernel processes too. */
for (rp = BEG_PROC_ADDR; rp < END_PROC_ADDR; ++rp) { for (rp = BEG_PROC_ADDR; rp < END_PROC_ADDR; ++rp) {
if (RTS_ISSET(rp, RTS_SLOT_FREE) || !iskernelp(rp)) if (isemptyp(rp) || !iskernelp(rp))
continue; continue;
rp->p_memmap[S].mem_len += incr_clicks; rp->p_memmap[S].mem_len += incr_clicks;
alloc_segments(rp); alloc_segments(rp);

6
kernel/arch/i386/system.c
View file

@ -191,7 +191,7 @@ PRIVATE void ser_dump_segs(void)
struct proc *pp; struct proc *pp;
for (pp= BEG_PROC_ADDR; pp < END_PROC_ADDR; pp++) for (pp= BEG_PROC_ADDR; pp < END_PROC_ADDR; pp++)
{ {
if (pp->p_rts_flags & RTS_SLOT_FREE) if (isemptyp(pp))
continue; continue;
kprintf("%d: %s ep %d\n", proc_nr(pp), pp->p_name, pp->p_endpoint); kprintf("%d: %s ep %d\n", proc_nr(pp), pp->p_name, pp->p_endpoint);
printseg("cs: ", 1, pp, pp->p_reg.cs); printseg("cs: ", 1, pp, pp->p_reg.cs);
@ -277,7 +277,7 @@ PRIVATE void printslot(struct proc *pp, int level)
kprintf(" ??? %d\n", dep); kprintf(" ??? %d\n", dep);
} else { } else {
depproc = proc_addr(procno); depproc = proc_addr(procno);
if(depproc->p_rts_flags & RTS_SLOT_FREE) { if(isemptyp(depproc)) {
kprintf(" empty slot %d???\n", procno); kprintf(" empty slot %d???\n", procno);
depproc = NULL; depproc = NULL;
} else { } else {
@ -304,7 +304,7 @@ PUBLIC void ser_dump_proc()
for (pp= BEG_PROC_ADDR; pp < END_PROC_ADDR; pp++) for (pp= BEG_PROC_ADDR; pp < END_PROC_ADDR; pp++)
{ {
if (pp->p_rts_flags & RTS_SLOT_FREE) if (isemptyp(pp))
continue; continue;
printslot(pp, 0); printslot(pp, 0);
} }

2
servers/is/dmp_kernel.c
View file

@ -319,7 +319,7 @@ PUBLIC void privileges_dmp()
r = -1; r = -1;
for (sp = &priv[0]; sp < &priv[NR_SYS_PROCS]; sp++) for (sp = &priv[0]; sp < &priv[NR_SYS_PROCS]; sp++)
if (sp->s_proc_nr == rp->p_nr) { r ++; break; } if (sp->s_proc_nr == rp->p_nr) { r ++; break; }
if (r == -1 && ! (rp->p_rts_flags & RTS_SLOT_FREE)) { if (r == -1 && !isemptyp(rp)) {
sp = &priv[USER_PRIV_ID]; sp = &priv[USER_PRIV_ID];
} }
printf("(%02u) %-7.7s %s %s %7d", printf("(%02u) %-7.7s %s %s %7d",