mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-19 10:53:58 +00:00
Code Issues Releases Activity

More removal of the abortive locking code; malloc buffers when

Browse Source 
needed, rather than potentially reusing contents.
This commit is contained in:
Mark Murray 2004-04-17 19:23:15 +00:00
parent ca813d2986
commit fa2d865bad
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=128367
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/dev/random/randomdev.c
View File

@ -70,8 +70,6 @@ static struct cdevsw random_cdevsw = {
.d_name = "random",
};
static void *random_buf;
struct random_systat random_systat;
/* For use with make_dev(9)/destroy_dev(9). */
@ -102,6 +100,7 @@ static int
random_read(dev_t dev __unused, struct uio *uio, int flag)
{
int c, error = 0;
void *random_buf;
/* Blocking logic */
while (!random_systat.seeded && !error) {
@ -118,11 +117,17 @@ random_read(dev_t dev __unused, struct uio *uio, int flag)
/* The actual read */
if (!error) {
random_buf = (void *)malloc(PAGE_SIZE, M_TEMP, M_WAITOK);
while (uio->uio_resid > 0 && !error) {
c = MIN(uio->uio_resid, PAGE_SIZE);
c = (*random_systat.read)(random_buf, c);
error = uiomove(random_buf, c, uio);
}
free(random_buf, M_TEMP);
}
return (error);
@ -133,6 +138,9 @@ static int
random_write(dev_t dev __unused, struct uio *uio, int flag __unused)
{
int c, error = 0;
void *random_buf;
random_buf = (void *)malloc(PAGE_SIZE, M_TEMP, M_WAITOK);
while (uio->uio_resid > 0) {
c = MIN((int)uio->uio_resid, PAGE_SIZE);
@ -142,6 +150,8 @@ random_write(dev_t dev __unused, struct uio *uio, int flag __unused)
(*random_systat.write)(random_buf, c);
}
free(random_buf, M_TEMP);
return (error);
}
@ -186,7 +196,6 @@ random_modevent(module_t mod __unused, int type, void *data __unused)
switch (type) {
case MOD_LOAD:
random_buf = (void *)malloc(PAGE_SIZE, M_TEMP, M_WAITOK);
random_ident_hardware(&random_systat);
(*random_systat.init)();
@ -200,7 +209,6 @@ random_modevent(module_t mod __unused, int type, void *data __unused)
case MOD_UNLOAD:
(*random_systat.deinit)();
free(random_buf, M_TEMP);
destroy_dev(random_dev);