[pykd] fixed : PyState save/restore

git-svn-id: https://pykd.svn.codeplex.com/svn@70203 9b283d60-5439-405e-af05-b73fd8c4d996

pykd/dbgext.cpp

@@ -213,8 +213,6 @@ BOOST_PYTHON_MODULE( pykd )
         "Return current processor mode as string: X86, ARM, IA64 or X64" );
     boost::python::def( "setProcessorMode", &setProcessorMode, 
         "Set current processor mode by string (X86, ARM, IA64 or X64)" );
-    boost::python::def( "getProcessorType", &getProcessorType,
-        "Returns physical processor type as string: X86, ARM, IA64 or X64");
     boost::python::def( "addSynSymbol", &addSyntheticSymbol,
         "Add new synthetic symbol for virtual address" );
     boost::python::def( "delAllSynSymbols", &delAllSyntheticSymbols, 
@@ -615,44 +613,7 @@ BOOST_PYTHON_MODULE( pykd )
 
 /////////////////////////////////////////////////////////////////////////////////
 
-class WindbgGlobalSession 
+WindbgGlobalSession::WindbgGlobalSession() {
-{
-public:
-    
-    static
-    boost::python::object
-    global() {
-        return windbgGlobalSession->main.attr("__dict__");
-    }
-    
-    static 
-    VOID
-    StartWindbgSession() {
-        if ( 1 == InterlockedIncrement( &sessionCount ) )
-        {
-            windbgGlobalSession = new WindbgGlobalSession();
-        }
-    }
-    
-    static
-    VOID
-    StopWindbgSession() {
-        if ( 0 == InterlockedDecrement( &sessionCount ) )
-        {
-            delete windbgGlobalSession;
-            windbgGlobalSession = NULL;
-        }            
-    }
-    
-    static
-    bool isInit() {
-        return windbgGlobalSession != NULL;
-    }
-    
-
-private:
-
-    WindbgGlobalSession() {
                  
     PyImport_AppendInittab("pykd", initpykd ); 
 
@@ -680,20 +641,15 @@ private:
     }            
     
     g_dbgClient.startEventsMgr();
+
+    pyState = PyEval_SaveThread();
  }
 
-    ~WindbgGlobalSession() {
+
+WindbgGlobalSession::~WindbgGlobalSession() {
 
      g_dbgClient.removeEventsMgr();
-    }
+}
-   
-    boost::python::object           main;
-
-    static volatile LONG            sessionCount;      
-    
-    static WindbgGlobalSession      *windbgGlobalSession;     
-
-};   
 
 volatile LONG            WindbgGlobalSession::sessionCount = 0;
 
@@ -831,7 +787,10 @@ py( PDEBUG_CLIENT4 client, PCSTR args)
 {
     DbgExt      ext( client );
 
+    WindbgGlobalSession::RestorePyState();
+
     PyThreadState   *globalInterpreter = PyThreadState_Swap( NULL );
+   
     PyThreadState   *localInterpreter = Py_NewInterpreter();
 
     try {
@@ -944,8 +903,11 @@ py( PDEBUG_CLIENT4 client, PCSTR args)
     }     
     
     Py_EndInterpreter( localInterpreter ); 
+
     PyThreadState_Swap( globalInterpreter );
 
+    WindbgGlobalSession::SavePyState();
+    
     return S_OK;  
 }
 
@@ -957,6 +919,8 @@ pycmd( PDEBUG_CLIENT4 client, PCSTR args )
 {
     DbgExt      ext( client );
 
+    WindbgGlobalSession::RestorePyState();
+
     try {
         
         // ïåðåíàïðàâëåíèå ñòàíäàðòíûõ ïîòîêîâ ÂÂ
@@ -1091,6 +1055,8 @@ pycmd( PDEBUG_CLIENT4 client, PCSTR args )
         dbgExt->control->Output( DEBUG_OUTPUT_ERROR, "unexpected error" );
     }
 
+    WindbgGlobalSession::SavePyState();
+    
     return S_OK;    
 }
 

pykd/dbgext.h

@@ -40,4 +40,66 @@ private:
 extern DbgExt    *dbgExt;
 
 
+class WindbgGlobalSession 
+{
+public:
+    
+    static
+    boost::python::object
+    global() {
+        return windbgGlobalSession->main.attr("__dict__");
+    }
+    
+    static 
+    VOID
+    StartWindbgSession() {
+        if ( 1 == InterlockedIncrement( &sessionCount ) )
+        {
+            windbgGlobalSession = new WindbgGlobalSession();
+        }
+    }
+    
+    static
+    VOID
+    StopWindbgSession() {
+        if ( 0 == InterlockedDecrement( &sessionCount ) )
+        {
+            delete windbgGlobalSession;
+            windbgGlobalSession = NULL;
+        }            
+    }
+    
+    static
+    bool isInit() {
+        return windbgGlobalSession != NULL;
+    }
+
+    static
+    VOID
+    RestorePyState() {
+        PyEval_RestoreThread( windbgGlobalSession->pyState );
+    }    
+
+    static
+    VOID
+    SavePyState() {
+        windbgGlobalSession->pyState = PyEval_SaveThread();
+    }    
+
+private:
+
+    WindbgGlobalSession();
+    
+    ~WindbgGlobalSession();
+   
+    boost::python::object           main;
+
+    PyThreadState                   *pyState;
+
+    static volatile LONG            sessionCount;      
+    
+    static WindbgGlobalSession      *windbgGlobalSession;     
+
+};
+
 bool isWindbgExt();

pykd/pyaux.h

@@ -17,14 +17,24 @@ public:
     }
 
     void saveState() {
+        if ( !isWindbgExt() )
             TlsSetValue( m_index, PyEval_SaveThread() );
+        else
+            WindbgGlobalSession::SavePyState();                
     }
 
     void restoreState() {
+        if ( !isWindbgExt() )
+        {
             PyThreadState*      state = (PyThreadState*)TlsGetValue( m_index );
             if ( state )
                 PyEval_RestoreThread( state );
         }
+        else
+        {
+            WindbgGlobalSession::RestorePyState();
+        }
+    }
 
 private: