From 50a0f04721591a4c0575b4261696587a820df708 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Fri, 18 Nov 2011 08:54:17 +0100 Subject: [PATCH] Bug 702764 part 1 - Use RUSAGE_THREAD for library loading time consumption reporting. r=tglek --- other-licenses/android/APKOpen.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/other-licenses/android/APKOpen.cpp b/other-licenses/android/APKOpen.cpp index b49d6eb1eb88..1f3817700b03 100644 --- a/other-licenses/android/APKOpen.cpp +++ b/other-licenses/android/APKOpen.cpp @@ -62,6 +62,11 @@ #include #include +/* Android headers don't define RUSAGE_THREAD */ +#ifndef RUSAGE_THREAD +#define RUSAGE_THREAD 1 +#endif + /* compression methods */ #define STORE 0 #define DEFLATE 8 @@ -580,7 +585,7 @@ loadLibs(const char *apkName) struct timeval t0, t1; gettimeofday(&t0, 0); struct rusage usage1; - getrusage(RUSAGE_SELF, &usage1); + getrusage(RUSAGE_THREAD, &usage1); void *zip = map_file(apkName); struct cdir_end *dirend = (struct cdir_end *)((char *)zip + zip_size - sizeof(*dirend)); @@ -647,7 +652,7 @@ loadLibs(const char *apkName) #undef GETFUNC gettimeofday(&t1, 0); struct rusage usage2; - getrusage(RUSAGE_SELF, &usage2); + getrusage(RUSAGE_THREAD, &usage2); __android_log_print(ANDROID_LOG_ERROR, "GeckoLibLoad", "Loaded libs in %dms total, %dms user, %dms system, %d faults", (t1.tv_sec - t0.tv_sec)*1000 + (t1.tv_usec - t0.tv_usec)/1000, (usage2.ru_utime.tv_sec - usage1.ru_utime.tv_sec)*1000 + (usage2.ru_utime.tv_usec - usage1.ru_utime.tv_usec)/1000,