Issue #1234, #2058 - Rewrite log facility, improving thread implementation

src/plugin/PluginTabBase.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "PluginStdAfx.h"
 #include "AdblockPlusClient.h"
-#include "PluginClientBase.h"
 #include "PluginSettings.h"
 #include "AdblockPlusDomTraverser.h"
 #include "PluginTabBase.h"
 #include "IeVersion.h"
 #include <Mshtmhst.h>
 
 CPluginTabBase::CPluginTabBase(CPluginClass* plugin)
   : m_plugin(plugin)
-  , m_isActivated(false)
-  , m_continueThreadRunning(true)
 {
   m_filter = std::auto_ptr<CPluginFilter>(new CPluginFilter());
   m_filter->hideFiltersLoadedEvent = CreateEvent(NULL, true, false, NULL);
 
   CPluginClient* client = CPluginClient::GetInstance();
-  if (AdblockPlus::IE::InstalledMajorVersion() < 10)
-  {
-    m_isActivated = true;
-  }
-
-  try
-  {
-    m_thread = std::thread(&CPluginTabBase::ThreadProc, this);
-  }
-  catch (const std::system_error& ex)
-  {
-    DEBUG_SYSTEM_EXCEPTION(ex, PLUGIN_ERROR_THREAD, PLUGIN_ERROR_TAB_THREAD_CREATE_PROCESS,
-      "Tab::Thread - Failed to create tab thread");
-  }
   m_traverser = new CPluginDomTraverser(static_cast<CPluginTab*>(this));
 }
 
 
 CPluginTabBase::~CPluginTabBase()
 {
   delete m_traverser;
   m_traverser = NULL;
-  m_continueThreadRunning = false;
-  if (m_thread.joinable()) {
-    m_thread.join();
-  }
-}
-
-void CPluginTabBase::OnActivate()
-{
-  m_isActivated = true;
-}
-
-
-void CPluginTabBase::OnUpdate()
-{
-  m_isActivated = true;
 }
 
 namespace
 {
   // Entry Point
   void FilterLoader(CPluginTabBase* tabBase)
   {
     try
     {
       tabBase->m_filter->LoadHideFilters(CPluginClient::GetInstance()->GetElementHidingSelectors(tabBase->GetDocumentDomain()));
@@ skipping 217 matching lines @@
   {
     if (domain.empty() || domain != m_cacheDomain)
     {
       m_cacheFrames.clear();
       m_cacheDomain = domain;
     }
   }
   m_criticalSectionCache.Unlock();
 }
 
-void CPluginTabBase::ThreadProc()
-{
-  // Force loading/creation of settings
-  CPluginSettings::GetInstance();
-
-  std::string message =
-    "================================================================================\n"
-    "TAB THREAD process=";
-  message += std::to_string(::GetCurrentProcessId());
-  message + " thread=";
-  message += std::to_string(::GetCurrentThreadId());
-  message +=
-    "\n"
-    "================================================================================";
-  DEBUG_GENERAL(message);
-
-  // --------------------------------------------------------------------
-  // Tab loop
-  // --------------------------------------------------------------------
-
-  DWORD loopCount = 0;
-  DWORD tabLoopIteration = 1;
-
-  while (this->m_continueThreadRunning)
-  {
-#ifdef ENABLE_DEBUG_THREAD
-    CStringA sTabLoopIteration;
-    sTabLoopIteration.Format("%u", tabLoopIteration);
-
-    DEBUG_THREAD("--------------------------------------------------------------------------------")
-      DEBUG_THREAD("Loop iteration " + sTabLoopIteration);
-    DEBUG_THREAD("--------------------------------------------------------------------------------")
-#endif
-      this->m_isActivated = false;
-
-      // --------------------------------------------------------------------
-      // End loop
-      // --------------------------------------------------------------------
-
-      // Sleep loop
-      while (this->m_continueThreadRunning && !this->m_isActivated && (++loopCount % (TIMER_THREAD_SLEEP_TAB_LOOP / 50)) != 0)
-      {
-        // Post async plugin error
-        CPluginError pluginError;
-        if (LogQueue::PopFirstPluginError(pluginError))
-        {
-          LogQueue::LogPluginError(pluginError.GetErrorCode(), pluginError.GetErrorId(), pluginError.GetErrorSubid(), pluginError.GetErrorDescription(), true, pluginError.GetProcessId(), pluginError.GetThreadId());
-        }
-
-        // Non-hanging sleep
-        Sleep(50);
-      }
-
-      tabLoopIteration++;
-  }
-}