some improvements;

F1ash · Apr 21, 2015 · be1e7ce · be1e7ce
1 parent 1875885
commit be1e7ce
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 23 deletions.
diff --git a/CMakeLists.txt.user b/CMakeLists.txt.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.3.2, 2015-04-20T09:34:06. -->
+<!-- Written by QtCreator 3.3.2, 2015-04-21T21:17:16. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

diff --git a/src/main.cpp b/src/main.cpp
@@ -5,6 +5,9 @@
 
 int main(int argc, char *argv[])
 {
+    if ( virInitialize()+1 ) {
+        virEventRegisterDefaultImpl();
+    };
     /*
      * WARNING:
      * for work askpass need to run

diff --git a/src/virt_objects/virt_connect/conn_alive_thread.cpp b/src/virt_objects/virt_connect/conn_alive_thread.cpp
@@ -50,9 +50,9 @@ void ConnAliveThread::run()
     openConnect();
     int probe = 0;
     int ret;
-    if ( keep_alive && registered ) {
+    if ( keep_alive ) {
         /* Use if virEventRegisterDefaultImpl() is registered */
-        ret = virConnectSetKeepAlive(conn, 10, 3);
+        ret = virConnectSetKeepAlive(conn, 3, 10);
         if ( ret<0 ) {
             sendConnErrors();
             closeConnect();
@@ -64,7 +64,7 @@ void ConnAliveThread::run()
         while ( keep_alive ) {
             if ( virEventRunDefaultImpl() < 0 ) {
                 sendConnErrors();
-                if ( ++probe>2 ) break;
+                //if ( ++probe>2 ) break;
             };
         };
     } else {
@@ -90,15 +90,10 @@ void ConnAliveThread::run()
 }
 void ConnAliveThread::openConnect()
 {
-    if ( virInitialize()+1 ) {
-        registered = (virEventRegisterDefaultImpl()==0)?true:false;
-        emit connMsg( QString("default event implementation registered: %1")
-                      .arg(QVariant(registered).toString()) );
-        //conn = virConnectOpen(URI.toUtf8().constData());
-        auth.cb = authCallback;
-        auth.cbdata = this;
-        conn = virConnectOpenAuth(URI.toUtf8().constData(), &auth, 0);
-    };
+    //conn = virConnectOpen(URI.toUtf8().constData());
+    auth.cb = authCallback;
+    auth.cbdata = this;
+    conn = virConnectOpenAuth(URI.toUtf8().constData(), &auth, 0);
     //qDebug()<<"openConn"<<conn;
     if (conn==NULL) {
         sendConnErrors();

diff --git a/src/virt_objects/virt_connect/conn_alive_thread.h b/src/virt_objects/virt_connect/conn_alive_thread.h
@@ -57,7 +57,6 @@ class ConnAliveThread : public QThread
 
     virConnectPtr   conn = NULL;
     virErrorPtr     virtErrors;
-    bool            registered;
 
 public slots:
     void            setData(QString&);

diff --git a/src/vm_viewer/lxc/lxc_viewer_thread.cpp b/src/vm_viewer/lxc/lxc_viewer_thread.cpp
@@ -121,7 +121,7 @@ void LXC_ViewerThread::sendDataToDisplay(virStreamPtr _stream)
     switch ( got ) {
     case -2:
         // This is basically EAGAIN
-        return;
+        break;
     case 0:
         // Received EOF from stream, closing
         closeStream();
@@ -130,13 +130,13 @@ void LXC_ViewerThread::sendDataToDisplay(virStreamPtr _stream)
         msg = QString("In '<b>%1</b>': EOF.").arg(domain);
         emit errorMsg(msg);
         emit termEOF();
-        qDebug()<<"EOF emited";
-        return;
+        //qDebug()<<"EOF emited";
+        break;
     case -1:
         // Error stream
         virStreamAbort(_stream);
         closeStream();
-        return;
+        break;
     default:
         // send to TermEmulator stdout useing ptySlaveFd
         for ( int i=0; i<got; i++ ) {
@@ -169,16 +169,18 @@ void LXC_ViewerThread::sendDataToVMachine(const char *buff, int got)
 }
 void LXC_ViewerThread::closeStream()
 {
-    qDebug()<<"stream close:";
+    //qDebug()<<"stream close:";
     if ( NULL!=stream ) {
         unregisterStreamEvents();
         if ( virStreamFinish(stream)<0 ) {
             sendConnErrors();
         };
-        virStreamFree(stream);
+        if ( virStreamFree(stream)<0 ) {
+            sendConnErrors();
+        };
         stream = NULL;
-        qDebug()<<"stream closed";
+        //qDebug()<<"stream closed";
     };
-    qDebug()<<"stream closed already";
+    //qDebug()<<"stream closed already";
     keep_alive = false;
 }
diff --git a/src/vm_viewer/lxc/lxc_viewer_thread.h b/src/vm_viewer/lxc/lxc_viewer_thread.h
@@ -24,10 +24,10 @@ public slots:
     void            setData(QString&, virDomainPtr, int);
     void            run();
     void            stop();
-    int             registerStreamEvents();
     void            sendDataToVMachine(const char*, int);
 
 private slots:
+    int             registerStreamEvents();
     int             unregisterStreamEvents();
     static void     freeData(void*);
     static void     streamEventCallBack(virStreamPtr, int, void*);