Fixed compilation errors in ps.c and rs/manager.c. The former was fixed by disabling code using no-longer-existant flags and the latter by removing the spurious parameter i from sys_privctl
This commit is contained in:
parent
dd0ea3aba0
commit
789c8a6ee4
3 changed files with 11 additions and 4 deletions
|
@ -245,6 +245,7 @@ struct pstat *bufp;
|
||||||
else if (bufp->ps_mflags & SIGSUSPENDED)
|
else if (bufp->ps_mflags & SIGSUSPENDED)
|
||||||
blkstr = "sigsusp";
|
blkstr = "sigsusp";
|
||||||
} else if (bufp->ps_recv == FS_PROC_NR) {
|
} else if (bufp->ps_recv == FS_PROC_NR) {
|
||||||
|
#if 0 /* these flags no longer exist, should find this out another way */
|
||||||
if (-bufp->ps_ftask == XPIPE)
|
if (-bufp->ps_ftask == XPIPE)
|
||||||
blkstr = "pipe";
|
blkstr = "pipe";
|
||||||
else if (-bufp->ps_ftask == XPOPEN)
|
else if (-bufp->ps_ftask == XPOPEN)
|
||||||
|
@ -255,7 +256,9 @@ struct pstat *bufp;
|
||||||
blkstr = "flock";
|
blkstr = "flock";
|
||||||
else if(-bufp->ps_ftask == XSELECT)
|
else if(-bufp->ps_ftask == XSELECT)
|
||||||
blkstr = "select";
|
blkstr = "select";
|
||||||
else if(-bufp->ps_ftask >= 0)
|
else
|
||||||
|
#endif
|
||||||
|
if(-bufp->ps_ftask >= 0)
|
||||||
blkstr = taskname(-bufp->ps_ftask);
|
blkstr = taskname(-bufp->ps_ftask);
|
||||||
else
|
else
|
||||||
blkstr = "??";
|
blkstr = "??";
|
||||||
|
@ -526,7 +529,11 @@ int endpoints;
|
||||||
else if (ps_proc[p_ki].p_rts_flags == 0)
|
else if (ps_proc[p_ki].p_rts_flags == 0)
|
||||||
bufp->ps_state = R_STATE; /* in run-queue */
|
bufp->ps_state = R_STATE; /* in run-queue */
|
||||||
else if (ps_mproc[p_nr].mp_flags & (WAITING | PAUSED | SIGSUSPENDED) ||
|
else if (ps_mproc[p_nr].mp_flags & (WAITING | PAUSED | SIGSUSPENDED) ||
|
||||||
ps_fproc[p_nr].fp_suspended == SUSPENDED)
|
#if 0 /* this field and this flag no longer exist, get this info elsewhere */
|
||||||
|
ps_fproc[p_nr].fp_suspended == SUSPENDED)
|
||||||
|
#else
|
||||||
|
0)
|
||||||
|
#endif
|
||||||
bufp->ps_state = S_STATE; /* sleeping */
|
bufp->ps_state = S_STATE; /* sleeping */
|
||||||
else
|
else
|
||||||
bufp->ps_state = W_STATE; /* a short wait */
|
bufp->ps_state = W_STATE; /* a short wait */
|
||||||
|
|
|
@ -40,7 +40,7 @@ _PROTOTYPE( int sys_newmap, (endpoint_t proc_ep, struct mem_map *ptr));
|
||||||
_PROTOTYPE( int sys_exit, (endpoint_t proc_ep));
|
_PROTOTYPE( int sys_exit, (endpoint_t proc_ep));
|
||||||
_PROTOTYPE( int sys_trace, (int req, endpoint_t proc_ep, long addr, long *data_p));
|
_PROTOTYPE( int sys_trace, (int req, endpoint_t proc_ep, long addr, long *data_p));
|
||||||
|
|
||||||
_PROTOTYPE( int sys_privctl, (endpoint_t proc_ep, int req, int i, void *p));
|
_PROTOTYPE( int sys_privctl, (endpoint_t proc_ep, int req, void *p));
|
||||||
_PROTOTYPE( int sys_setgrant, (cp_grant_t *grants, int ngrants));
|
_PROTOTYPE( int sys_setgrant, (cp_grant_t *grants, int ngrants));
|
||||||
_PROTOTYPE( int sys_nice, (endpoint_t proc_ep, int priority));
|
_PROTOTYPE( int sys_nice, (endpoint_t proc_ep, int priority));
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#include "syslib.h"
|
#include "syslib.h"
|
||||||
|
|
||||||
int sys_privctl(endpoint_t proc_ep, int request, int i, void *p)
|
int sys_privctl(endpoint_t proc_ep, int request, void *p)
|
||||||
{
|
{
|
||||||
message m;
|
message m;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue