Changeset 3b1426dce275c146696e284ef7e2a97e29f16847

Timestamp:

02/09/12 12:33:20 (3 months ago)

Author:

David C. Lonie <loniedavid@…>

Parents:

cdbef0057e4f15619cdc19e6e3fe32b490bdf055, f47c5505c30559e53309acf51db69912dec55033

Children:

5a9bb82c30cb2d37f28bcd39eb822b9ecdc2039d

git-committer:

David C. Lonie <loniedavid@…> (02/09/12 12:33:20)

Message:

Merge branch 'MAINT_use_sys_libssh'

Location:

src

Files:

• globalsearch/sshconnection.cpp (modified) (2 diffs)
• globalsearch/queuemanager.cpp (modified) (4 diffs)
• xtalopt/ui/tab_init.cpp (modified) (1 diff)

src/globalsearch/sshconnection.cpp

@@ -80 +80 @@
     }
 
-    // Set a three timeout, check every 50 ms for new data.
+    // Set a three second timeout, check every 50 ms for new data.
     int bytesAvail;
     int timeout = 3000;
@@ -410 +410 @@
     // Read output
     char buffer[SSH_BUFFER_SIZE];
-    int len;
-    while ((len = channel_read(channel, buffer, sizeof(buffer), 0)) > 0) {
-      ossout.write(buffer,len);
+    int bytesAvail;
+    // Wait three seconds for output
+    int timeout = 3000;
+    do {
+      bytesAvail = channel_poll(channel, 0);
+      if (bytesAvail == 0) {
+        GS_MSLEEP(50);
+        timeout -= 50;
+      }
+    }
+    while (timeout > 0 && bytesAvail == 0);
+
+    if (bytesAvail == SSH_ERROR) {
+      qWarning() << "Poll returns error:" << ssh_get_error(m_session);
+      channel_close(channel);
+      channel_free(channel);
+      END;
+      return false;
+    }
+
+    while ((bytesAvail = channel_read(channel, buffer, sizeof(buffer), 0)) > 0) {
+      ossout.write(buffer,bytesAvail);
     }
     stdout_str = QString(ossout.str().c_str());
-    while ((len = channel_read(channel, buffer, sizeof(buffer), 1)) > 0) {
-      osserr.write(buffer,len);
+    while ((bytesAvail = channel_read(channel, buffer, sizeof(buffer), 1)) > 0) {
+      osserr.write(buffer,bytesAvail);
     }
     stderr_str = QString(osserr.str().c_str());

src/globalsearch/queuemanager.cpp

@@ -791 +791 @@
   void QueueManager::killStructure(Structure *s) {
     // End job if currently running
+    s->lock()->lockForWrite();
+    s->stopOptTimer();
     if ( s->getStatus() != Structure::Optimized ) {
-      s->lock()->lockForWrite();
-      s->stopOptTimer();
       s->setStatus(Structure::Killed);
-      s->lock()->unlock();
     }
     else {
-      s->lock()->lockForWrite();
-      s->stopOptTimer();
       s->setStatus(Structure::Removed);
-      s->lock()->unlock();
-    }
+    }
+    s->lock()->unlock();
     stopJob(s);
     emit structureKilled(s);
@@ -877 +874 @@
   void QueueManager::stopJob(Structure *s)
   {
+    m_jobStartTracker.lockForWrite();
+    m_jobStartTracker.remove(s);
+    m_jobStartTracker.unlock();
     m_opt->queueInterface()->stopJob(s);
   }
@@ -971 +971 @@
                "The requested structures counter has become negative.");
 
-    qDebug() << "New structure accepted (" << s->getIDString() << ")";
+    qDebug() << "New structure received (" << s->getIDString() << ")";
 
     m_newStructureTracker.unlock();
@@ -1001 +1001 @@
 
     m_tracker->append(s);
+    qDebug() << "New structure accepted (" << s->getIDString() << ")";
 
     m_newStructureTracker.unlock();

src/xtalopt/ui/tab_init.cpp

@@ -432 +432 @@
     }
   }
-
 }