external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-15 04:32:24 +00:00
Code Issues Releases Wiki Activity

csa/agent.c: use select rather than poll

Browse source
This commit is contained in:
Jon Trulson 2012-06-19 16:51:25 -06:00
parent cdf8003f7c
commit d5deec6e72
1 changed files with 28 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
cde/lib/csa/agent.c
View file

@ -34,10 +34,8 @@
#include <unistd.h> #include <unistd.h>
#include <signal.h> #include <signal.h>
#include <rpc/rpc.h> #include <rpc/rpc.h>
#if defined(linux) #if !defined(linux) && !defined(CSRG_BASED)
# include <sys/poll.h> # include <sys/poll.h>
#else
# include <poll.h>
#endif #endif
#if defined(SunOS) || defined(USL) || defined(__uxp__) #if defined(SunOS) || defined(USL) || defined(__uxp__)
#include <netconfig.h> #include <netconfig.h>
@ -203,6 +201,30 @@ _DtCm_destroy_agent()
extern void extern void
_DtCm_process_updates() _DtCm_process_updates()
{ {
#if defined(CSRG_BASED) || defined(linux)
int i, nfd;
fd_set rpc_bits;
while (B_TRUE) {
rpc_bits = svc_fdset;
nfd = select(FD_SETSIZE, &rpc_bits, NULL, NULL, NULL);
if (nfd <= 0)
/* done */
return;
for (i = 0; i < FD_SETSIZE; i++) {
if (FD_ISSET(i, &rpc_bits)) {
svc_getreqset(&rpc_bits);
break;
}
}
}
#else
int i, j, nfd; int i, j, nfd;
fd_set rpc_bits; fd_set rpc_bits;
fd_mask fmask, *inbits; fd_mask fmask, *inbits;
@ -215,11 +237,7 @@ _DtCm_process_updates()
rpc_bits = svc_fdset; rpc_bits = svc_fdset;
/* convert to pollfd structure */ /* convert to pollfd structure */
#if defined(linux)
inbits = rpc_bits.__fds_bits;
#else
inbits = rpc_bits.fds_bits; inbits = rpc_bits.fds_bits;
#endif
p = pfd; p = pfd;
for (i = 0; i < FD_SETSIZE; i += NFDBITS) { for (i = 0; i < FD_SETSIZE; i += NFDBITS) {
fmask = *inbits; fmask = *inbits;
@ -253,11 +271,7 @@ _DtCm_process_updates()
for (p = pfd; i-- > 0; p++) { for (p = pfd; i-- > 0; p++) {
j = p->fd / NFDBITS; j = p->fd / NFDBITS;
if (j != last) { if (j != last) {
#if defined(linux)
inbits = &rpc_bits.__fds_bits[j];
#else
inbits = &rpc_bits.fds_bits[j]; inbits = &rpc_bits.fds_bits[j];
#endif
last = j; last = j;
} }
if (p->revents & POLLIN) { if (p->revents & POLLIN) {
@ -269,6 +283,7 @@ _DtCm_process_updates()
if (do_rpc) if (do_rpc)
svc_getreqset(&rpc_bits); svc_getreqset(&rpc_bits);
} }
#endif /* CSRG_BASED || linux */
} }
/* /*
@ -397,7 +412,8 @@ gettransient (u_long version)
static u_long static u_long
gettransient (int proto, u_long vers, int *sockp) gettransient (int proto, u_long vers, int *sockp)
{ {
int s, len, socktype; unsigned int len;
int s, socktype;
struct sockaddr_in addr; struct sockaddr_in addr;
switch (proto) { switch (proto) {