opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 18:59:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

use pkg/strongunits from c/common

Browse Source 
The code has been moved to c/common so it can be shared with libhvee.

[NO NEW TESTS NEEDED]

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2024-02-05 17:13:42 +01:00
parent 5de4bd5d13
commit 46fe7ef3bb
5 changed files with 4 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/machine/applehv/machine.go
View File

@ -18,6 +18,7 @@ import (
"time"
"github.com/containers/common/pkg/config"
"github.com/containers/common/pkg/strongunits"
gvproxy "github.com/containers/gvisor-tap-vsock/pkg/types"
"github.com/containers/podman/v4/pkg/machine"
"github.com/containers/podman/v4/pkg/machine/applehv/vfkit"
@ -25,7 +26,6 @@ import (
"github.com/containers/podman/v4/pkg/machine/ignition"
"github.com/containers/podman/v4/pkg/machine/sockets"
"github.com/containers/podman/v4/pkg/machine/vmconfigs"
"github.com/containers/podman/v4/pkg/strongunits"
"github.com/containers/podman/v4/pkg/systemd/parser"
"github.com/containers/podman/v4/utils"
"github.com/containers/storage/pkg/lockfile"
@ -573,7 +573,7 @@ func (m *MacMachine) Start(name string, opts machine.StartOptions) error {
}
if _, err := m.getRuntimeDir(); err != nil {
return err
return err
}
// TODO handle returns from startHostNetworking

2
pkg/machine/errors.go
View File

@ -4,7 +4,7 @@ import (
"errors"
"fmt"
"github.com/containers/podman/v4/pkg/strongunits"
"github.com/containers/common/pkg/strongunits"
)
var (

2
pkg/machine/hyperv/machine.go
View File

@ -16,6 +16,7 @@ import (
"github.com/Microsoft/go-winio"
"github.com/containers/common/pkg/config"
"github.com/containers/common/pkg/strongunits"
gvproxy "github.com/containers/gvisor-tap-vsock/pkg/types"
"github.com/containers/libhvee/pkg/hypervctl"
"github.com/containers/podman/v4/pkg/machine"
@ -23,7 +24,6 @@ import (
"github.com/containers/podman/v4/pkg/machine/hyperv/vsock"
"github.com/containers/podman/v4/pkg/machine/ignition"
"github.com/containers/podman/v4/pkg/machine/vmconfigs"
"github.com/containers/podman/v4/pkg/strongunits"
"github.com/containers/podman/v4/pkg/systemd/parser"
"github.com/containers/podman/v4/utils"
"github.com/containers/storage/pkg/lockfile"

65
pkg/strongunits/config.go
View File

@ -1,65 +0,0 @@
package strongunits
// supported units
// B represents bytes
type B uint64
// KiB represents KiB
type KiB uint64
// MiB represents MiB
type MiB uint64
// GiB represents GiB
type GiB uint64
const (
// kibToB is the math convert from bytes to KiB
kibToB = 1 << 10
// mibToB is the math to convert from bytes to MiB
mibToB = 1 << 20
// gibToB s the math to convert from bytes to GiB
gibToB = 1 << 30
)
// StorageUnits is an interface for converting disk/memory storage
// units amongst each other.
type StorageUnits interface {
ToBytes() B
}
// ToBytes is a pass-through function for bytes
func (b B) ToBytes() B {
return b
}
// ToBytes converts KiB to bytes
func (k KiB) ToBytes() B {
return B(k * kibToB)
}
// ToBytes converts MiB to bytes
func (m MiB) ToBytes() B {
return B(m * mibToB)
}
// ToBytes converts GiB to bytes
func (g GiB) ToBytes() B {
return B(g * gibToB)
}
// ToKiB converts any StorageUnit type to KiB
func ToKiB(b StorageUnits) KiB {
return KiB(b.ToBytes() >> 10)
}
// ToMib converts any StorageUnit type to MiB
func ToMib(b StorageUnits) MiB {
return MiB(b.ToBytes() >> 20)
}
// ToGiB converts any StorageUnit type to GiB
func ToGiB(b StorageUnits) GiB {
return GiB(b.ToBytes() >> 30)
}

188
pkg/strongunits/config_test.go
View File

@ -1,188 +0,0 @@
package strongunits
import "testing"
func TestGiB_toBytes(t *testing.T) {
tests := []struct {
name string
g GiB
want B
}{
{
name: "good-1",
g: 1,
want: 1073741824,
},
{
name: "good-2",
g: 2,
want: 2147483648,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := tt.g.ToBytes(); got != tt.want {
t.Errorf("ToBytes() = %v, want %v", got, tt.want)
}
})
}
}
func TestKiB_toBytes(t *testing.T) {
tests := []struct {
name string
k KiB
want B
}{
{
name: "good-1",
k: 100,
want: 102400,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := tt.k.ToBytes(); got != tt.want {
t.Errorf("ToBytes() = %v, want %v", got, tt.want)
}
})
}
}
func TestMiB_toBytes(t *testing.T) {
tests := []struct {
name string
m MiB
want B
}{
{
name: "good-1",
m: 1024,
want: 1073741824,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := tt.m.ToBytes(); got != tt.want {
t.Errorf("ToBytes() = %v, want %v", got, tt.want)
}
})
}
}
func TestToGiB(t *testing.T) {
type args struct {
b StorageUnits
}
tests := []struct {
name string
args args
want GiB
}{
{
name: "bytes to gib",
args: args{B(5368709120)},
want: 5,
},
{
name: "kib to gib",
args: args{KiB(3145728 * 2)},
want: 6,
},
{
name: "mib to gib",
args: args{MiB(2048)},
want: 2,
},
{
name: "gib to gib",
args: args{GiB(2)},
want: 2,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := ToGiB(tt.args.b); got != tt.want {
t.Errorf("ToGiB() = %v, want %v", got, tt.want)
}
})
}
}
func TestToKiB(t *testing.T) {
type args struct {
b StorageUnits
}
tests := []struct {
name string
args args
want KiB
}{
{
name: "bytes to kib",
args: args{B(1024)},
want: 1,
},
{
name: "mib to kib",
args: args{MiB(2)},
want: 2048,
},
{
name: "kib to kib",
args: args{KiB(800)},
want: 800,
},
{
name: "gib to mib",
args: args{GiB(3)},
want: 3145728,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := ToKiB(tt.args.b); got != tt.want {
t.Errorf("ToKiB() = %v, want %v", got, tt.want)
}
})
}
}
func TestToMib(t *testing.T) {
type args struct {
b StorageUnits
}
tests := []struct {
name string
args args
want MiB
}{
{
name: "bytes to mib",
args: args{B(3145728)},
want: 3,
},
{
name: "kib to mib",
args: args{KiB(2048)},
want: 2,
},
{
name: "mib to mib",
args: args{MiB(2)},
want: 2,
},
{
name: "gib to mib",
args: args{GiB(3)},
want: 3072,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := ToMib(tt.args.b); got != tt.want {
t.Errorf("ToMib() = %v, want %v", got, tt.want)
}
})
}
}