Browse Source

Change IVSysMan. fix a ivexit problem.

HAPO-9# 3 years ago
parent
commit
b877d36c1e

+ 3 - 0
src/driver/driver_can_nvidia_agx/nvcan.cpp

@@ -131,6 +131,8 @@ void nvcan::run()
 
     mbRunning = true;
 
+    int nrecvcount = 0;
+
     while((!QThread::isInterruptionRequested())&&(mbCANOpen))
     {
         FD_ZERO(&rdfs);
@@ -187,6 +189,7 @@ void nvcan::run()
                     continue;
                 }
 
+                nrecvcount++;
   //              qDebug("receive msg.");
                 mMutex.lock();
 

+ 1 - 1
src/tool/IVSysMan/mainwindow.cpp

@@ -141,7 +141,7 @@ MainWindow::~MainWindow()
             char strexitcode[255];
             snprintf(strexitcode,255,"adcivexit-%d",mPM->mvectorprog[i].mpid);
             qDebug("pid is %d",mPM->mvectorprog[i].mpid);
-            iv::ivexit::ExecIVExitCmd(mpivexit,strexitcode);
+ //           iv::ivexit::ExecIVExitCmd(mpivexit,strexitcode);
             QThread::msleep(5);
         }
     }

+ 13 - 10
src/tool/IVSysMan/progmon.cpp

@@ -27,6 +27,17 @@ ProgMon::ProgMon(std::string path)
 
 ProgMon::~ProgMon()
 {
+    std::cout<<"~ProgMon"<<std::endl;
+    unsigned int i;
+    for(i=0;i<mvectorprog.size();i++)
+    {
+        if(mvectorprog[i].mProcess != 0)
+        {
+            mvectorprog[i].mProcess->kill();
+  //          mvectorprog[i].mProcess->close();
+        }
+    }
+    std::cout<<"End Std out thread."<<std::endl;
     mbstdoutrun = false;
     mpthread_stdout->join();
 
@@ -57,16 +68,8 @@ ProgMon::~ProgMon()
         }
 
     }
-    unsigned int i;
-    for(i=0;i<mvectorprog.size();i++)
-    {
-        if(mvectorprog[i].mProcess != 0)
-        {
-            mvectorprog[i].mProcess->kill();
-  //          mvectorprog[i].mProcess->close();
-        }
-    }
-    mvectorprog.clear();
+
+//    mvectorprog.clear();
 }
 
 std::vector<ProgUnit> ProgMon::loadprogunit(std::string path)

+ 1 - 1
src/tool/ivdiagnosis/main.cpp

@@ -9,7 +9,7 @@
 #include "moduleunit.h"
 #include "QtDBus/QDBusConnection"
 
-#include "I
+//#include "I
 
 std::vector<moduleunit> gvecmodule;