changeset 4609:f438a35cc903

8012210: Make TracingTime available when INCLUDE_TRACE = 0 Reviewed-by: dholmes, sla
author rbackman
date Mon, 15 Apr 2013 11:38:46 +0200
parents 17ff5d08f85b
children 78538cd4794c
files src/share/vm/trace/noTraceBackend.hpp src/share/vm/trace/traceBackend.hpp
diffstat 2 files changed, 49 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/vm/trace/noTraceBackend.hpp	Mon Apr 15 11:38:46 2013 +0200
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+#ifndef SHARE_VM_TRACE_NOTRACEBACKEND_HPP
+#define SHARE_VM_TRACE_NOTRACEBACKEND_HPP
+
+#include "prims/jni.h"
+
+typedef jlong TracingTime;
+typedef jlong RelativeTracingTime;
+
+class NoTraceBackend {
+public:
+  static TracingTime time() {
+    return 0;
+  }
+};
+
+typedef NoTraceBackend Tracing;
+
+#endif
+
+
--- a/src/share/vm/trace/traceBackend.hpp	Mon Apr 15 08:17:40 2013 -0700
+++ b/src/share/vm/trace/traceBackend.hpp	Mon Apr 15 11:38:46 2013 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@
 #include "runtime/os.hpp"
 
 class TraceBackend {
- public:
+public:
   static bool enabled(TraceEventId id) {
     return EnableTracing;
   }
@@ -48,5 +48,9 @@
 
 typedef TraceBackend Tracing;
 
+#else /* INCLUDE_TRACE */
+
+#include "trace/noTraceBackend.hpp"
+
 #endif /* INCLUDE_TRACE */
 #endif /* SHARE_VM_TRACE_TRACEBACKEND_HPP */