Bump x/sys/unix #118

akhramov · 2022-06-05T11:36:24Z

A newer version of x/sys/unix updates the OpenBSD bindings
which makes the int8SliceToString helper function obsolete.

This change updates the x/sys/unix version

thaJeztah · 2022-06-05T12:12:57Z

mountinfo/go.mod

@@ -2,4 +2,4 @@ module github.com/moby/sys/mountinfo

 go 1.16

-require golang.org/x/sys v0.0.0-20220412211240-33da011f77ad
+require golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a


Probably good to update this dependency in all the modules in this repository (mount, mountinfo, symlink, signal)

diff is: golang/sys@33da011...bc2c85a

Sure, this is a good idea.

thaJeztah · 2022-06-05T12:20:57Z

mountinfo/mountinfo_bsd.go

+	mountinfo.Mountpoint = unix.ByteSliceToString(entry.Mntonname[:])
+	mountinfo.FSType = unix.ByteSliceToString(entry.Fstypename[:])
+	mountinfo.Source = unix.ByteSliceToString(entry.Mntfromname[:])


were these renamed at some point ? looks like the current names are;

Suggested change

mountinfo.Mountpoint = unix.ByteSliceToString(entry.Mntonname[:])

mountinfo.FSType = unix.ByteSliceToString(entry.Fstypename[:])

mountinfo.Source = unix.ByteSliceToString(entry.Mntfromname[:])

mountinfo.Mountpoint = unix.ByteSliceToString(entry.F_mntonname[:])

mountinfo.FSType = unix.ByteSliceToString(entry.F_fstypename[:])

mountinfo.Source = unix.ByteSliceToString(entry.F_mntfromname[:])

https://github.com/golang/sys/blob/bc2c85ada10aa9b6aa9607e9ac9ad0761b95cf1d/unix/ztypes_openbsd_amd64.go#L99-L102

Oh! I see; that's for the other bsd types, but for darwin (macOS) and freebsd it's the previous names

https://github.com/golang/sys/blob/bc2c85ada10aa9b6aa9607e9ac9ad0761b95cf1d/unix/ztypes_darwin_amd64.go#L100-L102

https://github.com/golang/sys/blob/bc2c85ada10aa9b6aa9607e9ac9ad0761b95cf1d/unix/ztypes_freebsd_amd64.go#L129-L131

so you'll need multiple implementations for this function

Oh, thanks, good catch.

thaJeztah · 2022-06-05T12:29:27Z

mountinfo/mountinfo_openbsd.go

-func getMountinfo(entry *unix.Statfs_t) *Info {
-	var mountinfo Info
-	mountinfo.Mountpoint = int8SliceToString(entry.F_mntonname[:])
-	mountinfo.FSType = int8SliceToString(entry.F_fstypename[:])
-	mountinfo.Source = int8SliceToString(entry.F_mntfromname[:])
-	return &mountinfo
-}


See my comment above; instead of removing this file, it's still needed to have separate implementations, but you can remove the int8SliceToString() function,

Perhaps we should also remove the intermediate mountinfo variable, and just return a literal (looks slightly cleaner);

Suggested change

func getMountinfo(entry *unix.Statfs_t) *Info {

var mountinfo Info

mountinfo.Mountpoint = int8SliceToString(entry.F_mntonname[:])

mountinfo.FSType = int8SliceToString(entry.F_fstypename[:])

mountinfo.Source = int8SliceToString(entry.F_mntfromname[:])

return &mountinfo

}

func getMountinfo(entry *unix.Statfs_t) *Info {

return &Info{

Mountpoint: unix.ByteSliceToString(entry.F_mntonname[:]),

FSType: unix.ByteSliceToString(entry.F_fstypename[:]),

Source: unix.ByteSliceToString(entry.F_mntfromname[:]),

}

}

thaJeztah · 2022-06-05T17:33:15Z

mountinfo/mountinfo_openbsd.go

+		FSType:     unix.ByteSliceToString(entry.F_fstypename[:]),
+		Source:     unix.ByteSliceToString(entry.F_mntfromname[:]),
+	}
+}


nit: missed a newline here

thaJeztah · 2022-06-05T17:38:16Z

mountinfo/mountinfo_freebsdlike.go

