|
 |
f325b2 |
From a105e5ba1e92f91b34e7f25cc4b307900248881a Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Markus Mohrhard <markus.mohrhard@googlemail.com>
|
|
|
f325b2 |
Date: Mon, 31 Aug 2015 01:36:02 +0200
|
|
|
f325b2 |
Subject: [PATCH 098/398] log resource usage of unit tests on UNX platforms
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: I3788eae60f73bc42488bf2e4961922962f7e505b
|
|
|
f325b2 |
Reviewed-on: https://gerrit.libreoffice.org/18155
|
|
|
f325b2 |
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
|
|
|
f325b2 |
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
|
|
|
f325b2 |
(cherry picked from commit 87514b0907dfbb479e2646b5ff951c68babf3417)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
sal/cppunittester/cppunittester.cxx | 50 +++++++++++++++++++++++++++++++++++++
|
|
|
f325b2 |
solenv/gbuild/CppunitTest.mk | 2 +-
|
|
|
f325b2 |
2 files changed, 51 insertions(+), 1 deletion(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/sal/cppunittester/cppunittester.cxx b/sal/cppunittester/cppunittester.cxx
|
|
|
f325b2 |
index b637fb62cb2d..ef9212d6a2fa 100644
|
|
|
f325b2 |
--- a/sal/cppunittester/cppunittester.cxx
|
|
|
f325b2 |
+++ b/sal/cppunittester/cppunittester.cxx
|
|
|
f325b2 |
@@ -21,6 +21,11 @@
|
|
|
f325b2 |
#include <windows.h>
|
|
|
f325b2 |
#endif
|
|
|
f325b2 |
|
|
|
f325b2 |
+#ifdef UNX
|
|
|
f325b2 |
+#include <sys/time.h>
|
|
|
f325b2 |
+#include <sys/resource.h>
|
|
|
f325b2 |
+#endif
|
|
|
f325b2 |
+
|
|
|
f325b2 |
#include <cstdlib>
|
|
|
f325b2 |
#include <iostream>
|
|
|
f325b2 |
#include <string>
|
|
|
f325b2 |
@@ -292,11 +297,48 @@ public:
|
|
|
f325b2 |
}
|
|
|
f325b2 |
};
|
|
|
f325b2 |
|
|
|
f325b2 |
+#ifdef UNX
|
|
|
f325b2 |
+
|
|
|
f325b2 |
+double get_time(timeval* time)
|
|
|
f325b2 |
+{
|
|
|
f325b2 |
+ double nTime = (double)time->tv_sec;
|
|
|
f325b2 |
+ nTime += ((double)time->tv_usec)/1000000.0;
|
|
|
f325b2 |
+ return nTime;
|
|
|
f325b2 |
+}
|
|
|
f325b2 |
+
|
|
|
f325b2 |
+OString generateTestName(const OUString& rPath)
|
|
|
f325b2 |
+{
|
|
|
f325b2 |
+ sal_Int32 nPathSep = rPath.lastIndexOf("/");
|
|
|
f325b2 |
+ OUString aTestName = rPath.copy(nPathSep+1);
|
|
|
f325b2 |
+ return OUStringToOString(aTestName, RTL_TEXTENCODING_UTF8);
|
|
|
f325b2 |
+}
|
|
|
f325b2 |
+
|
|
|
f325b2 |
+void reportResourceUsage(const OUString& rPath)
|
|
|
f325b2 |
+{
|
|
|
f325b2 |
+ OUString aFullPath = rPath + OUString(".resource.log");
|
|
|
f325b2 |
+ rusage resource_usage;
|
|
|
f325b2 |
+ getrusage(RUSAGE_SELF, &resource_usage);
|
|
|
f325b2 |
+
|
|
|
f325b2 |
+ OString aPath = OUStringToOString(aFullPath, RTL_TEXTENCODING_UTF8);
|
|
|
f325b2 |
+ std::ofstream resource_file(aPath.getStr());
|
|
|
f325b2 |
+ resource_file << "Name = " << generateTestName(rPath) << std::endl;
|
|
|
f325b2 |
+ double nUserSpace = get_time(&resource_usage.ru_utime);
|
|
|
f325b2 |
+ double nKernelSpace = get_time(&resource_usage.ru_stime);
|
|
|
f325b2 |
+ resource_file << "UserSpace = " << nUserSpace << std::endl;
|
|
|
f325b2 |
+ resource_file << "KernelSpace = " << nKernelSpace << std::endl;
|
|
|
f325b2 |
+}
|
|
|
f325b2 |
+#else
|
|
|
f325b2 |
+void reportResourceUsage(const OUString& /*rPath*/)
|
|
|
f325b2 |
+{
|
|
|
f325b2 |
+}
|
|
|
f325b2 |
+#endif
|
|
|
f325b2 |
+
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
SAL_IMPLEMENT_MAIN()
|
|
|
f325b2 |
{
|
|
|
f325b2 |
bool ok = false;
|
|
|
f325b2 |
+ OUString path;
|
|
|
f325b2 |
try
|
|
|
f325b2 |
{
|
|
|
f325b2 |
#ifdef WNT
|
|
|
f325b2 |
@@ -322,6 +364,12 @@ SAL_IMPLEMENT_MAIN()
|
|
|
f325b2 |
while (index < rtl_getAppCommandArgCount())
|
|
|
f325b2 |
{
|
|
|
f325b2 |
rtl::OUString arg = getArgument(index);
|
|
|
f325b2 |
+ if (arg == "--target")
|
|
|
f325b2 |
+ {
|
|
|
f325b2 |
+ path = getArgument(++index);
|
|
|
f325b2 |
+ ++index;
|
|
|
f325b2 |
+ continue;
|
|
|
f325b2 |
+ }
|
|
|
f325b2 |
if ( arg != "--protector" )
|
|
|
f325b2 |
{
|
|
|
f325b2 |
if (testlib.empty())
|
|
|
f325b2 |
@@ -383,6 +431,8 @@ SAL_IMPLEMENT_MAIN()
|
|
|
f325b2 |
SAL_WARN("vcl.app", "Fatal exception: " << e.what());
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
+ reportResourceUsage(path);
|
|
|
f325b2 |
+
|
|
|
f325b2 |
return ok ? EXIT_SUCCESS : EXIT_FAILURE;
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
|
|
|
f325b2 |
index 021ecc8c37aa..944a87ab612d 100644
|
|
|
f325b2 |
--- a/solenv/gbuild/CppunitTest.mk
|
|
|
f325b2 |
+++ b/solenv/gbuild/CppunitTest.mk
|
|
|
f325b2 |
@@ -101,7 +101,7 @@ $(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_RUNTIMEDEPS)
|
|
|
f325b2 |
PYTHONDONTWRITEBYTECODE=1) \
|
|
|
f325b2 |
$(ICECREAM_RUN) $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_CPPTESTCOMMAND) \
|
|
|
f325b2 |
$(call gb_LinkTarget_get_target,$(call gb_CppunitTest_get_linktarget,$*)) \
|
|
|
f325b2 |
- $(call gb_CppunitTest__make_args) \
|
|
|
f325b2 |
+ $(call gb_CppunitTest__make_args) --target $@ \
|
|
|
f325b2 |
$(if $(gb_CppunitTest__interactive),, \
|
|
|
f325b2 |
> $@.log 2>&1 \
|
|
|
f325b2 |
|| ($(if $(value gb_CppunitTest_postprocess), \
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|