GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — GH-98894: Fix `function__return` and `function__entry` dTrace probe missing after `GH-103083` by Zheaoli · Pull Request #125019 · python/cpython

GH-98894: Fix `functionreturn` and `functionentry` dTrace probe missing after `GH-103083` #125019

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed

Zheaoli wants to merge 6 commits into python:main from Zheaoli:manjusaka/fix-dtrace

Uh oh!

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

Closed

GH-98894: Fix `functionreturn` and `functionentry` dTrace probe missing after `GH-103083` #125019

Show file tree

Hide file tree

Changes from all commits

Commits

Show all changes

6 commits

Select commit Hold shift + click to select a range

f11b7c4

Fix `function__return` and `function__entry` dTrace probe missing aft…

Update Misc/NEWS.d/next/Core_and_Builtins/2024-10-06-17-46-24.gh-issu…

Merge branch 'main' of https://github.com/python/cpython into manjusa…

Zheaoli May 22, 2025

File filter

Filter by extension .c (3) .h (3) .rst (1) All 3 file types selected

Viewed files

Clear filters

Conversations

Failed to load comments.

Uh oh!

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

Jump to

Jump to file

Failed to load files.

Uh oh!

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

Diff view

Unified

Split

Hide whitespace

Diff view

Unified

Split

Hide whitespace

There are no files selected for viewing

1 change: 1 addition & 0 deletions 1 Misc/NEWS.d/next/Core_and_Builtins/2024-10-06-17-46-24.gh-issue-98894.uG2s-h.rst

Show comments

View file

Open in desktop

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix ``function__return`` and ``function__entry`` dtrace probe missing after :gh:`103083`.

2 changes: 2 additions & 0 deletions 2 Python/bytecodes.c

Show comments

View file

Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -1149,6 +1149,7 @@ dummy_func(
		DEAD(retval);
		SAVE_STACK();
		assert(STACK_LEVEL() == 0);
		DTRACE_FUNCTION_EXIT();
		_Py_LeaveRecursiveCallPy(tstate);
		// GH-99729: We need to unlink the frame before clearing it:
		_PyInterpreterFrame *dying = frame;
Expand Down Expand Up		@@ -1324,6 +1325,7 @@ dummy_func(
		_PyStackRef temp = retval;
		DEAD(retval);
		SAVE_STACK();
		DTRACE_FUNCTION_EXIT();
		tstate->exc_info = gen->gi_exc_state.previous_item;
		gen->gi_exc_state.previous_item = NULL;
		_Py_LeaveRecursiveCallPy(tstate);
Expand Down

34 changes: 34 additions & 0 deletions 34 Python/ceval.c

Show comments

View file

Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -1078,6 +1078,7 @@ _PyEval_EvalFrameDefault(PyThreadState tstate, _PyInterpreterFrame frame, int
		#endif
		/* Because this avoids the RESUME, we need to update instrumentation */
		_Py_Instrument(_PyFrame_GetCode(frame), tstate->interp);
		DTRACE_FUNCTION_ENTRY();
		next_instr = frame->instr_ptr;
		monitor_throw(tstate, frame, next_instr);
		stack_pointer = _PyFrame_GetStackPointer(frame);
Expand All		@@ -1097,6 +1098,8 @@ _PyEval_EvalFrameDefault(PyThreadState tstate, _PyInterpreterFrame frame, int
		_PyExecutorObject *current_executor = NULL;
		const _PyUOpInstruction *next_uop = NULL;
		#endif
		DTRACE_FUNCTION_ENTRY();

		#if Py_TAIL_CALL_INTERP
		# if Py_STATS
		return _TAIL_CALL_start_frame(frame, NULL, tstate, NULL, 0, lastopcode);
Expand Down Expand Up		@@ -3279,6 +3282,37 @@ PyUnstable_Eval_RequestCodeExtraIndex(freefunc free)
		return new_index;
		}


		static void
		dtrace_function_entry(_PyInterpreterFrame *frame)
		{
		const char *filename;
		const char *funcname;
		int lineno;

		PyCodeObject *code = _PyFrame_GetCode(frame);
		filename = PyUnicode_AsUTF8(code->co_filename);
		funcname = PyUnicode_AsUTF8(code->co_name);
		lineno = PyUnstable_InterpreterFrame_GetLine(frame);

		PyDTrace_FUNCTION_ENTRY(filename, funcname, lineno);
Comment thread picnixz marked this conversation as resolved. Resolved Uh oh! There was an error while loading. Please reload this page.
		}

		static void
		dtrace_function_return(_PyInterpreterFrame *frame)
		{
		const char *filename;
		const char *funcname;
		int lineno;

		PyCodeObject *code = _PyFrame_GetCode(frame);
		filename = PyUnicode_AsUTF8(code->co_filename);
		funcname = PyUnicode_AsUTF8(code->co_name);
		lineno = PyUnstable_InterpreterFrame_GetLine(frame);

		PyDTrace_FUNCTION_RETURN(filename, funcname, lineno);
Comment thread picnixz marked this conversation as resolved. Resolved Uh oh! There was an error while loading. Please reload this page.
		}

		/* Implement Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() as functions
		for the limited API. */

Expand Down

11 changes: 11 additions & 0 deletions 11 Python/ceval_macros.h

Show comments

View file

Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -41,6 +41,8 @@
		* the CFG.
		*/

		#include "pycore_frame.h"

		#ifdef WITH_DTRACE
		#define OR_DTRACE_LINE \| (PyDTrace_LINE_ENABLED() ? 255 : 0)
		#else
Expand Down Expand Up		@@ -266,6 +268,15 @@ GETITEM(PyObject *v, Py_ssize_t i) {
		#define CONSTS() _PyFrame_GetCode(frame)->co_consts
		#define NAMES() _PyFrame_GetCode(frame)->co_names

		static void dtrace_function_entry(_PyInterpreterFrame *);
		static void dtrace_function_return(_PyInterpreterFrame *);

		#define DTRACE_FUNCTION_EXIT() \
		if (PyDTrace_FUNCTION_RETURN_ENABLED()) { \
		dtrace_function_return(frame); \
		}


		#define DTRACE_FUNCTION_ENTRY() \
		if (PyDTrace_FUNCTION_ENTRY_ENABLED()) { \
		dtrace_function_entry(frame); \
Expand Down

2 changes: 2 additions & 0 deletions 2 Python/executor_cases.c.h

Show comments

View file

Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Oops, something went wrong.

Uh oh!

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

4 changes: 4 additions & 0 deletions 4 Python/generated_cases.c.h

Show comments

View file

Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Oops, something went wrong.

Uh oh!

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

1 change: 1 addition & 0 deletions 1 Tools/jit/template.c

Show comments

View file

Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -26,6 +26,7 @@
		#include "pycore_setobject.h"
		#include "pycore_sliceobject.h"
		#include "pycore_stackref.h"
		#include "pydtrace.h"
		#include "pycore_template.h"
		#include "pycore_tuple.h"
		#include "pycore_unicodeobject.h"
Expand Down

Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.

You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.

GeezerVison

GH-98894: Fix function__return and function__entry dTrace probe missing after GH-103083 #125019

Uh oh!

GH-98894: Fix function__return and function__entry dTrace probe missing after GH-103083 #125019

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Uh oh!

GH-98894: Fix `functionreturn` and `functionentry` dTrace probe missing after `GH-103083` #125019

GH-98894: Fix `functionreturn` and `functionentry` dTrace probe missing after `GH-103083` #125019