Merge branch 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-218
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/78babbba Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/78babbba Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/78babbba Branch: refs/heads/ignite-218 Commit: 78babbba499c3b51cff831080b055e3e01721de2 Parents: 4d32fee 5c30f9c Author: iveselovskiy <iveselovs...@gridgain.com> Authored: Fri May 29 21:10:51 2015 +0300 Committer: iveselovskiy <iveselovs...@gridgain.com> Committed: Fri May 29 21:10:51 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/cache/CacheMetrics.java | 187 +++++++-- .../internal/managers/GridManagerAdapter.java | 59 +-- .../processors/cache/CacheMetricsImpl.java | 367 ++++++++++++++++- .../cache/CacheMetricsMXBeanImpl.java | 100 +++++ .../processors/cache/CacheMetricsSnapshot.java | 380 +++++++++++++---- .../processors/cache/GridCacheAdapter.java | 12 +- .../processors/cache/GridCacheSwapManager.java | 118 ++++-- .../ignite/internal/util/GridJavaProcess.java | 30 +- .../ignite/mxbean/CacheMetricsMXBean.java | 80 ++++ .../org/apache/ignite/spi/IgniteSpiAdapter.java | 35 +- .../org/apache/ignite/spi/IgniteSpiContext.java | 47 --- .../spi/swapspace/file/FileSwapSpaceSpi.java | 8 +- ...CacheLocalOffHeapAndSwapMetricsSelfTest.java | 412 +++++++++++++++++++ .../testframework/GridSpiTestContext.java | 25 +- .../IgniteCacheMetricsSelfTestSuite.java | 1 + 15 files changed, 1530 insertions(+), 331 deletions(-) ----------------------------------------------------------------------
