sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fs/epoll: fix compile break about change type of pollevent_t

Browse Source 
Signed-off-by: Jiuzhu Dong <dongjiuzhu1@xiaomi.com>
This commit is contained in:
Jiuzhu Dong 2022-04-02 22:07:33 +08:00 committed by Xiang Xiao
parent 63f28099e3
commit 2f2e4680d0
1 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
examples/poll/poll_listener.c
View File

@ -91,18 +91,18 @@ void *poll_listener(pthread_addr_t pvarg)
printf("poll_listener: Opening %s for non-blocking read\n", FIFO_PATH1); printf("poll_listener: Opening %s for non-blocking read\n", FIFO_PATH1);
fd = open(FIFO_PATH1, O_RDONLY|O_NONBLOCK); fd = open(FIFO_PATH1, O_RDONLY | O_NONBLOCK);
if (fd < 0) if (fd < 0)
{ {
printf("poll_listener: ERROR Failed to open FIFO %s: %d\n", printf("poll_listener: ERROR Failed to open FIFO %s: %d\n",
FIFO_PATH1, errno); FIFO_PATH1, errno);
close(fd); close(fd);
return (void*)-1; return (FAR void *)-1;
} }
/* Loop forever */ /* Loop forever */
for (;;) for (; ; )
{ {
printf("poll_listener: Calling poll()\n"); printf("poll_listener: Calling poll()\n");
@ -143,32 +143,35 @@ void *poll_listener(pthread_addr_t pvarg)
nevents = 0; nevents = 0;
for (i = 0; i < NPOLLFDS; i++) for (i = 0; i < NPOLLFDS; i++)
{ {
printf("poll_listener: FIFO revents[%d]=%02x\n", i, fds[i].revents); printf("poll_listener: FIFO revents[%d]=%08" PRIx32 "\n", i,
fds[i].revents);
if (timeout) if (timeout)
{ {
if (fds[i].revents != 0) if (fds[i].revents != 0)
{ {
printf("poll_listener: ERROR? expected revents=00, received revents[%d]=%02x\n", printf("poll_listener: ERROR? expected revents=00, "
fds[i].revents, i); "received revents[%d]=%08" PRIx32 "\n",
i, fds[i].revents);
} }
} }
else if (pollin) else if (pollin)
{ {
if (fds[i].revents == POLLIN) if (fds[i].revents == POLLIN)
{
nevents++;
}
else if (fds[i].revents != 0)
{ {
printf("poll_listener: ERROR unexpected revents[%d]=%02x\n", nevents++;
i, fds[i].revents); }
} else if (fds[i].revents != 0)
{
printf("poll_listener: ERROR unexpected revents[%d]="
"%08" PRIx32 "\n", i, fds[i].revents);
}
} }
} }
if (pollin && nevents != ret) if (pollin && nevents != ret)
{ {
printf("poll_listener: ERROR found %d events, poll reported %d\n", nevents, ret); printf("poll_listener: ERROR found %d events, "
"poll reported %d\n", nevents, ret);
} }
/* In any event, read until the pipe/serial is empty */ /* In any event, read until the pipe/serial is empty */
@ -210,21 +213,26 @@ void *poll_listener(pthread_addr_t pvarg)
{ {
if ((fds[i].revents & POLLIN) != 0) if ((fds[i].revents & POLLIN) != 0)
{ {
printf("poll_listener: ERROR no read data[%d]\n", i); printf("poll_listener: ERROR no read"
" data[%d]\n", i);
} }
} }
else if (errno != EINTR) else if (errno != EINTR)
{ {
printf("poll_listener: read[%d] failed: %d\n", i, errno); printf("poll_listener: read[%d] failed: %d\n",
i, errno);
} }
nbytes = 0; nbytes = 0;
} }
else else
{ {
if (timeout) if (timeout)
{ {
printf("poll_listener: ERROR? Poll timeout, but data read[%d]\n", i); printf("poll_listener: ERROR? Poll timeout, "
printf(" (might just be a race condition)\n"); "but data read[%d]\n", i);
printf(" (might just be "
"a race condition)\n");
} }
buffer[nbytes] = '\0'; buffer[nbytes] = '\0';
@ -232,7 +240,9 @@ void *poll_listener(pthread_addr_t pvarg)
i, buffer, (long)nbytes); i, buffer, (long)nbytes);
} }
/* Suppress error report if no read data on the next time through */ /* Suppress error report if no read data on the next
* time through
*/
fds[i].revents = 0; fds[i].revents = 0;
} }