# HG changeset patch
# User egahlin
# Date 1568620646 -7200
# Node ID 9f3aadcaa43034f41e522ea9decb21d57e509d84
# Parent  bc54ed8d908a21c36e6e497b80709083d24fba86
Rename InternalEventFulter to ParserFilter

diff -r bc54ed8d908a -r 9f3aadcaa430 src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/ChunkParser.java
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/ChunkParser.java	Mon Sep 16 09:45:22 2019 +0200
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/ChunkParser.java	Mon Sep 16 09:57:26 2019 +0200
@@ -50,12 +50,12 @@
     static final class ParserConfiguration {
         final boolean reuse;
         final boolean ordered;
-        final InternalEventFilter eventFilter;
+        final ParserFilter eventFilter;
 
         long filterStart;
         long filterEnd;
 
-        public ParserConfiguration(long filterStart, long filterEnd, boolean reuse, boolean ordered, InternalEventFilter filter) {
+        public ParserConfiguration(long filterStart, long filterEnd, boolean reuse, boolean ordered, ParserFilter filter) {
             this.filterStart = filterStart;
             this.filterEnd = filterEnd;
             this.reuse = reuse;
@@ -64,7 +64,7 @@
         }
 
         public ParserConfiguration() {
-            this(0, Long.MAX_VALUE, false, false, InternalEventFilter.ACCEPT_ALL);
+            this(0, Long.MAX_VALUE, false, false, ParserFilter.ACCEPT_ALL);
         }
     }
 
diff -r bc54ed8d908a -r 9f3aadcaa430 src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/Dispatcher.java
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/Dispatcher.java	Mon Sep 16 09:45:22 2019 +0200
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/Dispatcher.java	Mon Sep 16 09:57:26 2019 +0200
@@ -63,12 +63,12 @@
         this.endNanos = c.endNanos;
     }
 
-    private static InternalEventFilter buildFilter(EventDispatcher[] dispatchers) {
-        InternalEventFilter ef = new InternalEventFilter();
+    private static ParserFilter buildFilter(EventDispatcher[] dispatchers) {
+        ParserFilter ef = new ParserFilter();
         for (EventDispatcher ed : dispatchers) {
             String name = ed.eventName;
             if (name == null) {
-                return InternalEventFilter.ACCEPT_ALL;
+                return ParserFilter.ACCEPT_ALL;
             }
             ef.setThreshold(name, 0);
         }
diff -r bc54ed8d908a -r 9f3aadcaa430 src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/EventParser.java
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/EventParser.java	Mon Sep 16 09:45:22 2019 +0200
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/EventParser.java	Mon Sep 16 09:57:26 2019 +0200
@@ -138,18 +138,13 @@
 
         if (cached != null) {
             RecordedEvent event = cachedEvent();
-            PRIVATE_ACCESS.setStartTicks(event, startTicks);
-            PRIVATE_ACCESS.setEndTicks(event, endTicks);
-            Object[] values = PRIVATE_ACCESS.eventValues(event);
+            JdkJfrConsumer access = PRIVATE_ACCESS;
+            access.setStartTicks(event, startTicks);
+            access.setEndTicks(event, endTicks);
+            Object[] values = access.eventValues(event);
             for (int i = 0; i < values.length; i++) {
                 values[i] = parsers[startIndex + i].parse(input);
             }
-//            event.startTimeTicks = startTicks;
-//            event.endTimeTicks = endTicks;
-//            Object[] values = event.objects;
-//            for (int i = 0; i < values.length; i++) {
-//
-//            }
             return event;
         }
 
diff -r bc54ed8d908a -r 9f3aadcaa430 src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/InternalEventFilter.java
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/InternalEventFilter.java	Mon Sep 16 09:45:22 2019 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2019, 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.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-package jdk.jfr.internal.consumer;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.StringJoiner;
-
-public final class InternalEventFilter {
-    public static final InternalEventFilter ACCEPT_ALL = new InternalEventFilter(true, Map.of());
-
-    private final Map<String, Long> thresholds;
-    private final boolean acceptAll;
-
-    public InternalEventFilter() {
-        this(false, new HashMap<>());
-    }
-
-    private InternalEventFilter(boolean acceptAll, Map<String, Long> thresholds) {
-        this.acceptAll = acceptAll;
-        this.thresholds = thresholds;
-    }
-
-    public void setThreshold(String eventName, long nanos) {
-        Long l = thresholds.get(eventName);
-        if (l != null) {
-            l = Math.min(l, nanos);
-        } else {
-            l = nanos;
-        }
-        thresholds.put(eventName, l);
-    }
-
-    public long getThreshold(String eventName) {
-        if (acceptAll) {
-            return 0L;
-        }
-        Long l = thresholds.get(eventName);
-        if (l != null) {
-            return l;
-        }
-        return -1;
-    }
-
-    public String toString() {
-        if (acceptAll) {
-            return "ACCEPT ALL";
-        }
-
-        StringJoiner sb = new StringJoiner(", ");
-        for (String key : thresholds.keySet().toArray(new String[0])) {
-            Long value = thresholds.get(key);
-            sb.add(key + " = " + value);
-        }
-        return sb.toString();
-    }
-}
\ No newline at end of file
diff -r bc54ed8d908a -r 9f3aadcaa430 src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/ParserFilter.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/ParserFilter.java	Mon Sep 16 09:57:26 2019 +0200
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2019, 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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+package jdk.jfr.internal.consumer;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.StringJoiner;
+
+public final class ParserFilter {
+    public static final ParserFilter ACCEPT_ALL = new ParserFilter(true, Map.of());
+
+    private final Map<String, Long> thresholds;
+    private final boolean acceptAll;
+
+    public ParserFilter() {
+        this(false, new HashMap<>());
+    }
+
+    private ParserFilter(boolean acceptAll, Map<String, Long> thresholds) {
+        this.acceptAll = acceptAll;
+        this.thresholds = thresholds;
+    }
+
+    public void setThreshold(String eventName, long nanos) {
+        Long l = thresholds.get(eventName);
+        if (l != null) {
+            l = Math.min(l, nanos);
+        } else {
+            l = nanos;
+        }
+        thresholds.put(eventName, l);
+    }
+
+    public long getThreshold(String eventName) {
+        if (acceptAll) {
+            return 0L;
+        }
+        Long l = thresholds.get(eventName);
+        if (l != null) {
+            return l;
+        }
+        return -1;
+    }
+
+    public String toString() {
+        if (acceptAll) {
+            return "ACCEPT ALL";
+        }
+
+        StringJoiner sb = new StringJoiner(", ");
+        for (String key : thresholds.keySet().toArray(new String[0])) {
+            Long value = thresholds.get(key);
+            sb.add(key + " = " + value);
+        }
+        return sb.toString();
+    }
+}
\ No newline at end of file