system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-23 18:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Convert select handler to poll style

Browse source
This commit is contained in:
Peter Wemm 1997-09-14 02:42:03 +00:00
parent 6183953301
commit 659ffb486a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=29355
2 changed files with 26 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
sys/dev/snp/snp.c
View file

@ -25,6 +25,7 @@
#include <sys/tty.h>
#include <sys/fcntl.h>
#include <sys/conf.h>
#include <sys/poll.h>
#include <sys/uio.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
@ -39,13 +40,13 @@ static d_close_t snpclose;
static d_read_t snpread;
static d_write_t snpwrite;
static d_ioctl_t snpioctl;
static d_select_t snpselect;
static d_poll_t snppoll;
#define CDEV_MAJOR 53
static struct cdevsw snp_cdevsw =
{ snpopen, snpclose, snpread, snpwrite, /*53*/
snpioctl, nostop, nullreset, nodevtotty,/* snoop */
snpselect, nommap, NULL, "snp", NULL, -1 };
snppoll, nommap, NULL, "snp", NULL, -1 };
#ifndef MIN
@ -489,30 +490,28 @@ snpioctl(dev, cmd, data, flags, p)
static int
snpselect(dev, rw, p)
snppoll(dev, events, p)
dev_t dev;
int rw;
int events;
struct proc *p;
{
int unit = minor(dev);
struct snoop *snp = &snoopsw[unit];
int revents = 0;
if (rw != FREAD)
return 1;
if (snp->snp_len > 0)
return 1;
/*
* If snoop is down,we don't want to select() forever so we return 1.
* If snoop is down,we don't want to poll() forever so we return 1.
* Caller should see if we down via FIONREAD ioctl().The last should
* return -1 to indicate down state.
*/
if (snp->snp_flags & SNOOP_DOWN)
return 1;
if (events & (POLLIN | POLLRDNORM))
if (snp->snp_flags & SNOOP_DOWN || snp->snp_len > 0)
revents |= events & (POLLIN | POLLRDNORM);
else
selrecord(p, &snp->snp_sel);
selrecord(p, &snp->snp_sel);
return 0;
return (revents);
}
#ifdef DEVFS

27
sys/kern/tty_snoop.c
View file

@ -25,6 +25,7 @@
#include <sys/tty.h>
#include <sys/fcntl.h>
#include <sys/conf.h>
#include <sys/poll.h>
#include <sys/uio.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
@ -39,13 +40,13 @@ static d_close_t snpclose;
static d_read_t snpread;
static d_write_t snpwrite;
static d_ioctl_t snpioctl;
static d_select_t snpselect;
static d_poll_t snppoll;
#define CDEV_MAJOR 53
static struct cdevsw snp_cdevsw =
{ snpopen, snpclose, snpread, snpwrite, /*53*/
snpioctl, nostop, nullreset, nodevtotty,/* snoop */
snpselect, nommap, NULL, "snp", NULL, -1 };
snppoll, nommap, NULL, "snp", NULL, -1 };
#ifndef MIN
@ -489,30 +490,28 @@ snpioctl(dev, cmd, data, flags, p)
static int
snpselect(dev, rw, p)
snppoll(dev, events, p)
dev_t dev;
int rw;
int events;
struct proc *p;
{
int unit = minor(dev);
struct snoop *snp = &snoopsw[unit];
int revents = 0;
if (rw != FREAD)
return 1;
if (snp->snp_len > 0)
return 1;
/*
* If snoop is down,we don't want to select() forever so we return 1.
* If snoop is down,we don't want to poll() forever so we return 1.
* Caller should see if we down via FIONREAD ioctl().The last should
* return -1 to indicate down state.
*/
if (snp->snp_flags & SNOOP_DOWN)
return 1;
if (events & (POLLIN | POLLRDNORM))
if (snp->snp_flags & SNOOP_DOWN || snp->snp_len > 0)
revents |= events & (POLLIN | POLLRDNORM);
else
selrecord(p, &snp->snp_sel);
selrecord(p, &snp->snp_sel);
return 0;
return (revents);
}
#ifdef DEVFS