* Move reparse to background thread

Author: alpha0010

README.md

@@ -7,13 +7,11 @@ Code::Blocks plugin integrating various features of LLVM Clang.
 
 ========
 ### Wish/todo list
-- [ ] Threaded parsing
 - [ ] Settings page
   - [ ] Autocomplete output format
   - [ ] Diagnostics visualization
   - [ ] More...
 - [ ] Preemptive codecomplete results caching
-- [ ] Asynchronous codecomplete queries
 - [ ] Resolve crash on fast exit
 - [ ] Support MSVC projects/unrecognized command line flags
 - [ ] Resolve mysterious crashes...

clangplugin.cpp

@@ -155,13 +155,16 @@ void ClangPlugin::OnAttach()
     Connect(idHightlightTimer, wxEVT_TIMER, wxTimerEventHandler(ClangPlugin::OnTimer));
     Connect(idGotoDeclaration, wxEVT_COMMAND_MENU_SELECTED, /*wxMenuEventHandler*/wxCommandEventHandler(ClangPlugin::OnGotoDeclaration), nullptr, this);
     Connect(EVT_PARSE_CC_READY, wxCommandEventHandler(ClangPlugin::OnCodeCompleteReady));
+    Connect(EVT_REPARSE_DONE, wxCommandEventHandler(ClangPlugin::OnReparseDone));
     m_EditorHookId = EditorHooks::RegisterHook(new EditorHooks::HookFunctor<ClangPlugin>(this, &ClangPlugin::OnEditorHook));
 }
 
 void ClangPlugin::OnRelease(bool WXUNUSED(appShutDown))
 {
     wxMutexLocker locker(m_ProxyMutex);
     EditorHooks::UnregisterHook(m_EditorHookId);
+    Disconnect(wxID_ANY, EVT_REPARSE_DONE);
+    Disconnect(wxID_ANY, EVT_PARSE_CC_READY);
     Disconnect(idGotoDeclaration);
     Disconnect(idHightlightTimer);
     Disconnect(idDiagnosticTimer);
@@ -639,6 +642,17 @@ void ClangPlugin::OnCodeCompleteReady(wxCommandEvent& event)
     m_AsyncStatusCC = ascNone;
 }
 
+void ClangPlugin::OnReparseDone(wxCommandEvent& WXUNUSED(event))
+{
+    cbEditor* ed = Manager::Get()->GetEditorManager()->GetBuiltinActiveEditor();
+    if (!ed || ed != m_pLastEditor)
+        return;
+    if (m_ProxyMutex.TryLock() != wxMUTEX_NO_ERROR)
+        return;
+    MutexUnlocker unlocker(m_ProxyMutex);
+    DiagnoseEd(ed, dlMinimal);
+}
+
 wxString ClangPlugin::GetCompilerInclDirs(const wxString& compId)
 {
     std::map<wxString, wxString>::const_iterator idItr = m_compInclDirs.find(compId);
@@ -894,7 +908,10 @@ void ClangPlugin::OnTimer(wxTimerEvent& event)
             return;
 
         if (m_ProxyMutex.TryLock() != wxMUTEX_NO_ERROR)
+        {
+            m_EdOpenTimer.Start(ED_OPEN_DELAY, wxTIMER_ONE_SHOT);
             return;
+        }
         MutexUnlocker unlocker(m_ProxyMutex);
         if (m_Proxy.GetTranslationUnitId(ed->GetFilename()) != wxNOT_FOUND)
         {
@@ -927,7 +944,10 @@ void ClangPlugin::OnTimer(wxTimerEvent& event)
         if (!ed)
             return;
         if (m_ProxyMutex.TryLock() != wxMUTEX_NO_ERROR)
+        {
+            m_ReparseTimer.Start(REPARSE_DELAY, wxTIMER_ONE_SHOT);
             return;
+        }
         MutexUnlocker unlocker(m_ProxyMutex);
 
         if (ed != m_pLastEditor)
@@ -944,8 +964,13 @@ void ClangPlugin::OnTimer(wxTimerEvent& event)
             if (ed && ed->GetModified())
                 unsavedFiles.insert(std::make_pair(ed->GetFilename(), ed->GetControl()->GetText()));
         }
-        m_Proxy.Reparse(m_TranslUnitId, unsavedFiles);
-        DiagnoseEd(m_pLastEditor, dlMinimal);
+        ParseThreadReparse* parseThread = new ParseThreadReparse(m_Proxy, m_ProxyMutex, m_TranslUnitId, unsavedFiles, this);
+        parseThread->Create();
+        if (parseThread->Run() != wxTHREAD_NO_ERROR)
+        {
+            delete parseThread;
+            parseThread = nullptr;
+        }
     }
     // m_DiagnosticTimer, m_HightlightTime
     else if (evId == idDiagnosticTimer || evId == idHightlightTimer)
