Merge "Refactor ZygoteProcess to deal in LocalSocketAddress." am: 9fda81e274 (1bb6046a) · Commits · e / os / android_frameworks_base

core/java/android/os/ZygoteProcess.java

+27 −9

Original line number	Diff line number	Diff line
		@@ -61,18 +61,27 @@ public class ZygoteProcess {
		/**
		* The name of the socket used to communicate with the primary zygote.
		*/
		private final String mSocket;
		private final LocalSocketAddress mSocket;

		/**
		* The name of the secondary (alternate ABI) zygote socket.
		*/
		private final String mSecondarySocket;
		private final LocalSocketAddress mSecondarySocket;

		public ZygoteProcess(String primarySocket, String secondarySocket) {
		this(new LocalSocketAddress(primarySocket, LocalSocketAddress.Namespace.RESERVED),
		new LocalSocketAddress(secondarySocket, LocalSocketAddress.Namespace.RESERVED));
		}

		public ZygoteProcess(LocalSocketAddress primarySocket, LocalSocketAddress secondarySocket) {
		mSocket = primarySocket;
		mSecondarySocket = secondarySocket;
		}

		public LocalSocketAddress getPrimarySocketAddress() {
		return mSocket;
		}

		/**
		* State for communicating with the zygote process.
		*/
		@@ -92,14 +101,13 @@ public class ZygoteProcess {
		this.abiList = abiList;
		}

		public static ZygoteState connect(String socketAddress) throws IOException {
		public static ZygoteState connect(LocalSocketAddress address) throws IOException {
		DataInputStream zygoteInputStream = null;
		BufferedWriter zygoteWriter = null;
		final LocalSocket zygoteSocket = new LocalSocket();

		try {
		zygoteSocket.connect(new LocalSocketAddress(socketAddress,
		LocalSocketAddress.Namespace.RESERVED));
		zygoteSocket.connect(address);

		zygoteInputStream = new DataInputStream(zygoteSocket.getInputStream());

		@@ -115,8 +123,8 @@ public class ZygoteProcess {
		}

		String abiListString = getAbiList(zygoteWriter, zygoteInputStream);
		Log.i("Zygote", "Process: zygote socket " + socketAddress + " opened, supported ABIS: "
		+ abiListString);
		Log.i("Zygote", "Process: zygote socket " + address.getNamespace() + "/"
		+ address.getName() + " opened, supported ABIS: " + abiListString);

		return new ZygoteState(zygoteSocket, zygoteInputStream, zygoteWriter,
		Arrays.asList(abiListString.split(",")));
		@@ -514,9 +522,19 @@ public class ZygoteProcess {
		* @param socketName The name of the socket to connect to.
		*/
		public static void waitForConnectionToZygote(String socketName) {
		final LocalSocketAddress address =
		new LocalSocketAddress(socketName, LocalSocketAddress.Namespace.RESERVED);
		waitForConnectionToZygote(address);
		}

		/**
		* Try connecting to the Zygote over and over again until we hit a time-out.
		* @param address The name of the socket to connect to.
		*/
		public static void waitForConnectionToZygote(LocalSocketAddress address) {
		for (int n = 20; n >= 0; n--) {
		try {
		final ZygoteState zs = ZygoteState.connect(socketName);
		final ZygoteState zs = ZygoteState.connect(address);
		zs.close();
		return;
		} catch (IOException ioe) {
		@@ -529,6 +547,6 @@ public class ZygoteProcess {
		} catch (InterruptedException ie) {
		}
		}
		Slog.wtf(LOG_TAG, "Failed to connect to Zygote through socket " + socketName);
		Slog.wtf(LOG_TAG, "Failed to connect to Zygote through socket " + address.getName());
		}
		}