Left: | ||
Right: |
OLD | NEW |
---|---|
1 /* | 1 /* |
2 * This file is part of Adblock Plus <https://adblockplus.org/>, | 2 * This file is part of Adblock Plus <https://adblockplus.org/>, |
3 * Copyright (C) 2006-2015 Eyeo GmbH | 3 * Copyright (C) 2006-2015 Eyeo GmbH |
4 * | 4 * |
5 * Adblock Plus is free software: you can redistribute it and/or modify | 5 * Adblock Plus is free software: you can redistribute it and/or modify |
6 * it under the terms of the GNU General Public License version 3 as | 6 * it under the terms of the GNU General Public License version 3 as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
8 * | 8 * |
9 * Adblock Plus is distributed in the hope that it will be useful, | 9 * Adblock Plus is distributed in the hope that it will be useful, |
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
332 m_cacheFrames.clear(); | 332 m_cacheFrames.clear(); |
333 m_cacheDomain = domain; | 333 m_cacheDomain = domain; |
334 } | 334 } |
335 } | 335 } |
336 m_criticalSectionCache.Unlock(); | 336 m_criticalSectionCache.Unlock(); |
337 } | 337 } |
338 | 338 |
339 void CPluginTabBase::ThreadProc() | 339 void CPluginTabBase::ThreadProc() |
340 { | 340 { |
341 // Force loading/creation of settings | 341 // Force loading/creation of settings |
342 CPluginSettings::GetInstance()->SetWorkingThreadId(); | 342 CPluginSettings::GetInstance(); |
Oleksandr
2015/11/25 04:42:30
Nit: This is a dummy call now. Note, the comment i
Eric
2015/11/25 17:41:17
This whole function is going away, including the c
| |
343 | 343 |
344 std::string message = | 344 std::string message = |
345 "=========================================================================== =====\n" | 345 "=========================================================================== =====\n" |
346 "TAB THREAD process="; | 346 "TAB THREAD process="; |
347 message += std::to_string(::GetCurrentProcessId()); | 347 message += std::to_string(::GetCurrentProcessId()); |
348 message + " thread="; | 348 message + " thread="; |
349 message += std::to_string(::GetCurrentThreadId()); | 349 message += std::to_string(::GetCurrentThreadId()); |
350 message += | 350 message += |
351 "\n" | 351 "\n" |
352 "=========================================================================== ====="; | 352 "=========================================================================== ====="; |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
385 LogQueue::LogPluginError(pluginError.GetErrorCode(), pluginError.GetEr rorId(), pluginError.GetErrorSubid(), pluginError.GetErrorDescription(), true, p luginError.GetProcessId(), pluginError.GetThreadId()); | 385 LogQueue::LogPluginError(pluginError.GetErrorCode(), pluginError.GetEr rorId(), pluginError.GetErrorSubid(), pluginError.GetErrorDescription(), true, p luginError.GetProcessId(), pluginError.GetThreadId()); |
386 } | 386 } |
387 | 387 |
388 // Non-hanging sleep | 388 // Non-hanging sleep |
389 Sleep(50); | 389 Sleep(50); |
390 } | 390 } |
391 | 391 |
392 tabLoopIteration++; | 392 tabLoopIteration++; |
393 } | 393 } |
394 } | 394 } |
OLD | NEW |