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

Nits here and there. Made log device buffer messages again.

Browse Source
This commit is contained in:
Ben Gras
2005-07-22 18:24:17 +00:00
parent b9b334c38c
commit d09f170abc
4 changed files with 35 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/log/log.c
+27 -6
View File
@@ -112,8 +112,13 @@ subwrite(struct logdevice *log, int count, int proc_nr, vir_bytes user_vir)
count = LOG_SIZE - log->log_write;
buf = log->log_buffer + log->log_write;
if((r=sys_vircopy(proc_nr,D,user_vir, SELF,D,(int)buf, count)) != OK)
return r;
if(proc_nr == SELF) {
memcpy(buf, (char *) user_vir, count);
}
else {
if((r=sys_vircopy(proc_nr,D,user_vir, SELF,D,(int)buf, count)) != OK)
return r;
}
LOGINC(log->log_write, count);
log->log_size += count;
@@ -160,6 +165,25 @@ subwrite(struct logdevice *log, int count, int proc_nr, vir_bytes user_vir)
return count;
}
/*===========================================================================*
* log_append *
*===========================================================================*/
PUBLIC void
log_append(char *buf, int count)
{
int w = 0, skip = 0;
if(count < 1) return;
if(count > LOG_SIZE) skip = count - LOG_SIZE;
count -= skip;
buf += skip;
w = subwrite(&logdevices[0], count, SELF, (vir_bytes) buf);
if(w > 0 && w < count)
subwrite(&logdevices[0], count-w, SELF, (vir_bytes) buf+w);
return;
}
/*===========================================================================*
* subread *
*===========================================================================*/
@@ -224,9 +248,6 @@ unsigned nr_req; /* length of request vector */
/* There's already someone hanging to read, or
* no real I/O requested.
*/
#if LOG_DEBUG
printf("someone (%d) is already blocking\n", log->log_proc_nr);
#endif
return(OK);
}
@@ -345,7 +366,7 @@ message *m_ptr;
}
/*============================================================================*
* log_select *
* log_other *
*============================================================================*/
PRIVATE int log_other(dp, m_ptr)
struct driver *dp;