Skip to content

Add function for users to set extra TLS needed before calling threading APIs #6

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add function for users to set extra TLS needed before calling threading APIs #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ docs/out/
.*/
*~
*.bak
*.sh
.clangd
4 changes: 4 additions & 0 deletions include/calico/system/thread.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,10 @@ void threadPrepare(Thread* t, ThreadFunc entrypoint, void* arg, void* stack_top,
//! @brief Returns the required size for thread-local storage (8-byte aligned) @see threadAttachLocalStorage
size_t threadGetLocalStorageSize(void);

// Sets an extra amount of thread-local storage to be allocated for threads created using
// system calls (POSIX threads, C threads, C++ std::thread). Will be 8-byte aligned.
void threadSetPthreadExtraTls(const size_t size);

/*! @brief Attaches thread-local storage to a @ref Thread @p t
@param[in] storage 8-byte aligned memory buffer to use as thread-local storage,
or NULL to consume thread stack memory instead
Expand Down
10 changes: 9 additions & 1 deletion source/system/newlib_syscalls.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,14 @@ int __SYSCALL(cond_wait_recursive)(_COND_T* cond, _LOCK_RECURSIVE_T* lock, uint6
return 0;
}

static size_t extraTls = 0;

void threadSetPthreadExtraTls(const size_t size)
{
// make sure it's 8-byte aligned
extraTls = (size + 7) &~ 7;
}

int __SYSCALL(thread_create)(struct __pthread_t** thread, void* (*func)(void*), void* arg, void* stack_addr, size_t stack_size)
{
if (((uptr)stack_addr & 7) || (stack_size & 7)) {
Expand All @@ -145,7 +153,7 @@ int __SYSCALL(thread_create)(struct __pthread_t** thread, void* (*func)(void*),

size_t struct_sz = (sizeof(struct __pthread_t) + 7) &~ 7;

size_t needed_sz = struct_sz + threadGetLocalStorageSize();
size_t needed_sz = struct_sz + threadGetLocalStorageSize() + extraTls;
if (!stack_addr) {
needed_sz += stack_size;
}
Expand Down