Merges dev/llc into master

Author: Steve Salas

.gitignore

@@ -14,4 +14,6 @@ outputs/
 /distrib/dependencies/
 /fetch-cache
 
-*.log
+*.log
+
+dotnet-symbol-service-last-commit

agent/src/main/java/com/codedx/codepulse/agent/agent/DefaultTraceAgent.java

@@ -37,7 +37,7 @@
 import com.codedx.codepulse.agent.message.MessageSenderManager;
 import com.codedx.codepulse.agent.message.PooledBufferService;
 import com.codedx.codepulse.agent.protocol.ProtocolVersion;
-import com.codedx.codepulse.agent.protocol.ProtocolVersion2;
+import com.codedx.codepulse.agent.protocol.ProtocolVersion3;
 import com.codedx.codepulse.agent.trace.TraceDataCollector;
 import com.codedx.codepulse.agent.util.ShutdownHook;
 import com.codedx.codepulse.agent.util.SocketFactory;
@@ -65,7 +65,7 @@ public class DefaultTraceAgent implements TraceAgent
 	private RuntimeAgentConfigurationV1 config;
 
 	private final Semaphore startMutex = new Semaphore(0);
-	private final ProtocolVersion protocol = new ProtocolVersion2();
+	private final ProtocolVersion protocol = new ProtocolVersion3();
 	private MinlogListener logger = null;
 	private ClassIdentifier classIdentifier = new ClassIdentifier();
 	private MethodIdentifier methodIdentifier = new MethodIdentifier();

agent/src/main/java/com/codedx/codepulse/agent/data/MessageDealerTraceDataCollector.java

@@ -60,4 +60,17 @@ public void methodExit(int methodId, boolean exThrown)
 			ErrorHandler.handleError("error sending method exit", e);
 		}
 	}
+
+	@Override
+	public void recordLineLevelTrace(int methodId, int startLine, int endLine, java.util.BitSet lineMap)
+	{
+		try
+		{
+			messageDealer.recordLineLevelTrace(methodId, startLine, endLine, lineMap);
+		}
+		catch (Exception e)
+		{
+			ErrorHandler.handleError("error recording line level trace", e);
+		}
+	}
 }

agent/src/main/java/com/codedx/codepulse/agent/message/MessageDealer.java

@@ -18,13 +18,17 @@
 package com.codedx.codepulse.agent.message;
 
 import java.io.IOException;
+import java.util.BitSet;
+import java.util.HashSet;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import com.codedx.bytefrog.instrumentation.LineLevelMapper;
 import com.codedx.bytefrog.instrumentation.id.*;
 
 import com.codedx.codepulse.agent.common.message.MessageProtocol;
+import com.codedx.codepulse.agent.common.message.NotSupportedException;
 import com.codedx.codepulse.agent.common.queue.DataBufferOutputStream;
 
 /**
@@ -33,9 +37,8 @@
  * {@link BufferService}, then sent via the same BufferService. For events that
  * require mapped ids for the current thread and method signature, those ids
  * (along with the appropriate secondary "map" events) will be automatically
- * generated by an internal {@link MethodId} and {@link ThreadId}. The time of
- * MessageFactory's construction will be saved, and used to calculate the
- * "relative timestamp" for each event that requires one.
+ * generated. The time of MessageFactory's construction will be saved, and used
+ * to calculate the "relative timestamp" for each event that requires one.
  *
  * @author dylanh
  */
@@ -45,12 +48,13 @@ public class MessageDealer
 	private final BufferService bufferService;
 
 	private final long startTime = System.currentTimeMillis();
-	private final ExceptionId exceptionIdMapper = new ExceptionId();
 	private final ThreadId threadIdMapper = new ThreadId();
 	private final Sequencer sequencer = new Sequencer();
 
 	private final MethodIdAdapter methodIdAdapter;
 
