Merge "Use libbase to get the elapsed time instead of libutils" into rvc-dev am: 19212e3212 (98ba0352) · Commits · e / os / android_system_core

libstats/push_compat/Android.bp

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -36,7 +36,6 @@ cc_defaults {
	static_libs: [		static_libs: [
	"libbase",		"libbase",
	"liblog",		"liblog",
	"libutils",
	],		],
	}		}

libstats/push_compat/StatsEventCompat.cpp

+12 −2

Original line number	Original line	Diff line number	Diff line
	@@ -15,12 +15,16 @@
	*/		*/

	#include "include/StatsEventCompat.h"		#include "include/StatsEventCompat.h"

			#include <chrono>

			#include <android-base/chrono_utils.h>
	#include <android-base/properties.h>		#include <android-base/properties.h>
	#include <android/api-level.h>		#include <android/api-level.h>
	#include <android/log.h>		#include <android/log.h>
	#include <dlfcn.h>		#include <dlfcn.h>
	#include <utils/SystemClock.h>

			using android::base::boot_clock;
	using android::base::GetProperty;		using android::base::GetProperty;

	const static int kStatsEventTag = 1937006964;		const static int kStatsEventTag = 1937006964;
	@@ -41,6 +45,12 @@ bool StatsEventCompat::mAttemptedLoad = false;
	void* StatsEventCompat::mStatsEventApi = nullptr;		void* StatsEventCompat::mStatsEventApi = nullptr;
	std::mutex StatsEventCompat::mLoadLock;		std::mutex StatsEventCompat::mLoadLock;

			static int64_t elapsedRealtimeNano() {
			return std::chrono::time_point_cast<std::chrono::nanoseconds>(boot_clock::now())
			.time_since_epoch()
			.count();
			}

	StatsEventCompat::StatsEventCompat() : mEventQ(kStatsEventTag) {		StatsEventCompat::StatsEventCompat() : mEventQ(kStatsEventTag) {
	// guard loading because StatsEventCompat might be called from multithreaded		// guard loading because StatsEventCompat might be called from multithreaded
	// environment		// environment
	@@ -61,7 +71,7 @@ StatsEventCompat::StatsEventCompat() : mEventQ(kStatsEventTag) {
	if (mStatsEventApi) {		if (mStatsEventApi) {
	// mEventR = mStatsEventApi->obtain();		// mEventR = mStatsEventApi->obtain();
	} else if (!mPlatformAtLeastR) {		} else if (!mPlatformAtLeastR) {
	mEventQ << android::elapsedRealtimeNano();		mEventQ << elapsedRealtimeNano();
	}		}
	}		}