mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

percheck: produce similar stats than off-tree callgrind

Browse Source 
Change-Id: I7035ea6f2d9ffe92282533064d69b75e2c1989e1
This commit is contained in:
Norbert Thiebaud
2015-09-02 14:31:21 -05:00
parent 159792e02f
commit 37e94841db
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sc/qa/perf/scperfobj.cxx
View File

@@ -136,7 +136,7 @@ void ScPerfObj::testSheetFindAll()
uno::Reference< container::XIndexAccess > xIndex = xSearchable->findAll(xSearchDescr); uno::Reference< container::XIndexAccess > xIndex = xSearchable->findAll(xSearchDescr);
callgrindDump("testSheetFindAll-Search value"); callgrindDump("sc:search_all_sheets_by_value");
CPPUNIT_ASSERT(xIndex.is()); CPPUNIT_ASSERT(xIndex.is());
@@ -158,7 +158,7 @@ void ScPerfObj::testSheetFindAll()
uno::Reference< container::XIndexAccess > xIndex2 = xSearchableStyle->findAll(xSearchDescr); uno::Reference< container::XIndexAccess > xIndex2 = xSearchableStyle->findAll(xSearchDescr);
callgrindDump("testSheetFindAll-Search style"); callgrindDump("sc:search_all_sheets_by_style");
CPPUNIT_ASSERT(xIndex2.is()); CPPUNIT_ASSERT(xIndex2.is());
@@ -194,7 +194,7 @@ void ScPerfObj::testSheetNamedRanges()
{ {
callgrindStart(); callgrindStart();
xNamedRanges->removeByName(maNameToRemove); xNamedRanges->removeByName(maNameToRemove);
callgrindDump("Namedranges-removeByName"); callgrindDump("sc:remove_named_range_by_name");
} }
// test addNewByName // test addNewByName
@@ -205,13 +205,13 @@ void ScPerfObj::testSheetNamedRanges()
OUString aName1("single_added"); OUString aName1("single_added");
callgrindStart(); callgrindStart();
xNamedRanges->addNewByName(aName1, aContent1, aBaseAddress, nType); xNamedRanges->addNewByName(aName1, aContent1, aBaseAddress, nType);
callgrindDump("Namedranges-addNewByName"); callgrindDump("sc:add_named_range_by_name");
//test AddNewFromTitles with some 1000 new named ranges //test AddNewFromTitles with some 1000 new named ranges
table::CellRangeAddress aCellRangeAddress = table::CellRangeAddress(0,1,0,2,999); table::CellRangeAddress aCellRangeAddress = table::CellRangeAddress(0,1,0,2,999);
callgrindStart(); callgrindStart();
xNamedRanges->addNewFromTitles(aCellRangeAddress, sheet::Border_LEFT); xNamedRanges->addNewFromTitles(aCellRangeAddress, sheet::Border_LEFT);
callgrindDump("Namedranges-addNewFromTitles"); callgrindDump("sc:add_named_range_from_titles");
} }
@@ -229,20 +229,20 @@ void ScPerfObj::testSheets()
callgrindStart(); callgrindStart();
xSheets->insertNewByName(aSheetName, 80); xSheets->insertNewByName(aSheetName, 80);
callgrindDump("Sheets-insertNewByName"); callgrindDump("sc:insert_new_sheet_by_name");
OUString aSourceSheetName = "aSheet_2"; OUString aSourceSheetName = "aSheet_2";
OUString aTargetSheetName = "aCopiedSheet"; OUString aTargetSheetName = "aCopiedSheet";
callgrindStart(); callgrindStart();
xSheets->copyByName(aSourceSheetName, aTargetSheetName, 70); xSheets->copyByName(aSourceSheetName, aTargetSheetName, 70);
callgrindDump("Sheets-copyByName"); callgrindDump("sc:copy_sheet_by_name");
uno::Reference< sheet::XSpreadsheets > xSheetsNameContainer (xSheets, UNO_QUERY_THROW); uno::Reference< sheet::XSpreadsheets > xSheetsNameContainer (xSheets, UNO_QUERY_THROW);
callgrindStart(); callgrindStart();
xSheetsNameContainer->removeByName(aSheetName); xSheetsNameContainer->removeByName(aSheetName);
callgrindDump("Sheets-removeByName"); callgrindDump("sc:remove_sheet_by_name");
} }

2
solenv/gbuild/CppunitTest.mk
View File

@@ -36,7 +36,7 @@ endif
ifneq (,$(filter perfcheck,$(MAKECMDGOALS))) ifneq (,$(filter perfcheck,$(MAKECMDGOALS)))
$(if $(ENABLE_VALGRIND),,$(call gb_Output_error,Running performance tests with empty $$(ENABLE_VALGRIND) does not make sense)) $(if $(ENABLE_VALGRIND),,$(call gb_Output_error,Running performance tests with empty $$(ENABLE_VALGRIND) does not make sense))
gb_CppunitTest_VALGRINDTOOL := valgrind --tool=callgrind --dump-instr=yes --instr-atstart=no gb_CppunitTest_VALGRINDTOOL := valgrind --tool=callgrind --dump-instr=yes --instr-atstart=no --simulate-cache=yes --dump-instr=yes --collect-bus=yes --branch-sim=yes
endif endif
# defined by platform # defined by platform

2
test/source/util/xreplaceable.cxx
View File

@@ -54,7 +54,7 @@ void XReplaceable::testReplaceAll()
callgrindStart(); callgrindStart();
xReplaceable->replaceAll(uno::Reference< util::XSearchDescriptor >(xReplaceDescr, UNO_QUERY_THROW)); xReplaceable->replaceAll(uno::Reference< util::XSearchDescriptor >(xReplaceDescr, UNO_QUERY_THROW));
callgrindDump("replaceAll"); callgrindDump("test:replace_all");
//check that now at least one element is found //check that now at least one element is found
xElement = xReplaceable->findFirst(xSearchDescr); xElement = xReplaceable->findFirst(xSearchDescr);