summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2015-03-28 23:31:57 +0200
committerTor Lillqvist <tml@collabora.com>2015-03-29 01:56:37 +0200
commit8c100755ba5c2a097b3d12c60fde6d3b1f1f606c (patch)
tree75fe61340abc668e24767be7724ed0bfa585d4fe /desktop
parent2b9cef0286d1361441c9350135a9874d4a3ba34c (diff)
Don't use any IPC pipe when in console-only mode or in a LOKit-based program
There is by definition no reason to do any IPC in those cases. Each program running LO code in such a mode is independent from any other. Do as before for Android, though, I don't have the patience now to check whether we actually need the pipe on Android for some reason. Change-Id: If0f54bf51e58b13c0c0b8f0bf6882bbef067960d
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/app/officeipcthread.cxx178
1 files changed, 102 insertions, 76 deletions
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 5d405e13dd79..aec9b3c0f279 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -456,106 +456,126 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread()
rtl::Reference< OfficeIPCThread > pThread(new OfficeIPCThread);
- // The name of the named pipe is created with the hashcode of the user installation directory (without /user). We have to retrieve
- // this information from a unotools implementation.
- ::utl::Bootstrap::PathStatus aLocateResult = ::utl::Bootstrap::locateUserInstallation( aUserInstallPath );
- if ( aLocateResult == ::utl::Bootstrap::PATH_EXISTS || aLocateResult == ::utl::Bootstrap::PATH_VALID)
- aDummy = aUserInstallPath;
- else
- {
- return IPC_STATUS_BOOTSTRAP_ERROR;
- }
-
- // Try to determine if we are the first office or not! This should prevent multiple
- // access to the user directory !
- // First we try to create our pipe if this fails we try to connect. We have to do this
- // in a loop because the other office can crash or shutdown between createPipe
- // and connectPipe!!
+ PipeMode nPipeMode = PIPEMODE_DONTKNOW;
- OUString aIniName;
+#ifndef ANDROID // On Android it might be that we still for some reason need the pipe?
- osl_getExecutableFile( &aIniName.pData );
+ // When console-only (which includes in LibreOfficeKit-based programs) we want to be totally
+ // independent from any other LibreOffice instance or LOKit-using program. Certainly no need for
+ // any IPC pipes by definition, as we don't have any reason to do any IPC. Why we even call this
+ // EnableOfficeIPCThread function from LibreOfficeKit's lo_initialize() I am not completely
+ // sure, but that code, and this, is such horrible crack that I don't want to change it too much.
- sal_uInt32 lastIndex = aIniName.lastIndexOf('/');
- if ( lastIndex > 0 )
+ if (Application::IsConsoleOnly())
{
- aIniName = aIniName.copy( 0, lastIndex+1 );
- aIniName += "perftune";
-#if defined(WNT)
- aIniName += ".ini";
-#else
- aIniName += "rc";
-#endif
+ // Setting nPipeMode to PIPEMODE_CREATED causes the trivial path to be taken below, starting
+ // the listeing thread. (Which will immediately finish, see the execute() function, but what
+ // the heck...)
+ nPipeMode = PIPEMODE_CREATED;
}
+ else
+#endif
+ {
+ // The name of the named pipe is created with the hashcode of the user installation directory (without /user). We have to retrieve
+ // this information from a unotools implementation.
+ ::utl::Bootstrap::PathStatus aLocateResult = ::utl::Bootstrap::locateUserInstallation( aUserInstallPath );
+ if ( aLocateResult == ::utl::Bootstrap::PATH_EXISTS || aLocateResult == ::utl::Bootstrap::PATH_VALID)
+ aDummy = aUserInstallPath;
+ else
+ {
+ return IPC_STATUS_BOOTSTRAP_ERROR;
+ }
- ::rtl::Bootstrap aPerfTuneIniFile( aIniName );
-
- OUString aDefault( "0" );
- OUString aPreloadData;
+ // Try to determine if we are the first office or not! This should prevent multiple
+ // access to the user directory !
+ // First we try to create our pipe if this fails we try to connect. We have to do this
+ // in a loop because the other office can crash or shutdown between createPipe
+ // and connectPipe!!
- aPerfTuneIniFile.getFrom( OUString( "FastPipeCommunication" ), aPreloadData, aDefault );
+ OUString aIniName;
+ osl_getExecutableFile( &aIniName.pData );
- OUString aUserInstallPathHashCode;
+ sal_uInt32 lastIndex = aIniName.lastIndexOf('/');
+ if ( lastIndex > 0 )
+ {
+ aIniName = aIniName.copy( 0, lastIndex+1 );
+ aIniName += "perftune";
+ #if defined(WNT)
+ aIniName += ".ini";
+ #else
+ aIniName += "rc";
+ #endif
+ }
- if ( aPreloadData == "1" )
- {
- sal_Char szBuffer[32];
- sprintf( szBuffer, "%d", LIBO_VERSION_MAJOR * 10000 + LIBO_VERSION_MINOR * 100 + LIBO_VERSION_MICRO * 1 );
- aUserInstallPathHashCode = OUString( szBuffer, strlen(szBuffer), osl_getThreadTextEncoding() );
- }
- else
- aUserInstallPathHashCode = CreateMD5FromString( aDummy );
+ ::rtl::Bootstrap aPerfTuneIniFile( aIniName );
+ OUString aDefault( "0" );
+ OUString aPreloadData;
- // Check result to create a hash code from the user install path
- if ( aUserInstallPathHashCode.isEmpty() )
- return IPC_STATUS_BOOTSTRAP_ERROR; // Something completely broken, we cannot create a valid hash code!
+ aPerfTuneIniFile.getFrom( OUString( "FastPipeCommunication" ), aPreloadData, aDefault );
- OUString aPipeIdent( "SingleOfficeIPC_" + aUserInstallPathHashCode );
- PipeMode nPipeMode = PIPEMODE_DONTKNOW;
- do
- {
- osl::Security &rSecurity = Security::get();
+ OUString aUserInstallPathHashCode;
- // Try to create pipe
- if ( pThread->maPipe.create( aPipeIdent.getStr(), osl_Pipe_CREATE, rSecurity ))
+ if ( aPreloadData == "1" )
{
- // Pipe created
- nPipeMode = PIPEMODE_CREATED;
+ sal_Char szBuffer[32];
+ sprintf( szBuffer, "%d", LIBO_VERSION_MAJOR * 10000 + LIBO_VERSION_MINOR * 100 + LIBO_VERSION_MICRO * 1 );
+ aUserInstallPathHashCode = OUString( szBuffer, strlen(szBuffer), osl_getThreadTextEncoding() );
}
- else if( pThread->maPipe.create( aPipeIdent.getStr(), osl_Pipe_OPEN, rSecurity )) // Creation not successful, now we try to connect
+ else
+ aUserInstallPathHashCode = CreateMD5FromString( aDummy );
+
+
+ // Check result to create a hash code from the user install path
+ if ( aUserInstallPathHashCode.isEmpty() )
+ return IPC_STATUS_BOOTSTRAP_ERROR; // Something completely broken, we cannot create a valid hash code!
+
+ OUString aPipeIdent( "SingleOfficeIPC_" + aUserInstallPathHashCode );
+
+ do
{
- osl::StreamPipe aStreamPipe(pThread->maPipe.getHandle());
- if (readStringFromPipe(aStreamPipe) == SEND_ARGUMENTS)
+ osl::Security &rSecurity = Security::get();
+
+ // Try to create pipe
+ if ( pThread->maPipe.create( aPipeIdent.getStr(), osl_Pipe_CREATE, rSecurity ))
+ {
+ // Pipe created
+ nPipeMode = PIPEMODE_CREATED;
+ }
+ else if( pThread->maPipe.create( aPipeIdent.getStr(), osl_Pipe_OPEN, rSecurity )) // Creation not successful, now we try to connect
{
- // Pipe connected to first office
- nPipeMode = PIPEMODE_CONNECTED;
+ osl::StreamPipe aStreamPipe(pThread->maPipe.getHandle());
+ if (readStringFromPipe(aStreamPipe) == SEND_ARGUMENTS)
+ {
+ // Pipe connected to first office
+ nPipeMode = PIPEMODE_CONNECTED;
+ }
+ else
+ {
+ // Pipe connection failed (other office exited or crashed)
+ TimeValue tval;
+ tval.Seconds = 0;
+ tval.Nanosec = 500000000;
+ salhelper::Thread::wait( tval );
+ }
}
else
{
- // Pipe connection failed (other office exited or crashed)
- TimeValue tval;
- tval.Seconds = 0;
- tval.Nanosec = 500000000;
- salhelper::Thread::wait( tval );
+ oslPipeError eReason = pThread->maPipe.getError();
+ if ((eReason == osl_Pipe_E_ConnectionRefused) || (eReason == osl_Pipe_E_invalidError))
+ return IPC_STATUS_PIPE_ERROR;
+
+ // Wait for second office to be ready
+ TimeValue aTimeValue;
+ aTimeValue.Seconds = 0;
+ aTimeValue.Nanosec = 10000000; // 10ms
+ salhelper::Thread::wait( aTimeValue );
}
- }
- else
- {
- oslPipeError eReason = pThread->maPipe.getError();
- if ((eReason == osl_Pipe_E_ConnectionRefused) || (eReason == osl_Pipe_E_invalidError))
- return IPC_STATUS_PIPE_ERROR;
-
- // Wait for second office to be ready
- TimeValue aTimeValue;
- aTimeValue.Seconds = 0;
- aTimeValue.Nanosec = 10000000; // 10ms
- salhelper::Thread::wait( aTimeValue );
- }
- } while ( nPipeMode == PIPEMODE_DONTKNOW );
+ } while ( nPipeMode == PIPEMODE_DONTKNOW );
+ }
if ( nPipeMode == PIPEMODE_CREATED )
{
@@ -684,6 +704,12 @@ bool OfficeIPCThread::IsEnabled()
void OfficeIPCThread::execute()
{
#if HAVE_FEATURE_DESKTOP || defined(ANDROID)
+
+#ifndef ANDROID
+ if (Application::IsConsoleOnly())
+ return;
+#endif
+
do
{
osl::StreamPipe aStreamPipe;