Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A5BCC189C8 for ; Thu, 24 Mar 2016 11:41:04 +0000 (UTC) Received: (qmail 63544 invoked by uid 500); 24 Mar 2016 11:41:04 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 63378 invoked by uid 500); 24 Mar 2016 11:41:04 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 62986 invoked by uid 99); 24 Mar 2016 11:41:04 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Mar 2016 11:41:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 12245E9813; Thu, 24 Mar 2016 11:41:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dmagda@apache.org To: commits@ignite.apache.org Date: Thu, 24 Mar 2016 11:41:15 -0000 Message-Id: <0458cca4fb0b46088f0ab5825a93c713@git.apache.org> In-Reply-To: <7354cc3ee2f84300a2e2d04e7dd81c73@git.apache.org> References: <7354cc3ee2f84300a2e2d04e7dd81c73@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [13/25] ignite git commit: Added ability to dump direct message reader and writer (cherry picked from commit 660aa2f) Added ability to dump direct message reader and writer (cherry picked from commit 660aa2f) Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/00139554 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/00139554 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/00139554 Branch: refs/heads/ignite-2849 Commit: 00139554ffdcfaae07970a2281b6dcec8cec0af4 Parents: 61a0a5f Author: Yakov Zhdanov Authored: Tue Mar 22 17:03:03 2016 +0300 Committer: Yakov Zhdanov Committed: Tue Mar 22 17:28:39 2016 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/direct/DirectMessageReader.java | 2 +- .../apache/ignite/internal/direct/DirectMessageWriter.java | 4 ++-- .../ignite/internal/direct/state/DirectMessageState.java | 7 +++---- .../direct/stream/v2/DirectByteBufferStreamImplV2.java | 2 +- .../org/apache/ignite/internal/util/nio/GridDirectParser.java | 4 ++-- .../org/apache/ignite/internal/util/nio/GridNioServer.java | 6 ++++++ 6 files changed, 15 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/00139554/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java index b567a03..10bc7e2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java @@ -26,8 +26,8 @@ import org.apache.ignite.internal.direct.state.DirectMessageState; import org.apache.ignite.internal.direct.state.DirectMessageStateItem; import org.apache.ignite.internal.direct.stream.DirectByteBufferStream; import org.apache.ignite.internal.direct.stream.v1.DirectByteBufferStreamImplV1; -import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.direct.stream.v2.DirectByteBufferStreamImplV2; +import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.lang.IgniteOutClosure; import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.plugin.extensions.communication.Message; http://git-wip-us.apache.org/repos/asf/ignite/blob/00139554/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java index be17113..28993c6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java @@ -26,9 +26,9 @@ import org.apache.ignite.internal.direct.state.DirectMessageState; import org.apache.ignite.internal.direct.state.DirectMessageStateItem; import org.apache.ignite.internal.direct.stream.DirectByteBufferStream; import org.apache.ignite.internal.direct.stream.v1.DirectByteBufferStreamImplV1; +import org.apache.ignite.internal.direct.stream.v2.DirectByteBufferStreamImplV2; import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.direct.stream.v2.DirectByteBufferStreamImplV2; import org.apache.ignite.lang.IgniteOutClosure; import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.plugin.extensions.communication.Message; @@ -336,7 +336,7 @@ public class DirectMessageWriter implements MessageWriter { } /** {@inheritDoc} */ - public String toString() { + @Override public String toString() { return S.toString(DirectMessageWriter.class, this); } http://git-wip-us.apache.org/repos/asf/ignite/blob/00139554/modules/core/src/main/java/org/apache/ignite/internal/direct/state/DirectMessageState.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/state/DirectMessageState.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/state/DirectMessageState.java index 8ad7fe0..58f625f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/direct/state/DirectMessageState.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/state/DirectMessageState.java @@ -18,8 +18,8 @@ package org.apache.ignite.internal.direct.state; import java.lang.reflect.Array; +import java.util.Arrays; import org.apache.ignite.internal.util.tostring.GridToStringExclude; -import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.lang.IgniteOutClosure; @@ -35,7 +35,6 @@ public class DirectMessageState { private final IgniteOutClosure factory; /** Stack array. */ - @GridToStringInclude private T[] stack; /** Current position. */ @@ -102,7 +101,7 @@ public class DirectMessageState { } /** {@inheritDoc} */ - public String toString() { - return S.toString(DirectMessageState.class, this); + @Override public String toString() { + return S.toString(DirectMessageState.class, this, "stack", Arrays.toString(stack)); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/00139554/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2.java index 7958793..d7dc990 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2.java @@ -1779,7 +1779,7 @@ public class DirectByteBufferStreamImplV2 implements DirectByteBufferStream { } /** {@inheritDoc} */ - public String toString() { + @Override public String toString() { return S.toString(DirectByteBufferStreamImplV2.class, this); } http://git-wip-us.apache.org/repos/asf/ignite/blob/00139554/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridDirectParser.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridDirectParser.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridDirectParser.java index 76e7d4d..5a02662 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridDirectParser.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridDirectParser.java @@ -33,10 +33,10 @@ import org.jetbrains.annotations.Nullable; */ public class GridDirectParser implements GridNioParser { /** Message metadata key. */ - private static final int MSG_META_KEY = GridNioSessionMetaKey.nextUniqueKey(); + static final int MSG_META_KEY = GridNioSessionMetaKey.nextUniqueKey(); /** Reader metadata key. */ - private static final int READER_META_KEY = GridNioSessionMetaKey.nextUniqueKey(); + static final int READER_META_KEY = GridNioSessionMetaKey.nextUniqueKey(); /** */ private final IgniteLogger log; http://git-wip-us.apache.org/repos/asf/ignite/blob/00139554/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java index 0d5c5de..c9c64ec 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java @@ -64,6 +64,7 @@ import org.apache.ignite.lang.IgniteBiInClosure; import org.apache.ignite.lang.IgniteInClosure; import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.plugin.extensions.communication.Message; +import org.apache.ignite.plugin.extensions.communication.MessageReader; import org.apache.ignite.plugin.extensions.communication.MessageWriter; import org.apache.ignite.thread.IgniteThread; import org.jetbrains.annotations.Nullable; @@ -1455,9 +1456,14 @@ public class GridNioServer { for (SelectionKey key : keys) { GridSelectorNioSessionImpl ses = (GridSelectorNioSessionImpl)key.attachment(); + MessageWriter writer = ses.meta(MSG_WRITER.ordinal()); + MessageReader reader = ses.meta(GridDirectParser.READER_META_KEY); + sb.append(" Connection info [") .append("rmtAddr=").append(ses.remoteAddress()) .append(", locAddr=").append(ses.localAddress()) + .append(", msgWriter=").append(writer != null ? writer.toString() : "null") + .append(", msgReader=").append(reader != null ? reader.toString() : "null") .append(", bytesRcvd=").append(ses.bytesReceived()) .append(", bytesSent=").append(ses.bytesSent());