[Libreoffice-commits] core.git: framework/source vcl/inc vcl/source vcl/unx
Juergen Funk
juergen.funk_ml at cib.de
Tue Feb 7 08:44:31 UTC 2017
framework/source/services/sessionlistener.cxx | 12 +
vcl/inc/unx/sm.hxx | 2
vcl/source/app/session.cxx | 3
vcl/unx/generic/app/sm.cxx | 178 +++++++++++++++-----------
4 files changed, 118 insertions(+), 77 deletions(-)
New commits:
commit f57424cc4c0dd68083c7935ce8a9b795625cf84c
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Thu Dec 8 15:41:24 2016 +0100
tdf#104101 Improve the session management handling
- Set the current time to the SessionID
- Split the SetProperties-Data, and send
DeleteProperties for DiscardCommand
(above both topic is the same as kate and
plasma-desktop to do)
- in statusChange the saveDone was not called, and
call only once the saveDone
- in shutdownCanceled must be send the saveDone too
Change-Id: I42855c75b88b5d651ef8091947e359dc2c3f9209
Reviewed-on: https://gerrit.libreoffice.org/33215
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index f9c5394..6a57c56 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -275,9 +275,10 @@ void SAL_CALL SessionListener::statusChanged(const frame::FeatureStateEvent& eve
m_bRestored = true; // a document was restored
}
- else if ( event.FeatureURL.Complete == "vnd.sun.star.autorecovery:/doSessionSave" )
- {
- if (event.FeatureDescriptor == "stop")
+ else if ( event.FeatureURL.Complete == "vnd.sun.star.autorecovery:/doAutoSave" )
+ { // the "doSessionSave" was never set, look to framework/source/services/autorecovery.cxx
+ // it always testing but never setting (enum AutoRecovery::E_SESSION_SAVE)
+ if (event.FeatureDescriptor == "update")
{
if (m_rSessionManager.is())
m_rSessionManager->saveDone(this); // done with save
@@ -372,7 +373,7 @@ void SAL_CALL SessionListener::approveInteraction( sal_Bool bInteractionGranted
m_rSessionManager->interactionDone( this );
}
- if ( m_rSessionManager.is() )
+ if ( m_rSessionManager.is() && m_bTerminated )
m_rSessionManager->saveDone(this);
}
else
@@ -386,6 +387,9 @@ void SessionListener::shutdownCanceled()
SAL_INFO("fwk.session", "SessionListener::shutdownCanceled");
// set the state back
m_bSessionStoreRequested = false; // there is no need to protect it with mutex
+
+ if ( m_rSessionManager.is() )
+ m_rSessionManager->saveDone(this);
}
void SessionListener::doQuit()
diff --git a/vcl/inc/unx/sm.hxx b/vcl/inc/unx/sm.hxx
index f754547..ab736a4 100644
--- a/vcl/inc/unx/sm.hxx
+++ b/vcl/inc/unx/sm.hxx
@@ -38,6 +38,8 @@ class SessionManagerClient
static std::unique_ptr< ICEConnectionObserver > m_xICEConnectionObserver;
static SmcConn m_pSmcConnection;
static OString m_aClientID;
+ static OString m_aTimeID;
+ static OString m_aClientTimeID;
static bool m_bDocSaveDone;
static void SaveYourselfProc( SmcConn connection,
diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx
index fd8ef60..3d371dc 100644
--- a/vcl/source/app/session.cxx
+++ b/vcl/source/app/session.cxx
@@ -359,7 +359,8 @@ void SAL_CALL VCLSession::saveDone( const css::uno::Reference< XSessionManagerLi
}
SAL_INFO("vcl.se.debug", " bSaveDone = " << (bSaveDone ? "true" : "false"));
- if( bSaveDone )
+
+ if( bSaveDone && !m_bSaveDone )
{
m_bSaveDone = true;
if (m_xSession)
diff --git a/vcl/unx/generic/app/sm.cxx b/vcl/unx/generic/app/sm.cxx
index fe88a8e..5b7d1d9 100644
--- a/vcl/unx/generic/app/sm.cxx
+++ b/vcl/unx/generic/app/sm.cxx
@@ -154,7 +154,9 @@ SalSession * SessionManagerClient::m_pSession = nullptr;
std::unique_ptr< ICEConnectionObserver >
SessionManagerClient::m_xICEConnectionObserver;
SmcConn SessionManagerClient::m_pSmcConnection = nullptr;
-OString SessionManagerClient::m_aClientID;
+OString SessionManagerClient::m_aClientID = "";
+OString SessionManagerClient::m_aTimeID = "";
+OString SessionManagerClient::m_aClientTimeID = "";
bool SessionManagerClient::m_bDocSaveDone = false; // HACK
extern "C" {
@@ -172,79 +174,91 @@ static void IgnoreIceIOErrors(SAL_UNUSED_PARAMETER IceConn) {}
static SmProp* pSmProps = nullptr;
static SmProp** ppSmProps = nullptr;
+static char ** ppSmDel = nullptr;
+
static int nSmProps = 0;
+static int nSmDel = 0;
static unsigned char *pSmRestartHint = nullptr;
+
+enum { eCloneCommand, eProgram, eRestartCommand, eUserId, eRestartStyleHint };
+enum { eDiscardCommand };
+
+
static void BuildSmPropertyList()
{
SAL_INFO("vcl.sm", "BuildSmPropertyList");
if( ! pSmProps )
{
- OString aExec(OUStringToOString(SessionManagerClient::getExecName(), osl_getThreadTextEncoding()));
-
- nSmProps = 5;
- pSmProps = new SmProp[ nSmProps ];
-
- pSmProps[ 0 ].name = const_cast<char*>(SmCloneCommand);
- pSmProps[ 0 ].type = const_cast<char*>(SmLISTofARRAY8);
- pSmProps[ 0 ].num_vals = 1;
- pSmProps[ 0 ].vals = new SmPropValue;
- pSmProps[ 0 ].vals->length = aExec.getLength()+1;
- pSmProps[ 0 ].vals->value = strdup( aExec.getStr() );
-
- pSmProps[ 1 ].name = const_cast<char*>(SmProgram);
- pSmProps[ 1 ].type = const_cast<char*>(SmARRAY8);
- pSmProps[ 1 ].num_vals = 1;
- pSmProps[ 1 ].vals = new SmPropValue;
- pSmProps[ 1 ].vals->length = aExec.getLength()+1;
- pSmProps[ 1 ].vals->value = strdup( aExec.getStr() );
-
- pSmProps[ 2 ].name = const_cast<char*>(SmRestartCommand);
- pSmProps[ 2 ].type = const_cast<char*>(SmLISTofARRAY8);
- pSmProps[ 2 ].num_vals = 3;
- pSmProps[ 2 ].vals = new SmPropValue[3];
- pSmProps[ 2 ].vals[0].length = aExec.getLength()+1;
- pSmProps[ 2 ].vals[0].value = strdup( aExec.getStr() );
- OStringBuffer aRestartOption;
- aRestartOption.append("--session=");
- aRestartOption.append(SessionManagerClient::getSessionID());
- pSmProps[ 2 ].vals[1].length = aRestartOption.getLength()+1;
- pSmProps[ 2 ].vals[1].value = strdup(aRestartOption.getStr());
- OString aRestartOptionNoLogo("--nologo");
- pSmProps[ 2 ].vals[2].length = aRestartOptionNoLogo.getLength()+1;
- pSmProps[ 2 ].vals[2].value = strdup(aRestartOptionNoLogo.getStr());
-
- OUString aUserName;
- OString aUser;
- oslSecurity aSec = osl_getCurrentSecurity();
- if( aSec )
- {
- osl_getUserName( aSec, &aUserName.pData );
- aUser = OUStringToOString( aUserName, osl_getThreadTextEncoding() );
- osl_freeSecurityHandle( aSec );
- }
-
- pSmProps[ 3 ].name = const_cast<char*>(SmUserID);
- pSmProps[ 3 ].type = const_cast<char*>(SmARRAY8);
- pSmProps[ 3 ].num_vals = 1;
- pSmProps[ 3 ].vals = new SmPropValue;
- pSmProps[ 3 ].vals->value = strdup( aUser.getStr() );
- pSmProps[ 3 ].vals->length = rtl_str_getLength( static_cast<char *>(pSmProps[ 3 ].vals->value) )+1;
-
- pSmProps[ 4 ].name = const_cast<char*>(SmRestartStyleHint);
- pSmProps[ 4 ].type = const_cast<char*>(SmCARD8);
- pSmProps[ 4 ].num_vals = 1;
- pSmProps[ 4 ].vals = new SmPropValue;
- pSmProps[ 4 ].vals->value = malloc(1);
- pSmRestartHint = static_cast<unsigned char *>(pSmProps[ 4 ].vals->value);
- *pSmRestartHint = SmRestartIfRunning;
- pSmProps[ 4 ].vals->length = 1;
-
+ nSmProps = 5;
+ nSmDel = 1;
+ pSmProps = new SmProp[ nSmProps ];
ppSmProps = new SmProp*[ nSmProps ];
- for( int i = 0; i < nSmProps; i++ )
- ppSmProps[ i ] = &pSmProps[i];
+ ppSmDel = new char*[ nSmDel ];
+ }
+
+ OString aExec(OUStringToOString(SessionManagerClient::getExecName(), osl_getThreadTextEncoding()));
+
+ pSmProps[ eCloneCommand ].name = const_cast<char*>(SmCloneCommand);
+ pSmProps[ eCloneCommand ].type = const_cast<char*>(SmLISTofARRAY8);
+ pSmProps[ eCloneCommand ].num_vals = 1;
+ pSmProps[ eCloneCommand ].vals = new SmPropValue;
+ pSmProps[ eCloneCommand ].vals->length = aExec.getLength()+1;
+ pSmProps[ eCloneCommand ].vals->value = strdup( aExec.getStr() );
+
+ pSmProps[ eProgram ].name = const_cast<char*>(SmProgram);
+ pSmProps[ eProgram ].type = const_cast<char*>(SmARRAY8);
+ pSmProps[ eProgram ].num_vals = 1;
+ pSmProps[ eProgram ].vals = new SmPropValue;
+ pSmProps[ eProgram ].vals->length = aExec.getLength()+1;
+ pSmProps[ eProgram ].vals->value = strdup( aExec.getStr() );
+
+ pSmProps[ eRestartCommand ].name = const_cast<char*>(SmRestartCommand);
+ pSmProps[ eRestartCommand ].type = const_cast<char*>(SmLISTofARRAY8);
+ pSmProps[ eRestartCommand ].num_vals = 3;
+ pSmProps[ eRestartCommand ].vals = new SmPropValue[3];
+ pSmProps[ eRestartCommand ].vals[0].length = aExec.getLength()+1;
+ pSmProps[ eRestartCommand ].vals[0].value = strdup( aExec.getStr() );
+ OStringBuffer aRestartOption;
+ aRestartOption.append("--session=");
+ aRestartOption.append(SessionManagerClient::getSessionID());
+ pSmProps[ eRestartCommand ].vals[1].length = aRestartOption.getLength()+1;
+ pSmProps[ eRestartCommand ].vals[1].value = strdup(aRestartOption.getStr());
+ OString aRestartOptionNoLogo("--nologo");
+ pSmProps[ eRestartCommand ].vals[2].length = aRestartOptionNoLogo.getLength()+1;
+ pSmProps[ eRestartCommand ].vals[2].value = strdup(aRestartOptionNoLogo.getStr());
+
+ OUString aUserName;
+ OString aUser;
+ oslSecurity aSec = osl_getCurrentSecurity();
+ if( aSec )
+ {
+ osl_getUserName( aSec, &aUserName.pData );
+ aUser = OUStringToOString( aUserName, osl_getThreadTextEncoding() );
+ osl_freeSecurityHandle( aSec );
}
+
+ pSmProps[ eUserId ].name = const_cast<char*>(SmUserID);
+ pSmProps[ eUserId ].type = const_cast<char*>(SmARRAY8);
+ pSmProps[ eUserId ].num_vals = 1;
+ pSmProps[ eUserId ].vals = new SmPropValue;
+ pSmProps[ eUserId ].vals->value = strdup( aUser.getStr() );
+ pSmProps[ eUserId ].vals->length = rtl_str_getLength( static_cast<char *>(pSmProps[ 3 ].vals->value) )+1;
+
+ pSmProps[ eRestartStyleHint ].name = const_cast<char*>(SmRestartStyleHint);
+ pSmProps[ eRestartStyleHint ].type = const_cast<char*>(SmCARD8);
+ pSmProps[ eRestartStyleHint ].num_vals = 1;
+ pSmProps[ eRestartStyleHint ].vals = new SmPropValue;
+ pSmProps[ eRestartStyleHint ].vals->value = malloc(1);
+ pSmRestartHint = static_cast<unsigned char *>(pSmProps[ 4 ].vals->value);
+ *pSmRestartHint = SmRestartIfRunning;
+ pSmProps[ eRestartStyleHint ].vals->length = 1;
+
+ for( int i = 0; i < nSmProps; i++ )
+ ppSmProps[ i ] = &pSmProps[i];
+
+ ppSmDel[eDiscardCommand] = const_cast<char*>(SmDiscardCommand);
}
bool SessionManagerClient::checkDocumentsSaved()
@@ -333,13 +347,25 @@ void SessionManagerClient::SaveYourselfProc(
{
SAL_INFO("vcl.sm", "SessionManagerClient::SaveYourselfProc");
- SAL_INFO("vcl.sm.debug", " save_type = " << ((save_type == SmSaveLocal ) ? "local" :
- (save_type == SmSaveGlobal) ? "global" : "both") <<
- ", shutdown = " << (shutdown ? "true" : "false" ) <<
- ", interact_style = " << ((interact_style == SmInteractStyleNone) ? "SmInteractStyleNone" :
- (interact_style == SmInteractStyleErrors) ? "SmInteractStyleErrors" :
- "SmInteractStyleAny"));
+ TimeValue now;
+ osl_getSystemTime(&now);
+
+ SAL_INFO("vcl.sm", " save_type = " << ((save_type == SmSaveLocal ) ? "local" :
+ (save_type == SmSaveGlobal) ? "global" : "both") <<
+ ", shutdown = " << (shutdown ? "true" : "false" ) <<
+ ", interact_style = " << ((interact_style == SmInteractStyleNone) ? "SmInteractStyleNone" :
+ (interact_style == SmInteractStyleErrors) ? "SmInteractStyleErrors" :
+ "SmInteractStyleAny"));
+ char num[100];
+ snprintf(num, sizeof(num), "_%d_%d", now.Seconds, (now.Nanosec / 1000));
+ m_aTimeID = OString(num);
+
BuildSmPropertyList();
+
+ SmcSetProperties( m_pSmcConnection, 1, &ppSmProps[ eProgram ] );
+ SmcSetProperties( m_pSmcConnection, 1, &ppSmProps[ eUserId ] );
+
+
m_bDocSaveDone = false;
/* #i49875# some session managers send a "die" message if the
* saveDone does not come early enough for their convenience
@@ -426,7 +452,12 @@ void SessionManagerClient::saveDone()
{
assert(m_xICEConnectionObserver);
osl::MutexGuard g(m_xICEConnectionObserver->m_ICEMutex);
- SmcSetProperties( m_pSmcConnection, nSmProps, ppSmProps );
+ //SmcSetProperties( m_pSmcConnection, 1, &ppSmProps[ eCloneCommand ] );
+ // this message-handling is now equal to kate and plasma desktop
+ SmcSetProperties( m_pSmcConnection, 1, &ppSmProps[ eRestartCommand ] );
+ SmcDeleteProperties( m_pSmcConnection, 1, &ppSmDel[ eDiscardCommand ] );
+ SmcSetProperties( m_pSmcConnection, 1, &ppSmProps[ eRestartStyleHint ] );
+
SmcSaveYourselfDone( m_pSmcConnection, True );
SAL_INFO("vcl.sm.debug", " sent SmRestartHint = " << (*pSmRestartHint) );
m_bDocSaveDone = true;
@@ -509,8 +540,11 @@ const OString& SessionManagerClient::getSessionID()
{
SAL_INFO("vcl.sm", "SessionManagerClient::getSessionID");
- SAL_INFO("vcl.sm.debug", " SessionID = " << m_aClientID);
- return m_aClientID;
+ m_aClientTimeID = m_aClientID + m_aTimeID;
+
+ SAL_INFO("vcl.sm", " SessionID = " << m_aClientTimeID);
+
+ return m_aClientTimeID;
}
void SessionManagerClient::close()
More information about the Libreoffice-commits
mailing list