225089 2021-04-26 23:07:10 -0700 HashTableConstIterator's consistency assertion fails while closing m_webIDBServers in NetworkProcess::didClose since r275846 2021-04-27 15:11:26 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 224305 1 fujii fujii achristensen cdumez darin ddkilzer ggaren kkinnunen ryanhaddad sihui_liu webkit-bug-importer oldest_to_newest 1754498 0 fujii 2021-04-26 23:07:10 -0700 HashTableConstIterator's consistency assertion fails while closing m_webIDBServers in NetworkProcess::didClose since r275846 WinCairo WK2 Debug WebKitNetworkProcess.exe is crashing while running layout tests. Callstack: # Child-SP RetAddr Call Site 00 00000033`2bfff380 00007ffc`3ba940c1 WTF!WTFCrash(void)+0x1f [C:\home\webkit\gc\Source\WTF\wtf\Assertions.cpp @ 305] 01 00000033`2bfff3b0 00007ffc`3c575d12 WebKit2!WTFCrashWithInfo(int __formal = 0n219, char * __formal = 0x00007ffc`418912e0 "C:\home\webkit\gc\WebKitBuild\Debug\WTF\Headers\wtf/HashTable.h", char * __formal = 0x00007ffc`43a9bb10 "WTF::HashTableConstIterator<class WTF::HashTable<class PAL::SessionID,struct WTF::KeyValuePair<class PAL::SessionID,class WTF::RefPtr<class WebKit::WebIDBServer,struct WTF::RawPtrTraits<class WebKit::WebIDBServer>,struct WTF::DefaultRefDerefTraits<class WebKit::WebIDBServer> > >,struct WTF::KeyValuePairKeyExtractor<struct WTF::KeyValuePair<class PAL::SessionID,class WTF::RefPtr<class WebKit::WebIDBServer,struct WTF::RawPtrTraits<class WebKit::WebIDBServer>,struct WTF::DefaultRefDerefTraits<class WebKit::WebIDBServer> > > >,struct WTF::DefaultHash<class PAL::SessionID>,struct WTF::HashMap<class PAL::SessionID,class WTF::RefPtr<class WebKit::WebIDBServer,struct WTF::RawPtrTraits<class WebKit::WebIDBServer>,struct WTF::DefaultRefDerefTraits<class WebKit::WebIDBServer> >,struct WTF::DefaultHash<class PAL::SessionID>,struct WTF::HashTraits<class PAL::SessionID>,struct WTF::HashTraits<class WTF::RefPtr<class WebKit::WebIDBServer,struct WTF::RawPtrTraits<class WebKit::WebIDBServer>,struct WTF::DefaultRefDerefTraits<class WebKit::WebIDBServer> > >,struct WTF::HashTableTraits>::KeyValuePairTraits,struct WTF::HashTraits<class PAL::SessionID> >,class PAL::SessionID,struct WTF::KeyValuePair<class PAL::SessionID,class WTF::RefPtr<class WebKit::WebIDBServer,struct WTF::RawPtrTraits<class WebKit::WebIDBServer>,struct WTF::DefaultRefDerefTraits<class WebKit::WebIDBServer> > >,struct WTF::KeyValuePairKeyExtractor<struct WTF::KeyValuePair<class PAL::SessionID,class WTF::RefPtr<class WebKit::WebIDBServer,struct WTF::RawPtrTraits<class WebKit::WebIDBServer>,struct WTF::DefaultRefDerefTraits<class WebKit::WebIDBServer> > > >,struct WTF::DefaultHash<class PAL::SessionID>,struct WTF::HashMap<class PAL::SessionID,class WTF::RefPtr<class WebKit::WebIDBServer,struct WTF::RawPtrTraits<class WebKit::WebIDBServer>,struct WTF::DefaultRefDerefTraits<class WebKit::WebIDBServer> >,struct WTF::DefaultHash<class PAL::SessionID>,struct WTF::HashTraits<class PAL::SessionID>,struct WTF::HashTraits<class WTF::RefPtr<class WebKit::WebIDBServer,struct WTF::RawPtrTraits<class WebKit::WebIDBServer>,struct WTF::DefaultRefDerefTraits<class WebKit::WebIDBServer> > >,struct WTF::HashTableTraits>::KeyValuePairTraits,struct WTF::HashTraits<class PAL::SessionID> >::checkValidity", int __formal = 0n72)+0x31 [C:\home\webkit\gc\WebKitBuild\Debug\WTF\Headers\wtf\Assertions.h @ 693] 02 00000033`2bfff3e0 00007ffc`3c561fd8 WebKit2!WTF::HashTableConstIterator<WTF::HashTable<PAL::SessionID,WTF::KeyValuePair<PAL::SessionID,WTF::RefPtr<WebKit::WebIDBServer,WTF::RawPtrTraits<WebKit::WebIDBServer>,WTF::DefaultRefDerefTraits<WebKit::WebIDBServer> > >,WTF::KeyValuePairKeyExtractor<WTF::KeyValuePair<PAL::SessionID,WTF::RefPtr<WebKit::WebIDBServer,WTF::RawPtrTraits<WebKit::WebIDBServer>,WTF::DefaultRefDerefTraits<WebKit::WebIDBServer> > > >,WTF::DefaultHash<PAL::SessionID>,WTF::HashMap<PAL::SessionID,WTF::RefPtr<WebKit::WebIDBServer,WTF::RawPtrTraits<WebKit::WebIDBServer>,WTF::DefaultRefDerefTraits<WebKit::WebIDBServer> >,WTF::DefaultHash<PAL::SessionID>,WTF::HashTraits<PAL::SessionID>,WTF::HashTraits<WTF::RefPtr<WebKit::WebIDBServer,WTF::RawPtrTraits<WebKit::WebIDBServer>,WTF::DefaultRefDerefTraits<WebKit::WebIDBServer> > >,WTF::HashTableTraits>::KeyValuePairTraits,WTF::HashTraits<PAL::SessionID> >,PAL::SessionID,WTF::KeyValuePair<PAL::SessionID,WTF::RefPtr<WebKit::WebIDBServer,WTF::RawPtrTraits<WebKit::WebIDBServer>,WTF::DefaultRefDerefTraits<WebKit::WebIDBServer> > >,WTF::KeyValuePairKeyExtractor<WTF::KeyValuePair<PAL::SessionID,WTF::RefPtr<WebKit::WebIDBServer,WTF::RawPtrTraits<WebKit::WebIDBServer>,WTF::DefaultRefDerefTraits<WebKit::WebIDBServer> > > >,WTF::DefaultHash<PAL::SessionID>,WTF::HashMap<PAL::SessionID,WTF::RefPtr<WebKit::WebIDBServer,WTF::RawPtrTraits<WebKit::WebIDBServer>,WTF::DefaultRefDerefTraits<WebKit::WebIDBServer> >,WTF::DefaultHash<PAL::SessionID>,WTF::HashTraits<PAL::SessionID>,WTF::HashTraits<WTF::RefPtr<WebKit::WebIDBServer,WTF::RawPtrTraits<WebKit::WebIDBServer>,WTF::DefaultRefDerefTraits<WebKit::WebIDBServer> > >,WTF::HashTableTraits>::KeyValuePairTraits,WTF::HashTraits<PAL::SessionID> >::checkValidity(void)+0x72 [C:\home\webkit\gc\WebKitBuild\Debug\WTF\Headers\wtf\HashTable.h @ 219] 03 00000033`2bfff410 00007ffc`3c56259b WebKit2!WTF::HashTableConstIterator<WTF::HashTable<PAL::SessionID,WTF::KeyValuePair<PAL::SessionID,WTF::RefPtr<WebKit::WebIDBServer,WTF::RawPtrTraits<WebKit::WebIDBServer>,WTF::DefaultRefDerefTraits<WebKit::WebIDBServer> > >,WTF::KeyValuePairKeyExtractor<WTF::KeyValuePair<PAL::SessionID,WTF::RefPtr<WebKit::WebIDBServer,WTF::RawPtrTraits<WebKit::WebIDBServer>,WTF::DefaultRefDerefTraits<WebKit::WebIDBServer> > > >,WTF::DefaultHash<PAL::SessionID>,WTF::HashMap<PAL::SessionID,WTF::RefPtr<WebKit::WebIDBServer,WTF::RawPtrTraits<WebKit::WebIDBServer>,WTF::DefaultRefDerefTraits<WebKit::WebIDBServer> >,WTF::DefaultHash<PAL::SessionID>,WTF::HashTraits<PAL::SessionID>,WTF::HashTraits<WTF::RefPtr<WebKit::WebIDBServer,WTF::RawPtrTraits<WebKit::WebIDBServer>,WTF::DefaultRefDerefTraits<WebKit::WebIDBServer> > >,WTF::HashTableTraits>::KeyValuePairTraits,WTF::HashTraits<PAL::SessionID> >,PAL::SessionID,WTF::KeyValuePair<PAL::SessionID,WTF::RefPtr<WebKit::WebIDBServer,WTF::RawPtrTraits<WebKit::WebIDBServer>,WTF::DefaultRefDerefTraits<WebKit::WebIDBServer> > >,WTF::KeyValuePairKeyExtractor<WTF::KeyValuePair<PAL::SessionID,WTF::RefPtr<WebKit::WebIDBServer,WTF::RawPtrTraits<WebKit::WebIDBServer>,WTF::DefaultRefDerefTraits<WebKit::WebIDBServer> > > >,WTF::DefaultHash<PAL::SessionID>,WTF::HashMap<PAL::SessionID,WTF::RefPtr<WebKit::WebIDBServer,WTF::RawPtrTraits<WebKit::WebIDBServer>,WTF::DefaultRefDerefTraits<WebKit::WebIDBServer> >,WTF::DefaultHash<PAL::SessionID>,WTF::HashTraits<PAL::SessionID>,WTF::HashTraits<WTF::RefPtr<WebKit::WebIDBServer,WTF::RawPtrTraits<WebKit::WebIDBServer>,WTF::DefaultRefDerefTraits<WebKit::WebIDBServer> > >,WTF::HashTableTraits>::KeyValuePairTraits,WTF::HashTraits<PAL::SessionID> >::operator++(void)+0x28 [C:\home\webkit\gc\WebKitBuild\Debug\WTF\Headers\wtf\HashTable.h @ 187] 04 00000033`2bfff440 00007ffc`3c5627db WebKit2!WTF::HashTableIterator<WTF::HashTable<PAL::SessionID,WTF::KeyValuePair<PAL::SessionID,WTF::RefPtr<WebKit::WebIDBServer,WTF::RawPtrTraits<WebKit::WebIDBServer>,WTF::DefaultRefDerefTraits<WebKit::WebIDBServer> > >,WTF::KeyValuePairKeyExtractor<WTF::KeyValuePair<PAL::SessionID,WTF::RefPtr<WebKit::WebIDBServer,WTF::RawPtrTraits<WebKit::WebIDBServer>,WTF::DefaultRefDerefTraits<WebKit::WebIDBServer> > > >,WTF::DefaultHash<PAL::SessionID>,WTF::HashMap<PAL::SessionID,WTF::RefPtr<WebKit::WebIDBServer,WTF::RawPtrTraits<WebKit::WebIDBServer>,WTF::DefaultRefDerefTraits<WebKit::WebIDBServer> >,WTF::DefaultHash<PAL::SessionID>,WTF::HashTraits<PAL::SessionID>,WTF::HashTraits<WTF::RefPtr<WebKit::WebIDBServer,WTF::RawPtrTraits<WebKit::WebIDBServer>,WTF::DefaultRefDerefTraits<WebKit::WebIDBServer> > >,WTF::HashTableTraits>::KeyValuePairTraits,WTF::HashTraits<PAL::SessionID> >,PAL::SessionID,WTF::KeyValuePair<PAL::SessionID,WTF::RefPtr<WebKit::WebIDBServer,WTF::RawPtrTraits<WebKit::WebIDBServer>,WTF::DefaultRefDerefTraits<WebKit::WebIDBServer> > >,WTF::KeyValuePairKeyExtractor<WTF::KeyValuePair<PAL::SessionID,WTF::RefPtr<WebKit::WebIDBServer,WTF::RawPtrTraits<WebKit::WebIDBServer>,WTF::DefaultRefDerefTraits<WebKit::WebIDBServer> > > >,WTF::DefaultHash<PAL::SessionID>,WTF::HashMap<PAL::SessionID,WTF::RefPtr<WebKit::WebIDBServer,WTF::RawPtrTraits<WebKit::WebIDBServer>,WTF::DefaultRefDerefTraits<WebKit::WebIDBServer> >,WTF::DefaultHash<PAL::SessionID>,WTF::HashTraits<PAL::SessionID>,WTF::HashTraits<WTF::RefPtr<WebKit::WebIDBServer,WTF::RawPtrTraits<WebKit::WebIDBServer>,WTF::DefaultRefDerefTraits<WebKit::WebIDBServer> > >,WTF::HashTableTraits>::KeyValuePairTraits,WTF::HashTraits<PAL::SessionID> >::operator++(void)+0x2b [C:\home\webkit\gc\WebKitBuild\Debug\WTF\Headers\wtf\HashTable.h @ 273] 05 00000033`2bfff470 00007ffc`3c5629db WebKit2!WTF::HashTableIteratorAdapter<WTF::HashTable<PAL::SessionID,WTF::KeyValuePair<PAL::SessionID,WTF::RefPtr<WebKit::WebIDBServer,WTF::RawPtrTraits<WebKit::WebIDBServer>,WTF::DefaultRefDerefTraits<WebKit::WebIDBServer> > >,WTF::KeyValuePairKeyExtractor<WTF::KeyValuePair<PAL::SessionID,WTF::RefPtr<WebKit::WebIDBServer,WTF::RawPtrTraits<WebKit::WebIDBServer>,WTF::DefaultRefDerefTraits<WebKit::WebIDBServer> > > >,WTF::DefaultHash<PAL::SessionID>,WTF::HashMap<PAL::SessionID,WTF::RefPtr<WebKit::WebIDBServer,WTF::RawPtrTraits<WebKit::WebIDBServer>,WTF::DefaultRefDerefTraits<WebKit::WebIDBServer> >,WTF::DefaultHash<PAL::SessionID>,WTF::HashTraits<PAL::SessionID>,WTF::HashTraits<WTF::RefPtr<WebKit::WebIDBServer,WTF::RawPtrTraits<WebKit::WebIDBServer>,WTF::DefaultRefDerefTraits<WebKit::WebIDBServer> > >,WTF::HashTableTraits>::KeyValuePairTraits,WTF::HashTraits<PAL::SessionID> >,WTF::KeyValuePair<PAL::SessionID,WTF::RefPtr<WebKit::WebIDBServer,WTF::RawPtrTraits<WebKit::WebIDBServer>,WTF::DefaultRefDerefTraits<WebKit::WebIDBServer> > > >::operator++(void)+0x2b [C:\home\webkit\gc\WebKitBuild\Debug\WTF\Headers\wtf\HashIterators.h @ 80] 06 00000033`2bfff4a0 00007ffc`3c4cdb37 WebKit2!WTF::HashTableValuesIterator<WTF::HashTable<PAL::SessionID,WTF::KeyValuePair<PAL::SessionID,WTF::RefPtr<WebKit::WebIDBServer,WTF::RawPtrTraits<WebKit::WebIDBServer>,WTF::DefaultRefDerefTraits<WebKit::WebIDBServer> > >,WTF::KeyValuePairKeyExtractor<WTF::KeyValuePair<PAL::SessionID,WTF::RefPtr<WebKit::WebIDBServer,WTF::RawPtrTraits<WebKit::WebIDBServer>,WTF::DefaultRefDerefTraits<WebKit::WebIDBServer> > > >,WTF::DefaultHash<PAL::SessionID>,WTF::HashMap<PAL::SessionID,WTF::RefPtr<WebKit::WebIDBServer,WTF::RawPtrTraits<WebKit::WebIDBServer>,WTF::DefaultRefDerefTraits<WebKit::WebIDBServer> >,WTF::DefaultHash<PAL::SessionID>,WTF::HashTraits<PAL::SessionID>,WTF::HashTraits<WTF::RefPtr<WebKit::WebIDBServer,WTF::RawPtrTraits<WebKit::WebIDBServer>,WTF::DefaultRefDerefTraits<WebKit::WebIDBServer> > >,WTF::HashTableTraits>::KeyValuePairTraits,WTF::HashTraits<PAL::SessionID> >,PAL::SessionID,WTF::RefPtr<WebKit::WebIDBServer,WTF::RawPtrTraits<WebKit::WebIDBServer>,WTF::DefaultRefDerefTraits<WebKit::WebIDBServer> > >::operator++(void)+0x2b [C:\home\webkit\gc\WebKitBuild\Debug\WTF\Headers\wtf\HashIterators.h @ 163] 07 00000033`2bfff4d0 00007ffc`3c7cc2be WebKit2!WebKit::NetworkProcess::didClose(class IPC::Connection * __formal = 0x000001b5`0afb1bb0)+0x197 [C:\home\webkit\gc\Source\WebKit\NetworkProcess\NetworkProcess.cpp @ 277] 08 00000033`2bfff670 00007ffc`3c7cef0f WebKit2!<lambda_6f468efff3d3d300976f9a19a0593f24>::operator()(void)+0x9e [C:\home\webkit\gc\Source\WebKit\Platform\IPC\Connection.cpp @ 895] 09 00000033`2bfff6c0 00007ffc`6cc89cb7 WebKit2!WTF::Detail::CallableWrapper<<lambda_6f468efff3d3d300976f9a19a0593f24>,void>::call(void)+0x2f [C:\home\webkit\gc\WebKitBuild\Debug\WTF\Headers\wtf\Function.h @ 52] 0a 00000033`2bfff6f0 00007ffc`6ccffe87 WTF!WTF::Function<void __cdecl(void)+0xa7 [C:\home\webkit\gc\Source\WTF\wtf\Function.h @ 84] 0b 00000033`2bfff730 00007ffc`6cdf37c5 WTF!WTF::RunLoop::performWork(void)+0x187 [C:\home\webkit\gc\Source\WTF\wtf\RunLoop.cpp @ 134] 0c 00000033`2bfff830 00007ffc`6cdf3718 WTF!WTF::RunLoop::wndProc(struct HWND__ * hWnd = 0x00000000`00740d62, unsigned int message = 0x401, unsigned int64 wParam = 0x000001b5`0af93060, int64 lParam = 0n0)+0x55 [C:\home\webkit\gc\Source\WTF\wtf\win\RunLoopWin.cpp @ 57] 0d 00000033`2bfff870 00007ffc`b318e858 WTF!WTF::RunLoop::RunLoopWndProc(struct HWND__ * hWnd = 0x00000000`00740d62, unsigned int message = 0x401, unsigned int64 wParam = 0x000001b5`0af93060, int64 lParam = 0n0)+0x68 [C:\home\webkit\gc\Source\WTF\wtf\win\RunLoopWin.cpp @ 39] 0e 00000033`2bfff8c0 00007ffc`b318e299 USER32!UserCallWinProcCheckWow+0x2f8 0f 00000033`2bfffa50 00007ffc`6cdf2b54 USER32!DispatchMessageWorker+0x249 10 00000033`2bfffad0 00007ffc`3bb2496f WTF!WTF::RunLoop::run(void)+0x64 [C:\home\webkit\gc\Source\WTF\wtf\win\RunLoopWin.cpp @ 74] 11 00000033`2bfffb60 00007ffc`3bb24091 WebKit2!WebKit::AuxiliaryProcessMainBase<WebKit::NetworkProcess,0>::run(int argc = 0n7, char ** argv = 0x000001b5`0af9d880)+0xbf [C:\home\webkit\gc\Source\WebKit\Shared\AuxiliaryProcessMain.h @ 71] 12 00000033`2bfffbb0 00007ffc`3bb23f9f WebKit2!WebKit::AuxiliaryProcessMain<WebKit::NetworkProcessMainCurl>(int argc = 0n7, char ** argv = 0x000001b5`0af9d880)+0x71 [C:\home\webkit\gc\Source\WebKit\Shared\AuxiliaryProcessMain.h @ 97] 13 00000033`2bfffc80 00007ff6`ec5e1030 WebKit2!WebKit::NetworkProcessMain(int argc = 0n7, char ** argv = 0x000001b5`0af9d880)+0x2f [C:\home\webkit\gc\Source\WebKit\NetworkProcess\curl\NetworkProcessMainCurl.cpp @ 45] 14 00000033`2bfffcb0 00007ff6`ec5e1270 WebKitNetworkProcess!main(int argc = 0n7, char ** argv = 0x000001b5`0af9d880)+0x30 [C:\home\webkit\gc\Source\WebKit\NetworkProcess\EntryPoint\win\NetworkProcessMain.cpp @ 35] 15 (Inline Function) --------`-------- WebKitNetworkProcess!invoke_main(void)+0x22 [D:\a01\_work\26\s\src\vctools\crt\vcstartup\src\startup\exe_common.inl @ 78] 16 00000033`2bfffce0 00007ffc`b30d7034 WebKitNetworkProcess!__scrt_common_main_seh(void)+0x10c [D:\a01\_work\26\s\src\vctools\crt\vcstartup\src\startup\exe_common.inl @ 288] 17 00000033`2bfffd20 00007ffc`b4862651 KERNEL32!BaseThreadInitThunk+0x14 18 00000033`2bfffd50 00000000`00000000 ntdll!RtlUserThreadStart+0x21 1754507 1 427124 fujii 2021-04-26 23:35:33 -0700 Created attachment 427124 Patch 1754614 2 webkit-bug-importer 2021-04-27 08:21:26 -0700 <rdar://problem/77210724> 1754621 3 427124 sihui_liu 2021-04-27 08:38:01 -0700 Comment on attachment 427124 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=427124&action=review > Source/WebKit/NetworkProcess/NetworkProcess.cpp:-278 > - for (auto& server : m_webIDBServers.values()) > - server->close(); Nice catch! Can we replace this with something like: for (auto& sessionID : copyToVector(m_webIDBServers.keys())) m_webIDBServers.get(sessionID)->close(); So we are sure the loop will only run limited times (even when logic of close() changes not). 1754622 4 427124 cdumez 2021-04-27 08:40:32 -0700 Comment on attachment 427124 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=427124&action=review >> Source/WebKit/NetworkProcess/NetworkProcess.cpp:-278 >> - server->close(); > > Nice catch! Can we replace this with something like: > > for (auto& sessionID : copyToVector(m_webIDBServers.keys())) > m_webIDBServers.get(sessionID)->close(); > > So we are sure the loop will only run limited times (even when logic of close() changes not). Sihui, would you mind explaining why your proposal is better than one Fujii proposed? I kinda like his proposal because: 1. No need for a copy to a vector 2. No hash table look-up of IDs. 1754623 5 427124 cdumez 2021-04-27 08:44:01 -0700 Comment on attachment 427124 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=427124&action=review >>> Source/WebKit/NetworkProcess/NetworkProcess.cpp:-278 >>> - server->close(); >> >> Nice catch! Can we replace this with something like: >> >> for (auto& sessionID : copyToVector(m_webIDBServers.keys())) >> m_webIDBServers.get(sessionID)->close(); >> >> So we are sure the loop will only run limited times (even when logic of close() changes not). > > Sihui, would you mind explaining why your proposal is better than one Fujii proposed? I kinda like his proposal because: > 1. No need for a copy to a vector > 2. No hash table look-up of IDs. Not to mention that the dereference of m_webIDBServers.get(sessionID) looks potentially unsafe here. 1754629 6 sihui_liu 2021-04-27 09:09:09 -0700 (In reply to Chris Dumez from comment #5) > Comment on attachment 427124 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=427124&action=review > > >>> Source/WebKit/NetworkProcess/NetworkProcess.cpp:-278 > >>> - server->close(); > >> > >> Nice catch! Can we replace this with something like: > >> > >> for (auto& sessionID : copyToVector(m_webIDBServers.keys())) > >> m_webIDBServers.get(sessionID)->close(); > >> > >> So we are sure the loop will only run limited times (even when logic of close() changes not). > > > > Sihui, would you mind explaining why your proposal is better than one Fujii proposed? I kinda like his proposal because: > > 1. No need for a copy to a vector > > 2. No hash table look-up of IDs. > > Not to mention that the dereference of m_webIDBServers.get(sessionID) looks > potentially unsafe here. Yes, should better check if m_webIDBServers contains sessionID first. I suggested that just because it makes sure the loop ends no matter what WebIDBServer::close() does. I guess adding an assert to current implementation to make sure the value does not exist in map after close() will also do. 1754634 7 427124 darin 2021-04-27 09:13:38 -0700 Comment on attachment 427124 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=427124&action=review >>>> Source/WebKit/NetworkProcess/NetworkProcess.cpp:-278 >>>> - server->close(); >>> >>> Nice catch! Can we replace this with something like: >>> >>> for (auto& sessionID : copyToVector(m_webIDBServers.keys())) >>> m_webIDBServers.get(sessionID)->close(); >>> >>> So we are sure the loop will only run limited times (even when logic of close() changes not). >> >> Sihui, would you mind explaining why your proposal is better than one Fujii proposed? I kinda like his proposal because: >> 1. No need for a copy to a vector >> 2. No hash table look-up of IDs. > > Not to mention that the dereference of m_webIDBServers.get(sessionID) looks potentially unsafe here. I agree with Chris that Fujii’s original is better than the suggested replacement. I have two thoughts: 1) It’s a *little* scary that the server is removed indirectly through the call to close. This code relies on it happening synchronously and 100% reliably in that function. 2) There is a function named "random()" that does the same thing as begin(), more efficiently. Its name makes it sound less apropos than begin, but it’s probably better for a case like this, for just selecting one item from a hash table to operate on without preference. 1754635 8 427124 cdumez 2021-04-27 09:14:54 -0700 Comment on attachment 427124 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=427124&action=review >>>>> Source/WebKit/NetworkProcess/NetworkProcess.cpp:-278 >>>>> - server->close(); >>>> >>>> Nice catch! Can we replace this with something like: >>>> >>>> for (auto& sessionID : copyToVector(m_webIDBServers.keys())) >>>> m_webIDBServers.get(sessionID)->close(); >>>> >>>> So we are sure the loop will only run limited times (even when logic of close() changes not). >>> >>> Sihui, would you mind explaining why your proposal is better than one Fujii proposed? I kinda like his proposal because: >>> 1. No need for a copy to a vector >>> 2. No hash table look-up of IDs. >> >> Not to mention that the dereference of m_webIDBServers.get(sessionID) looks potentially unsafe here. > > Yes, should better check if m_webIDBServers contains sessionID first. > > I suggested that just because it makes sure the loop ends no matter what WebIDBServer::close() does. > > I guess adding an assert to current implementation to make sure the value does not exist in map after close() will also do. To be safe and make sure we cannot end up in an infinite loop, I guess the best approach is to tweak Sihui's proposal like so then: ``` for (auto& sessionID : copyToVector(m_webIDBServers.keys())) { if (auto* server = m_webIDBServers.get(sessionID)) server->close(); } ``` I think the following would be a bit more efficient and concise though: ``` for (auto& server : copyToVector(m_webIDBServers.values())) server->close(); ``` 1754637 9 cdumez 2021-04-27 09:18:31 -0700 (In reply to Darin Adler from comment #7) > Comment on attachment 427124 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=427124&action=review > > >>>> Source/WebKit/NetworkProcess/NetworkProcess.cpp:-278 > >>>> - server->close(); > >>> > >>> Nice catch! Can we replace this with something like: > >>> > >>> for (auto& sessionID : copyToVector(m_webIDBServers.keys())) > >>> m_webIDBServers.get(sessionID)->close(); > >>> > >>> So we are sure the loop will only run limited times (even when logic of close() changes not). > >> > >> Sihui, would you mind explaining why your proposal is better than one Fujii proposed? I kinda like his proposal because: > >> 1. No need for a copy to a vector > >> 2. No hash table look-up of IDs. > > > > Not to mention that the dereference of m_webIDBServers.get(sessionID) looks potentially unsafe here. > > I agree with Chris that Fujii’s original is better than the suggested > replacement. I have two thoughts: > > 1) It’s a *little* scary that the server is removed indirectly through the > call to close. This code relies on it happening synchronously and 100% > reliably in that function. > > 2) There is a function named "random()" that does the same thing as begin(), > more efficiently. Its name makes it sound less apropos than begin, but it’s > probably better for a case like this, for just selecting one item from a > hash table to operate on without preference. I looked at the implementation of random() and it does not look more efficient than begin() to me? 1754639 10 cdumez 2021-04-27 09:19:16 -0700 By the way, I did not mean to overwrite Darin's r+. I had a bugzilla conflict :/ Sorry about that. 1754643 11 darin 2021-04-27 09:30:53 -0700 Wow, I was totally wrong about random(); please don’t switch to it. I was confusing it with takeAny(). 1754645 12 427124 cdumez 2021-04-27 09:33:12 -0700 Comment on attachment 427124 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=427124&action=review Restoring r+, I personally think the patch is fine as is. Each WebIDBServer has a closeCallback that get passed to it when constructed and which removes the WebIDBServer from m_webIDBServers. > Source/WebKit/NetworkProcess/NetworkProcess.cpp:278 > + m_webIDBServers.values().begin()->get()->close(); I am surprised you really need the `->get()` here. 1754709 13 427124 ggaren 2021-04-27 11:16:27 -0700 Comment on attachment 427124 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=427124&action=review >>>>>>>> Source/WebKit/NetworkProcess/NetworkProcess.cpp:-278 >>>>>>>> - server->close(); >>>>>>> >>>>>>> Nice catch! Can we replace this with something like: >>>>>>> >>>>>>> for (auto& sessionID : copyToVector(m_webIDBServers.keys())) >>>>>>> m_webIDBServers.get(sessionID)->close(); >>>>>>> >>>>>>> So we are sure the loop will only run limited times (even when logic of close() changes not). >>>>>> >>>>>> Sihui, would you mind explaining why your proposal is better than one Fujii proposed? I kinda like his proposal because: >>>>>> 1. No need for a copy to a vector >>>>>> 2. No hash table look-up of IDs. >>>>> >>>>> Not to mention that the dereference of m_webIDBServers.get(sessionID) looks potentially unsafe here. >>>> >>>> Yes, should better check if m_webIDBServers contains sessionID first. >>>> >>>> I suggested that just because it makes sure the loop ends no matter what WebIDBServer::close() does. >>>> >>>> I guess adding an assert to current implementation to make sure the value does not exist in map after close() will also do. >>> >>> I agree with Chris that Fujii’s original is better than the suggested replacement. I have two thoughts: >>> >>> 1) It’s a *little* scary that the server is removed indirectly through the call to close. This code relies on it happening synchronously and 100% reliably in that function. >>> >>> 2) There is a function named "random()" that does the same thing as begin(), more efficiently. Its name makes it sound less apropos than begin, but it’s probably better for a case like this, for just selecting one item from a hash table to operate on without preference. >> >> To be safe and make sure we cannot end up in an infinite loop, I guess the best approach is to tweak Sihui's proposal like so then: >> ``` >> for (auto& sessionID : copyToVector(m_webIDBServers.keys())) { >> if (auto* server = m_webIDBServers.get(sessionID)) >> server->close(); >> } >> ``` >> >> I think the following would be a bit more efficient and concise though: >> ``` >> for (auto& server : copyToVector(m_webIDBServers.values())) >> server->close(); >> ``` > > I looked at the implementation of random() and it does not look more efficient than begin() to me? A downside to removing begin() repeatedly is that computing begin() requires iterating from the start of the table to find an in-use bucket, and that iteration becomes increasingly long as you remove what you find. In the worst case this would be O(N^2); however, the hash table eventually saves you by rehashing as it shrinks. In theory, removing random() could result in a less lopsided pattern of iteration and removal, possibly saving some time. I think the ideal behavior would move the existing table into a temporary, and then iterate the temporary calling close() (without removing from it). That saves all the rehashing commotion, and any need to copy. Not sure if it's valid to effectively remove an entry before calling close() in this case, though. 1754770 14 427191 fujii 2021-04-27 13:46:41 -0700 Created attachment 427191 Patch 1754772 15 427191 cdumez 2021-04-27 13:51:37 -0700 Comment on attachment 427191 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=427191&action=review > Source/WebKit/NetworkProcess/NetworkProcess.cpp:277 > + auto servers = WTFMove(m_webIDBServers); We prefer `std::exchange(m_webIDBServers, { })` in such cases, since m_webIDBServers may get used later on. 1754773 16 427191 cdumez 2021-04-27 13:52:40 -0700 Comment on attachment 427191 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=427191&action=review > Source/WebKit/NetworkProcess/NetworkProcess.cpp:278 > + for (auto& server : servers.values()) Also, this can be done on a single line: ``` for (auto& server : std::exchange(m_webIDBServers, { })) server->close(); ``` 1754783 17 427191 fujii 2021-04-27 14:11:54 -0700 Comment on attachment 427191 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=427191&action=review >> Source/WebKit/NetworkProcess/NetworkProcess.cpp:278 >> + for (auto& server : servers.values()) > > Also, this can be done on a single line: > ``` > for (auto& server : std::exchange(m_webIDBServers, { })) > server->close(); > ``` Unfortunately, the single line approach still causes the assertion failure. for (auto& server : std::exchange(m_webIDBServers, { }).values()) It seems that I should ensure the HashMap is alive for the 'for' statement. 1754784 18 427195 fujii 2021-04-27 14:12:29 -0700 Created attachment 427195 Patch 1754785 19 427195 cdumez 2021-04-27 14:28:51 -0700 Comment on attachment 427195 Patch Oh yes. That's because of the `.values()` call. My bad. 1754794 20 427195 darin 2021-04-27 14:49:57 -0700 Comment on attachment 427195 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=427195&action=review > Source/WebKit/NetworkProcess/NetworkProcess.cpp:278 > + auto servers = std::exchange(m_webIDBServers, { }); > + for (auto& server : servers.values()) So annoying, this difference between function calls (temporaries last until the end of the full expression) and things like the range-based for statement (temporaries last only until the end of the expression and are destroyed before we start iterating the loop). 1754804 21 ews-feeder 2021-04-27 15:11:24 -0700 Committed r276671 (237090@main): <https://commits.webkit.org/237090@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 427195. 427124 2021-04-26 23:35:33 -0700 2021-04-27 13:46:31 -0700 Patch bug-225089-20210427153531.patch text/plain 1623 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2NjE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDk0NGRjM2NjZjI1NGYwYmZi ZTcxYTIxZGUyODUxZDViMmFmNGNlYmEuLjRkOWJlZmRjNTBjMzI5ZTgwMmZmOTMyNGU2ZWI3ZDE5 ODY1MGZlOWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMjEtMDQtMjYgIEZ1amlpIEhp cm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CisKKyAgICAgICAgSGFzaFRhYmxlQ29u c3RJdGVyYXRvcidzIGNvbnNpc3RlbmN5IGFzc2VydGlvbiBmYWlscyB3aGlsZSBjbG9zaW5nIG1f d2ViSURCU2VydmVycyBpbiBOZXR3b3JrUHJvY2Vzczo6ZGlkQ2xvc2Ugc2luY2UgcjI3NTg0Ngor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1MDg5CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGl0ZW1z IG9mIG1fd2ViSURCU2VydmVycyB3ZXJlIHJlbW92ZWQgd2hpbGUgaXRlcmF0aW5nCisgICAgICAg IG1fd2ViSURCU2VydmVycy4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9j ZXNzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Byb2Nlc3M6OmRpZENsb3NlKTogQ2xv c2UgdGhlIGl0ZW1zIG9mCisgICAgICAgIG1fd2ViSURCU2VydmVycyB3aXRob3V0IHVzaW5nIHRo ZSBpdGVyYXRvci4KKwogMjAyMS0wNC0yNiAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNl bkB3ZWJraXQub3JnPgogCiAgICAgICAgIFVwZGF0ZSBNYWMtc3BlY2lmaWMgQ01ha2UgZmlsZXMK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3Mu Y3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAKaW5k ZXggYmVhMWNhY2I0NDI0ZTJjZjAyMjg0NzQ3OWM1MmI0ZjEzODMyMzVkOS4uNTQ3OTg5MTgxYzk4 YzgyZGM1ZGEwZWNlZWJiZDlmOGQ1Y2VmZWQ0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAKQEAgLTI3NCw4ICsyNzQsOCBAQCB2b2lkIE5l dHdvcmtQcm9jZXNzOjpkaWRDbG9zZShJUEM6OkNvbm5lY3Rpb24mKQogICAgIH0pOwogCiAgICAg Ly8gTWFrZSBzdXJlIHJlZmVyZW5jZXMgdG8gTmV0d29ya1Byb2Nlc3MgaW4gc3BhY2VSZXF1ZXN0 ZXIgYW5kIGNsb3NlSGFuZGxlciBpcyByZW1vdmVkLgotICAgIGZvciAoYXV0byYgc2VydmVyIDog bV93ZWJJREJTZXJ2ZXJzLnZhbHVlcygpKQotICAgICAgICBzZXJ2ZXItPmNsb3NlKCk7CisgICAg d2hpbGUgKCFtX3dlYklEQlNlcnZlcnMuaXNFbXB0eSgpKQorICAgICAgICBtX3dlYklEQlNlcnZl cnMudmFsdWVzKCkuYmVnaW4oKS0+Z2V0KCktPmNsb3NlKCk7CiB9CiAKIHZvaWQgTmV0d29ya1By b2Nlc3M6OmRpZENyZWF0ZURvd25sb2FkKCkK 427191 2021-04-27 13:46:41 -0700 2021-04-27 13:57:01 -0700 Patch bug-225089-20210428054639.patch text/plain 1588 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2NjU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDk1NWM4YzcxY2Y3YjFkNDFk YjEyZjcxY2E4ZmJkMGU1ZjI4NGM1MWUuLjQyNzFjYTI3ZDJmYmFhMzkyNWY4NzdhNDFhMzNmZGQx NGI3NzdiYzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMjEtMDQtMjcgIEZ1amlpIEhp cm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CisKKyAgICAgICAgSGFzaFRhYmxlQ29u c3RJdGVyYXRvcidzIGNvbnNpc3RlbmN5IGFzc2VydGlvbiBmYWlscyB3aGlsZSBjbG9zaW5nIG1f d2ViSURCU2VydmVycyBpbiBOZXR3b3JrUHJvY2Vzczo6ZGlkQ2xvc2Ugc2luY2UgcjI3NTg0Ngor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1MDg5CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgQ2hyaXMgRHVtZXouCisKKyAgICAgICAgVGhlIGl0ZW1zIG9m IG1fd2ViSURCU2VydmVycyB3ZXJlIHJlbW92ZWQgd2hpbGUgaXRlcmF0aW5nCisgICAgICAgIG1f d2ViSURCU2VydmVycy4KKworICAgICAgICBNb3ZlIG1fd2ViSURCU2VydmVycyB0byBhIHRlbXBv cmFyeSBIYXNoTWFwIGJlZm9yZSBpdGVyYXRpbmcuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vz cy9OZXR3b3JrUHJvY2Vzcy5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzOjpk aWRDbG9zZSk6IAorCiAyMDIxLTA0LTI3ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+ CiAKICAgICAgICAgRG9uJ3Qga2VlcCBsb2NhbCBzdG9yYWdlIGRhdGEgaW4gbWVtb3J5IGluIHRo ZSBOZXR3b3JrUHJvY2VzcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9OZXR3b3JrUHJvY2Vzcy5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdv cmtQcm9jZXNzLmNwcAppbmRleCAzZWEwYWFiNDQ5ZjYyZGZlODdkZmVjYzFmMTUxYjgwN2FiYTRh ZjcxLi4xNjAzMGYwYWYzZjU4YjFmYWFkNzgyZDhiOWNhYmMyMDI4NjAwMTE5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcApAQCAtMjc0LDcg KzI3NCw4IEBAIHZvaWQgTmV0d29ya1Byb2Nlc3M6OmRpZENsb3NlKElQQzo6Q29ubmVjdGlvbiYp CiAgICAgfSk7CiAKICAgICAvLyBNYWtlIHN1cmUgcmVmZXJlbmNlcyB0byBOZXR3b3JrUHJvY2Vz cyBpbiBzcGFjZVJlcXVlc3RlciBhbmQgY2xvc2VIYW5kbGVyIGlzIHJlbW92ZWQuCi0gICAgZm9y IChhdXRvJiBzZXJ2ZXIgOiBtX3dlYklEQlNlcnZlcnMudmFsdWVzKCkpCisgICAgYXV0byBzZXJ2 ZXJzID0gV1RGTW92ZShtX3dlYklEQlNlcnZlcnMpOworICAgIGZvciAoYXV0byYgc2VydmVyIDog c2VydmVycy52YWx1ZXMoKSkKICAgICAgICAgc2VydmVyLT5jbG9zZSgpOwogfQogCg== 427195 2021-04-27 14:12:29 -0700 2021-04-27 15:11:25 -0700 Patch bug-225089-20210428061228.patch text/plain 1598 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2NjU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDk1NWM4YzcxY2Y3YjFkNDFk YjEyZjcxY2E4ZmJkMGU1ZjI4NGM1MWUuLjUxZTIwZGMwMTRiY2U2OTMzOTY2MzEyOGI2MjQ2OTMz ODIxMTE4MWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMjEtMDQtMjcgIEZ1amlpIEhp cm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CisKKyAgICAgICAgSGFzaFRhYmxlQ29u c3RJdGVyYXRvcidzIGNvbnNpc3RlbmN5IGFzc2VydGlvbiBmYWlscyB3aGlsZSBjbG9zaW5nIG1f d2ViSURCU2VydmVycyBpbiBOZXR3b3JrUHJvY2Vzczo6ZGlkQ2xvc2Ugc2luY2UgcjI3NTg0Ngor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1MDg5CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgQ2hyaXMgRHVtZXouCisKKyAgICAgICAgVGhlIGl0ZW1zIG9m IG1fd2ViSURCU2VydmVycyB3ZXJlIHJlbW92ZWQgd2hpbGUgaXRlcmF0aW5nCisgICAgICAgIG1f d2ViSURCU2VydmVycy4KKworICAgICAgICBNb3ZlIG1fd2ViSURCU2VydmVycyB0byBhIHRlbXBv cmFyeSBIYXNoTWFwIGJlZm9yZSBpdGVyYXRpbmcuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vz cy9OZXR3b3JrUHJvY2Vzcy5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzOjpk aWRDbG9zZSk6CisKIDIwMjEtMDQtMjcgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4K IAogICAgICAgICBEb24ndCBrZWVwIGxvY2FsIHN0b3JhZ2UgZGF0YSBpbiBtZW1vcnkgaW4gdGhl IE5ldHdvcmtQcm9jZXNzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L05ldHdvcmtQcm9jZXNzLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29y a1Byb2Nlc3MuY3BwCmluZGV4IDNlYTBhYWI0NDlmNjJkZmU4N2RmZWNjMWYxNTFiODA3YWJhNGFm NzEuLjYxYjk2MjMzMGU0NGVkMzcyNjgwNWNlNDYwOWIxOTFmMjRhNWVkOGUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCkBAIC0yNzQsNyAr Mjc0LDggQEAgdm9pZCBOZXR3b3JrUHJvY2Vzczo6ZGlkQ2xvc2UoSVBDOjpDb25uZWN0aW9uJikK ICAgICB9KTsKIAogICAgIC8vIE1ha2Ugc3VyZSByZWZlcmVuY2VzIHRvIE5ldHdvcmtQcm9jZXNz IGluIHNwYWNlUmVxdWVzdGVyIGFuZCBjbG9zZUhhbmRsZXIgaXMgcmVtb3ZlZC4KLSAgICBmb3Ig KGF1dG8mIHNlcnZlciA6IG1fd2ViSURCU2VydmVycy52YWx1ZXMoKSkKKyAgICBhdXRvIHNlcnZl cnMgPSBzdGQ6OmV4Y2hhbmdlKG1fd2ViSURCU2VydmVycywgeyB9KTsKKyAgICBmb3IgKGF1dG8m IHNlcnZlciA6IHNlcnZlcnMudmFsdWVzKCkpCiAgICAgICAgIHNlcnZlci0+Y2xvc2UoKTsKIH0K IAo=