X-Git-Url: https://git.pterodactylus.net/?p=sonitus.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsonitus%2Fdata%2FPipeline.java;h=063a0bc52e75023cee02dd4078c0e7b88643bd37;hp=c24502fcd1b4f05ac513650dc592852fbe72b035;hb=44e662f7a3918b46c3abe6646c1e167a112749c1;hpb=cbeadf6d9eea57ab98cacd60e2419dd3c18bef89

diff --git a/src/main/java/net/pterodactylus/sonitus/data/Pipeline.java b/src/main/java/net/pterodactylus/sonitus/data/Pipeline.java
index c24502f..063a0bc 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;
@@ -71,6 +71,21 @@ public class Pipeline implements Iterable<ControlledComponent> {
 	private Pipeline(Source source, Multimap<Source, Sink> sinks) {
 		this.source = Preconditions.checkNotNull(source, "source must not be null");
 		this.sinks = Preconditions.checkNotNull(sinks, "sinks must not be null");
+		for (ControlledComponent component : Lists.reverse(components())) {
+			logger.finest(String.format("Adding Listener to %s.", component.name()));
+			component.addMetadataListener(new MetadataListener() {
+				@Override
+				public void metadataUpdated(ControlledComponent component, Metadata metadata) {
+					if (!(component instanceof Source)) {
+						return;
+					}
+					for (ControlledComponent controlledComponent : sinks((Source) component)) {
+						logger.fine(String.format("Updating Metadata from %s to %s as %s.", component.name(), controlledComponent.name(), metadata));
+						controlledComponent.metadataUpdated(metadata);
+					}
+				}
+			});
+		}
 	}
 
 	//
@@ -144,6 +159,7 @@ public class Pipeline implements Iterable<ControlledComponent> {
 			Collection<Sink> sinks = this.sinks.get(source);
 			connections.add(new Connection(source, sinks));
 			for (Sink sink : sinks) {
+				logger.info(String.format("Opening %s with %s...", sink.name(), source.metadata()));
 				sink.open(source.metadata());
 				if (sink instanceof Filter) {
 					sources.add((Source) sink);
@@ -151,8 +167,15 @@ public class Pipeline implements Iterable<ControlledComponent> {
 			}
 		}
 		for (Connection connection : connections) {
-			logger.info(String.format("Starting Connection from %s to %s.", connection.source, connection.sinks));
-			new Thread(connection).start();
+			String threadName = String.format("%s → %s.", connection.source.name(), FluentIterable.from(connection.sinks).transform(new Function<Sink, String>() {
+
+				@Override
+				public String apply(Sink sink) {
+					return sink.name();
+				}
+			}));
+			logger.info(String.format("Starting Thread: %s", threadName));
+			new Thread(connection, threadName).start();
 		}
 	}
 
@@ -172,7 +195,34 @@ public class Pipeline implements Iterable<ControlledComponent> {
 
 	@Override
 	public Iterator<ControlledComponent> iterator() {
-		return ImmutableSet.<ControlledComponent>builder().add(source).addAll(sinks.values()).build().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<ControlledComponent> components() {
+		ImmutableList.Builder<ControlledComponent> components = ImmutableList.builder();
+		List<ControlledComponent> currentComponents = Lists.newArrayList();
+		components.add(source);
+		currentComponents.add(source);
+		while (!currentComponents.isEmpty()) {
+			Collection<Sink> sinks = this.sinks((Source) currentComponents.remove(0));
+			for (Sink sink : sinks) {
+				components.add(sink);
+				if (sink instanceof Source) {
+					currentComponents.add(sink);
+				}
+			}
+		}
+		return components.build();
 	}
 
 	//
@@ -282,6 +332,9 @@ public class Pipeline implements Iterable<ControlledComponent> {
 		/** The executor service. */
 		private final ExecutorService executorService;
 
+		/** The time the connection was started. */
+		private long startTime;
+
 		/** The number of copied bytes. */
 		private long counter;
 
@@ -296,7 +349,7 @@ public class Pipeline implements Iterable<ControlledComponent> {
 		public Connection(Source source, Collection<Sink> sinks) {
 			this.source = source;
 			this.sinks = sinks;
-			if (sinks.size() == 1) {
+			if (sinks.size() < 2) {
 				executorService = MoreExecutors.sameThreadExecutor();
 			} else {
 				executorService = Executors.newCachedThreadPool();
@@ -308,6 +361,16 @@ public class Pipeline implements Iterable<ControlledComponent> {
 		//
 
 		/**
+		 * Returns the time this connection was started.
+		 *
+		 * @return The time this connection was started (in milliseconds since Jan 1,
+		 *         1970 UTC)
+		 */
+		public long startTime() {
+			return startTime;
+		}
+
+		/**
 		 * Returns the number of bytes that this connection has received from its
 		 * source during its lifetime.
 		 *
@@ -332,7 +395,7 @@ public class Pipeline implements Iterable<ControlledComponent> {
 
 		@Override
 		public void run() {
-			Metadata firstMetadata = null;
+			startTime = System.currentTimeMillis();
 			while (!stopped.get()) {
 				try {
 					final byte[] buffer;