From 515d18d899b0e547d4a59e3f8a53bce4c09e0b92 Mon Sep 17 00:00:00 2001 From: wu-sheng Date: Mon, 6 Nov 2017 14:41:56 +0800 Subject: [PATCH] Fix graph. --- README.md | 2 +- .../apm/collector/core/graph/Graph.java | 8 ++++---- .../apm/collector/core/graph/Next.java | 8 ++++---- .../apm/collector/core/graph/Node.java | 18 +++++++++--------- .../apm/collector/core/graph/NodeHandler.java | 4 ++-- .../collector/core/graph/GraphManagerTest.java | 13 +++++++------ 6 files changed, 27 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index 625d210bc..bcdb0036a 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Sky Walking | [中文](README_ZH.md) [![OpenTracing-1.x Badge](https://img.shields.io/badge/OpenTracing--1.x-enabled-blue.svg)](http://opentracing.io) * Provide Java agent, **no need to CHANGE any application source code**. - * High performance agent. Only increase extra **10%** cpu cost in 5000+ tps application, even **When collect all traces**, [check test reports](#test-reports). + * High performance agent. Only increase extra **10%** cpu cost in 5000+ tps application, even **when collect all traces**. * [Supported middlewares, frameworks and libraries](https://github.com/OpenSkywalking/sky-walking/wiki/3.2-supported-list). * Manual instrumentation * As an [OpenTracing supported tracer](http://opentracing.io/documentation/pages/supported-tracers) diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/graph/Graph.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/graph/Graph.java index 8c1f88251..d570cd48b 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/graph/Graph.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/graph/Graph.java @@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentHashMap; /** * @author peng-yongsheng, wu-sheng */ -public final class Graph { +public final class Graph { private int id; private Node startNode; private ConcurrentHashMap nodeIndex = new ConcurrentHashMap<>(); @@ -32,11 +32,11 @@ public final class Graph { this.id = id; } - public void start(Input input) { - startNode.execute(input); + public void start(INPUT INPUT) { + startNode.execute(INPUT); } - public Node addNode(NodeHandler nodeHandler) { + public Node addNode(NodeHandler nodeHandler) { synchronized (this) { startNode = new Node(this, nodeHandler); return startNode; diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/graph/Next.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/graph/Next.java index a7f636a4f..ba8e6c049 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/graph/Next.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/graph/Next.java @@ -27,7 +27,7 @@ import org.skywalking.apm.collector.core.framework.Executor; * * @author peng-yongsheng, wu-sheng */ -public class Next implements Executor { +public class Next implements Executor { private final List nextNodes; @@ -42,9 +42,9 @@ public class Next implements Executor { /** * Drive to the next nodes * - * @param input + * @param INPUT */ - @Override public void execute(Input input) { - nextNodes.forEach(node -> node.execute(input)); + @Override public void execute(INPUT INPUT) { + nextNodes.forEach(node -> node.execute(INPUT)); } } diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/graph/Node.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/graph/Node.java index 8a947bb34..87ea56cb0 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/graph/Node.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/graph/Node.java @@ -19,39 +19,39 @@ package org.skywalking.apm.collector.core.graph; /** - * The Node in the graph with explicit Input and Output types. + * The Node in the graph with explicit INPUT and OUTPUT types. * * @author peng-yongsheng, wu-sheng */ -public final class Node { +public final class Node { private final NodeHandler nodeHandler; - private final Next next; + private final Next next; private final Graph graph; - Node(Graph graph, NodeHandler nodeHandler) { + Node(Graph graph, NodeHandler nodeHandler) { this.graph = graph; this.nodeHandler = nodeHandler; this.next = new Next<>(); this.graph.checkForNewNode(this); } - public final Node addNext(NodeHandler nodeHandler) { + public final Node addNext(NodeHandler nodeHandler) { synchronized (graph) { - Node node = new Node<>(graph, nodeHandler); + Node node = new Node<>(graph, nodeHandler); next.addNext(node); return node; } } - final void execute(Input input) { - nodeHandler.process(input, next); + final void execute(INPUT INPUT) { + nodeHandler.process(INPUT, next); } NodeHandler getHandler() { return nodeHandler; } - Next getNext() { + Next getNext() { return next; } } diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/graph/NodeHandler.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/graph/NodeHandler.java index 10b1d63fb..9a35100a6 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/graph/NodeHandler.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/graph/NodeHandler.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.core.graph; /** * @author peng-yongsheng, wu-sheng */ -public interface NodeHandler { +public interface NodeHandler { /** * The unique id in the certain graph. * @@ -29,5 +29,5 @@ public interface NodeHandler { */ int id(); - void process(Input input, Next next); + void process(INPUT INPUT, Next next); } diff --git a/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/graph/GraphManagerTest.java b/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/graph/GraphManagerTest.java index 11a13490e..3e84ad091 100644 --- a/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/graph/GraphManagerTest.java +++ b/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/graph/GraphManagerTest.java @@ -31,6 +31,7 @@ import org.junit.Test; public class GraphManagerTest { private static PrintStream OUT_REF; private ByteArrayOutputStream outputStream; + private static String lineSeparator = System.lineSeparator(); @Before public void initAndHoldOut() { @@ -53,8 +54,8 @@ public class GraphManagerTest { testGraph.start("Input String"); String output = outputStream.toString(); - String expected = "Node1 process: s=Input String\n" + - "Node2 process: s=Input String\n"; + String expected = "Node1 process: s=Input String" + lineSeparator + + "Node2 process: s=Input String" + lineSeparator; Assert.assertEquals(expected, output); } @@ -67,9 +68,9 @@ public class GraphManagerTest { graph.start("Input String"); String output = outputStream.toString(); - String expected = "Node1 process: s=Input String\n" + - "Node2 process: s=Input String\n" + - "Node4 process: int=123\n"; + String expected = "Node1 process: s=Input String" + lineSeparator + + "Node2 process: s=Input String" + lineSeparator + + "Node4 process: int=123" + lineSeparator; Assert.assertEquals(expected, output); } @@ -91,7 +92,7 @@ public class GraphManagerTest { next.execute(123); String output = outputStream.toString(); String expected = - "Node4 process: int=123\n"; + "Node4 process: int=123" + lineSeparator; Assert.assertEquals(expected, output); }