Repository: incubator-ignite Updated Branches: refs/heads/ignite-505 e56252b7c -> 2494573b1
# IGNITE-505 - Shmem debug Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2494573b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2494573b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2494573b Branch: refs/heads/ignite-505 Commit: 2494573b17775076355ad711d7caf0f60583a2a7 Parents: e56252b Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Wed Mar 18 21:24:07 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Wed Mar 18 21:24:07 2015 -0700 ---------------------------------------------------------------------- .../shmem/IpcSharedMemoryClientEndpoint.java | 2 + .../shmem/IpcSharedMemoryServerEndpoint.java | 2 +- .../util/ipc/shmem/IpcSharedMemorySpace.java | 2 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 66 +++++++++----------- 4 files changed, 33 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2494573b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryClientEndpoint.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryClientEndpoint.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryClientEndpoint.java index 27a234f..36bcb60 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryClientEndpoint.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryClientEndpoint.java @@ -296,6 +296,8 @@ public class IpcSharedMemoryClientEndpoint implements IpcEndpoint { File tokFile = new File(space.tokenFileName()); + U.dumpStack(">>> FREE 2 <<<"); + // Space is not usable at this point and all local threads // are guaranteed to leave its methods (other party is not alive). // So, we can cleanup resources without additional synchronization. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2494573b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java index 8766eb7..0303985 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java @@ -671,7 +671,7 @@ public class IpcSharedMemoryServerEndpoint implements IpcServerEndpoint { if (log.isDebugEnabled()) log.debug("Possibly stale token file: " + f0); - U.dumpStack(">>> FREE <<<"); + U.dumpStack(">>> FREE 3 <<<"); IpcSharedMemoryUtils.freeSystemResources(f0.getAbsolutePath(), size); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2494573b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemorySpace.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemorySpace.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemorySpace.java index 1b7aaca..49409df 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemorySpace.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemorySpace.java @@ -299,7 +299,7 @@ public class IpcSharedMemorySpace implements Closeable { lock.writeLock().lock(); try { - U.dumpStack(">>> FREE <<<"); + U.dumpStack(">>> FREE 1 <<<"); IpcSharedMemoryUtils.freeSystemResources(tokFileName, shmemPtr, force); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2494573b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java index 6091338..5038d44 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java @@ -18,15 +18,7 @@ package org.apache.ignite.testsuites; import junit.framework.*; -import org.apache.ignite.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.processors.affinity.*; -import org.apache.ignite.internal.processors.closure.*; -import org.apache.ignite.internal.processors.continuous.*; -import org.apache.ignite.internal.product.*; import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.messaging.*; -import org.apache.ignite.spi.*; /** * Basic test suite. @@ -39,39 +31,39 @@ public class IgniteBasicTestSuite extends TestSuite { public static TestSuite suite() throws Exception { TestSuite suite = new TestSuite("Ignite Basic Test Suite"); - suite.addTest(IgniteLangSelfTestSuite.suite()); - suite.addTest(IgniteUtilSelfTestSuite.suite()); - suite.addTest(IgniteMarshallerSelfTestSuite.suite()); - suite.addTest(IgniteKernalSelfTestSuite.suite()); - suite.addTest(IgniteStartUpTestSuite.suite()); - suite.addTest(IgniteExternalizableSelfTestSuite.suite()); - suite.addTest(IgniteP2PSelfTestSuite.suite()); - - suite.addTest(new TestSuite(GridSelfTest.class)); - suite.addTest(new TestSuite(GridProjectionSelfTest.class)); - suite.addTest(new TestSuite(GridMessagingSelfTest.class)); - suite.addTest(new TestSuite(GridMessagingNoPeerClassLoadingSelfTest.class)); +// suite.addTest(IgniteLangSelfTestSuite.suite()); +// suite.addTest(IgniteUtilSelfTestSuite.suite()); +// suite.addTest(IgniteMarshallerSelfTestSuite.suite()); +// suite.addTest(IgniteKernalSelfTestSuite.suite()); +// suite.addTest(IgniteStartUpTestSuite.suite()); +// suite.addTest(IgniteExternalizableSelfTestSuite.suite()); +// suite.addTest(IgniteP2PSelfTestSuite.suite()); +// +// suite.addTest(new TestSuite(GridSelfTest.class)); +// suite.addTest(new TestSuite(GridProjectionSelfTest.class)); +// suite.addTest(new TestSuite(GridMessagingSelfTest.class)); +// suite.addTest(new TestSuite(GridMessagingNoPeerClassLoadingSelfTest.class)); if (U.isLinux() || U.isMacOs()) suite.addTest(IgniteIpcSharedMemorySelfTestSuite.suite()); - suite.addTestSuite(GridReleaseTypeSelfTest.class); - suite.addTestSuite(GridProductVersionSelfTest.class); - suite.addTestSuite(GridAffinityProcessorRendezvousSelfTest.class); - suite.addTestSuite(GridClosureProcessorSelfTest.class); - suite.addTestSuite(GridStartStopSelfTest.class); - suite.addTestSuite(GridProjectionForCachesSelfTest.class); - suite.addTestSuite(GridSpiLocalHostInjectionTest.class); - suite.addTestSuite(GridLifecycleBeanSelfTest.class); - suite.addTestSuite(GridStopWithCancelSelfTest.class); - suite.addTestSuite(GridReduceSelfTest.class); - suite.addTestSuite(GridEventConsumeSelfTest.class); - suite.addTestSuite(GridSuppressedExceptionSelfTest.class); - suite.addTestSuite(GridLifecycleAwareSelfTest.class); - suite.addTestSuite(GridMessageListenSelfTest.class); - - // Streamer. - suite.addTest(IgniteStreamerSelfTestSuite.suite()); +// suite.addTestSuite(GridReleaseTypeSelfTest.class); +// suite.addTestSuite(GridProductVersionSelfTest.class); +// suite.addTestSuite(GridAffinityProcessorRendezvousSelfTest.class); +// suite.addTestSuite(GridClosureProcessorSelfTest.class); +// suite.addTestSuite(GridStartStopSelfTest.class); +// suite.addTestSuite(GridProjectionForCachesSelfTest.class); +// suite.addTestSuite(GridSpiLocalHostInjectionTest.class); +// suite.addTestSuite(GridLifecycleBeanSelfTest.class); +// suite.addTestSuite(GridStopWithCancelSelfTest.class); +// suite.addTestSuite(GridReduceSelfTest.class); +// suite.addTestSuite(GridEventConsumeSelfTest.class); +// suite.addTestSuite(GridSuppressedExceptionSelfTest.class); +// suite.addTestSuite(GridLifecycleAwareSelfTest.class); +// suite.addTestSuite(GridMessageListenSelfTest.class); +// +// // Streamer. +// suite.addTest(IgniteStreamerSelfTestSuite.suite()); return suite; }
