X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsonitus%2Fdata%2FPipeline.java;h=1487d138eecc927f07e91732bf6ac14614256c85;hb=668abadea3b268169c839d8b88260295085a4306;hp=975c21c45a365da709e80e94ae3b510055e2f4aa;hpb=8a4389d8a0567473daf35aaac3e084f7ed8bcd12;p=sonitus.git
diff --git a/src/main/java/net/pterodactylus/sonitus/data/Pipeline.java b/src/main/java/net/pterodactylus/sonitus/data/Pipeline.java
index 975c21c..1487d13 100644
--- a/src/main/java/net/pterodactylus/sonitus/data/Pipeline.java
+++ b/src/main/java/net/pterodactylus/sonitus/data/Pipeline.java
@@ -34,8 +34,8 @@ import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.FluentIterable;
+import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMultimap;
-import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
import com.google.common.collect.Multimap;
import com.google.common.util.concurrent.MoreExecutors;
@@ -46,7 +46,7 @@ import com.google.common.util.concurrent.MoreExecutors;
*
* @author David âBombeâ Roden
*/
-public class Pipeline implements Iterable {
+public class Pipeline implements Iterable {
/** The logger. */
private static final Logger logger = Logger.getLogger(Pipeline.class.getName());
@@ -102,18 +102,18 @@ public class Pipeline implements Iterable {
/**
* Returns the traffic counters of the given controlled component.
*
- * @param controlled
+ * @param controlledComponent
* The controlled component to get the traffic counters for
* @return The traffic counters for the given controlled component
*/
- public TrafficCounter trafficCounter(Controlled controlled) {
+ public TrafficCounter trafficCounter(ControlledComponent controlledComponent) {
long input = -1;
long output = -1;
for (Connection connection : connections) {
/* the connection where the source matches knows the output. */
- if (connection.source.equals(controlled)) {
+ if (connection.source.equals(controlledComponent)) {
output = connection.counter();
- } else if (connection.sinks.contains(controlled)) {
+ } else if (connection.sinks.contains(controlledComponent)) {
input = connection.counter();
}
}
@@ -171,8 +171,35 @@ public class Pipeline implements Iterable {
//
@Override
- public Iterator iterator() {
- return ImmutableSet.builder().add(source).addAll(sinks.values()).build().iterator();
+ public Iterator iterator() {
+ return components().iterator();
+ }
+
+ //
+ // PRIVATE METHODS
+ //
+
+ /**
+ * Returns all components of this pipeline, listed breadth-first, starting with
+ * the source.
+ *
+ * @return All components of this pipeline
+ */
+ public List components() {
+ ImmutableList.Builder components = ImmutableList.builder();
+ List currentComponents = Lists.newArrayList();
+ components.add(source);
+ currentComponents.add(source);
+ while (!currentComponents.isEmpty()) {
+ Collection sinks = this.sinks((Source) currentComponents.remove(0));
+ for (Sink sink : sinks) {
+ components.add(sink);
+ if (sink instanceof Source) {
+ currentComponents.add(sink);
+ }
+ }
+ }
+ return components.build();
}
//
@@ -335,8 +362,6 @@ public class Pipeline implements Iterable {
Metadata firstMetadata = null;
while (!stopped.get()) {
try {
- final Metadata lastMetadata = firstMetadata;
- final Metadata metadata = firstMetadata = source.metadata();
final byte[] buffer;
try {
logger.finest(String.format("Getting %d bytes from %s...", 4096, source));
@@ -353,9 +378,6 @@ public class Pipeline implements Iterable {
@Override
public Void call() throws Exception {
- if (!metadata.equals(lastMetadata)) {
- sink.metadataUpdated(metadata);
- }
try {
logger.finest(String.format("Sending %d bytes to %s.", buffer.length, sink));
sink.process(buffer);