android/Bootstrap/Makefile.shared
| 1 +
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
| 4 ++--
android/mobile-config.py
| 2 --
configmgr/source/components.cxx
| 4 ++++
configmgr/source/parsemanager.cxx
| 5 ++++-
configmgr/source/parsemanager.hxx
| 1 +
6 files changed, 12 insertions(+), 5 deletions(-)
New commits:
commit 4488e5612f38a4a8753eae11a62353cff66b3500
Author: Tor Lillqvist <t...@collabora.com>
Date: Thu Oct 23 14:30:26 2014 +0300
Add (commented-out) invocation of mobile-config.py
Change-Id: I379601099bda928b9eeeaeb29030bc009e3cbbf2
diff --git a/android/Bootstrap/Makefile.shared
b/android/Bootstrap/Makefile.shared
index 7ec1419..3924dfe 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -138,6 +138,7 @@ copy-stuff:
rm -Rf assets/share # pre-clean it
mkdir -p assets/share/config
cp -R $(INSTDIR)/share/registry assets/share
+# $(SRC_ROOT)/android/mobile-config.py assets/share/registry/main.xcd
assets/share/registry/main.xcd.new && mv assets/share/registry/main.xcd.new
assets/share/registry/main.xcd
if ! test z$(DISABLE_UI) = zTRUE; then \
echo "Copying UI files into the apk"; \
cp -R $(INSTDIR)/share/config/soffice.cfg assets/share/config; \
commit 00d2482326af17ac61d3c2aaa21d837f0e72bb37
Author: Tor Lillqvist <t...@collabora.com>
Date: Thu Oct 23 14:29:59 2014 +0300
Temporarily do more verbose logging
Change-Id: I3d0db329311e9f2496f80931e6d2776e18f1b2d9
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
index 1bc6499..a63bf4c 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
@@ -36,7 +36,7 @@ public class LOKitTileProvider implements TileProvider {
mTileWidth = pixelToTwip(TILE_SIZE, mDPI);
mTileHeight = pixelToTwip(TILE_SIZE, mDPI);
- LibreOfficeKit.putenv("SAL_LOG=-WARN+INFO.lok");
+ LibreOfficeKit.putenv("SAL_LOG=+WARN+INFO");
LibreOfficeKit.init(LibreOfficeMainActivity.mAppContext);
mOffice = new Office(LibreOfficeKit.getLibreOfficeKitHandle());
@@ -54,7 +54,7 @@ public class LOKitTileProvider implements TileProvider {
mOffice = new Office(handle);
Log.i(LOGTAG, "====> new Office created");
mDocument = mOffice.documentLoad(input);
- LibreOfficeKit.putenv("SAL_LOG=-WARN+INFO.lok");
+ LibreOfficeKit.putenv("SAL_LOG=+WARN+INFO.lok");
}
Log.i(LOGTAG, "====> mDocument = " + mDocument);
commit 3061747ffe044601ce715d682fd0ce43ff5ae958
Author: Tor Lillqvist <t...@collabora.com>
Date: Thu Oct 23 14:29:27 2014 +0300
Try to be less eager
Change-Id: I83a395c628b00b6ca96c93d5d5362ea750e57b2b
diff --git a/android/mobile-config.py b/android/mobile-config.py
index 4cc6fa6..ff2fd53 100755
--- a/android/mobile-config.py
+++ b/android/mobile-config.py
@@ -39,7 +39,6 @@ main_xcd_discard = [
'org.openoffice.Office.UI/BasicIDECommands',
'org.openoffice.Office.UI/BibliographyCommands',
'org.openoffice.Office.UI/DbQueryWindowState',
- 'org.openoffice.Office.UI/WindowState',
'org.openoffice.Office.UI/DbRelationWindowState',
'org.openoffice.Office.UI/DbTableWindowState',
'org.openoffice.Office.UI/DbTableDataWindowState',
@@ -47,7 +46,6 @@ main_xcd_discard = [
'org.openoffice.Office.UI/WindowContentFactories',
'org.openoffice.Office.UI/StartModuleWindowState',
'org.openoffice.Office.UI/GlobalSettings',
- 'org.openoffice.Office.UI/Commands',
'org.openoffice.Office.UI/BibliographyWindowState',
'org.openoffice.Office.UI/Category',
]
commit e8935cc7859ed850e6cb6ca5c8914f511615d4bd
Author: Tor Lillqvist <t...@collabora.com>
Date: Thu Oct 23 12:31:58 2014 +0300
Log parsing time of each xcd file
Change-Id: I290e2c84b17b9b5063139c6027b72f6cd3a78a99
diff --git a/configmgr/source/parsemanager.cxx
b/configmgr/source/parsemanager.cxx
index 8768fcb..fab0a38 100644
--- a/configmgr/source/parsemanager.cxx
+++ b/configmgr/source/parsemanager.cxx
@@ -35,7 +35,7 @@ namespace configmgr {
ParseManager::ParseManager(
OUString const & url, rtl::Reference< Parser > const & parser)
- : reader_(url), parser_(parser)
+ : url_(url), reader_(url), parser_(parser)
{
assert(parser.is());
int id;
@@ -56,6 +56,7 @@ ParseManager::ParseManager(
}
bool ParseManager::parse(std::set< OUString > const * existingDependencies) {
+ sal_uInt32 startTime( osl_getGlobalTimer() );
for (;;) {
switch (itemData_.is()
? xmlreader::XmlReader::RESULT_BEGIN
@@ -66,6 +67,7 @@ bool ParseManager::parse(std::set< OUString > const *
existingDependencies) {
if (!parser_->startElement(
reader_, itemNamespaceId_, itemData_,
existingDependencies))
{
+ SAL_INFO("configmgr", "parsing " << url_ << " took " <<
(osl_getGlobalTimer() - startTime) << " ms, fail");
return false;
}
break;
@@ -76,6 +78,7 @@ bool ParseManager::parse(std::set< OUString > const *
existingDependencies) {
parser_->characters(itemData_);
break;
case xmlreader::XmlReader::RESULT_DONE:
+ SAL_INFO("configmgr", "parsing " << url_ << " took " <<
(osl_getGlobalTimer() - startTime) << " ms, success");
return true;
}
itemData_.clear();
diff --git a/configmgr/source/parsemanager.hxx
b/configmgr/source/parsemanager.hxx
index 85ed3c5..74fa131 100644
--- a/configmgr/source/parsemanager.hxx
+++ b/configmgr/source/parsemanager.hxx
@@ -47,6 +47,7 @@ public:
enum { NAMESPACE_OOR = 1, NAMESPACE_XS = 2, NAMESPACE_XSI = 3 };
private:
+ OUString url_;
virtual ~ParseManager();
xmlreader::XmlReader reader_;
commit 78f666b9c688825dd6e7476752e1b976c85a7431
Author: Tor Lillqvist <t...@collabora.com>
Date: Wed Oct 22 16:55:37 2014 +0300
SAL_INFO how long parseXcsXcuLayer() and parseResLayer() took
Change-Id: I1e71b8a6348301cd5b3fed0ae8b3346ae3e07d8e
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 8dcf88d..ddb4d9e2 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -492,7 +492,9 @@ Components::Components(
OUString type(conf.copy(i, c - i));
OUString url(conf.copy(c + 1, n - c - 1));
if ( type == "xcsxcu" ) {
+ sal_uInt32 nStartTime = osl_getGlobalTimer();
parseXcsXcuLayer(layer, url);
+ SAL_INFO("configmgr", "parseXcsXcuLayer() took " <<
(osl_getGlobalTimer() - nStartTime) << " ms");
layer += 2; //TODO: overflow
} else if ( type == "bundledext" )
{
@@ -518,7 +520,9 @@ Components::Components(
parseModuleLayer(layer, url);
++layer; //TODO: overflow
} else if ( type == "res" ) {
+ sal_uInt32 nStartTime = osl_getGlobalTimer();
parseResLayer(layer, url);
+ SAL_INFO("configmgr", "parseResLayer() took " <<
(osl_getGlobalTimer() - nStartTime) << " ms");
++layer; //TODO: overflow
} else if ( type == "user" ) {
if (url.isEmpty()) {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
