[X2Go-Commits] [x2goclient] 01/01: ssh{masterconnection, process}.cpp: add more debugging messages to trace mutex lock and unlock and command execution via SSH.

git-admin at x2go.org git-admin at x2go.org
Mon Feb 16 05:22:43 CET 2015


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/cleanup
in repository x2goclient.

commit 29c0780b7d30a46c0187f2f953695814086242ce
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Feb 16 05:22:35 2015 +0100

    ssh{masterconnection,process}.cpp: add more debugging messages to trace mutex lock and unlock and command execution via SSH.
---
 src/sshmasterconnection.cpp |    3 +++
 src/sshprocess.cpp          |    1 +
 2 files changed, 4 insertions(+)

diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 2449cf5..e9a7008 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1242,8 +1242,11 @@ void SshMasterConnection::addChannelConnection ( SshProcess* creator, QString uu
     con.command=cmd;
     con.uuid=uuid;
 
+    x2goDebug << "locking SSH channel connection MUTEX.";
     channelConnectionsMutex.lock();
+    x2goDebug << "passing con to channelConnections.";
     channelConnections<<con;
+    x2goDebug << "unlocking SSH channel connection MUTEX.";
     channelConnectionsMutex.unlock();
 }
 
diff --git a/src/sshprocess.cpp b/src/sshprocess.cpp
index 50bd7ae..3c43496 100644
--- a/src/sshprocess.cpp
+++ b/src/sshprocess.cpp
@@ -191,6 +191,7 @@ void SshProcess::startNormal(const QString& cmd)
     if(!masterCon->useKerberos())
     {
         QString shcmd = "sh -c 'echo X2GODATABEGIN:" + uuidStr + "; PATH=/usr/local/bin:/usr/bin:/bin "+cmd+"; echo X2GODATAEND:" + uuidStr +";'";
+        x2goDebug << "running masterCon->addChannelConnection(this, '" << uuidStr << "', '" << shcmd.left (200) << "');";
         masterCon->addChannelConnection(this, uuidStr, shcmd);
         connect(masterCon,SIGNAL(stdOut(SshProcess*,QByteArray)),this,SLOT(slotStdOut(SshProcess*,QByteArray)));
         connect(masterCon,SIGNAL(channelClosed(SshProcess*,QString)), this,SLOT(slotChannelClosed(SshProcess*,QString)));

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git


More information about the x2go-commits mailing list