Merge pull request #44 from parca-dev/add_frame_owner

python: Add frame owner
parca-dev · Feb 26, 2024 · faf52d0 · faf52d0
2 parents 6adb051 + e8d9576
commit faf52d0
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 4 deletions.
diff --git a/pkg/python/datamap.go b/pkg/python/datamap.go
@@ -95,6 +95,9 @@ func (p python27) Layout() runtimedata.RuntimeData {
 		PyTupleObject: PyTupleObject{
 			ObItem: p.PyTupleObjectObItem,
 		},
+		PyInterpreterFrame: PyInterpreterFrame{
+			Owner: doesNotExist,
+		},
 	}
 }
 
@@ -163,6 +166,9 @@ func (p python33_39) Layout() runtimedata.RuntimeData {
 		PyTupleObject: PyTupleObject{
 			ObItem: p.PyTupleObjectObItem,
 		},
+		PyInterpreterFrame: PyInterpreterFrame{
+			Owner: doesNotExist,
+		},
 	}
 }
 
@@ -231,6 +237,9 @@ func (p python310) Layout() runtimedata.RuntimeData {
 		PyTupleObject: PyTupleObject{
 			ObItem: p.PyTupleObjectObItem,
 		},
+		PyInterpreterFrame: PyInterpreterFrame{
+			Owner: doesNotExist,
+		},
 	}
 }
 
@@ -251,6 +260,7 @@ type python311 struct {
 	PyFrameObjectFBack                int64 `offsetof:"_PyInterpreterFrame.previous"`
 	PyFrameObjectFCode                int64 `offsetof:"_PyInterpreterFrame.f_code"`
 	PyFrameObjectFLocalsplus          int64 `offsetof:"_PyInterpreterFrame.localsplus"`
+	PyInterpreterFrameOwner           int64 `offsetof:"_PyInterpreterFrame.owner"`
 	PyCodeObjectCoFilename            int64 `offsetof:"PyCodeObject.co_filename"`
 	PyCodeObjectCoName                int64 `offsetof:"PyCodeObject.co_name"`
 	PyCodeObjectCoVarNames            int64 `offsetof:"PyCodeObject.co_localsplusnames"`
@@ -302,6 +312,9 @@ func (p python311) Layout() runtimedata.RuntimeData {
 		PyTupleObject: PyTupleObject{
 			ObItem: p.PyTupleObjectObItem,
 		},
+		PyInterpreterFrame: PyInterpreterFrame{
+			Owner: p.PyInterpreterFrameOwner,
+		},
 	}
 }
 
@@ -321,6 +334,7 @@ type python312 struct {
 	PyFrameObjectFBack                int64 `offsetof:"_PyInterpreterFrame.previous"`
 	PyFrameObjectFCode                int64 `offsetof:"_PyInterpreterFrame.f_code"`
 	PyFrameObjectFLocalsplus          int64 `offsetof:"_PyInterpreterFrame.localsplus"`
+	PyInterpreterFrameOwner           int64 `offsetof:"_PyInterpreterFrame.owner"`
 	PyCodeObjectCoFilename            int64 `offsetof:"PyCodeObject.co_filename"`
 	PyCodeObjectCoName                int64 `offsetof:"PyCodeObject.co_name"`
 	PyCodeObjectCoVarNames            int64 `offsetof:"PyCodeObject.co_varnames"`
@@ -372,6 +386,9 @@ func (p python312) Layout() runtimedata.RuntimeData {
 		PyTupleObject: PyTupleObject{
 			ObItem: p.PyTupleObjectObItem,
 		},
+		PyInterpreterFrame: PyInterpreterFrame{
+			Owner: p.PyInterpreterFrameOwner,
+		},
 	}
 }
 
@@ -391,6 +408,7 @@ type python313 struct {
 	PyFrameObjectFBack                int64 `offsetof:"_PyInterpreterFrame.previous"`
 	PyFrameObjectFExecutable          int64 `offsetof:"_PyInterpreterFrame.f_executable"`
 	PyFrameObjectFLocalsplus          int64 `offsetof:"_PyInterpreterFrame.localsplus"`
+	PyInterpreterFrameOwner           int64 `offsetof:"_PyInterpreterFrame.owner"`
 	PyCodeObjectCoFilename            int64 `offsetof:"PyCodeObject.co_filename"`
 	PyCodeObjectCoName                int64 `offsetof:"PyCodeObject.co_name"`
 	PyCodeObjectCoFirstlineno         int64 `offsetof:"PyCodeObject.co_firstlineno"`
@@ -442,5 +460,8 @@ func (p python313) Layout() runtimedata.RuntimeData {
 		PyTupleObject: PyTupleObject{
 			ObItem: p.PyTupleObjectObItem,
 		},
+		PyInterpreterFrame: PyInterpreterFrame{
+			Owner: p.PyInterpreterFrameOwner,
+		},
 	}
 }
diff --git a/pkg/python/layout.go b/pkg/python/layout.go
@@ -82,6 +82,11 @@ type PyFrameObject struct {
 	FLocalsplus int64 `yaml:"f_localsplus"`
 }
 
+// PyInterpreterFrame
+type PyInterpreterFrame struct {
+	Owner int64 `yaml:"owner"`
+}
+
 type Layout struct {
 	PyCFrame           PyCFrame           `yaml:"py_cframe"`
 	PyCodeObject       PyCodeObject       `yaml:"py_code_object"`
@@ -93,6 +98,7 @@ type Layout struct {
 	PyThreadState      PyThreadState      `yaml:"py_thread_state"`
 	PyTupleObject      PyTupleObject      `yaml:"py_tuple_object"`
 	PyTypeObject       PyTypeObject       `yaml:"py_type_object"`
+	PyInterpreterFrame PyInterpreterFrame `yaml:"py_interpreter_frame"`
 }
 
 func (pvo Layout) Data() ([]byte, error) {

diff --git a/pkg/python/python_test.go b/pkg/python/python_test.go
@@ -65,8 +65,9 @@ func TestGetLayout(t *testing.T) {
 					NativeThreadID: -1,
 					CFrame:         -1,
 				},
-				PyTupleObject: PyTupleObject{ObItem: 24},
-				PyTypeObject:  PyTypeObject{TPName: 24},
+				PyTupleObject:      PyTupleObject{ObItem: 24},
+				PyTypeObject:       PyTypeObject{TPName: 24},
+				PyInterpreterFrame: PyInterpreterFrame{Owner: -1},
 			},
 		},
 		{
@@ -100,8 +101,9 @@ func TestGetLayout(t *testing.T) {
 					NativeThreadID: -1,
 					CFrame:         -1,
 				},
-				PyTupleObject: PyTupleObject{ObItem: 24},
-				PyTypeObject:  PyTypeObject{TPName: 24},
+				PyTupleObject:      PyTupleObject{ObItem: 24},
+				PyTypeObject:       PyTypeObject{TPName: 24},
+				PyInterpreterFrame: PyInterpreterFrame{Owner: -1},
 			},
 		},
 		{
@@ -150,6 +152,9 @@ func TestGetLayout(t *testing.T) {
 				PyTupleObject: PyTupleObject{
 					ObItem: 24,
 				},
+				PyInterpreterFrame: PyInterpreterFrame{
+					Owner: 69,
+				},
 			},
 		},
 		{
@@ -198,6 +203,9 @@ func TestGetLayout(t *testing.T) {
 				PyTupleObject: PyTupleObject{
 					ObItem: 24,
 				},
+				PyInterpreterFrame: PyInterpreterFrame{
+					Owner: 70,
+				},
 			},
 		},
 	}