From 117f03cbbf83e0e51b7cc8c9e866635fd90b7f6f Mon Sep 17 00:00:00 2001
From: Alex Tkachman <alex.tkachman@gmail.com>
Date: Tue, 20 Dec 2011 12:54:21 +0200
Subject: [PATCH] System.timeMillis method renamed to measureTimeMillis and
 measureTimeNano added

---
 examples/src/benchmarks/LockPerf.kt |  2 +-
 stdlib/ktSrc/System.kt              | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/examples/src/benchmarks/LockPerf.kt b/examples/src/benchmarks/LockPerf.kt
index fd1559f0574..2937c59dfd1 100644
--- a/examples/src/benchmarks/LockPerf.kt
+++ b/examples/src/benchmarks/LockPerf.kt
@@ -21,7 +21,7 @@ fun main(args: Array<String>) {
     while(threadNum <= 1024) {
         val counter = AtomicInteger()
 
-        val duration = millisTime {
+        val duration = measureTimeMillis {
             threadNum.latch{
                 val lock = ReentrantLock()
                 for(i in 0..threadNum-1) {
diff --git a/stdlib/ktSrc/System.kt b/stdlib/ktSrc/System.kt
index 42c0c045ce0..1b5545f0266 100644
--- a/stdlib/ktSrc/System.kt
+++ b/stdlib/ktSrc/System.kt
@@ -3,8 +3,17 @@ namespace std.util
 /**
 Executes current block and returns elapsed time in milliseconds
 */
-fun millisTime(block: fun() : Unit) : Long {
+fun measureTimeMillis(block: fun() : Unit) : Long {
     val start = System.currentTimeMillis()
     block()
     return System.currentTimeMillis() - start
+}
+
+/**
+Executes current block and returns elapsed time in milliseconds
+*/
+fun measureTimeNano(block: fun() : Unit) : Long {
+    val start = System.nanoTime()
+    block()
+    return System.nanoTime() - start
 }
\ No newline at end of file