-	mountinfo.FSType = unix.ByteSliceToString(entry.Fstypename[:])
-	mountinfo.Source = unix.ByteSliceToString(entry.Mntfromname[:])
-	return &mountinfo
+     return &Info{


Linter is complaining about this part; I haven't checked locally, but possibly indentation is wrong in this file?

mountinfo_freebsdlike.go:9: File is not `gofumpt`-ed (gofumpt) [18](https://github.com/moby/sys/runs/6746317554?check_suite_focus=true#step:4:19) return &Info{

Oh, absolutely. Sorry for the hustle.

thaJeztah

LGTM, thanks!

thaJeztah · 2022-06-05T17:49:11Z

@kolyshkin PTAL

kolyshkin · 2022-06-06T17:27:19Z

mount/go.sum

@@ -3,3 +3,5 @@ github.com/moby/sys/mountinfo v0.6.1/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdx
 golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0=
 golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=


Looks like you forgot go mod tidy (and our CI do not have a check for that).

Ah! I was wondering that; got a different result locally, but thought it would be different Go version (as CI was green)

Absolutely, thanks

A newer version of x/sys/unix updates the OpenBSD bindings which makes the `int8SliceToString` helper function obsolete. This change updates the x/sys/unix version Signed-off-by: Artem Khramov <akhramov@pm.me>

thaJeztah

LGTM, thanks!

kolyshkin

LGTM, thanks!

akhramov mentioned this pull request Jun 5, 2022

mountinfo: BSDs no longer need cgo nor reflect #114

Merged

akhramov force-pushed the feature/bump-x-sys branch from c875a63 to cfb4ff9 Compare June 5, 2022 11:37

thaJeztah requested changes Jun 5, 2022

View reviewed changes

akhramov force-pushed the feature/bump-x-sys branch 2 times, most recently from 9728999 to 2e48ad7 Compare June 5, 2022 16:02

thaJeztah reviewed Jun 5, 2022

View reviewed changes

akhramov force-pushed the feature/bump-x-sys branch from 2e48ad7 to b74365b Compare June 5, 2022 17:39

thaJeztah approved these changes Jun 5, 2022

View reviewed changes

This comment was marked as outdated.

Sign in to view

kolyshkin reviewed Jun 6, 2022

View reviewed changes

This comment was marked as outdated.

Sign in to view

This was referenced Jun 6, 2022

ci: add go mod tidy check #119

Merged

mountinfo_openbsd: Rewrite int8SliceToString with unsafe #117

Closed

Bump x/sys/unix

1f80079

A newer version of x/sys/unix updates the OpenBSD bindings which makes the `int8SliceToString` helper function obsolete. This change updates the x/sys/unix version Signed-off-by: Artem Khramov <akhramov@pm.me>

akhramov force-pushed the feature/bump-x-sys branch from b74365b to 1f80079 Compare June 6, 2022 18:33

thaJeztah approved these changes Jun 6, 2022

View reviewed changes

kolyshkin approved these changes Jun 6, 2022

View reviewed changes

kolyshkin merged commit 1bf36f7 into moby:main Jun 6, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bump x/sys/unix #118

Bump x/sys/unix #118

akhramov commented Jun 5, 2022

thaJeztah Jun 5, 2022

akhramov Jun 5, 2022

thaJeztah Jun 5, 2022

thaJeztah Jun 5, 2022

akhramov Jun 5, 2022

thaJeztah Jun 5, 2022

thaJeztah Jun 5, 2022

thaJeztah Jun 5, 2022

akhramov Jun 5, 2022

thaJeztah left a comment

thaJeztah commented Jun 5, 2022

This comment was marked as outdated.

kolyshkin Jun 6, 2022

thaJeztah Jun 6, 2022

akhramov Jun 6, 2022

This comment was marked as outdated.

thaJeztah left a comment

kolyshkin left a comment

Bump x/sys/unix #118

Bump x/sys/unix #118

Conversation

akhramov commented Jun 5, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

thaJeztah left a comment

Choose a reason for hiding this comment

thaJeztah commented Jun 5, 2022

This comment was marked as outdated.

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

This comment was marked as outdated.

thaJeztah left a comment

Choose a reason for hiding this comment

kolyshkin left a comment

Choose a reason for hiding this comment