OLD | NEW |
1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file |
2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
4 | 4 |
5 #include "platform/globals.h" | 5 #include "platform/globals.h" |
6 #if defined(TARGET_OS_LINUX) | 6 #if defined(TARGET_OS_LINUX) |
7 | 7 |
8 #include "bin/eventhandler.h" | 8 #include "bin/eventhandler.h" |
9 | 9 |
10 #include <errno.h> // NOLINT | 10 #include <errno.h> // NOLINT |
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
202 ASSERT(msg[i].data == (1 << kCloseCommand)); | 202 ASSERT(msg[i].data == (1 << kCloseCommand)); |
203 // Close the socket and free system resources and move on to | 203 // Close the socket and free system resources and move on to |
204 // next message. | 204 // next message. |
205 RemoveFromEpollInstance(epoll_fd_, sd); | 205 RemoveFromEpollInstance(epoll_fd_, sd); |
206 intptr_t fd = sd->fd(); | 206 intptr_t fd = sd->fd(); |
207 sd->Close(); | 207 sd->Close(); |
208 socket_map_.Remove(GetHashmapKeyFromFd(fd), GetHashmapHashFromFd(fd)); | 208 socket_map_.Remove(GetHashmapKeyFromFd(fd), GetHashmapHashFromFd(fd)); |
209 delete sd; | 209 delete sd; |
210 DartUtils::PostInt32(msg[i].dart_port, 1 << kDestroyedEvent); | 210 DartUtils::PostInt32(msg[i].dart_port, 1 << kDestroyedEvent); |
211 } else if ((msg[i].data & (1 << kReturnTokenCommand)) != 0) { | 211 } else if ((msg[i].data & (1 << kReturnTokenCommand)) != 0) { |
212 if (sd->ReturnToken()) { | 212 int count = msg[i].data & ((1 << kReturnTokenCommand) - 1); |
213 AddToEpollInstance(epoll_fd_, sd); | 213 for (int i = 0; i < count; i++) { |
| 214 if (sd->ReturnToken()) { |
| 215 AddToEpollInstance(epoll_fd_, sd); |
| 216 } |
214 } | 217 } |
215 } else { | 218 } else { |
216 // Setup events to wait for. | 219 // Setup events to wait for. |
217 sd->SetPortAndMask(msg[i].dart_port, msg[i].data); | 220 sd->SetPortAndMask(msg[i].dart_port, msg[i].data); |
218 AddToEpollInstance(epoll_fd_, sd); | 221 AddToEpollInstance(epoll_fd_, sd); |
219 } | 222 } |
220 } | 223 } |
221 } | 224 } |
222 } | 225 } |
223 | 226 |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
268 int64_t val; | 271 int64_t val; |
269 VOID_TEMP_FAILURE_RETRY(read(timer_fd_, &val, sizeof(val))); | 272 VOID_TEMP_FAILURE_RETRY(read(timer_fd_, &val, sizeof(val))); |
270 if (timeout_queue_.HasTimeout()) { | 273 if (timeout_queue_.HasTimeout()) { |
271 DartUtils::PostNull(timeout_queue_.CurrentPort()); | 274 DartUtils::PostNull(timeout_queue_.CurrentPort()); |
272 timeout_queue_.RemoveCurrent(); | 275 timeout_queue_.RemoveCurrent(); |
273 } | 276 } |
274 } else { | 277 } else { |
275 SocketData* sd = reinterpret_cast<SocketData*>(events[i].data.ptr); | 278 SocketData* sd = reinterpret_cast<SocketData*>(events[i].data.ptr); |
276 intptr_t event_mask = GetPollEvents(events[i].events, sd); | 279 intptr_t event_mask = GetPollEvents(events[i].events, sd); |
277 if (event_mask != 0) { | 280 if (event_mask != 0) { |
278 if (sd->TakeToken()) { | 281 if (!sd->IsListeningSocket() && sd->TakeToken()) { |
279 // Took last token, remove from epoll. | 282 // Took last token, remove from epoll. |
280 RemoveFromEpollInstance(epoll_fd_, sd); | 283 RemoveFromEpollInstance(epoll_fd_, sd); |
281 } | 284 } |
282 Dart_Port port = sd->port(); | 285 Dart_Port port = sd->port(); |
283 ASSERT(port != 0); | 286 ASSERT(port != 0); |
284 DartUtils::PostInt32(port, event_mask); | 287 DartUtils::PostInt32(port, event_mask); |
285 } | 288 } |
286 } | 289 } |
287 } | 290 } |
288 if (interrupt_seen) { | 291 if (interrupt_seen) { |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
346 | 349 |
347 uint32_t EventHandlerImplementation::GetHashmapHashFromFd(intptr_t fd) { | 350 uint32_t EventHandlerImplementation::GetHashmapHashFromFd(intptr_t fd) { |
348 // The hashmap does not support keys with value 0. | 351 // The hashmap does not support keys with value 0. |
349 return dart::Utils::WordHash(fd + 1); | 352 return dart::Utils::WordHash(fd + 1); |
350 } | 353 } |
351 | 354 |
352 } // namespace bin | 355 } // namespace bin |
353 } // namespace dart | 356 } // namespace dart |
354 | 357 |
355 #endif // defined(TARGET_OS_LINUX) | 358 #endif // defined(TARGET_OS_LINUX) |
OLD | NEW |