X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust-java-agent%2Fjava%2Flttng-ust-agent-common%2Forg%2Flttng%2Fust%2Fagent%2Fclient%2FSessiondEnableEventCommand.java;h=35029c9bd5712067fd0d0f1d122460cc47e59127;hb=c0c0989ab70574e09b2f7e8b48c2da6af664a849;hp=bb20ac5784454ac6170b22913f1e096e3c379fe3;hpb=932535693bb8a719c40f63141dbfac786388ed4a;p=lttng-ust.git

diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondEnableEventCommand.java b/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondEnableEventCommand.java
index bb20ac57..35029c9b 100644
--- a/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondEnableEventCommand.java
+++ b/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondEnableEventCommand.java
@@ -1,19 +1,9 @@
 /*
- * Copyright (C) 2015 - EfficiOS Inc., Alexandre Montplaisir <alexmonthy@efficios.com>
- * Copyright (C) 2013 - David Goulet <dgoulet@efficios.com>
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, version 2.1 only,
- * as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Copyright (C) 2015 EfficiOS Inc.
+ * Copyright (C) 2015 Alexandre Montplaisir <alexmonthy@efficios.com>
+ * Copyright (C) 2013 David Goulet <dgoulet@efficios.com>
  */
 
 package org.lttng.ust.agent.client;
@@ -21,7 +11,8 @@ package org.lttng.ust.agent.client;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
-import org.lttng.ust.agent.AbstractLttngAgent;
+import org.lttng.ust.agent.session.EventRule;
+import org.lttng.ust.agent.session.LogLevelSelector;
 
 /**
  * Session daemon command indicating to the Java agent that some events were
@@ -30,29 +21,57 @@ import org.lttng.ust.agent.AbstractLttngAgent;
  * @author Alexandre Montplaisir
  * @author David Goulet
  */
-class SessiondEnableEventCommand implements ISessiondCommand {
+class SessiondEnableEventCommand extends SessiondCommand {
+
+	/** Fixed event name length. Value defined by the lttng agent protocol. */
+	private static final int EVENT_NAME_LENGTH = 256;
 
-	private static final int INT_SIZE = 4;
+	private final boolean commandIsValid;
 
-	/** Event name to enable in the tracing session */
+	/* Parameters of the event rule being enabled */
 	private final String eventName;
+	private final LogLevelSelector logLevelFilter;
+	private final String filterString;
 
 	public SessiondEnableEventCommand(byte[] data) {
 		if (data == null) {
 			throw new IllegalArgumentException();
 		}
-		int dataOffset = INT_SIZE * 2;
-
 		ByteBuffer buf = ByteBuffer.wrap(data);
-		buf.order(ByteOrder.LITTLE_ENDIAN);
-		buf.getInt(); // logLevel, currently unused
-		buf.getInt(); // logLevelType, currently unused
-		eventName = new String(data, dataOffset, data.length - dataOffset).trim();
+		buf.order(ByteOrder.BIG_ENDIAN);
+		int logLevel = buf.getInt();
+		int logLevelType = buf.getInt();
+		logLevelFilter = new LogLevelSelector(logLevel, logLevelType);
+
+		/* Read the event name */
+		byte[] eventNameBytes = new byte[EVENT_NAME_LENGTH];
+		buf.get(eventNameBytes);
+		eventName = new String(eventNameBytes, SESSIOND_PROTOCOL_CHARSET).trim();
+
+		/* Read the filter string */
+		filterString = readNextString(buf);
+
+		/* The command was invalid if the string could not be read correctly */
+		commandIsValid = (filterString != null);
 	}
 
 	@Override
-	public LttngAgentResponse execute(AbstractLttngAgent<?> agent) {
-		boolean success = agent.eventEnabled(this.eventName);
+	public LttngAgentResponse execute(ILttngTcpClientListener agent) {
+		if (!commandIsValid) {
+			return LttngAgentResponse.FAILURE_RESPONSE;
+		}
+
+		EventRule rule = new EventRule(eventName, logLevelFilter, filterString);
+		boolean success = agent.eventEnabled(rule);
 		return (success ? LttngAgentResponse.SUCESS_RESPONSE : LttngAgentResponse.FAILURE_RESPONSE);
 	}
+
+	@Override
+	public String toString() {
+		return "SessiondEnableEventCommand["
+				+ "eventName=" + eventName
+				+ ", logLevel=" + logLevelFilter.toString()
+				+ ", filterString=" + filterString
+				+"]";
+	}
 }