Changeset 76967 in webkit
- Timestamp:
- Jan 28, 2011 12:16:02 PM (13 years ago)
- Location:
- trunk/Source
- Files:
-
- 8 edited
- 1 copied
-
JavaScriptCore/ChangeLog (modified) (1 diff)
-
JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def (modified) (1 diff)
-
JavaScriptCore/wtf/ThreadingPrimitives.h (modified) (2 diffs)
-
JavaScriptCore/wtf/ThreadingWin.cpp (modified) (1 diff)
-
WebKit2/ChangeLog (modified) (1 diff)
-
WebKit2/Platform/CoreIPC/BinarySemaphore.cpp (modified) (2 diffs)
-
WebKit2/Platform/CoreIPC/BinarySemaphore.h (modified) (1 diff)
-
WebKit2/Platform/CoreIPC/win/BinarySemaphoreWin.cpp (copied) (copied from trunk/Source/WebKit2/Platform/CoreIPC/BinarySemaphore.cpp) (2 diffs)
-
WebKit2/win/WebKit2.vcproj (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r76956 r76967 1 2011-01-27 Adam Roben <aroben@apple.com> 2 3 Extract code to convert a WTF absolute time to a Win32 wait interval into a separate 4 function 5 6 Fixes <http://webkit.org/b/53208> <rdar://problem/8922490> BinarySemaphore should wrap a 7 Win32 event 8 9 Reviewed by Dave Hyatt. 10 11 * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def: Export the new function. 12 13 * wtf/ThreadingPrimitives.h: Declare the new function. 14 15 * wtf/ThreadingWin.cpp: 16 (WTF::ThreadCondition::timedWait): Moved code to convert the absolute time to a wait 17 interval from here... 18 (WTF::absoluteTimeToWaitTimeoutInterval): ...to here. 19 1 20 2011-01-28 Sam Weinig <sam@webkit.org> 2 21 -
trunk/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def
r76615 r76967 44 44 ??8WTF@@YA_NABVCString@0@0@Z 45 45 ?NaN@JSC@@3NB 46 ?absoluteTimeToWaitTimeoutInterval@WTF@@YAKN@Z 46 47 ?add@Identifier@JSC@@SA?AV?$PassRefPtr@VStringImpl@WTF@@@WTF@@PAVExecState@2@PBD@Z 47 48 ?add@PropertyNameArray@JSC@@QAEXPAVStringImpl@WTF@@@Z -
trunk/Source/JavaScriptCore/wtf/ThreadingPrimitives.h
r76248 r76967 151 151 }; 152 152 153 #if PLATFORM(WIN) 154 // The absoluteTime is in seconds, starting on January 1, 1970. The time is assumed to use the same time zone as WTF::currentTime(). 155 // Returns an interval in milliseconds suitable for passing to one of the Win32 wait functions (e.g., ::WaitForSingleObject). 156 DWORD absoluteTimeToWaitTimeoutInterval(double absoluteTime); 157 #endif 158 153 159 } // namespace WTF 154 160 … … 157 163 using WTF::ThreadCondition; 158 164 165 #if PLATFORM(WIN) 166 using WTF::absoluteTimeToWaitTimeoutInterval; 167 #endif 168 159 169 #endif // ThreadingPrimitives_h -
trunk/Source/JavaScriptCore/wtf/ThreadingWin.cpp
r74983 r76967 459 459 bool ThreadCondition::timedWait(Mutex& mutex, double absoluteTime) 460 460 { 461 DWORD interval = absoluteTimeToWaitTimeoutInterval(absoluteTime); 462 463 if (!interval) { 464 // Consider the wait to have timed out, even if our condition has already been signaled, to 465 // match the pthreads implementation. 466 return false; 467 } 468 469 return m_condition.timedWait(mutex.impl(), interval); 470 } 471 472 void ThreadCondition::signal() 473 { 474 m_condition.signal(false); // Unblock only 1 thread. 475 } 476 477 void ThreadCondition::broadcast() 478 { 479 m_condition.signal(true); // Unblock all threads. 480 } 481 482 DWORD absoluteTimeToWaitTimeoutInterval(double absoluteTime) 483 { 461 484 double currentTime = WTF::currentTime(); 462 485 463 486 // Time is in the past - return immediately. 464 487 if (absoluteTime < currentTime) 465 return false;488 return 0; 466 489 467 490 // Time is too far in the future (and would overflow unsigned long) - wait forever. 468 if (absoluteTime - currentTime > static_cast<double>(INT_MAX) / 1000.0) { 469 wait(mutex); 470 return true; 471 } 472 473 double intervalMilliseconds = (absoluteTime - currentTime) * 1000.0; 474 return m_condition.timedWait(mutex.impl(), static_cast<unsigned long>(intervalMilliseconds)); 475 } 476 477 void ThreadCondition::signal() 478 { 479 m_condition.signal(false); // Unblock only 1 thread. 480 } 481 482 void ThreadCondition::broadcast() 483 { 484 m_condition.signal(true); // Unblock all threads. 491 if (absoluteTime - currentTime > static_cast<double>(INT_MAX) / 1000.0) 492 return INFINITE; 493 494 return (absoluteTime - currentTime) * 1000; 485 495 } 486 496 -
trunk/Source/WebKit2/ChangeLog
r76962 r76967 1 2011-01-27 Adam Roben <aroben@apple.com> 2 3 Change BinarySemaphore to wrap an auto-reset Win32 event on Windows 4 5 Fixes <http://webkit.org/b/53208> <rdar://problem/8922490>. 6 7 Reviewed by Dave Hyatt. 8 9 * Platform/CoreIPC/BinarySemaphore.cpp: Wrap this implementation in #if !PLATFORM(WIN). 10 11 * Platform/CoreIPC/BinarySemaphore.h: Make the Windows implementation have a single HANDLE 12 member that holds the event. 13 14 * Platform/CoreIPC/win/BinarySemaphoreWin.cpp: Copied from Source/WebKit2/Platform/CoreIPC/BinarySemaphore.cpp. 15 (CoreIPC::BinarySemaphore::BinarySemaphore): Create our event. 16 (CoreIPC::BinarySemaphore::~BinarySemaphore): Destory our event. 17 (CoreIPC::BinarySemaphore::signal): Signal the event. 18 (CoreIPC::BinarySemaphore::wait): Convert the absolute time to a wait interval, then wait 19 for the event to be signaled or for the interval to elapse. 20 21 * win/WebKit2.vcproj: Added BinarySemaphoreWin.cpp. Also let VS have its way with the file. 22 1 23 2011-01-27 Chris Marrin <cmarrin@apple.com> 2 24 -
trunk/Source/WebKit2/Platform/CoreIPC/BinarySemaphore.cpp
r76916 r76967 28 28 29 29 namespace CoreIPC { 30 31 #if !PLATFORM(WIN) 30 32 31 33 BinarySemaphore::BinarySemaphore() … … 62 64 } 63 65 66 #endif // !PLATFORM(WIN) 64 67 65 68 } // namespace CoreIPC -
trunk/Source/WebKit2/Platform/CoreIPC/BinarySemaphore.h
r69584 r76967 43 43 44 44 private: 45 #if PLATFORM(WIN) 46 HANDLE m_event; 47 #else 45 48 bool m_isSet; 46 49 47 50 Mutex m_mutex; 48 51 ThreadCondition m_condition; 52 #endif 49 53 }; 50 54 -
trunk/Source/WebKit2/Platform/CoreIPC/win/BinarySemaphoreWin.cpp
r76964 r76967 1 1 /* 2 * Copyright (C) 201 0Apple Inc. All rights reserved.2 * Copyright (C) 2011 Apple Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 30 30 31 31 BinarySemaphore::BinarySemaphore() 32 : m_ isSet(false)32 : m_event(::CreateEventW(0, FALSE, FALSE, 0)) 33 33 { 34 34 } 35 35 36 36 BinarySemaphore::~BinarySemaphore() 37 37 { 38 ::CloseHandle(m_event); 38 39 } 39 40 40 41 void BinarySemaphore::signal() 41 42 { 42 MutexLocker locker(m_mutex); 43 44 m_isSet = true; 45 m_condition.signal(); 43 ::SetEvent(m_event); 46 44 } 47 45 48 46 bool BinarySemaphore::wait(double absoluteTime) 49 47 { 50 MutexLocker locker(m_mutex); 51 52 bool timedOut = false; 53 while (!m_isSet) { 54 timedOut = !m_condition.timedWait(m_mutex, absoluteTime); 55 if (timedOut) 56 return false; 48 DWORD interval = absoluteTimeToWaitTimeoutInterval(absoluteTime); 49 if (!interval) { 50 // Consider the wait to have timed out, even if the event has already been signaled, to 51 // match the WTF::ThreadCondition implementation. 52 return false; 57 53 } 58 54 59 // Reset the semaphore. 60 m_isSet = false; 61 return true; 55 DWORD result = ::WaitForSingleObjectEx(m_event, interval, FALSE); 56 switch (result) { 57 case WAIT_OBJECT_0: 58 // The event was signaled. 59 return true; 60 61 case WAIT_TIMEOUT: 62 // The wait timed out. 63 return false; 64 65 case WAIT_FAILED: 66 ASSERT_WITH_MESSAGE(false, "::WaitForSingleObjectEx failed with error %lu", ::GetLastError()); 67 return false; 68 default: 69 ASSERT_WITH_MESSAGE(false, "::WaitForSingleObjectEx returned unexpected result %lu", result); 70 return false; 71 } 62 72 } 63 73 64 65 74 } // namespace CoreIPC -
trunk/Source/WebKit2/win/WebKit2.vcproj
r76769 r76967 400 400 </File> 401 401 <File 402 RelativePath="..\Shared\CacheModel.h" 403 > 404 </File> 405 <File 406 RelativePath="..\Shared\ChildProcess.cpp" 407 > 408 </File> 409 <File 410 RelativePath="..\Shared\ChildProcess.h" 411 > 412 </File> 413 <File 414 RelativePath="..\Shared\CommandLine.h" 415 > 416 </File> 417 <File 418 RelativePath="..\Shared\ContextMenuState.h" 419 > 420 </File> 421 <File 422 RelativePath="..\Shared\DrawingAreaInfo.h" 423 > 424 </File> 425 <File 426 RelativePath="..\Shared\FontSmoothingLevel.h" 427 > 428 </File> 429 <File 430 RelativePath="..\Shared\ImmutableArray.cpp" 431 > 432 </File> 433 <File 434 RelativePath="..\Shared\ImmutableArray.h" 435 > 436 </File> 437 <File 438 RelativePath="..\Shared\ImmutableDictionary.cpp" 439 > 440 </File> 441 <File 442 RelativePath="..\Shared\ImmutableDictionary.h" 443 > 444 </File> 445 <File 446 RelativePath="..\Shared\MutableArray.cpp" 447 > 448 </File> 449 <File 450 RelativePath="..\Shared\MutableArray.h" 451 > 452 </File> 453 <File 454 RelativePath="..\Shared\MutableDictionary.cpp" 455 > 456 </File> 457 <File 458 RelativePath="..\Shared\MutableDictionary.h" 459 > 460 </File> 461 <File 462 RelativePath="..\Shared\NativeWebKeyboardEvent.h" 463 > 464 </File> 465 <File 466 RelativePath="..\Shared\NotImplemented.h" 467 > 468 </File> 469 <File 470 RelativePath="..\Shared\OriginAndDatabases.cpp" 471 > 472 </File> 473 <File 474 RelativePath="..\Shared\OriginAndDatabases.h" 475 > 476 </File> 477 <File 478 RelativePath="..\Shared\PlatformPopupMenuData.cpp" 479 > 480 </File> 481 <File 482 RelativePath="..\Shared\PlatformPopupMenuData.h" 483 > 484 </File> 485 <File 486 RelativePath="..\Shared\PrintInfo.cpp" 487 > 488 </File> 489 <File 490 RelativePath="..\Shared\PrintInfo.h" 491 > 492 </File> 493 <File 494 RelativePath="..\Shared\SameDocumentNavigationType.h" 495 > 496 </File> 497 <File 498 RelativePath="..\Shared\SelectionState.h" 499 > 500 </File> 501 <File 502 RelativePath="..\Shared\SessionState.cpp" 503 > 504 </File> 505 <File 506 RelativePath="..\Shared\SessionState.h" 507 > 508 </File> 509 <File 402 510 RelativePath="..\Shared\ShareableBitmap.cpp" 403 511 > … … 405 513 <File 406 514 RelativePath="..\Shared\ShareableBitmap.h" 407 >408 </File>409 <File410 RelativePath="..\Shared\CacheModel.h"411 >412 </File>413 <File414 RelativePath="..\Shared\ChildProcess.cpp"415 >416 </File>417 <File418 RelativePath="..\Shared\ChildProcess.h"419 >420 </File>421 <File422 RelativePath="..\Shared\CommandLine.h"423 >424 </File>425 <File426 RelativePath="..\Shared\ContextMenuState.h"427 >428 </File>429 <File430 RelativePath="..\Shared\DrawingAreaInfo.h"431 >432 </File>433 <File434 RelativePath="..\Shared\FontSmoothingLevel.h"435 >436 </File>437 <File438 RelativePath="..\Shared\ImmutableArray.cpp"439 >440 </File>441 <File442 RelativePath="..\Shared\ImmutableArray.h"443 >444 </File>445 <File446 RelativePath="..\Shared\ImmutableDictionary.cpp"447 >448 </File>449 <File450 RelativePath="..\Shared\ImmutableDictionary.h"451 >452 </File>453 <File454 RelativePath="..\Shared\MutableArray.cpp"455 >456 </File>457 <File458 RelativePath="..\Shared\MutableArray.h"459 >460 </File>461 <File462 RelativePath="..\Shared\MutableDictionary.cpp"463 >464 </File>465 <File466 RelativePath="..\Shared\MutableDictionary.h"467 >468 </File>469 <File470 RelativePath="..\Shared\NativeWebKeyboardEvent.h"471 >472 </File>473 <File474 RelativePath="..\Shared\NotImplemented.h"475 >476 </File>477 <File478 RelativePath="..\Shared\OriginAndDatabases.cpp"479 >480 </File>481 <File482 RelativePath="..\Shared\OriginAndDatabases.h"483 >484 </File>485 <File486 RelativePath="..\Shared\PlatformPopupMenuData.cpp"487 >488 </File>489 <File490 RelativePath="..\Shared\PlatformPopupMenuData.h"491 >492 </File>493 <File494 RelativePath="..\Shared\PrintInfo.cpp"495 >496 </File>497 <File498 RelativePath="..\Shared\PrintInfo.h"499 >500 </File>501 <File502 RelativePath="..\Shared\SameDocumentNavigationType.h"503 >504 </File>505 <File506 RelativePath="..\Shared\SelectionState.h"507 >508 </File>509 <File510 RelativePath="..\Shared\SessionState.cpp"511 >512 </File>513 <File514 RelativePath="..\Shared\SessionState.h"515 515 > 516 516 </File> … … 1809 1809 </File> 1810 1810 <File 1811 RelativePath="..\WebProcess\InjectedBundle\API\c\WKBundleHitTestResult.cpp" 1812 > 1813 </File> 1814 <File 1815 RelativePath="..\WebProcess\InjectedBundle\API\c\WKBundleHitTestResult.h" 1816 > 1817 </File> 1818 <File 1819 RelativePath="..\WebProcess\InjectedBundle\API\c\WKBundleInitialize.h" 1820 > 1821 </File> 1822 <File 1811 1823 RelativePath="..\WebProcess\InjectedBundle\API\c\WKBundleInspector.cpp" 1812 1824 > … … 1814 1826 <File 1815 1827 RelativePath="..\WebProcess\InjectedBundle\API\c\WKBundleInspector.h" 1816 >1817 </File>1818 <File1819 RelativePath="..\WebProcess\InjectedBundle\API\c\WKBundleHitTestResult.cpp"1820 >1821 </File>1822 <File1823 RelativePath="..\WebProcess\InjectedBundle\API\c\WKBundleHitTestResult.h"1824 >1825 </File>1826 <File1827 RelativePath="..\WebProcess\InjectedBundle\API\c\WKBundleInitialize.h"1828 1828 > 1829 1829 </File> … … 2977 2977 Name="win" 2978 2978 > 2979 <File 2980 RelativePath="..\Platform\CoreIPC\win\BinarySemaphoreWin.cpp" 2981 > 2982 </File> 2979 2983 <File 2980 2984 RelativePath="..\Platform\CoreIPC\win\ConnectionWin.cpp"
Note: See TracChangeset
for help on using the changeset viewer.
