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

List:       kde-commits
Subject:    kdelibs/kinit
From:       Waldo Bastian <bastian () kde ! org>
Date:       2004-02-01 13:46:07
Message-ID: 20040201134607.4E06A9911 () office ! kde ! org
[Download RAW message or body]

CVS commit by waba: 

Add support for running io-slaves through valgrind.


  M +16 -4     klauncher.cpp   1.95
  M +1 -0      klauncher.h   1.37


--- kdelibs/kinit/klauncher.cpp  #1.94:1.95
@@ -30,11 +30,14 @@
 #include <qfile.h>
 
-#include <klocale.h>
+#include <kconfig.h>
 #include <kdebug.h>
-#include <kurl.h>
+#include <klibloader.h>
+#include <klocale.h>
 #include <kprotocolmanager.h>
 #include <kprotocolinfo.h>
 #include <krun.h>
 #include <kstandarddirs.h>
+#include <ktempfile.h>
+#include <kurl.h>
 
 #if defined Q_WS_X11 && ! defined K_WS_QTONLY
@@ -42,6 +45,4 @@
 #endif
 
-#include <ktempfile.h>
-#include <kconfig.h>
 
 #include "kio/global.h"
@@ -206,4 +207,9 @@ KLauncher::KLauncher(int _kdeinitSocket)
       qWarning("Klauncher running in slave-debug mode for slaves of protocol '%s'", \
mSlaveDebug.data());  }
+   mSlaveValgrind = getenv("KDE_SLAVE_VALGRIND");
+   if (!mSlaveValgrind.isEmpty())
+   {
+      qWarning("Klauncher running slaves through valgrind for slaves of protocol \
'%s'", mSlaveValgrind.data()); +   }
    klauncher_header request_header;
    request_header.cmd = LAUNCHER_OK;
@@ -1255,4 +1261,10 @@ KLauncher::requestSlave(const QString &p
        write(kdeinitSocket, &request_header, sizeof(request_header));
     }
+    if (mSlaveValgrind == arg1)
+    {
+       arg_list.prepend(QFile::encodeName(KLibLoader::findLibrary(name)));
+       arg_list.prepend(QFile::encodeName(locate("exe", "kioslave")));
+       name = "valgrind";
+    }
 
     KLaunchRequest *request = new KLaunchRequest;

--- kdelibs/kinit/klauncher.h  #1.36:1.37
@@ -189,4 +189,5 @@ protected:
    AutoStart mAutoStart;
    QCString mSlaveDebug;
+   QCString mSlaveValgrind;
    bool dontBlockReading;
 #ifdef Q_WS_X11


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