+	private static final int unavailableSourceLocationId = -1;
+
 	/**
 	 *
 	 * @param messageProtocol
@@ -85,45 +89,14 @@ public int getCurrentSequence()
 	// ===============================
 
 	/**
-	 * MAP EXCEPTION (EVENT) MESSAGE
-	 *
-	 * @param exception
-	 * @param id
-	 * @throws IOException
-	 * @throws FailedToObtainBufferException
-	 * @throws FailedToSendBufferException
-	 */
-	public void sendMapException(String exception, int id) throws IOException,
-			FailedToObtainBufferException, FailedToSendBufferException
-	{
-		DataBufferOutputStream buffer = bufferService.obtainBuffer();
-		if (buffer != null)
-		{
-			boolean wrote = false;
-			try
-			{
-				messageProtocol.writeMapException(buffer, id, exception);
-				wrote = true;
-			}
-			finally
-			{
-				if (!wrote)
-					buffer.reset();
-				bufferService.sendBuffer(buffer);
-			}
-		}
-	}
-
-	/**
-	 * MAP THREAD NAME (EVENT) MESSAGE
+	 * METHOD ENTRY (EVENT) MESSAGE
 	 *
-	 * @param name
-	 * @param id
+	 * @param methodId
 	 * @throws IOException
 	 * @throws FailedToObtainBufferException
 	 * @throws FailedToSendBufferException
 	 */
-	public void sendMapThreadName(String name, int id) throws IOException,
+	public void sendMethodEntry(int methodId) throws IOException,
 			FailedToObtainBufferException, FailedToSendBufferException
 	{
 		DataBufferOutputStream buffer = bufferService.obtainBuffer();
@@ -132,7 +105,11 @@ public void sendMapThreadName(String name, int id) throws IOException,
 			boolean wrote = false;
 			try
 			{
-				messageProtocol.writeMapThreadName(buffer, id, getTimeOffset(), name);
+				int timestamp = getTimeOffset();
+				int threadId = threadIdMapper.getCurrent();
+				methodIdAdapter.mark(methodId, buffer);
+				messageProtocol.writeMethodEntry(buffer, timestamp, sequencer.getSequence(),
+						methodId, threadId);
 				wrote = true;
 			}
 			finally
@@ -145,14 +122,15 @@ public void sendMapThreadName(String name, int id) throws IOException,
 	}
 
 	/**
-	 * METHOD ENTRY (EVENT) MESSAGE
+	 * METHOD EXIT (EVENT) MESSAGE
 	 *
 	 * @param methodId
+	 * @param exThrown
 	 * @throws IOException
 	 * @throws FailedToObtainBufferException
 	 * @throws FailedToSendBufferException
 	 */
-	public void sendMethodEntry(int methodId) throws IOException,
+	public void sendMethodExit(int methodId, boolean exThrown) throws IOException,
 			FailedToObtainBufferException, FailedToSendBufferException
 	{
 		DataBufferOutputStream buffer = bufferService.obtainBuffer();
@@ -164,8 +142,8 @@ public void sendMethodEntry(int methodId) throws IOException,
 				int timestamp = getTimeOffset();
 				int threadId = threadIdMapper.getCurrent();
 				methodIdAdapter.mark(methodId, buffer);
-				messageProtocol.writeMethodEntry(buffer, timestamp, sequencer.getSequence(),
-						methodId, threadId);
+				messageProtocol.writeMethodExit(buffer, timestamp, sequencer.getSequence(),
+						methodId, exThrown, threadId);
 				wrote = true;
 			}
 			finally
@@ -177,17 +155,8 @@ public void sendMethodEntry(int methodId) throws IOException,
 		}
 	}
 
