Attachment 137967 Details for Bug 114025 – patch to help test the deadlock easily - finds another issue ...

patch to help test the deadlock easily - finds another issue ...

0001-test-patch.patch (text/plain), 2.62 KB, created by Michael Meeks on 2017-11-24 14:40:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Meeks

Created: 2017-11-24 14:40:23 UTC

Size: 2.62 KB

patch

obsolete

>From 2115c2a976979f693e09b62cb29b23ce50cbe227 Mon Sep 17 00:00:00 2001
>From: Michael Meeks <michael.meeks@collabora.com>
>Date: Fri, 24 Nov 2017 14:13:06 +0000
>Subject: [PATCH] test patch.
>
>Change-Id: I27f1b0ff0fbc9e5ad04a1e33b9bebcf91e203255
>---
> desktop/source/app/app.cxx                  | 6 ++++--
> desktop/source/deployment/misc/lockfile.cxx | 2 ++
> framework/source/services/desktop.cxx       | 2 ++
> 3 files changed, 8 insertions(+), 2 deletions(-)
>
>diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
>index a27408547d38..949e78d436ff 100644
>--- a/desktop/source/app/app.cxx
>+++ b/desktop/source/app/app.cxx
>@@ -1339,10 +1339,12 @@ int Desktop::Main()
>         bool bMustLockProfile = ( getenv( "SAL_NOLOCK_PROFILE" ) == nullptr );
>         if ( bMustLockProfile )
>         {
>+            SAL_DEBUG("take lock file");
>+            new Lockfile; // leak.
>+            SAL_DEBUG("now re-take lock file");
>             m_xLockfile.reset(new Lockfile);
> 
>-            if ( !rCmdLineArgs.IsHeadless() && !rCmdLineArgs.IsInvisible() &&
>-                 !rCmdLineArgs.IsNoLockcheck() && !m_xLockfile->check( Lockfile_execWarning ))
>+            if ( !m_xLockfile->check( Lockfile_execWarning ))
>             {
>                 // Lockfile exists, and user clicked 'no'
>                 return EXIT_FAILURE;
>diff --git a/desktop/source/deployment/misc/lockfile.cxx b/desktop/source/deployment/misc/lockfile.cxx
>index 219ccaf10431..18aed299e125 100644
>--- a/desktop/source/deployment/misc/lockfile.cxx
>+++ b/desktop/source/deployment/misc/lockfile.cxx
>@@ -148,6 +148,8 @@ namespace desktop {
> 
>     bool Lockfile::isStale() const
>     {
>+        return false;
>+
>         // this checks whether the lockfile was created on the same
>         // host by the same user. Should this be the case it is safe
>         // to assume that it is a stale lockfile which can be overwritten
>diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
>index fd52af489998..b86b22f97ed4 100644
>--- a/framework/source/services/desktop.cxx
>+++ b/framework/source/services/desktop.cxx
>@@ -1790,6 +1790,7 @@ struct Instance {
>         css::uno::Reference<css::uno::XComponentContext> const & context):
>         instance(new framework::Desktop(context))
>     {
>+        osl::Thread::wait(TimeValue(2, 0));
>         instance->constructorInit();
>     }
> 
>@@ -1808,6 +1809,7 @@ com_sun_star_comp_framework_Desktop_get_implementation(
>     css::uno::XComponentContext *context,
>     css::uno::Sequence<css::uno::Any> const &)
> {
>+    // Assert solar mutex is not held here ...
>     return cppu::acquire(Singleton::get(context).instance.get());
> }
> 
>-- 
>2.13.6
>

Actions: View

Attachments on bug 114025: 137967