You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sirona.apache.org by ol...@apache.org on 2014/02/20 01:32:06 UTC
svn commit: r1570009 - in /incubator/sirona/trunk:
agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/
core/src/main/java/org/apache/sirona/store/tracking/
core/src/main/java/org/apache/sirona/tracking/
Author: olamy
Date: Thu Feb 20 00:32:05 2014
New Revision: 1570009
URL: http://svn.apache.org/r1570009
Log:
fixing path entries record
Modified:
incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingInvocationListenerTest.java
incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/tracking/InMemoryPathTrackingDataStore.java
incubator/sirona/trunk/core/src/main/java/org/apache/sirona/tracking/PathTracker.java
Modified: incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingInvocationListenerTest.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingInvocationListenerTest.java?rev=1570009&r1=1570008&r2=1570009&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingInvocationListenerTest.java (original)
+++ incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingInvocationListenerTest.java Thu Feb 20 00:32:05 2014
@@ -21,15 +21,12 @@ import org.apache.sirona.javaagent.Agent
import org.apache.sirona.javaagent.JavaAgentRunner;
import org.apache.sirona.pathtracking.test.ExtendedInMemoryPathTrackingDataStore;
import org.apache.sirona.store.DataStoreFactory;
-import org.apache.sirona.store.tracking.InMemoryPathTrackingDataStore;
import org.apache.sirona.tracking.PathTrackingEntry;
import org.junit.Assert;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -58,33 +55,25 @@ public class PathTrackingInvocationListe
Map<String, Set<PathTrackingEntry>> all = ptds.retrieveAll();
- //Assert.assertTrue( !all.isEmpty() );
+ Assert.assertTrue( !all.isEmpty() );
-/* FIXME: fix stop() to get consistent storage
+ // so we have 4 entries constructor is ignored!
- // test only one Thread so only one trackingId
-/*
- Assert.assertEquals( 1, all.size() );
-
- List<PathTrackingEntry> entries = new ArrayList<PathTrackingEntry>( all.values().iterator().next() );
- PathTrackingEntry first = entries.get( 0 );
- System.out.println( "first entry: " + first );
- PathTrackingEntry second = entries.get( 1 );
- System.out.println( "second entry: " + second );
+ // test only one Thread so only one trackingId
+ Assert.assertEquals( 1, all.size() );
- PathTrackingEntry last = entries.get( entries.size() - 1 );
+ List<PathTrackingEntry> entries = new ArrayList<PathTrackingEntry>( all.values().iterator().next() );
- System.out.println( "last entry: " + last );
+ Assert.assertEquals( 4, entries.size() );
for ( PathTrackingEntry entry : entries )
{
System.out.println( "entry:" + entry );
}
-*/
}
@@ -93,13 +82,27 @@ public class PathTrackingInvocationListe
public void foo()
throws Exception
{
- Thread.sleep( 1000 );
+ Thread.sleep( 500 );
}
public void beer()
throws Exception
{
this.foo();
+ this.pub();
+ }
+
+ public void pub()
+ throws Exception
+ {
+ Thread.sleep( 100 );
+ this.bar();
+ }
+
+ public void bar()
+ throws Exception
+ {
+ Thread.sleep( 300 );
}
}
Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/tracking/InMemoryPathTrackingDataStore.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/tracking/InMemoryPathTrackingDataStore.java?rev=1570009&r1=1570008&r2=1570009&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/tracking/InMemoryPathTrackingDataStore.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/tracking/InMemoryPathTrackingDataStore.java Thu Feb 20 00:32:05 2014
@@ -80,7 +80,7 @@ public class InMemoryPathTrackingDataSto
entriesList = new TreeSet<PathTrackingEntry>( PathTrackingEntryComparator.INSTANCE );
}
entriesList.addAll( entry.getValue() );
- entries.put( entry.getKey(), entriesList );
+ this.pathTrackingEntries.put( entry.getKey(), entriesList );
}
}
Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/tracking/PathTracker.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/tracking/PathTracker.java?rev=1570009&r1=1570008&r2=1570009&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/tracking/PathTracker.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/tracking/PathTracker.java Thu Feb 20 00:32:05 2014
@@ -236,12 +236,13 @@ public class PathTracker
//THREAD_LOCAL_LEVEL_INFO.set( pathTrackingInformation );
+ THREAD_LOCAL_ENTRIES.get().add( pathTrackingEntry );
+
// FIXME: same all duration/level browsing the tree, do we need TrackingEntry or should information just be used?
if (pathTrackingInformation.getLevel() == 1 && pathTrackingInformation.getParent() == null) { // 0 is never reached so 1 is first
- PATH_TRACKING_DATA_STORE.store(THREAD_LOCAL_ENTRIES.get());
+ List<PathTrackingEntry> pathTrackingEntries = THREAD_LOCAL_ENTRIES.get();
+ PATH_TRACKING_DATA_STORE.store( pathTrackingEntries );
PathTracker.cleanUp();
- } else {
- THREAD_LOCAL_ENTRIES.get().add( pathTrackingEntry );
}
}