-	/**
-	 * METHOD EXIT (EVENT) MESSAGE
-	 *
-	 * @param methodId
-	 * @param exThrown
-	 * @throws IOException
-	 * @throws FailedToObtainBufferException
-	 * @throws FailedToSendBufferException
-	 */
-	public void sendMethodExit(int methodId, boolean exThrown) throws IOException,
-			FailedToObtainBufferException, FailedToSendBufferException
+	public void recordLineLevelTrace(int methodId, int startLine, int endLine, java.util.BitSet lineMap)  throws IOException,
+			FailedToObtainBufferException, FailedToSendBufferException, NotSupportedException
 	{
 		DataBufferOutputStream buffer = bufferService.obtainBuffer();
 		if (buffer != null)
@@ -196,10 +165,14 @@ public void sendMethodExit(int methodId, boolean exThrown) throws IOException,
 			try
 			{
 				int timestamp = getTimeOffset();
+
 				int threadId = threadIdMapper.getCurrent();
-				methodIdAdapter.mark(methodId, buffer);
-				messageProtocol.writeMethodExit(buffer, timestamp, sequencer.getSequence(),
-						methodId, exThrown, threadId);
+				for (int i = lineMap.nextSetBit(0); i >= 0; i = lineMap.nextSetBit(i+1)) {
+					int sourceLocationId = methodIdAdapter.markSourceLocation(methodId, startLine+i, startLine+i, buffer);
+					if (sourceLocationId != unavailableSourceLocationId) {
+						messageProtocol.writeMethodVisit(buffer, timestamp, sequencer.getSequence(), methodId, sourceLocationId, threadId);
+					}
+				}
 				wrote = true;
 			}
 			finally
@@ -218,12 +191,95 @@ private class MethodIdAdapter
 
 		private final ConcurrentMap<Integer, Boolean> observedIds = new ConcurrentHashMap<Integer, Boolean>();
 
+		private final ConcurrentMap<Integer, Integer> sourceLocationCounts = new ConcurrentHashMap<>();
+
+		private final AtomicInteger nextSourceLocationId = new AtomicInteger();
+		protected final ConcurrentHashMap<String, Integer> sourceLocationMap = new ConcurrentHashMap<>();
+
 		public MethodIdAdapter(ClassIdentifier classIdentifier, MethodIdentifier methodIdentifier)
 		{
 			this.classIdentifier = classIdentifier;
 			this.methodIdentifier = methodIdentifier;
 		}
 
+		public int markSourceLocation(int methodId, int startLine, int endLine, DataBufferOutputStream buffer)
+				throws IOException, NotSupportedException, FailedToObtainBufferException, FailedToSendBufferException {
+
+			mark(methodId, buffer);
+
+			String key = String.format("%d-%d-%d", methodId, startLine, endLine);
+			Integer id = sourceLocationMap.get(key);
+			if (id != null)
+			{
+				return id;
+			}
+
+			int classId = methodIdentifier.get(methodId).getClassId();
+
+			ClassIdentifier.ClassInformation classInformation = classIdentifier.get(classId);
+			LineLevelMapper llm = classInformation.getLineLevelMapper();
+			if (llm != null) {
+
+				Boolean sourceLocationCountsMessageSent = sourceLocationCounts.containsKey(classId);
+				if (!sourceLocationCountsMessageSent) {
+					HashSet<String> mappedLocations = new HashSet<>();
+
+					BitSet lineNumbers = classInformation.getLineNumbers();
+					for (int l = lineNumbers.nextSetBit(0); l >= 0; l = lineNumbers.nextSetBit(l + 1)) {
+						BitSet b = new BitSet();
+						b.set(0);
+						LineLevelMapper.MappedCoverage mappedCoverage[] = llm.map(l, b);
+						if (mappedCoverage != null) {
+							StringBuilder s = new StringBuilder();
+							for (LineLevelMapper.MappedCoverage mappedCoverageItem : mappedCoverage) {
+								for (int q = mappedCoverageItem.lines.nextSetBit(0); q >= 0; q = mappedCoverageItem.lines.nextSetBit(q + 1)) {
+									s.append(mappedCoverageItem.startLine + q);
+									s.append("; ");
+								}
+							}
+							mappedLocations.add(s.toString());
+						}
+					}
+
+					int mappingsCount = mappedLocations.size();
+					messageProtocol.writeSourceLocationCount(buffer, methodId, mappingsCount);
+					sourceLocationCounts.put(classId, mappingsCount);
+				}
+
+				BitSet bitSet = new BitSet();
+				bitSet.set(0, endLine - startLine + 1);
+
+				LineLevelMapper.MappedCoverage mappedCoverage[] = llm.map(startLine, bitSet);
+				if (mappedCoverage == null) {
+					return unavailableSourceLocationId;
+				}
+
+				int newStartLine = Integer.MAX_VALUE;
+				int newEndLine = Integer.MIN_VALUE;
+				for (LineLevelMapper.MappedCoverage mappedCoverageItem: mappedCoverage){
+					for (int l = mappedCoverageItem.lines.nextSetBit(0); l >= 0; l = mappedCoverageItem.lines.nextSetBit(l + 1)) {
+						newStartLine = l < newStartLine ? l : newStartLine;
+						newEndLine = l > newEndLine ? l : newEndLine;
+					}
+				}
+
+				// adjust for zero-based line offset
+				startLine = newStartLine + 1;
+				endLine = newEndLine + 1;
+			}
+
+			Integer newId = nextSourceLocationId.getAndIncrement();
+			id = sourceLocationMap.putIfAbsent(key, newId);
+
+			if (id == null)
+			{
+				short ignored = -1;
+				messageProtocol.writeMapSourceLocation(buffer, newId, methodId, startLine, endLine, ignored, ignored);
+				return newId;
+			}
+			return id;
+		}
+
 		public void mark(int methodId, DataBufferOutputStream buffer) throws IOException, FailedToObtainBufferException, FailedToSendBufferException
 		{
 			Boolean seen = observedIds.putIfAbsent(methodId, true);
@@ -239,27 +295,6 @@ public void mark(int methodId, DataBufferOutputStream buffer) throws IOException
 		}
 	}
 
