colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #317227 from rhelmot/freebsd-nix-boehmgc

Browse Source 
nix: make boehmgc patch respect HAVE_PTHREAD_ATTR_GET_NP
This commit is contained in:
John Ericson 2024-06-16 23:39:01 -04:00 committed by GitHub
commit 483a8dc493
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/tools/package-management/nix/patches/boehmgc-coroutine-sp-fallback.patch
View File

@ -11,14 +11,23 @@ index 2b45489..0e6d8ef 100644
GC_bool found_me = FALSE;
size_t nthreads = 0;
int i;
@@ -868,6 +870,31 @@ GC_INNER void GC_push_all_stacks(void)
@@ -868,6 +870,40 @@ GC_INNER void GC_push_all_stacks(void)
hi = p->altstack + p->altstack_size;
# endif
/* FIXME: Need to scan the normal stack too, but how ? */
+ } else {
+ #ifdef HAVE_PTHREAD_ATTR_GET_NP
+ if (pthread_attr_init(&pattr) != 0) {
+ ABORT("GC_push_all_stacks: pthread_attr_init failed!");
+ }
+ if (pthread_attr_get_np(p->id, &pattr) != 0) {
+ ABORT("GC_push_all_stacks: pthread_attr_get_np failed!");
+ }
+ #else
+ if (pthread_getattr_np(p->id, &pattr)) {
+ ABORT("GC_push_all_stacks: pthread_getattr_np failed!");
+ }
+ #endif
+ if (pthread_attr_getstacksize(&pattr, &stack_limit)) {
+ ABORT("GC_push_all_stacks: pthread_attr_getstacksize failed!");
+ }