Skip to content

[GR-74145] Address PR 4321 review comments #705

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.

Sign up for GitHub

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
graalvmbot wants to merge 4 commits into from
Closed

[GR-74145] Address PR 4321 review comments #705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
093a909
[GR-74145] Address PR 4321 review comments
timfel Mar 18, 2026
4dfe10a
[GR-74145] Simplify POSIX stack depth fix
timfel Mar 18, 2026
6ef292c
[GR-74145] Fix obmalloc sample depth define order
timfel Mar 18, 2026
f47b920
Split sandboxed gate into two batches
timfel Mar 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@
}),
// tests with sandboxed backends for various modules (posix, sha3, compression, pyexpat, ...)
"python-unittest-sandboxed": gpgate_ee + platform_spec(no_jobs) + platform_spec({
"linux:amd64:jdk-latest" : tier2,
"linux:amd64:jdk-latest" : tier2 + batches(2),
"linux:aarch64:jdk-latest" : tier3,
"darwin:aarch64:jdk-latest" : tier3,
}),
Expand Down
3 changes: 1 addition & 2 deletions graalpython/com.oracle.graal.python.cext/src/graalpy_stacktrace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@

#define GRAALPY_NATIVE_STACK_MAX_NAME 1024
#define GRAALPY_NATIVE_STACK_LINE_BUFFER 2048

typedef void (*GraalPyStacktraceWriter)(void *ctx, const char *line);

static void
Expand Down Expand Up @@ -194,7 +193,7 @@ GraalPyPrivate_CaptureStacktrace(void **frames, size_t max_depth, size_t skip)
#if defined(MS_WINDOWS)
return (size_t) CaptureStackBackTrace((ULONG) (skip + 1), (ULONG) max_depth, frames, NULL);
#elif (defined(__linux__) && defined(__GNU_LIBRARY__)) || defined(__APPLE__)
int raw_depth = backtrace(frames, (int) max_depth);
int raw_depth = backtrace(frames, (int) (max_depth + skip + 1));
size_t depth = raw_depth > 0 ? (size_t) raw_depth : 0;
size_t start = depth > (skip + 1) ? (skip + 1) : depth;
size_t usable_depth = depth - start;
Expand Down
5 changes: 3 additions & 2 deletions graalpython/com.oracle.graal.python.cext/src/obmalloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,11 @@ typedef struct {
size_t dummy;
} mem_head_t;

#define GRAALPY_MEM_SAMPLE_USEFUL_DEPTH (10)

typedef struct {
void *ptr;
void *stack[12];
void *stack[GRAALPY_MEM_SAMPLE_USEFUL_DEPTH];
size_t size;
size_t depth;
unsigned long long serial;
Expand All @@ -70,7 +72,6 @@ typedef struct {
#define GRAALPY_MEM_SAMPLE_RING_SIZE (4096)
#define GRAALPY_MEM_SAMPLE_HISTORY (8)
#define GRAALPY_MEM_SAMPLE_STACK_SKIP (2)
#define GRAALPY_MEM_SAMPLE_USEFUL_DEPTH (10)
#define MAX_COLLECTION_RETRIES (7)
#define COLLECTION_DELAY_INCREMENT (50)

Expand Down
Loading