Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed bug relating to FS and MEMORY during startup;

Browse Source 
Relocated some syslib functions to utils library;
Changed location of 'Multiuser startup ..." echo in /etc/rc
This commit is contained in:
Jorrit Herder
2005-06-06 09:30:44 +00:00
parent f2a85e58d9
commit c281867f46
22 changed files with 121 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
kernel/proc.c
View File

@@ -85,12 +85,6 @@ FORWARD _PROTOTYPE( void pick_proc, (void) );
#endif /* (CHIP == M68000) */
#if DEAD_CODE /* now in glo.h */
/* Declare buffer space and a bit map for notification messages. */
PRIVATE struct notification notify_buffer[NR_NOTIFY_BUFS];
PRIVATE bitchunk_t notify_bitmap[BITMAP_CHUNKS(NR_NOTIFY_BUFS)];
#endif
/*===========================================================================*
* sys_call *
@@ -152,6 +146,20 @@ message *m_ptr; /* pointer to message in the caller's space */
*/
switch(function) {
case SENDREC: /* has FRESH_ANSWER flags */
#if DEAD_CODE
{ message m;
if (caller_ptr->p_nr == MEMORY && src_dst == FS_PROC_NR) {
CopyMess(caller_ptr->p_nr, caller_ptr, m_ptr, proc_addr(HARDWARE), &m);
kprintf("MEMORY sendrec FS, m.m_type %d", m.m_type);
kprintf("TTY_LINE %d", m.TTY_LINE);
kprintf("TTY_REQ %d\n", m.TTY_REQUEST);
}
if (caller_ptr->p_nr == FS_PROC_NR && src_dst == MEMORY) {
CopyMess(caller_ptr->p_nr, caller_ptr, m_ptr, proc_addr(HARDWARE), &m);
kprintf("FS sendrec MEMORY, m.m_type %d\n", m.m_type);
}
}
#endif
/* fall through */
case SEND:
if (! isalive(src_dst)) {
@@ -214,9 +222,7 @@ unsigned flags; /* system call flags */
dst_ptr = proc_addr(dst); /* pointer to destination's proc entry */
/* Check for deadlock by 'caller_ptr' and 'dst' sending to each other.
* This check is rare, so overhead is acceptable.
*/
/* Check for deadlock by 'caller_ptr' and 'dst' sending to each other. */
if (dst_ptr->p_flags & SENDING) {
next_ptr = proc_addr(dst_ptr->p_sendto);
while (TRUE) {