Simulation executes in a separate thread

eeschema/sim/ngspice.cpp

@@ -103,6 +103,12 @@ bool NGSPICE::LoadNetlist( const string& aNetlist )
 }
 
 
+bool NGSPICE::Run()
+{
+    return Command( "run\n" );
+}
+
+
 bool NGSPICE::Command( const string& aCmd )
 {
     m_ngSpice_Command( (char*)( aCmd + string( "\n" ) ).c_str() );

eeschema/sim/ngspice.h

@@ -38,6 +38,7 @@ public:
 
     void Init();
     bool LoadNetlist( const std::string& aNetlist );
+    bool Run();
     bool Command( const std::string& aCmd );
 
     std::string GetConsole() const;

eeschema/sim/sim_plot_frame.cpp

@@ -40,27 +40,56 @@
 #endif
 
 
-class SIM_REPORTER : public REPORTER
+class SIM_THREAD_REPORTER : public REPORTER
 {
 public:
-    SIM_REPORTER( wxRichTextCtrl* aConsole )
+    SIM_THREAD_REPORTER( SIM_PLOT_FRAME* aParent )
-    {
+        : m_parent( aParent )
-        m_console = aConsole;
-    }
-
-    ~SIM_REPORTER()
     {
     }
 
     virtual REPORTER& Report( const wxString& aText, SEVERITY aSeverity = RPT_UNDEFINED )
     {
-        m_console->WriteText( aText );
+        wxThreadEvent* event = new wxThreadEvent( wxEVT_SIM_REPORT );
-        m_console->Newline();
+        event->SetPayload( aText );
+        wxQueueEvent( m_parent, event );
         return *this;
     }
 
 private:
-    wxRichTextCtrl* m_console;
+    SIM_PLOT_FRAME* m_parent;
+};
+
+
+class SIM_THREAD : public wxThread
+{
+public:
+    SIM_THREAD( SIM_PLOT_FRAME* aParent, SPICE_SIMULATOR* aSimulator )
+        : m_parent( aParent ), m_sim( aSimulator )
+    {}
+
+    ~SIM_THREAD()
+    {
+        wxCriticalSectionLocker lock( m_parent->m_simThreadCS );
+
+        // Let know the parent that the pointer is not valid anymore
+        m_parent->m_simThread = NULL;
+    }
+
+private:
+    // Thread routine
+    ExitCode Entry()
+    {
+        assert( m_sim );
+
+        m_sim->Run();
+        wxQueueEvent( m_parent, new wxThreadEvent( wxEVT_SIM_FINISHED ) );
+
+        return (ExitCode) 0;
+    }
+
+    SIM_PLOT_FRAME* m_parent;
+    SPICE_SIMULATOR* m_sim;
 };
 
 
@@ -71,29 +100,36 @@ SIM_PLOT_FRAME::SIM_PLOT_FRAME( KIWAY* aKiway, wxWindow* aParent )
     m_simulator = NULL;
     m_currentPlot = NULL;
     m_pyConsole = NULL;
+    m_simThread = NULL;
+
+    Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SIM_PLOT_FRAME::onClose ), NULL, this );
+    Connect( wxEVT_SIM_REPORT, wxThreadEventHandler( SIM_PLOT_FRAME::onSimReport ), NULL, this );
+    Connect( wxEVT_SIM_FINISHED, wxThreadEventHandler( SIM_PLOT_FRAME::onSimFinished ), NULL, this );
 
     NewPlot();
