import java.io.BufferedReader;
import java.io.DataInputStream;
import java.io.DataOutputStream;
+import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+import org.lttng.ust.agent.utils.LttngUstAgentLogger;
+
/**
* Client for agents to connect to a local session daemon, using a TCP socket.
*
/*
* Connect to the session daemon before anything else.
*/
+ log("Connecting to sessiond");
connectToSessiond();
/*
* Register to the session daemon as the Java component of the
* UST application.
*/
+ log("Registering to sessiond");
registerToSessiond();
/*
* session daemon. This will return if and only if there is a
* fatal error or the socket closes.
*/
+ log("Waiting on sessiond commands...");
handleSessiondCmd();
} catch (UnknownHostException uhe) {
uhe.printStackTrace();
* Dispose this client and close any socket connection it may hold.
*/
public void close() {
+ log("Closing client");
this.quit = true;
try {
}
private void connectToSessiond() throws IOException {
- int port;
+ int rootPort = getPortFromFile(ROOT_PORT_FILE);
+ int userPort = getPortFromFile(getHomePath() + USER_PORT_FILE);
+
+ /*
+ * Check for the edge case of both files existing but pointing to the
+ * same port. In this case, let the root client handle it.
+ */
+ if ((rootPort != 0) && (rootPort == userPort) && (!isRoot)) {
+ log("User and root config files both point to port " + rootPort +
+ ". Letting the root client handle it.");
+ throw new IOException();
+ }
- if (this.isRoot) {
- port = getPortFromFile(ROOT_PORT_FILE);
- if (port == 0) {
- /* No session daemon available. Stop and retry later. */
- throw new IOException();
- }
- } else {
- port = getPortFromFile(getHomePath() + USER_PORT_FILE);
- if (port == 0) {
- /* No session daemon available. Stop and retry later. */
- throw new IOException();
- }
+ int portToUse = (isRoot ? rootPort : userPort);
+
+ if (portToUse == 0) {
+ /* No session daemon available. Stop and retry later. */
+ throw new IOException();
}
- this.sessiondSock = new Socket(SESSION_HOST, port);
+ this.sessiondSock = new Socket(SESSION_HOST, portToUse);
this.inFromSessiond = new DataInputStream(sessiondSock.getInputStream());
this.outToSessiond = new DataOutputStream(sessiondSock.getOutputStream());
}
private static String getHomePath() {
- return System.getProperty("user.home");
+ /*
+ * The environment variable LTTNG_HOME overrides HOME if
+ * defined.
+ */
+ String homePath = System.getenv("LTTNG_HOME");
+
+ if (homePath == null) {
+ homePath = System.getProperty("user.home");
+ }
+ return homePath;
}
/**
private static int getPortFromFile(String path) throws IOException {
int port;
BufferedReader br = null;
+ File file = new File(path);
try {
- br = new BufferedReader(new FileReader(path));
+ br = new BufferedReader(new FileReader(file));
String line = br.readLine();
port = Integer.parseInt(line, 10);
if (port < 0 || port > 65535) {
* We don't send any reply to the registration done command.
* This just marks the end of the initial session setup.
*/
+ log("Registration done");
continue;
}
case CMD_LIST:
SessiondCommand listLoggerCmd = new SessiondListLoggersCommand();
LttngAgentResponse response = listLoggerCmd.execute(logAgent);
responseData = response.getBytes();
+ log("Received list loggers command");
break;
}
case CMD_EVENT_ENABLE:
SessiondCommand enableEventCmd = new SessiondEnableEventCommand(inputData);
LttngAgentResponse response = enableEventCmd.execute(logAgent);
responseData = response.getBytes();
+ log("Received enable event command");
break;
}
case CMD_EVENT_DISABLE:
SessiondCommand disableEventCmd = new SessiondDisableEventCommand(inputData);
LttngAgentResponse response = disableEventCmd.execute(logAgent);
responseData = response.getBytes();
+ log("Received disable event command");
break;
}
case CMD_APP_CTX_ENABLE:
SessiondCommand enableAppCtxCmd = new SessiondEnableAppContextCommand(inputData);
LttngAgentResponse response = enableAppCtxCmd.execute(logAgent);
responseData = response.getBytes();
+ log("Received enable app-context command");
break;
}
case CMD_APP_CTX_DISABLE:
SessiondCommand disableAppCtxCmd = new SessiondDisableAppContextCommand(inputData);
LttngAgentResponse response = disableAppCtxCmd.execute(logAgent);
responseData = response.getBytes();
+ log("Received disable app-context command");
break;
}
default:
responseData = new byte[4];
ByteBuffer buf = ByteBuffer.wrap(responseData);
buf.order(ByteOrder.BIG_ENDIAN);
+ log("Received unknown command, ignoring");
break;
}
}
/* Send response to the session daemon. */
+ log("Sending response");
this.outToSessiond.write(responseData, 0, responseData.length);
this.outToSessiond.flush();
}
return null;
}
- this.inFromSessiond.read(payload, 0, payload.length);
+ int read = inFromSessiond.read(payload, 0, payload.length);
+ if (read != payload.length) {
+ throw new IOException("Unexpected number of bytes read in sessiond command payload");
+ }
return payload;
}
+ /**
+ * Wrapper for this class's logging, adds the connection's characteristics
+ * to help differentiate between multiple TCP clients.
+ */
+ private void log(String message) {
+ LttngUstAgentLogger.log(getClass(),
+ "(root=" + isRoot + ", domain=" + domainValue + ") " + message);
+ }
}
projects / lttng-ust.git / blobdiff