[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    Re: branches/soprano/2.4/backends/virtuoso
From:       Michael Seiwert <mseiwert () hbv ! de>
Date:       2010-02-23 10:27:38
Message-ID: 201002231127.38505.mseiwert () hbv ! de
[Download RAW message or body]

Hi,

will you backport this commit to the kdesupport-for-4.4 branch ?

Michael

On Tuesday 23 February 2010 10:08:26 Sebastian Trueg wrote:
> SVN commit 1094791 by trueg:
> 
> Backport: wait for the killed Virtuoso instance to go down.
> 
>  M  +5 -11     virtuosocontroller.cpp
> 
> 
> --- branches/soprano/2.4/backends/virtuoso/virtuosocontroller.cpp
> #1094790:1094791 @@ -37,16 +37,12 @@
>  #ifndef Q_OS_WIN
>  #include <sys/types.h>
>  #include <signal.h>
> +#include <sys/wait.h>
>  #endif
> 
>  Q_DECLARE_METATYPE( QProcess::ExitStatus )
> 
>  namespace {
> -
> -#ifdef Q_OS_WIN
> -    QMutex portNumberMutex;
> -#endif
> -
>      quint16 getFreePortNumber() {
>  //         QTcpServer server;
>  //         if ( server.listen() ) {
> @@ -57,6 +53,7 @@
>  //             return 1111;
>  //         }
>  #ifdef Q_OS_WIN
> +        static QMutex portNumberMutex;
>          static quint16 p = 1111;
>          QMutexLocker l(&portNumberMutex);
>          return p++;
> @@ -121,6 +118,7 @@
>  #ifndef Q_OS_WIN
>              qDebug( "Shutting down Virtuoso instance (%d) which is in our
> way.", pid );
> 
>              ::kill( pid_t( pid ), SIGINT );
> 
> +            ::waitpid( pid_t( pid ), 0, 0 );
>  #endif
>              pid = 0;
>          }
> @@ -133,14 +131,10 @@
>          }
> 
>          QStringList args;
> -#ifdef Q_OS_WIN
>          args << "+foreground"
> -             << "+configfile" <<
> QDir::toNativeSeparators(m_configFilePath); -#else
> -        args << "+foreground"
> -             << "+config" << m_configFilePath
> +             << "+configfile" <<
> QDir::toNativeSeparators(m_configFilePath) << "+wait";
> -#endif
> +
>          qDebug() << "Starting Virtuoso server:" << virtuosoExe << args;
> 
>          m_virtuosoProcess.start( virtuosoExe, args, QIODevice::ReadOnly );
[prev in list] [next in list] [prev in thread] [next in thread]