-    TogglePythonConsole();
 }
 
 
 SIM_PLOT_FRAME::~SIM_PLOT_FRAME()
 {
+    // m_simThread should be already destroyed by onClose()
+    assert( m_simThread == NULL );
+
+    delete m_exporter;
+    delete m_simulator;
 }
 
 
 void SIM_PLOT_FRAME::StartSimulation()
 {
-    if( m_exporter )
     delete m_exporter;
-
-    if( m_simulator )
     delete m_simulator;
 
+    m_simConsole->Clear();
+
     m_simulator = SPICE_SIMULATOR::CreateInstance( "ngspice" );
-    m_simulator->SetConsoleReporter( new SIM_REPORTER( m_simConsole ) );
+    m_simulator->SetConsoleReporter( new SIM_THREAD_REPORTER( this ) );
     m_simulator->Init();
-    //m_simulator->SetConsoleReporter( , this );
 
     NETLIST_OBJECT_LIST* net_atoms = m_schematicFrame->BuildNetListBase();
     m_exporter = new NETLIST_EXPORTER_PSPICE ( net_atoms, Prj().SchLibs() );
@@ -102,29 +138,59 @@ void SIM_PLOT_FRAME::StartSimulation()
     m_exporter->Format( &formatter, GNL_ALL );
     //m_plotPanel->DeleteTraces();
 
-    wxLogDebug( "*******************\n%s\n", (const char *)formatter.GetString().c_str() );
-
     m_simulator->LoadNetlist( formatter.GetString() );
-    m_simulator->Command("run\n");
 
-    auto mapping = m_exporter->GetNetIndexMap();
+    // Execute the simulation in a separate thread
-//    auto data_t = m_simulator->GetPlot("time");
-
-    for(auto name : m_exporter->GetProbeList())
     {
-        char spiceName[1024];
+        wxCriticalSectionLocker lock( m_simThreadCS );
 
-        sprintf(spiceName,"V(%d)", mapping[name] );
+        assert( m_simThread == NULL );
-        //printf("probe %s->%s\n", (const char *) name.c_str(), spiceName);
+        m_simThread = new SIM_THREAD( this, m_simulator );
-    //    auto data_y = m_simulator->GetPlot(spiceName);
 
-        //printf("%d - %d data points\n", data_t.size(), data_y.size() );
+        if( m_simThread->Run() != wxTHREAD_NO_ERROR )
-    //    m_plotPanel->AddTrace(wxT("V(") + name + wxT(")"), data_t.size(), data_t.data(), data_y.data(), 0);
+        {
+            wxLogError( "Can't create the simulator thread!" );
+            delete m_simThread;
         }
+    }
+}
 
-    delete m_simulator;
+
-    m_simulator = NULL;
+void SIM_PLOT_FRAME::PauseSimulation()
-    //m_simulator->Command("quit\n");
+{
+    wxCriticalSectionLocker lock( m_simThreadCS );
+
+    if( m_simThread )
+    {
+        if( m_simThread->Pause() != wxTHREAD_NO_ERROR )
+            wxLogError( "Cannot pause the simulation thread" );
+    }
+}
+
+
+void SIM_PLOT_FRAME::ResumeSimulation()
+{
+    wxCriticalSectionLocker lock( m_simThreadCS );
+
+    if( m_simThread )
+    {
+        if( m_simThread->Resume() != wxTHREAD_NO_ERROR )
+            wxLogError( "Cannot resume the simulation thread" );
+    }
+}
+
+
+void SIM_PLOT_FRAME::StopSimulation()
+{
+    wxCriticalSectionLocker lock( m_simThreadCS );
+
+    if( m_simThread )
+    {
+        // we could use m_simThread->Delete() if there was a way to run the simulation
+        // in parts, so the thread would be able to call TestDestroy()
+        if( m_simThread->Kill() != wxTHREAD_NO_ERROR )
+            wxLogError( "Cannot delete the simulation thread" );
+    }
 }
 
 
@@ -134,3 +200,68 @@ void SIM_PLOT_FRAME::NewPlot()
     m_plotNotebook->AddPage( plot, wxT( "Plot1" ), true );
     m_currentPlot = plot;
 }
