diff options
| author | Andrzej Hunt <andrzej.hunt@collabora.com> | 2014-09-26 09:12:56 +0100 |
|---|---|---|
| committer | Andrzej Hunt <andrzej@ahunt.org> | 2014-09-26 09:39:02 +0100 |
| commit | a79846ab296a40310af798bb42f0c590c3b87ed8 (patch) | |
| tree | 07477a2cdd9c0631b1571416c49188c4798bfab1 | |
| parent | 35cecf52d34cbcc54eb7b3b2297635b4cc227ede (diff) | |
Add more lok debug output.
This should allow as at least to see if soffice_main thread
initialisation gets stuck (which we'd otherwise have a hard time
determining if we are trying to debug e.g. on Android).
Change-Id: I0baa211c015318c4e0fcf78a4e86a0ba8b895d5f
| -rw-r--r-- | desktop/source/lib/init.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 89c8168b4777..96135143d6fd 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -700,9 +700,12 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath) // to LOK in an external program). if (!osl_areCommandArgsSet()) { + SAL_INFO("lok", "commandArgs not previously set"); osl_setCommandArgs(2, pArgs); } + SAL_INFO("lok", "attempting to initalize UNO"); initialize_uno(aAppURL); + SAL_INFO("lok", "uno successfully initalized"); force_c_locale(); // Force headless -- this is only for bitmap rendering. @@ -724,9 +727,13 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath) // the Thread from wherever (it's done again in Desktop::Main), and can // then use it to wait until we're definitely ready to continue. + SAL_INFO("lok", "enabling OfficeIPCThread"); OfficeIPCThread::EnableOfficeIPCThread(); + SAL_INFO("lok", "starting soffice_main"); pthread_create(&(pLib->maThread), 0, lo_startmain, NULL); + SAL_INFO("lok", "waiting for OfficeIPCThread"); OfficeIPCThread::WaitForReady(); + SAL_INFO("lok", "OfficeIPCThread ready -- continuing"); // If the Thread has been disabled again that indicates that a // restart is required (or in any case we don't have a useable |