ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libev/ev_port.c
(Generate patch)

Comparing libev/ev_port.c (file contents):
Revision 1.10 by root, Tue Dec 25 07:05:45 2007 UTC vs.
Revision 1.21 by root, Fri Oct 15 22:44:41 2010 UTC

1/* 1/*
2 * libev solaris event port backend 2 * libev solaris event port backend
3 * 3 *
4 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
57 ) 57 )
58 { 58 {
59 if (errno == EBADFD) 59 if (errno == EBADFD)
60 fd_kill (EV_A_ fd); 60 fd_kill (EV_A_ fd);
61 else 61 else
62 syserr ("(libev) port_associate"); 62 ev_syserr ("(libev) port_associate");
63 } 63 }
64} 64}
65 65
66static void 66static void
67port_modify (EV_P_ int fd, int oev, int nev) 67port_modify (EV_P_ int fd, int oev, int nev)
… …
83{ 83{
84 int res, i; 84 int res, i;
85 struct timespec ts; 85 struct timespec ts;
86 uint_t nget = 1; 86 uint_t nget = 1;
87 87
88 ts.tv_sec = (time_t)timeout; 88 EV_RELEASE_CB;
89 ts.tv_nsec = (long)(timeout - (ev_tstamp)ts.tv_sec) * 1e9; 89 EV_TS_SET (ts, timeout);
90 res = port_getn (backend_fd, port_events, port_eventmax, &nget, &ts); 90 res = port_getn (backend_fd, port_events, port_eventmax, &nget, &ts);
91 EV_ACQUIRE_CB;
91 92
92 if (res < 0) 93 if (res == -1)
93 { 94 {
94 if (errno != EINTR && errno != ETIME) 95 if (errno != EINTR && errno != ETIME)
95 syserr ("(libev) port_getn"); 96 ev_syserr ("(libev) port_getn (see http://bugs.opensolaris.org/view_bug.do?bug_id=6268715, try LIBEV_FLAGS=3 env variable)");
96 97
97 return; 98 return;
98 } 99 }
99 100
100 for (i = 0; i < nget; ++i) 101 for (i = 0; i < nget; ++i)
… …
123} 124}
124 125
125int inline_size 126int inline_size
126port_init (EV_P_ int flags) 127port_init (EV_P_ int flags)
127{ 128{
128 /* Initalize the kernel queue */ 129 /* Initialize the kernel queue */
129 if ((backend_fd = port_create ()) < 0) 130 if ((backend_fd = port_create ()) < 0)
130 return 0; 131 return 0;
131 132
132 fcntl (backend_fd, F_SETFD, FD_CLOEXEC); /* not sure if necessary, hopefully doesn't hurt */ 133 fcntl (backend_fd, F_SETFD, FD_CLOEXEC); /* not sure if necessary, hopefully doesn't hurt */
133 134
134 backend_fudge = 1e-3; /* needed to compensate for port_getn returning early */ 135 backend_fudge = 1e-3; /* needed to compensate for port_getn returning early */
135 backend_modify = port_modify; 136 backend_modify = port_modify;
136 backend_poll = port_poll; 137 backend_poll = port_poll;
137 138
138 port_eventmax = 64; /* intiial number of events receivable per poll */ 139 port_eventmax = 64; /* initial number of events receivable per poll */
139 port_events = (port_event_t *)ev_malloc (sizeof (port_event_t) * port_eventmax); 140 port_events = (port_event_t *)ev_malloc (sizeof (port_event_t) * port_eventmax);
140 141
141 return EVBACKEND_PORT; 142 return EVBACKEND_PORT;
142} 143}
143 144
… …
151port_fork (EV_P) 152port_fork (EV_P)
152{ 153{
153 close (backend_fd); 154 close (backend_fd);
154 155
155 while ((backend_fd = port_create ()) < 0) 156 while ((backend_fd = port_create ()) < 0)
156 syserr ("(libev) port"); 157 ev_syserr ("(libev) port");
157 158
158 fcntl (backend_fd, F_SETFD, FD_CLOEXEC); 159 fcntl (backend_fd, F_SETFD, FD_CLOEXEC);
159 160
160 /* re-register interest in fds */ 161 /* re-register interest in fds */
161 fd_rearm_all (EV_A); 162 fd_rearm_all (EV_A);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines