summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan@lightbend.com>2017-02-07 17:44:46 -0800
committerGitHub <noreply@github.com>2017-02-07 17:44:46 -0800
commit02a240aab66567d4d525f7ed4f95853b8f5299eb (patch)
treebbae94593deb0d5067710e956275a97864c5fe91 /src/compiler
parent8035fb298e5075441b3c87f73183183ec30d972d (diff)
parent2268aabbcbc1a4ad6ac3d6cde960dfeb85ffbb5b (diff)
downloadscala-02a240aab66567d4d525f7ed4f95853b8f5299eb.tar.gz
scala-02a240aab66567d4d525f7ed4f95853b8f5299eb.tar.bz2
scala-02a240aab66567d4d525f7ed4f95853b8f5299eb.zip
Merge pull request #5642 from janekdb/topic/MB-calculation-correction
Calculate MB instead of MiB
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/scala/tools/nsc/CompileServer.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/CompileServer.scala b/src/compiler/scala/tools/nsc/CompileServer.scala
index 9cac497a85..ffe95ba9dc 100644
--- a/src/compiler/scala/tools/nsc/CompileServer.scala
+++ b/src/compiler/scala/tools/nsc/CompileServer.scala
@@ -47,7 +47,7 @@ class StandardCompileServer(fixPort: Int = 0) extends SocketServer(fixPort) {
}
def printMemoryStats() {
- def mb(bytes: Long) = "%dMB".format(bytes / 1000000)
+ def mb(bytes: Long) = "%10.2fMB".format(bytes / 1048576.0)
info("New session: total memory = %s, max memory = %s, free memory = %s".format(
mb(totalMemory), mb(maxMemory), mb(freeMemory)))
}