Merge "Fix format string" (84babf39) · Commits · e / os / android_system_core

libprocessgroup/processgroup.cpp

+4 −3

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@
		#include <assert.h>
		#include <dirent.h>
		#include <fcntl.h>
		#include <inttypes.h>
		#include <stdbool.h>
		#include <stdio.h>
		#include <stdlib.h>
		@@ -100,7 +101,7 @@ static int refillBuffer(struct ctx *ctx)

		ctx->buf_len += ret;
		ctx->buf[ctx->buf_len] = 0;
		SLOGV("Read %d to buffer: %s", ret, ctx->buf);
		SLOGV("Read %zd to buffer: %s", ret, ctx->buf);

		assert(ctx->buf_len <= sizeof(ctx->buf));

		@@ -251,7 +252,7 @@ int killProcessGroup(uid_t uid, int initialPid, int signal)
		{
		int processes;
		int sleep_us = 100;
		long startTime = android::uptimeMillis();
		int64_t startTime = android::uptimeMillis();

		while ((processes = killProcessGroupOnce(uid, initialPid, signal)) > 0) {
		SLOGV("killed %d processes for processgroup %d\n", processes, initialPid);
		@@ -265,7 +266,7 @@ int killProcessGroup(uid_t uid, int initialPid, int signal)
		}
		}

		SLOGV("Killed process group uid %d pid %d in %ldms, %d procs remain", uid, initialPid,
		SLOGV("Killed process group uid %d pid %d in %" PRId64 "ms, %d procs remain", uid, initialPid,
		android::uptimeMillis()-startTime, processes);

		if (processes == 0) {