+
+
+void SIM_PLOT_FRAME::onClose( wxCloseEvent& aEvent )
+{
+    {
+        wxCriticalSectionLocker lock( m_simThreadCS );
+
+        if( m_simThread )
+        {
+            if( m_simThread->Delete() != wxTHREAD_NO_ERROR )
+                wxLogError( "Cannot delete the simulation thread" );
+        }
+    }
+
+    int timeout = 10;
+
+    while( 1 )
+    {
+        // Wait until the thread is finished
+        {
+            wxCriticalSectionLocker lock( m_simThreadCS );
+
+            if( m_simThread == NULL )
+                break;
+        }
+
+        wxThread::This()->Sleep( 1 );
+
+        if( --timeout == 0 )
+        {
+            m_simThread->Kill();        // no mercy
+            break;
+        }
+    }
+
+    Destroy();
+}
+
+
+void SIM_PLOT_FRAME::onSimReport( wxThreadEvent& aEvent )
+{
+    m_simConsole->WriteText( aEvent.GetPayload<wxString>() );
+    m_simConsole->Newline();
+}
+
+
+void SIM_PLOT_FRAME::onSimFinished( wxThreadEvent& aEvent )
+{
+    wxLogDebug( "Simulation finished" );
+
+    auto mapping = m_exporter->GetNetIndexMap();
+    //    auto data_t = m_simulator->GetPlot( "time" );
+
+    for( auto name : m_exporter->GetProbeList() )
+    {
+        char spiceName[1024];
+
+        snprintf( spiceName, sizeof( spiceName ), "V(%d)", mapping[name] );
+        //wxLogDebug( "probe %s->%s\n", (const char *) name.c_str(), spiceName );
+        //    auto data_y = m_simulator->GetPlot( spiceName );
+
+        //wxLogDebug( "%d - %d data points\n", data_t.size(), data_y.size() );
+        //    m_plotPanel->AddTrace(wxT("V(") + name + wxT(")"), data_t.size(), data_t.data(), data_y.data(), 0);
+    }
+}

eeschema/sim/sim_plot_frame.h

@@ -34,10 +34,12 @@ Subclass of SIM_PLOT_FRAME_BASE, which is generated by wxFormBuilder.
 #include "sim_plot_frame_base.h"
 #include "kiway_player.h"
 #include <netlist_exporters/netlist_exporter_pspice.h>
+#include <wx/event.h>
 
 class SPICE_SIMULATOR;
 class NETLIST_EXPORTER_PSPICE;
 class SIM_PLOT_PANEL;
+class SIM_THREAD;
 
 /** Implementing SIM_PLOT_FRAME_BASE */
 class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
@@ -53,20 +55,32 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         }
 
         void StartSimulation();
+        void PauseSimulation();
+        void ResumeSimulation();
+        void StopSimulation();
 
         void NewPlot();
 
         void TogglePythonConsole();
 
     private:
+        virtual void onClose( wxCloseEvent& aEvent );
         virtual void onNewPlot( wxCommandEvent& aEvent ) { NewPlot(); }
+        virtual void onSimReport( wxThreadEvent& aEvent );
+        virtual void onSimFinished( wxThreadEvent& aEvent );
 
         SIM_PLOT_PANEL* m_currentPlot;
         SCH_EDIT_FRAME* m_schematicFrame;
         NETLIST_EXPORTER_PSPICE* m_exporter;
         SPICE_SIMULATOR* m_simulator;
         wxWindow* m_pyConsole;
+        SIM_THREAD* m_simThread;
+        wxCriticalSection m_simThreadCS;
 
+        friend class SIM_THREAD;
 };
 
+wxDEFINE_EVENT( wxEVT_SIM_REPORT, wxThreadEvent );
+wxDEFINE_EVENT( wxEVT_SIM_FINISHED, wxThreadEvent );
+
 #endif // __sim_plot_frame__

eeschema/sim/spice_simulator.h

@@ -42,13 +42,14 @@ enum SIM_TRACE_TYPE
 class SPICE_SIMULATOR {
 
 public:
-    SPICE_SIMULATOR() {}
+    SPICE_SIMULATOR() : m_consoleReporter( NULL ) {}
     virtual ~SPICE_SIMULATOR() {}
 
     static SPICE_SIMULATOR* CreateInstance( const std::string& aName );
 
     virtual void Init() = 0;
     virtual bool LoadNetlist( const std::string& aNetlist ) = 0;
+    virtual bool Run() = 0;
     virtual bool Command( const std::string& aCmd ) = 0;
 
     virtual void SetConsoleReporter( REPORTER* aReporter )