kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #9233 from inatatsu/fix-pkg-units-size-for-gccgo

Browse source 
Fix to avoid a compile error due to float to int truncation with GCCGO
This commit is contained in:
Michael Crosby 2014-12-18 18:33:01 -08:00
commit 2acb856dff
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
api/client/commands.go
View file

@ -1080,7 +1080,7 @@ func (cli *DockerCli) CmdHistory(args ...string) error {
} else { } else {
fmt.Fprintf(w, "%s\t", utils.Trunc(out.Get("CreatedBy"), 45)) fmt.Fprintf(w, "%s\t", utils.Trunc(out.Get("CreatedBy"), 45))
} }
fmt.Fprintf(w, "%s\n", units.HumanSize(out.GetInt64("Size"))) fmt.Fprintf(w, "%s\n", units.HumanSize(float64(out.GetInt64("Size"))))
} else { } else {
if *noTrunc { if *noTrunc {
fmt.Fprintln(w, outID) fmt.Fprintln(w, outID)
@ -1485,7 +1485,7 @@ func (cli *DockerCli) CmdImages(args ...string) error {
} }
if !*quiet { if !*quiet {
fmt.Fprintf(w, "%s\t%s\t%s\t%s ago\t%s\n", repo, tag, outID, units.HumanDuration(time.Now().UTC().Sub(time.Unix(out.GetInt64("Created"), 0))), units.HumanSize(out.GetInt64("VirtualSize"))) fmt.Fprintf(w, "%s\t%s\t%s\t%s ago\t%s\n", repo, tag, outID, units.HumanDuration(time.Now().UTC().Sub(time.Unix(out.GetInt64("Created"), 0))), units.HumanSize(float64(out.GetInt64("VirtualSize"))))
} else { } else {
fmt.Fprintln(w, outID) fmt.Fprintln(w, outID)
} }
@ -1559,7 +1559,7 @@ func (cli *DockerCli) printTreeNode(noTrunc bool, image *engine.Env, prefix stri
imageID = utils.TruncateID(image.Get("Id")) imageID = utils.TruncateID(image.Get("Id"))
} }
fmt.Fprintf(cli.out, "%s%s Virtual Size: %s", prefix, imageID, units.HumanSize(image.GetInt64("VirtualSize"))) fmt.Fprintf(cli.out, "%s%s Virtual Size: %s", prefix, imageID, units.HumanSize(float64(image.GetInt64("VirtualSize"))))
if image.GetList("RepoTags")[0] != "<none>:<none>" { if image.GetList("RepoTags")[0] != "<none>:<none>" {
fmt.Fprintf(cli.out, " Tags: %s\n", strings.Join(image.GetList("RepoTags"), ", ")) fmt.Fprintf(cli.out, " Tags: %s\n", strings.Join(image.GetList("RepoTags"), ", "))
} else { } else {
@ -1707,9 +1707,9 @@ func (cli *DockerCli) CmdPs(args ...string) error {
if *size { if *size {
if out.GetInt("SizeRootFs") > 0 { if out.GetInt("SizeRootFs") > 0 {
fmt.Fprintf(w, "%s (virtual %s)\n", units.HumanSize(out.GetInt64("SizeRw")), units.HumanSize(out.GetInt64("SizeRootFs"))) fmt.Fprintf(w, "%s (virtual %s)\n", units.HumanSize(float64(out.GetInt64("SizeRw"))), units.HumanSize(float64(out.GetInt64("SizeRootFs"))))
} else { } else {
fmt.Fprintf(w, "%s\n", units.HumanSize(out.GetInt64("SizeRw"))) fmt.Fprintf(w, "%s\n", units.HumanSize(float64(out.GetInt64("SizeRw"))))
} }
continue continue

10
daemon/graphdriver/devmapper/driver.go
View file

@ -56,13 +56,13 @@ func (d *Driver) Status() [][2]string {
status := [][2]string{ status := [][2]string{
{"Pool Name", s.PoolName}, {"Pool Name", s.PoolName},
{"Pool Blocksize", fmt.Sprintf("%s", units.HumanSize(int64(s.SectorSize)))}, {"Pool Blocksize", fmt.Sprintf("%s", units.HumanSize(float64(s.SectorSize)))},
{"Data file", s.DataLoopback}, {"Data file", s.DataLoopback},
{"Metadata file", s.MetadataLoopback}, {"Metadata file", s.MetadataLoopback},
{"Data Space Used", fmt.Sprintf("%s", units.HumanSize(int64(s.Data.Used)))}, {"Data Space Used", fmt.Sprintf("%s", units.HumanSize(float64(s.Data.Used)))},
{"Data Space Total", fmt.Sprintf("%s", units.HumanSize(int64(s.Data.Total)))}, {"Data Space Total", fmt.Sprintf("%s", units.HumanSize(float64(s.Data.Total)))},
{"Metadata Space Used", fmt.Sprintf("%s", units.HumanSize(int64(s.Metadata.Used)))}, {"Metadata Space Used", fmt.Sprintf("%s", units.HumanSize(float64(s.Metadata.Used)))},
{"Metadata Space Total", fmt.Sprintf("%s", units.HumanSize(int64(s.Metadata.Total)))}, {"Metadata Space Total", fmt.Sprintf("%s", units.HumanSize(float64(s.Metadata.Total)))},
} }
if vStr, err := devicemapper.GetLibraryVersion(); err == nil { if vStr, err := devicemapper.GetLibraryVersion(); err == nil {
status = append(status, [2]string{"Library Version", vStr}) status = append(status, [2]string{"Library Version", vStr})

2
pkg/units/size.go
View file

@ -39,7 +39,7 @@ var binaryAbbrs = []string{"B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB",
// HumanSize returns a human-readable approximation of a size // HumanSize returns a human-readable approximation of a size
// using SI standard (eg. "44kB", "17MB") // using SI standard (eg. "44kB", "17MB")
func HumanSize(size int64) string { func HumanSize(size float64) string {
return intToString(float64(size), 1000.0, decimapAbbrs) return intToString(float64(size), 1000.0, decimapAbbrs)
} }

4
utils/jsonmessage.go
View file

@ -44,11 +44,11 @@ func (p *JSONProgress) String() string {
if p.Current <= 0 && p.Total <= 0 { if p.Current <= 0 && p.Total <= 0 {
return "" return ""
} }
current := units.HumanSize(int64(p.Current)) current := units.HumanSize(float64(p.Current))
if p.Total <= 0 { if p.Total <= 0 {
return fmt.Sprintf("%8v", current) return fmt.Sprintf("%8v", current)
} }
total := units.HumanSize(int64(p.Total)) total := units.HumanSize(float64(p.Total))
percentage := int(float64(p.Current)/float64(p.Total)*100) / 2 percentage := int(float64(p.Current)/float64(p.Total)*100) / 2
if width > 110 { if width > 110 {
// this number can't be negetive gh#7136 // this number can't be negetive gh#7136