Skip to content

Commit e76bac2

Browse files
committed
Remove jl_task_stack_buffer (#54527)
This was removed previously in PR #54527 but had to be reverted in PR #54559 as one usage remained (more by accident then by design). This has since then been resolved.
1 parent 90d346f commit e76bac2

File tree

3 files changed

+0
-38
lines changed

3 files changed

+0
-38
lines changed

src/jl_exported_funcs.inc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,6 @@
449449
XX(jl_tagged_gensym) \
450450
XX(jl_take_buffer) \
451451
XX(jl_task_get_next) \
452-
XX(jl_task_stack_buffer) \
453452
XX(jl_termios_size) \
454453
XX(jl_test_cpu_feature) \
455454
XX(jl_threadid) \

src/julia_gcext.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -135,15 +135,6 @@ JL_DLLEXPORT int jl_gc_conservative_gc_support_enabled(void);
135135
// NOTE: Only valid to call from within a GC context.
136136
JL_DLLEXPORT jl_value_t *jl_gc_internal_obj_base_ptr(void *p) JL_NOTSAFEPOINT;
137137

138-
// Return a non-null pointer to the start of the stack area if the task
139-
// has an associated stack buffer. In that case, *size will also contain
140-
// the size of that stack buffer upon return. Also, if task is a thread's
141-
// current task, that thread's id will be stored in *tid; otherwise,
142-
// *tid will be set to -1.
143-
//
144-
// DEPRECATED: use jl_active_task_stack() instead.
145-
JL_DLLEXPORT void *jl_task_stack_buffer(jl_task_t *task, size_t *size, int *tid);
146-
147138
// Query the active and total stack range for the given task, and set
148139
// *active_start and *active_end respectively *total_start and *total_end
149140
// accordingly. The range for the active part is a best-effort approximation

src/task.c

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -352,34 +352,6 @@ void JL_NORETURN jl_finish_task(jl_task_t *ct)
352352
abort();
353353
}
354354

355-
JL_DLLEXPORT void *jl_task_stack_buffer(jl_task_t *task, size_t *size, int *ptid)
356-
{
357-
size_t off = 0;
358-
#ifndef _OS_WINDOWS_
359-
jl_ptls_t ptls0 = jl_atomic_load_relaxed(&jl_all_tls_states)[0];
360-
if (ptls0->root_task == task) {
361-
// See jl_init_root_task(). The root task of the main thread
362-
// has its buffer enlarged by an artificial 3000000 bytes, but
363-
// that means that the start of the buffer usually points to
364-
// inaccessible memory. We need to correct for this.
365-
off = ROOT_TASK_STACK_ADJUSTMENT;
366-
}
367-
#endif
368-
jl_ptls_t ptls2 = task->ptls;
369-
*ptid = -1;
370-
if (ptls2) {
371-
*ptid = jl_atomic_load_relaxed(&task->tid);
372-
#ifdef COPY_STACKS
373-
if (task->ctx.copy_stack) {
374-
*size = ptls2->stacksize;
375-
return (char *)ptls2->stackbase - *size;
376-
}
377-
#endif
378-
}
379-
*size = task->ctx.bufsz - off;
380-
return (void *)((char *)task->ctx.stkbuf + off);
381-
}
382-
383355
JL_DLLEXPORT void jl_active_task_stack(jl_task_t *task,
384356
char **active_start, char **active_end,
385357
char **total_start, char **total_end)

0 commit comments

Comments
 (0)