Skip to content

Support pyston based environment #3126

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

Merged
korniltsev merged 4 commits into from
Apr 2, 2024
Merged

Support pyston based environment #3126

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
4c16604
Support pyston based environment
keyolk Mar 21, 2024
cb6191e
Update test
keyolk Apr 2, 2024
43d828f
Update submodule
keyolk Apr 2, 2024
f417605
Fix test
keyolk Apr 2, 2024
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
4 changes: 2 additions & 2 deletions ebpf/python/procinfo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ type ProcInfo struct {
Glibc []*symtab.ProcMap
}

var rePython = regexp.MustCompile("/.*/((?:lib)?python)(\\d+)\\.(\\d+)(?:[mu]?(?:\\.so)?)?(?:.1.0)?$")
var rePython = regexp.MustCompile("/.*/((?:lib)?python)(\\d+)\\.(\\d+)(?:[mu]?(-pyston\\d.\\d)?(?:\\.so)?)?(?:.1.0)?$")

// GetProcInfo parses /proc/pid/map of a python process.
func GetProcInfo(s *bufio.Scanner) (ProcInfo, error) {
Expand Down Expand Up @@ -58,7 +58,7 @@ func GetProcInfo(s *bufio.Scanner) (ProcInfo, error) {
strings.Contains(m.Pathname, "/lib/ld-musl-aarch64.so.1") {
res.Musl = append(res.Musl, m)
}
if strings.HasSuffix(m.Pathname, "/libc.so.6") {
if strings.HasSuffix(m.Pathname, "/libc.so.6") || strings.HasSuffix(m.Pathname, "/libc-2") {
res.Glibc = append(res.Glibc, m)
}
}
Expand Down
34 changes: 34 additions & 0 deletions ebpf/python/procinfo_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,38 @@ ffffffffff600000-ffffffffff601000 --xp 00000000 00:00 0 [vsysca
require.Equal(t, info.Version, Version{3, 7, 0})
require.NotNil(t, info.PythonMaps)
require.Nil(t, info.LibPythonMaps)

maps = `aaaae1f10000-aaaae2040000 r-xp 00000000 103:01 980158 /usr/bin/uwsgi
aaaae204f000-aaaae2052000 r--p 0012f000 103:01 980158 /usr/bin/uwsgi
aaaae2052000-aaaae2065000 rw-p 00132000 103:01 980158 /usr/bin/uwsgi
aaaae2065000-aaaae206c000 rw-p 00000000 00:00 0
aaaaeb0dc000-aaaaef082000 rw-p 00000000 00:00 0 [heap]
aaaaef082000-aaaaf6ad7000 rw-p 00000000 00:00 0 [heap]
ffffa259d000-ffffa25a1000 rw-p 00000000 00:00 0
ffffa25a1000-ffffa26fc000 r-xp 00000000 103:01 831681 /usr/lib/aarch64-linux-gnu/libc-2.31.so
ffffa26fc000-ffffa270b000 ---p 0015b000 103:01 831681 /usr/lib/aarch64-linux-gnu/libc-2.31.so
ffffa270b000-ffffa270f000 r--p 0015a000 103:01 831681 /usr/lib/aarch64-linux-gnu/libc-2.31.so
ffffa270f000-ffffa2711000 rw-p 0015e000 103:01 831681 /usr/lib/aarch64-linux-gnu/libc-2.31.so
ffffa2711000-ffffa2714000 rw-p 00000000 00:00 0
ffffa2714000-ffffa2b35000 r-xp 00000000 103:01 836228 /usr/lib/libpython3.8-pyston2.3.so.1.0
ffffa2b35000-ffffa2b45000 ---p 00421000 103:01 836228 /usr/lib/libpython3.8-pyston2.3.so.1.0
ffffa2b45000-ffffa2b4c000 r--p 00421000 103:01 836228 /usr/lib/libpython3.8-pyston2.3.so.1.0
ffffa2b4c000-ffffa2b83000 rw-p 00428000 103:01 836228 /usr/lib/libpython3.8-pyston2.3.so.1.0
ffffa2b83000-ffffa2ba4000 rw-p 00000000 00:00 0
ffffa32a1000-ffffa32a3000 r--p 00000000 00:00 0 [vvar]
ffffa32a3000-ffffa32a4000 r-xp 00000000 00:00 0 [vdso]
ffffa32a4000-ffffa32a5000 r--p 00021000 103:01 836208 /usr/lib/ld-linux-aarch64.so.1
ffffa32a5000-ffffa32a7000 rw-p 00022000 103:01 836208 /usr/lib/ld-linux-aarch64.so.1
ffffa4126000-ffffa45e6000 rwxp 00000000 00:00 0
ffffa45e6000-ffffa52e6000 rwxp 00000000 00:00 0
fffff8c25000-fffff8c53000 rw-p 00000000 00:00 0 [stack]`

info, err = GetProcInfo(bufio.NewScanner(bytes.NewReader([]byte(maps))))
require.NoError(t, err)
require.Nil(t, info.Musl)
require.Equal(t, info.Version, Version{3, 8, 0})
require.Nil(t, info.PythonMaps)
require.NotNil(t, info.LibPythonMaps)
}

const testdataPath = "../testdata/"
Expand Down Expand Up @@ -261,6 +293,7 @@ func TestPython(t *testing.T) {
testdataPath + "python-x64/3.6.6/lib/libpython3.6m.so.1.0",
testdataPath + "python-x64/3.8.11/lib/libpython3.8.so.1.0",
testdataPath + "python-x64/3.8.10/lib/libpython3.8.so.1.0",
testdataPath + "python-x64/3.8.12/lib/libpython3.8-pyston2.3.so.1.0",
testdataPath + "python-arm64/3.7.12/lib/libpython3.7m.so.1.0",
testdataPath + "python-arm64/3.5.1/lib/libpython3.5m.so.1.0",
testdataPath + "python-arm64/3.9.15/lib/libpython3.9.so.1.0",
Expand Down Expand Up @@ -366,6 +399,7 @@ func TestPython(t *testing.T) {
testdataPath + "python-arm64/3.6.6/lib/libpython3.6m.so.1.0",
testdataPath + "python-arm64/3.8.11/lib/libpython3.8.so.1.0",
testdataPath + "python-arm64/3.8.10/lib/libpython3.8.so.1.0",
testdataPath + "python-arm64/3.8.12/lib/libpython3.8-pyston2.3.so.1.0",
}
for _, f := range fs {
t.Run(f, func(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion ebpf/testdata
Open in desktop
Submodule testdata updated from cdb3fc to c60d4a