Merge "meminfo: Use getprogname(3) in all tools." (40d06258) · Commits · e / os / android_system_core

libmeminfo/tools/librank.cpp

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -40,7 +40,7 @@ using ::android::meminfo::MemUsage;
	using ::android::meminfo::ProcMemInfo;		using ::android::meminfo::ProcMemInfo;
	using ::android::meminfo::Vma;		using ::android::meminfo::Vma;

	[[noreturn]] static void usage(const char* myname, int exit_status) {		[[noreturn]] static void usage(int exit_status) {
	fprintf(stderr,		fprintf(stderr,
	"Usage: %s [ -P \| -L ] [ -v \| -r \| -p \| -u \| -s \| -h ]\n"		"Usage: %s [ -P \| -L ] [ -v \| -r \| -p \| -u \| -s \| -h ]\n"
	"\n"		"\n"
	@@ -59,7 +59,7 @@ using ::android::meminfo::Vma;
	" -C Only show non-cached (ram/swap backed) pages\n"		" -C Only show non-cached (ram/swap backed) pages\n"
	" -k Only show pages collapsed by KSM\n"		" -k Only show pages collapsed by KSM\n"
	" -h Display this help screen.\n",		" -h Display this help screen.\n",
	myname);		getprogname());
	exit(exit_status);		exit(exit_status);
	}		}

	@@ -278,7 +278,7 @@ int main(int argc, char* argv[]) {
	g_pgflags = g_pgflags_mask = (1 << KPF_SWAPBACKED);		g_pgflags = g_pgflags_mask = (1 << KPF_SWAPBACKED);
	break;		break;
	case 'h':		case 'h':
	usage(argv[0], EXIT_SUCCESS);		usage(EXIT_SUCCESS);
	case 'k':		case 'k':
	g_pgflags = g_pgflags_mask = (1 << KPF_KSM);		g_pgflags = g_pgflags_mask = (1 << KPF_KSM);
	break;		break;
	@@ -307,7 +307,7 @@ int main(int argc, char* argv[]) {
	g_reverse_sort = true;		g_reverse_sort = true;
	break;		break;
	default:		default:
	usage(argv[0], EXIT_FAILURE);		usage(EXIT_FAILURE);
	}		}
	}		}

libmeminfo/tools/procmem.cpp

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -42,7 +42,7 @@ bool reset_wss = false;
	// Show working set, mutually exclusive with reset_wss;		// Show working set, mutually exclusive with reset_wss;
	bool show_wss = false;		bool show_wss = false;

	static void usage(const char* cmd) {		[[noreturn]] static void usage(int exit_status) {
	fprintf(stderr,		fprintf(stderr,
	"Usage: %s [-i] [ -w \| -W ] [ -p \| -m ] [ -h ] pid\n"		"Usage: %s [-i] [ -w \| -W ] [ -p \| -m ] [ -h ] pid\n"
	" -i Uses idle page tracking for working set statistics.\n"		" -i Uses idle page tracking for working set statistics.\n"
	@@ -52,7 +52,9 @@ static void usage(const char* cmd) {
	" -u Sort by USS.\n"		" -u Sort by USS.\n"
	" -m Sort by mapping order (as read from /proc).\n"		" -m Sort by mapping order (as read from /proc).\n"
	" -h Hide maps with no RSS.\n",		" -h Hide maps with no RSS.\n",
	cmd);		getprogname());

			exit(exit_status);
	}		}

	static void print_separator(std::stringstream& ss) {		static void print_separator(std::stringstream& ss) {
	@@ -154,17 +156,15 @@ int main(int argc, char* argv[]) {
	show_wss = true;		show_wss = true;
	break;		break;
	case '?':		case '?':
	usage(argv[0]);		usage(EXIT_SUCCESS);
	return 0;
	default:		default:
	abort();		usage(EXIT_FAILURE);
	}		}
	}		}

	if (optind != (argc - 1)) {		if (optind != (argc - 1)) {
	fprintf(stderr, "Need exactly one pid at the end\n");		fprintf(stderr, "Need exactly one pid at the end\n");
	usage(argv[0]);		usage(EXIT_FAILURE);
	exit(EXIT_FAILURE);
	}		}

	pid_t pid = atoi(argv[optind]);		pid_t pid = atoi(argv[optind]);

libmeminfo/tools/procrank.cpp

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -142,8 +142,9 @@ uint64_t total_pswap = 0;
	uint64_t total_uswap = 0;		uint64_t total_uswap = 0;
	uint64_t total_zswap = 0;		uint64_t total_zswap = 0;

	static void usage(const char* myname) {		[[noreturn]] static void usage(int exit_status) {
	std::cerr << "Usage: " << myname << " [ -W ] [ -v \| -r \| -p \| -u \| -s \| -h ]" << std::endl		std::cerr << "Usage: " << getprogname() << " [ -W ] [ -v \| -r \| -p \| -u \| -s \| -h ]"
			<< std::endl
	<< " -v Sort by VSS." << std::endl		<< " -v Sort by VSS." << std::endl
	<< " -r Sort by RSS." << std::endl		<< " -r Sort by RSS." << std::endl
	<< " -p Sort by PSS." << std::endl		<< " -p Sort by PSS." << std::endl
	@@ -159,6 +160,7 @@ static void usage(const char* myname) {
	<< " -o Show and sort by oom score against lowmemorykiller thresholds."		<< " -o Show and sort by oom score against lowmemorykiller thresholds."
	<< std::endl		<< std::endl
	<< " -h Display this help screen." << std::endl;		<< " -h Display this help screen." << std::endl;
			exit(exit_status);
	}		}

	static bool read_all_pids(std::vector<pid_t>* pids, std::function<bool(pid_t pid)> for_each_pid) {		static bool read_all_pids(std::vector<pid_t>* pids, std::function<bool(pid_t pid)> for_each_pid) {
	@@ -386,9 +388,7 @@ int main(int argc, char* argv[]) {
	pgflags_mask = (1 << KPF_SWAPBACKED);		pgflags_mask = (1 << KPF_SWAPBACKED);
	break;		break;
	case 'h':		case 'h':
	usage(argv[0]);		usage(EXIT_SUCCESS);
	return 0;
	break;
	case 'k':		case 'k':
	pgflags = (1 << KPF_KSM);		pgflags = (1 << KPF_KSM);
	pgflags_mask = (1 << KPF_KSM);		pgflags_mask = (1 << KPF_KSM);
	@@ -422,7 +422,7 @@ int main(int argc, char* argv[]) {
	reset_wss = true;		reset_wss = true;
	break;		break;
	default:		default:
	abort();		usage(EXIT_FAILURE);
	}		}
	}		}