-	private class ExceptionId
-	{
-		private final AtomicInteger idGen = new AtomicInteger(1);
-		private final ConcurrentMap<String, Integer> ids = new ConcurrentHashMap<String, Integer>();
-
-		public int getId(String exception) throws IOException, FailedToObtainBufferException,
-				FailedToSendBufferException
-		{
-			Integer id = ids.putIfAbsent(exception, 0);
-			if (id == null || id == 0)
-			{
-				id = idGen.getAndIncrement();
-				if (ids.replace(exception, 0, id))
-				{
-					sendMapException(exception, id);
-				}
-			}
-			return ids.get(exception);
-		}
-	}
-
 	/**
 	 * Creates a monotonically-incrementing unique id for each thread. The id
 	 * for the currently-running thread is available via {@link #getCurrent()}
@@ -310,9 +345,7 @@ protected String initialValue()
 		};
 
 		/**
-		 * Get the unique id of the currently-running thread. When necessary,
-		 * this method will automatically send a MapMethodName message to the
-		 * message queue.
+		 * Get the unique id of the currently-running thread.
 		 *
 		 * @return The unique id for the currently-running thread.
 		 * @throws InterruptedException
@@ -323,14 +356,12 @@ protected String initialValue()
 		public int getCurrent() throws IOException, FailedToObtainBufferException,
 				FailedToSendBufferException
 		{
-			boolean updated = false;
 			int id = threadId.get();
 
 			// check if the id is "new"
 			if (!threadHasId.get())
 			{
 				threadHasId.set(true);
-				updated = true;
 			}
 
 			// check if the name has changed
@@ -344,14 +375,8 @@ public int getCurrent() throws IOException, FailedToObtainBufferException,
 			if (!nowName.equals(oldName))
 			{
 				threadName.set(nowName);
-				updated = true;
 			}
 
-			// when updated, send a MapThreadName message
-			if (updated)
-			{
-				sendMapThreadName(nowName, id);
-			}
 			return id;
 		}
 	}