Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(56)

Side by Side Diff: runtime/bin/eventhandler_macos.h

Issue 12646007: Fix file descriptor leak in event handler implementation. When shutting down an isolate, we did not… (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « runtime/bin/eventhandler_linux.cc ('k') | runtime/bin/eventhandler_macos.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #ifndef BIN_EVENTHANDLER_MACOS_H_ 5 #ifndef BIN_EVENTHANDLER_MACOS_H_
6 #define BIN_EVENTHANDLER_MACOS_H_ 6 #define BIN_EVENTHANDLER_MACOS_H_
7 7
8 #if !defined(BIN_EVENTHANDLER_H_) 8 #if !defined(BIN_EVENTHANDLER_H_)
9 #error Do not include eventhandler_macos.h directly; use eventhandler.h instead. 9 #error Do not include eventhandler_macos.h directly; use eventhandler.h instead.
10 #endif 10 #endif
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 99
100 class EventHandlerImplementation { 100 class EventHandlerImplementation {
101 public: 101 public:
102 EventHandlerImplementation(); 102 EventHandlerImplementation();
103 ~EventHandlerImplementation(); 103 ~EventHandlerImplementation();
104 104
105 // Gets the socket data structure for a given file 105 // Gets the socket data structure for a given file
106 // descriptor. Creates a new one if one is not found. 106 // descriptor. Creates a new one if one is not found.
107 SocketData* GetSocketData(intptr_t fd); 107 SocketData* GetSocketData(intptr_t fd);
108 void SendData(intptr_t id, Dart_Port dart_port, int64_t data); 108 void SendData(intptr_t id, Dart_Port dart_port, int64_t data);
109 void Start(); 109 void Start(EventHandler* handler);
110 void Shutdown(); 110 void Shutdown();
111 111
112 private: 112 private:
113 intptr_t GetTimeout(); 113 intptr_t GetTimeout();
114 bool GetInterruptMessage(InterruptMessage* msg); 114 bool GetInterruptMessage(InterruptMessage* msg);
115 void HandleEvents(struct kevent* events, int size); 115 void HandleEvents(struct kevent* events, int size);
116 void HandleTimeout(); 116 void HandleTimeout();
117 static void EventHandlerEntry(uword args); 117 static void EventHandlerEntry(uword args);
118 void WakeupHandler(intptr_t id, Dart_Port dart_port, int64_t data); 118 void WakeupHandler(intptr_t id, Dart_Port dart_port, int64_t data);
119 void HandleInterruptFd(); 119 void HandleInterruptFd();
120 void SetPort(intptr_t fd, Dart_Port dart_port, intptr_t mask); 120 void SetPort(intptr_t fd, Dart_Port dart_port, intptr_t mask);
121 intptr_t GetEvents(struct kevent* event, SocketData* sd); 121 intptr_t GetEvents(struct kevent* event, SocketData* sd);
122 static void* GetHashmapKeyFromFd(intptr_t fd); 122 static void* GetHashmapKeyFromFd(intptr_t fd);
123 static uint32_t GetHashmapHashFromFd(intptr_t fd); 123 static uint32_t GetHashmapHashFromFd(intptr_t fd);
124 124
125 HashMap socket_map_; 125 HashMap socket_map_;
126 int64_t timeout_; // Time for next timeout. 126 int64_t timeout_; // Time for next timeout.
127 Dart_Port timeout_port_; 127 Dart_Port timeout_port_;
128 bool shutdown_; 128 bool shutdown_;
129 int interrupt_fds_[2]; 129 int interrupt_fds_[2];
130 int kqueue_fd_; 130 int kqueue_fd_;
131 }; 131 };
132 132
133 133
134 #endif // BIN_EVENTHANDLER_MACOS_H_ 134 #endif // BIN_EVENTHANDLER_MACOS_H_
OLDNEW
« no previous file with comments | « runtime/bin/eventhandler_linux.cc ('k') | runtime/bin/eventhandler_macos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698