Add _PyThraedState_GetCurrent().

python · ericsnowcurrently · Apr 24, 2023 · Jan 10, 2023 · Apr 6, 2023 · Apr 7, 2023
commit cf22de1b1229033aac3eb780eaad889fafe9c6c6
@@ -64,12 +64,12 @@ _Py_ThreadCanHandlePendingCalls(void)
 /* Variable and macro for in-line access to current thread
   and interpreter state */

-PyAPI_DATA(thread_local PyThreadState *) _Py_tss_tstate;
+PyAPI_DATA(PyThreadState *) _PyThreadState_GetCurrent(void);

 static inline PyThreadState*
 _PyRuntimeState_GetThreadState(_PyRuntimeState *runtime)
 {
-    return _Py_tss_tstate;
+    return _PyThreadState_GetCurrent();
 }

 /* Get the current Python thread state.
@@ -82,7 +82,7 @@ _PyRuntimeState_GetThreadState(_PyRuntimeState *runtime)
 static inline PyThreadState*
 _PyThreadState_GET(void)
 {
-    return _PyRuntimeState_GetThreadState(&_PyRuntime);
+    return _PyThreadState_GetCurrent();
 }

 static inline void

@@ -61,7 +61,13 @@ extern "C" {
 */


-thread_local PyThreadState *_Py_tss_tstate;
+thread_local PyThreadState *_Py_tss_tstate = NULL;
+
+PyThreadState *
+_PyThreadState_GetCurrent(void)
+{
+    return _Py_tss_tstate;
+}

 static inline PyThreadState *
 current_fast_get(_PyRuntimeState *Py_UNUSED(runtime))
-Original file line number
+Diff line change
@@ -64,12 +64,12 @@ _Py_ThreadCanHandlePendingCalls(void)
     /* Variable and macro for in-line access to current thread
        and interpreter state */
-    PyAPI_DATA(thread_local PyThreadState *) _Py_tss_tstate;
+    PyAPI_DATA(PyThreadState *) _PyThreadState_GetCurrent(void);
             Copy link

  
      
    
  

  
      

  
  Member


      

  

  
    
      

      
            vstinner
  

      

      

      


        May 4, 2023


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      What is the use case for this new _PyThreadState_GetCurrent() function? There is already PyThreadState_Get(). How is it different?
The API to get the current thread state is already complicated and has a complicated history: https://pythondev.readthedocs.io/pystate.html
    
  
  


    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
      
        
            
    All reactions
  


          
          
        
      
    

    



  
        
  
    
        
    
  


      
          
  
      
            Copy link

  
      
    
  

  
      

  
  Member


      

  Author


  

  
    
      

      
            ericsnowcurrently
  

      

      

      


        May 4, 2023


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      It's there because I couldn't find a way to mix PyAPI_DATA with _Py_thread_local.  Looks like that's the same issue you ran into in 2020.
    
  
  


    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
      
        
            
    All reactions
     static inline PyThreadState*
     _PyRuntimeState_GetThreadState(_PyRuntimeState *runtime)
     {
-        return _Py_tss_tstate;
+        return _PyThreadState_GetCurrent();
     }
     /* Get the current Python thread state.
@@ -82,7 +82,7 @@ _PyRuntimeState_GetThreadState(_PyRuntimeState *runtime)
     static inline PyThreadState*
     _PyThreadState_GET(void)
     {
-        return _PyRuntimeState_GetThreadState(&_PyRuntime);
+        return _PyThreadState_GetCurrent();
     }
     static inline void
-          Expand Down