Merge "Adjust obb path to be able calculate external's codeSize well wo/quota" (d9fffc5b) · Commits · e / os / android_frameworks_native

cmds/installd/InstalldNativeService.cpp

+14 −10

Original line number	Original line	Diff line number	Diff line
	@@ -2374,11 +2374,15 @@ static void collectManualExternalStatsForUser(const std::string& path, struct st
	p->fts_number = p->fts_parent->fts_number;		p->fts_number = p->fts_parent->fts_number;
	switch (p->fts_info) {		switch (p->fts_info) {
	case FTS_D:		case FTS_D:
	if (p->fts_level == 4		if (p->fts_level == 3
			&& !strcmp(p->fts_parent->fts_name, "obb")
			&& !strcmp(p->fts_parent->fts_parent->fts_name, "Android")) {
			p->fts_number = 1;
			} else if (p->fts_level == 4
	&& !strcmp(p->fts_name, "cache")		&& !strcmp(p->fts_name, "cache")
	&& !strcmp(p->fts_parent->fts_parent->fts_name, "data")		&& !strcmp(p->fts_parent->fts_parent->fts_name, "data")
	&& !strcmp(p->fts_parent->fts_parent->fts_parent->fts_name, "Android")) {		&& !strcmp(p->fts_parent->fts_parent->fts_parent->fts_name, "Android")) {
	p->fts_number = 1;		p->fts_number = 2;
	}		}
	[[fallthrough]]; // to count the directory		[[fallthrough]]; // to count the directory
	case FTS_DEFAULT:		case FTS_DEFAULT:
	@@ -2387,9 +2391,13 @@ static void collectManualExternalStatsForUser(const std::string& path, struct st
	case FTS_SLNONE:		case FTS_SLNONE:
	int64_t size = (p->fts_statp->st_blocks * 512);		int64_t size = (p->fts_statp->st_blocks * 512);
	if (p->fts_number == 1) {		if (p->fts_number == 1) {
			stats->codeSize += size;
			} else {
			if (p->fts_number == 2) {
	stats->cacheSize += size;		stats->cacheSize += size;
	}		}
	stats->dataSize += size;		stats->dataSize += size;
			}
	break;		break;
	}		}
	}		}
	@@ -2735,11 +2743,6 @@ binder::Status InstalldNativeService::getUserSize(const std::optional<std::strin
	extStats.dataSize = dataSize;		extStats.dataSize = dataSize;
	atrace_pm_end();		atrace_pm_end();
	} else {		} else {
	atrace_pm_begin("obb");
	auto obbPath = create_data_path(uuid_) + "/media/obb";
	calculate_tree_size(obbPath, &extStats.codeSize);
	atrace_pm_end();

	atrace_pm_begin("code");		atrace_pm_begin("code");
	calculate_tree_size(create_data_app_path(uuid_), &stats.codeSize);		calculate_tree_size(create_data_app_path(uuid_), &stats.codeSize);
	atrace_pm_end();		atrace_pm_end();
	@@ -2770,9 +2773,10 @@ binder::Status InstalldNativeService::getUserSize(const std::optional<std::strin
	atrace_pm_begin("external");		atrace_pm_begin("external");
	auto dataMediaPath = create_data_media_path(uuid_, userId);		auto dataMediaPath = create_data_media_path(uuid_, userId);
	collectManualExternalStatsForUser(dataMediaPath, &extStats);		collectManualExternalStatsForUser(dataMediaPath, &extStats);

	#if MEASURE_DEBUG		#if MEASURE_DEBUG
	LOG(DEBUG) << "Measured external data " << extStats.dataSize << " cache "		LOG(DEBUG) << "Measured external data " << extStats.dataSize << " cache "
	<< extStats.cacheSize;		<< extStats.cacheSize << " code " << extStats.codeSize;
	#endif		#endif
	atrace_pm_end();		atrace_pm_end();