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

Side by Side Diff: runtime/bin/eventhandler_linux.cc

Issue 2635253002: VM eventhandler: Read "old" event mask before it can be modified. (Closed)
Patch Set: Revert previous changes. Read correct old_mask. Created 3 years, 11 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
« no previous file with comments | « runtime/bin/eventhandler_fuchsia.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 #if !defined(DART_IO_DISABLED) 5 #if !defined(DART_IO_DISABLED)
6 6
7 #include "platform/globals.h" 7 #include "platform/globals.h"
8 #if defined(TARGET_OS_LINUX) 8 #if defined(TARGET_OS_LINUX)
9 9
10 #include "bin/eventhandler.h" 10 #include "bin/eventhandler.h"
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 int64_t val; 354 int64_t val;
355 VOID_TEMP_FAILURE_RETRY_NO_SIGNAL_BLOCKER( 355 VOID_TEMP_FAILURE_RETRY_NO_SIGNAL_BLOCKER(
356 read(timer_fd_, &val, sizeof(val))); 356 read(timer_fd_, &val, sizeof(val)));
357 if (timeout_queue_.HasTimeout()) { 357 if (timeout_queue_.HasTimeout()) {
358 DartUtils::PostNull(timeout_queue_.CurrentPort()); 358 DartUtils::PostNull(timeout_queue_.CurrentPort());
359 timeout_queue_.RemoveCurrent(); 359 timeout_queue_.RemoveCurrent();
360 } 360 }
361 } else { 361 } else {
362 DescriptorInfo* di = 362 DescriptorInfo* di =
363 reinterpret_cast<DescriptorInfo*>(events[i].data.ptr); 363 reinterpret_cast<DescriptorInfo*>(events[i].data.ptr);
364 const intptr_t old_mask = di->Mask();
364 intptr_t event_mask = GetPollEvents(events[i].events, di); 365 intptr_t event_mask = GetPollEvents(events[i].events, di);
365
366 if ((event_mask & (1 << kErrorEvent)) != 0) { 366 if ((event_mask & (1 << kErrorEvent)) != 0) {
367 di->NotifyAllDartPorts(event_mask); 367 di->NotifyAllDartPorts(event_mask);
368 } 368 }
369 event_mask &= ~(1 << kErrorEvent); 369 event_mask &= ~(1 << kErrorEvent);
370 370
371 if (event_mask != 0) { 371 if (event_mask != 0) {
372 intptr_t old_mask = di->Mask();
373 Dart_Port port = di->NextNotifyDartPort(event_mask); 372 Dart_Port port = di->NextNotifyDartPort(event_mask);
374 ASSERT(port != 0); 373 ASSERT(port != 0);
375 UpdateEpollInstance(old_mask, di); 374 UpdateEpollInstance(old_mask, di);
376 DartUtils::PostInt32(port, event_mask); 375 DartUtils::PostInt32(port, event_mask);
377 } 376 }
378 } 377 }
379 } 378 }
380 if (interrupt_seen) { 379 if (interrupt_seen) {
381 // Handle after socket events, so we avoid closing a socket before we handle 380 // Handle after socket events, so we avoid closing a socket before we handle
382 // the current events. 381 // the current events.
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
440 // The hashmap does not support keys with value 0. 439 // The hashmap does not support keys with value 0.
441 return dart::Utils::WordHash(fd + 1); 440 return dart::Utils::WordHash(fd + 1);
442 } 441 }
443 442
444 } // namespace bin 443 } // namespace bin
445 } // namespace dart 444 } // namespace dart
446 445
447 #endif // defined(TARGET_OS_LINUX) 446 #endif // defined(TARGET_OS_LINUX)
448 447
449 #endif // !defined(DART_IO_DISABLED) 448 #endif // !defined(DART_IO_DISABLED)
OLDNEW
« no previous file with comments | « runtime/bin/eventhandler_fuchsia.cc ('k') | runtime/bin/eventhandler_macos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698