/*
+ * Copyright (C) 2015-2016 EfficiOS Inc., Alexandre Montplaisir <alexmonthy@efficios.com>
* Copyright (C) 2013 - David Goulet <dgoulet@efficios.com>
*
* This library is free software; you can redistribute it and/or modify it
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import org.lttng.ust.agent.AbstractLttngAgent;
+import org.lttng.ust.agent.utils.LttngUstAgentLogger;
/**
* Client for agents to connect to a local session daemon, using a TCP socket.
private static final String ROOT_PORT_FILE = "/var/run/lttng/agent.port";
private static final String USER_PORT_FILE = "/.lttng/agent.port";
- private static int protocolMajorVersion = 1;
- private static int protocolMinorVersion = 0;
+ private static final int PROTOCOL_MAJOR_VERSION = 2;
+ private static final int PROTOCOL_MINOR_VERSION = 0;
/** Command header from the session deamon. */
private final CountDownLatch registrationLatch = new CountDownLatch(1);
private DataInputStream inFromSessiond;
private DataOutputStream outToSessiond;
- private final AbstractLttngAgent<?> logAgent;
+ private final ILttngTcpClientListener logAgent;
+ private final int domainValue;
private final boolean isRoot;
-
/**
* Constructor
*
* @param logAgent
- * The logging agent this client will operate on.
+ * The listener this client will operate on, typically an LTTng
+ * agent.
+ * @param domainValue
+ * The integer to send to the session daemon representing the
+ * tracing domain to handle.
* @param isRoot
* True if this client should connect to the root session daemon,
* false if it should connect to the user one.
*/
- public LttngTcpSessiondClient(AbstractLttngAgent<?> logAgent, boolean isRoot) {
+ public LttngTcpSessiondClient(ILttngTcpClientListener logAgent, int domainValue, boolean isRoot) {
this.logAgent = logAgent;
+ this.domainValue = domainValue;
this.isRoot = isRoot;
}
/*
* Connect to the session daemon before anything else.
*/
+ LttngUstAgentLogger.log(getClass(), "Connecting to sessiond");
connectToSessiond();
/*
* Register to the session daemon as the Java component of the
* UST application.
*/
+ LttngUstAgentLogger.log(getClass(), "Registering to sessiond");
registerToSessiond();
/*
* session daemon. This will return if and only if there is a
* fatal error or the socket closes.
*/
+ LttngUstAgentLogger.log(getClass(), "Waiting on sessiond commands...");
handleSessiondCmd();
} catch (UnknownHostException uhe) {
uhe.printStackTrace();
* Dispose this client and close any socket connection it may hold.
*/
public void close() {
+ LttngUstAgentLogger.log(getClass(), "Closing client");
this.quit = true;
try {
ByteBuffer buf = ByteBuffer.wrap(data);
String pid = ManagementFactory.getRuntimeMXBean().getName().split("@")[0];
- buf.putInt(logAgent.getDomain().value());
+ buf.putInt(domainValue);
buf.putInt(Integer.parseInt(pid));
- buf.putInt(protocolMajorVersion);
- buf.putInt(protocolMinorVersion);
+ buf.putInt(PROTOCOL_MAJOR_VERSION);
+ buf.putInt(PROTOCOL_MINOR_VERSION);
this.outToSessiond.write(data, 0, data.length);
this.outToSessiond.flush();
}
* We don't send any reply to the registration done command.
* This just marks the end of the initial session setup.
*/
+ LttngUstAgentLogger.log(getClass(), "Registration done");
continue;
}
case CMD_LIST:
{
- ISessiondCommand listLoggerCmd = new SessiondListLoggersCommand();
- ILttngAgentResponse response = listLoggerCmd.execute(logAgent);
+ SessiondCommand listLoggerCmd = new SessiondListLoggersCommand();
+ LttngAgentResponse response = listLoggerCmd.execute(logAgent);
responseData = response.getBytes();
+ LttngUstAgentLogger.log(getClass(), "Received list loggers command");
break;
}
- case CMD_ENABLE:
+ case CMD_EVENT_ENABLE:
{
if (inputData == null) {
/* Invalid command */
- responseData = ILttngAgentResponse.FAILURE_RESPONSE.getBytes();
+ responseData = LttngAgentResponse.FAILURE_RESPONSE.getBytes();
break;
}
- ISessiondCommand enableCmd = new SessiondEnableEventCommand(inputData);
- ILttngAgentResponse response = enableCmd.execute(logAgent);
+ SessiondCommand enableEventCmd = new SessiondEnableEventCommand(inputData);
+ LttngAgentResponse response = enableEventCmd.execute(logAgent);
responseData = response.getBytes();
+ LttngUstAgentLogger.log(getClass(), "Received enable event command");
break;
}
- case CMD_DISABLE:
+ case CMD_EVENT_DISABLE:
{
if (inputData == null) {
/* Invalid command */
- responseData = ILttngAgentResponse.FAILURE_RESPONSE.getBytes();
+ responseData = LttngAgentResponse.FAILURE_RESPONSE.getBytes();
+ break;
+ }
+ SessiondCommand disableEventCmd = new SessiondDisableEventCommand(inputData);
+ LttngAgentResponse response = disableEventCmd.execute(logAgent);
+ responseData = response.getBytes();
+ LttngUstAgentLogger.log(getClass(), "Received disable event command");
+ break;
+ }
+ case CMD_APP_CTX_ENABLE:
+ {
+ if (inputData == null) {
+ /* This commands expects a payload, invalid command */
+ responseData = LttngAgentResponse.FAILURE_RESPONSE.getBytes();
+ break;
+ }
+ SessiondCommand enableAppCtxCmd = new SessiondEnableAppContextCommand(inputData);
+ LttngAgentResponse response = enableAppCtxCmd.execute(logAgent);
+ responseData = response.getBytes();
+ LttngUstAgentLogger.log(getClass(), "Received enable app-context command");
+ break;
+ }
+ case CMD_APP_CTX_DISABLE:
+ {
+ if (inputData == null) {
+ /* This commands expects a payload, invalid command */
+ responseData = LttngAgentResponse.FAILURE_RESPONSE.getBytes();
break;
}
- ISessiondCommand disableCmd = new SessiondDisableEventCommand(inputData);
- ILttngAgentResponse response = disableCmd.execute(logAgent);
+ SessiondCommand disableAppCtxCmd = new SessiondDisableAppContextCommand(inputData);
+ LttngAgentResponse response = disableAppCtxCmd.execute(logAgent);
responseData = response.getBytes();
+ LttngUstAgentLogger.log(getClass(), "Received disable app-context command");
break;
}
default:
responseData = new byte[4];
ByteBuffer buf = ByteBuffer.wrap(responseData);
buf.order(ByteOrder.BIG_ENDIAN);
+ LttngUstAgentLogger.log(getClass(), "Received unknown command, ignoring");
break;
}
}
/* Send response to the session daemon. */
+ LttngUstAgentLogger.log(getClass(), "Sending response");
this.outToSessiond.write(responseData, 0, responseData.length);
this.outToSessiond.flush();
}