Skip to content

Commit

Permalink
Merge pull request #37 from parca-dev/musl_fixes
Browse files Browse the repository at this point in the history 
Fix musl key size
  • Loading branch information
@kakkoyun
kakkoyun authored Feb 25, 2024
2 parents 32e3db8 + 8211f94 commit 241008d
Show file tree
Hide file tree
Showing 14 changed files with 37 additions and 37 deletions.
10 changes: 5 additions & 5 deletions pkg/libc/musl/datamap.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ import (
)

type musl struct {
PThreadSize int64 `sizeof:"__pthread" yaml:"pthread_size"`
PThreadTSD int64 `offsetof:"__pthread.tsd" yaml:"pthread_tsd"`
PThreadSize int64 `sizeof:"__pthread"`
PThreadTSD int64 `offsetof:"__pthread.tsd"`
}

func (m *musl) Layout() runtimedata.RuntimeData {
return &libc.Layout{
PThreadSize: m.PThreadSize,
PThreadSpecific1stblock: m.PThreadTSD,
// TODO(kakkoyun): Extract.
PThreadKeyData: 8,
PThreadKeyDataSize: 16,
PThreadKeyData: 0, // unused.
// pthread_key_t: TYPEDEF unsigned pthread_key_t;
PThreadKeyDataSize: 8,
}
}

Expand Down
4 changes: 2 additions & 2 deletions pkg/libc/musl/layout/amd64/1.1.11 - 1.1.15.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pthread_key_data: 8
pthread_key_data_size: 16
pthread_key_data: 0
pthread_key_data_size: 8
pthread_size: 336
pthread_specific_1stblock: 152
4 changes: 2 additions & 2 deletions pkg/libc/musl/layout/amd64/1.1.16 - 1.1.19.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pthread_key_data: 8
pthread_key_data_size: 16
pthread_key_data: 0
pthread_key_data_size: 8
pthread_size: 280
pthread_specific_1stblock: 152
4 changes: 2 additions & 2 deletions pkg/libc/musl/layout/amd64/1.1.22 - 1.1.24.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pthread_key_data: 8
pthread_key_data_size: 16
pthread_key_data: 0
pthread_key_data_size: 8
pthread_size: 224
pthread_specific_1stblock: 136
4 changes: 2 additions & 2 deletions pkg/libc/musl/layout/amd64/1.2.2 - 1.2.4.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pthread_key_data: 8
pthread_key_data_size: 16
pthread_key_data: 0
pthread_key_data_size: 8
pthread_size: 200
pthread_specific_1stblock: 128
4 changes: 2 additions & 2 deletions pkg/libc/musl/layout/amd64/= 1.1.20.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pthread_key_data: 8
pthread_key_data_size: 16
pthread_key_data: 0
pthread_key_data_size: 8
pthread_size: 240
pthread_specific_1stblock: 152
4 changes: 2 additions & 2 deletions pkg/libc/musl/layout/amd64/= 1.1.4.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pthread_key_data: 8
pthread_key_data_size: 16
pthread_key_data: 0
pthread_key_data_size: 8
pthread_size: 288
pthread_specific_1stblock: 144
4 changes: 2 additions & 2 deletions pkg/libc/musl/layout/amd64/= 1.1.5.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pthread_key_data: 8
pthread_key_data_size: 16
pthread_key_data: 0
pthread_key_data_size: 8
pthread_size: 296
pthread_specific_1stblock: 144
4 changes: 2 additions & 2 deletions pkg/libc/musl/layout/arm64/1.1.16 - 1.1.19.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pthread_key_data: 8
pthread_key_data_size: 16
pthread_key_data: 0
pthread_key_data_size: 8
pthread_size: 280
pthread_specific_1stblock: 152
4 changes: 2 additions & 2 deletions pkg/libc/musl/layout/arm64/1.1.22 - 1.1.24.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pthread_key_data: 8
pthread_key_data_size: 16
pthread_key_data: 0
pthread_key_data_size: 8
pthread_size: 224
pthread_specific_1stblock: 136
4 changes: 2 additions & 2 deletions pkg/libc/musl/layout/arm64/1.2.2 - 1.2.4.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pthread_key_data: 8
pthread_key_data_size: 16
pthread_key_data: 0
pthread_key_data_size: 8
pthread_size: 200
pthread_specific_1stblock: 112
4 changes: 2 additions & 2 deletions pkg/libc/musl/layout/arm64/= 1.1.15.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pthread_key_data: 8
pthread_key_data_size: 16
pthread_key_data: 0
pthread_key_data_size: 8
pthread_size: 336
pthread_specific_1stblock: 152
4 changes: 2 additions & 2 deletions pkg/libc/musl/layout/arm64/= 1.1.20.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pthread_key_data: 8
pthread_key_data_size: 16
pthread_key_data: 0
pthread_key_data_size: 8
pthread_size: 240
pthread_specific_1stblock: 152
16 changes: 8 additions & 8 deletions pkg/libc/musl/musl_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ func Test_getLayoutForArch(t *testing.T) {
want: &libc.Layout{
PThreadSize: 200,
PThreadSpecific1stblock: 128,
PThreadKeyData: 8,
PThreadKeyDataSize: 16,
PThreadKeyData: 0,
PThreadKeyDataSize: 0x8,
},
},
{
Expand All @@ -34,8 +34,8 @@ func Test_getLayoutForArch(t *testing.T) {
want: &libc.Layout{
PThreadSize: 200,
PThreadSpecific1stblock: 112,
PThreadKeyData: 8,
PThreadKeyDataSize: 16,
PThreadKeyData: 0,
PThreadKeyDataSize: 0x8,
},
},
{
Expand All @@ -45,8 +45,8 @@ func Test_getLayoutForArch(t *testing.T) {
want: &libc.Layout{
PThreadSize: 280,
PThreadSpecific1stblock: 152,
PThreadKeyData: 8,
PThreadKeyDataSize: 16,
PThreadKeyData: 0,
PThreadKeyDataSize: 0x8,
},
},
{
Expand All @@ -56,8 +56,8 @@ func Test_getLayoutForArch(t *testing.T) {
want: &libc.Layout{
PThreadSize: 280,
PThreadSpecific1stblock: 152,
PThreadKeyData: 8,
PThreadKeyDataSize: 16,
PThreadKeyData: 0,
PThreadKeyDataSize: 0x8,
},
},
}
Expand Down

0 comments on commit 241008d

Please sign in to comment.