@@ -954,7 +979,13 @@ void ClangPlugin::OnTimer(wxTimerEvent& event)
         if (!ed)
             return;
         if (m_ProxyMutex.TryLock() != wxMUTEX_NO_ERROR)
+        {
+            if (evId == idDiagnosticTimer)
+                m_DiagnosticTimer.Start(DIAGNOSTIC_DELAY, wxTIMER_ONE_SHOT);
+            else
+                m_HightlightTimer.Start(HIGHTLIGHT_DELAY, wxTIMER_ONE_SHOT);
             return;
+        }
         MutexUnlocker unlocker(m_ProxyMutex);
 
         if (ed != m_pLastEditor)

clangplugin.h

@@ -87,6 +87,7 @@ class ClangPlugin : public cbCodeCompletionPlugin
         /// Resolve the token under the cursor and open the relevant location
         void OnGotoDeclaration(wxCommandEvent& event);
         void OnCodeCompleteReady(wxCommandEvent& event);
+        void OnReparseDone(wxCommandEvent& event);
 
         enum DiagnosticLevel { dlMinimal, dlFull };
         /**

clangproxy.cpp

@@ -6,6 +6,7 @@
 
 #include "clangproxy.h"
 
+#include <clang-c/Documentation.h>
 #include <wx/tokenzr.h>
 
 #ifndef CB_PRECOMP

parsethread.cpp

@@ -3,6 +3,7 @@
 #include "parsethread.h"
 
 DEFINE_LOCAL_EVENT_TYPE(EVT_PARSE_CC_READY)
+DEFINE_LOCAL_EVENT_TYPE(EVT_REPARSE_DONE)
 
 ParseThreadCreate::ParseThreadCreate(ClangProxy& proxy, wxMutex& proxyMutex, const wxString& compileCommand,
                                      const wxString& filename, const wxString& source) :
@@ -50,3 +51,24 @@ wxThread::ExitCode ParseThreadCodeComplete::Entry()
     m_pHandler->AddPendingEvent(evt);
     return 0;
 }
+
+ParseThreadReparse::ParseThreadReparse(ClangProxy& proxy, wxMutex& proxyMutex, int translId,
+                                       const std::map<wxString, wxString>& unsavedFiles,
+                                       wxEvtHandler* handler) :
+    m_Proxy(proxy), m_ProxyMutex(proxyMutex), m_TranslId(translId), m_pHandler(handler)
+{
+    for (std::map<wxString, wxString>::const_iterator fileIt = unsavedFiles.begin();
+         fileIt != unsavedFiles.end(); ++fileIt)
+    {
+        m_UnsavedFiles[fileIt->first.c_str()] = fileIt->second.c_str();
+    }
+}
+
+wxThread::ExitCode ParseThreadReparse::Entry()
+{
+    wxMutexLocker locker(m_ProxyMutex);
+    m_Proxy.Reparse(m_TranslId, m_UnsavedFiles);
+    wxCommandEvent evt(EVT_REPARSE_DONE);
+    m_pHandler->AddPendingEvent(evt);
+    return 0;
+}

parsethread.h

@@ -4,6 +4,7 @@
 #include "clangproxy.h"
 
 DECLARE_LOCAL_EVENT_TYPE(EVT_PARSE_CC_READY, -1)
+DECLARE_LOCAL_EVENT_TYPE(EVT_REPARSE_DONE,   -1)
 
 class ParseThreadCreate : public wxThread
 {
@@ -47,4 +48,23 @@ class ParseThreadCodeComplete : public wxThread
         wxEvtHandler* m_pHandler;
 };
 
+
+class ParseThreadReparse : public wxThread
+{
+    public:
+        ParseThreadReparse(ClangProxy& proxy, wxMutex& proxyMutex, int translId,
+                           const std::map<wxString, wxString>& unsavedFiles, wxEvtHandler* handler);
+        virtual ~ParseThreadReparse() {}
+
+    protected:
+        virtual ExitCode Entry();
+
+    private:
+        ClangProxy& m_Proxy;
+        wxMutex& m_ProxyMutex;
+        int m_TranslId;
+        std::map<wxString, wxString> m_UnsavedFiles;
+        wxEvtHandler* m_pHandler;
+};
+
 #endif // PARSETHREAD_H