From 84086578bb07eb65c141f5cba0c5e31a12d44c17 Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Wed, 14 Apr 2010 18:48:02 -0700
Subject: [PATCH] Add timestamp to monkey log

Change-Id: Ia477aca8b00d06049621d848f5792c291e3db040
---
 .../com/android/commands/monkey/Monkey.java   |  5 +++
 .../android/commands/monkey/MonkeyUtils.java  | 44 +++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 cmds/monkey/src/com/android/commands/monkey/MonkeyUtils.java

diff --git a/cmds/monkey/src/com/android/commands/monkey/Monkey.java b/cmds/monkey/src/com/android/commands/monkey/Monkey.java
index af8ca95e7..ae8e53b17 100644
--- a/cmds/monkey/src/com/android/commands/monkey/Monkey.java
+++ b/cmds/monkey/src/com/android/commands/monkey/Monkey.java
@@ -28,6 +28,7 @@ import android.os.Debug;
 import android.os.Process;
 import android.os.RemoteException;
 import android.os.ServiceManager;
+import android.os.SystemClock;
 import android.os.SystemProperties;
 import android.view.IWindowManager;
 
@@ -894,6 +895,10 @@ public class Monkey {
             }
 
             if ((mVerbose > 0) && (eventCounter % 100) == 0 && eventCounter != 0) {
+                String calendarTime = MonkeyUtils.toCalendarTime(System.currentTimeMillis());
+                long systemUpTime = SystemClock.elapsedRealtime();
+                System.out.println("    //[calendar_time:" + calendarTime + " system_uptime:"
+                                   + systemUpTime + "]");
                 System.out.println("    // Sending event #" + eventCounter);
             }
 
diff --git a/cmds/monkey/src/com/android/commands/monkey/MonkeyUtils.java b/cmds/monkey/src/com/android/commands/monkey/MonkeyUtils.java
new file mode 100644
index 000000000..a6543e2b9
--- /dev/null
+++ b/cmds/monkey/src/com/android/commands/monkey/MonkeyUtils.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.commands.monkey;
+
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * Misc utilities.
+ */
+public abstract class MonkeyUtils {
+
+    private static final java.util.Date DATE = new java.util.Date();
+    private static final SimpleDateFormat DATE_FORMATTER = new SimpleDateFormat(
+        "yyyy/MM/dd HH:mm:ss.SSS");
+
+    private MonkeyUtils() {
+    }
+
+    /**
+     * Return calendar time in pretty string.
+     */
+    public static synchronized String toCalendarTime(long time) {
+        DATE.setTime(time);
+        return DATE_FORMATTER.format(DATE);
+    }
+
+}