diff options
| author | Pierre-Eric Pelloux-Prayer <pierre-eric@lanedo.com> | 2012-11-20 11:03:03 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-12-13 11:16:12 +0100 |
| commit | 0dce7eae55bf90d2a7171a1fb8663d66ba4ac6d3 (patch) | |
| tree | 104a391ba1d2d6cdaa2bc121a522c827e45e8577 /desktop/source/app/officeipcthread.hxx | |
| parent | 53fbd30b3cd6465251b1b07f4728813d524fcd82 (diff) | |
startup: more reliable startup of multiple instances
Until now, when a new soffice instance (S2) started and tried to
connect to an existing soffice process (S1), S2 may have failed to
boostrap due to race condition in communication over the shared pipe.
S1 can be shutdown after S2 connected to it but _before_ S1 handled its
arguments (code run after 'accept' method in OfficeIPCThread).
This patch introduces a new message, sent by the main soffice after it
has called accept if and only if it's not shutting down (see mbDowning
member).
The other soffice waits for this message before enabling going in
PIPE_CONNECTED mode. If soffice fails to receive this message, pipe mode is
left unchanged and after a quick pause, it will try again.
Change-Id: I2e099a5804e1e8dd535cfd31ef454cffa44efa62
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'desktop/source/app/officeipcthread.hxx')
| -rw-r--r-- | desktop/source/app/officeipcthread.hxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/desktop/source/app/officeipcthread.hxx b/desktop/source/app/officeipcthread.hxx index 734119d61ad9..3dd7eac5197c 100644 --- a/desktop/source/app/officeipcthread.hxx +++ b/desktop/source/app/officeipcthread.hxx @@ -94,6 +94,8 @@ class OfficeIPCThread : public salhelper::Thread static const int sc_nShSeqLength; static const char *sc_aConfirmationSequence; static const int sc_nCSeqLength; + static const char *sc_aSendArgumentsSequence; + static const int sc_nCSASeqLength; OfficeIPCThread(); |