change driver_cloud_grpc_thread. use waitcondition.

src/driver/driver_cloud_grpc_server_thread/picbuf.h

@@ -21,7 +21,7 @@ class PicBuf
 private:
     std::vector<iv::PicData> mvectordata_ptr;
     qint64 mBufTime = 500;
-    qint64 mnReceiveBufTime = 100;
+    qint64 mnReceiveBufTime = 50;
     qint64 mLastBufTime = 0;
     QMutex mMutexBuf;
 public:

src/driver/driver_cloud_grpc_thread/grpcclient.cpp

@@ -54,6 +54,43 @@ grpcclient::grpcclient(std::string stryamlpath)
 
 }
 
+grpcclient::~grpcclient()
+{
+    std::cout<<" enter ~grpcclient"<<std::endl;
+    mbPicUpload = false;
+
+    requestInterruption();
+    while(this->isFinished() == false)
+    {
+
+    }
+
+    std::cout<<"now join grpcclient thread"<<std::endl;
+
+    unsigned int i;
+    for(i=0;i<NUM_CAM;i++)
+    {
+        unsigned int j;
+        for(j=0;j<NUM_THREAD_PERCAM;j++)
+        {
+            mpThread[i*NUM_THREAD_PERCAM + j]->join();
+        }
+    }
+
+    for(i=0;i<mvectorctrlmsgunit.size();i++)
+    {
+        iv::modulecomm::Unregister(mvectorctrlmsgunit[i].mpa);
+    }
+
+    for(i=0;i<mvectormsgunit.size();i++)
+    {
+        iv::modulecomm::Unregister(mvectormsgunit[i].mpa);
+    }
+
+    std::cout<<"complete ~grpcclient"<<std::endl;
+
+}
+
 void grpcclient::run()
 {
     int nsize = mvectormsgunit.size();
@@ -177,7 +214,7 @@ void grpcclient::run()
 
                       stub_ = iv::UploadThread::NewStub(channel);
                   }
-                  std::this_thread::sleep_for(std::chrono::milliseconds(900));
+                  std::this_thread::sleep_for(std::chrono::milliseconds(300));
 
                 }
 
@@ -185,6 +222,8 @@ void grpcclient::run()
 
 
     }
+
+    std::cout<<" grpcclient:run complete."<<std::endl;
 }
 
 
@@ -384,6 +423,7 @@ void grpcclient::UpdatePicData(const char *strdata, const unsigned int nSize, co
     mpicbuf[npos].mDataSize = nSize;
     memcpy(mpicbuf[npos].mpstrmsgdata.get(),strdata,nSize);
     mpicbuf[npos].mMutex.unlock();
+    mpicbuf[npos].mwc.wakeAll();
 }
 
 
@@ -428,7 +468,7 @@ void grpcclient::threadpicupload(int nCamPos)
 
 
 
-    while(true)
+    while(mbPicUpload)
     {
         std::shared_ptr<char> pstr_ptr;
         if((nCamPos<0)||(nCamPos >= NUM_CAM))
@@ -441,6 +481,11 @@ void grpcclient::threadpicupload(int nCamPos)
         bool bUpdate = false;
         qint64 nMsgTime = 0;
         int nSize = 0;
+
+        mpicbuf[nCamPos].mWaitMutex.lock();
+        mpicbuf[nCamPos].mwc.wait(&mpicbuf[nCamPos].mWaitMutex,100);
+        mpicbuf[nCamPos].mWaitMutex.unlock();
+
         mpicbuf[nCamPos].mMutex.lock();
         bUpdate = mpicbuf[nCamPos].mbRefresh;
         if(bUpdate == true)
@@ -454,7 +499,7 @@ void grpcclient::threadpicupload(int nCamPos)
         mpicbuf[nCamPos].mMutex.unlock();
         if(bUpdate == false)
         {
-            std::this_thread::sleep_for(std::chrono::milliseconds(10));
+ //           std::this_thread::sleep_for(std::chrono::milliseconds(10));
             continue;
         }
 
@@ -499,4 +544,6 @@ void grpcclient::threadpicupload(int nCamPos)
 
 
     }
+
+    std::cout<<"threadpicupload cam pos: "<<nCamPos<<" exit."<<std::endl;
 }

src/driver/driver_cloud_grpc_thread/grpcclient.h

@@ -14,6 +14,7 @@
 #include <memory>
 
 #include <QMutex>
+#include <QWaitCondition>
 
 #include <thread>
 
@@ -44,6 +45,7 @@ struct msgunit
     bool mbRefresh = false;
     bool mbImportant = false;
     int mnkeeptime = 100;
+
 };
 
 struct  threadpicunit
@@ -52,6 +54,8 @@ struct  threadpicunit
      qint64 mnMsgTime;
      std::shared_ptr<char> mpstrmsgdata;
      int mDataSize;
+     QMutex mWaitMutex;
+     QWaitCondition mwc;
      QMutex mMutex;
 };
 }
@@ -65,6 +69,7 @@ class grpcclient : public QThread
 {
 public:
     grpcclient(std::string stryamlpath);
+    ~grpcclient();
 
 private:
     std::string gstrserverip = "111.33.136.149";//"0.0.0.0";//"192.168.14.98";// "123.57.212.138";
@@ -107,6 +112,8 @@ private:
 
     std::thread * mpThread[NUM_CAM * NUM_THREAD_PERCAM];
 
+    bool mbPicUpload = true;
+
 };
 
 #endif // GRPCCLIENT_H

src/driver/driver_cloud_grpc_thread/main.cpp

@@ -1,439 +1,43 @@
 #include <QCoreApplication>
 
+#include <signal.h>
+
 #include "grpcclient.h"
 
 #include "ivversion.h"
+#include "ivexit.h"
+#include "ivbacktrace.h"
 
-/*
-#include <yaml-cpp/yaml.h>
-
-#include <QDateTime>
-
-#include <iostream>
-
-#include <vector>
-
-#include <memory>
-
-#include <QMutex>
-
-#include <thread>
-
-#include "modulecomm.h"
-
-#include "cloud.pb.h"
-
-#include <iostream>
-#include <memory>
-#include <string>
-
-#include <grpcpp/grpcpp.h>
-
-#include "uploadmsg.grpc.pb.h"
-
-
-using grpc::Channel;
-using grpc::ClientContext;
-using grpc::Status;
-
-
-void test()
-{
-    std::string target_str = "0.0.0.0:50051";
-
-    auto cargs = grpc::ChannelArguments();
-    cargs.SetMaxReceiveMessageSize(1024 * 1024 * 1024); // 1 GB
-    cargs.SetMaxSendMessageSize(1024 * 1024 * 1024);
-
-    std::shared_ptr<Channel> channel = grpc::CreateCustomChannel(
-             target_str, grpc::InsecureChannelCredentials(),cargs);
-
-    std::unique_ptr<iv::Upload::Stub> stub_ = iv::Upload::NewStub(channel);
-
-
-    iv::UploadRequest request;
-
-
-
-    // Container for the data we expect from the server.
-    iv::UploadReply reply;
-
-    int nid = 0;
-
-    nid = 1;
-
-    while(1)
-    {
-
-
-
-
-        // Context for the client. It could be used to convey extra information to
-        // the server and/or tweak certain RPC behaviors.
-
-
-        ClientContext context ;
-        std::this_thread::sleep_for(std::chrono::milliseconds(100));
-        qint64 time1 = QDateTime::currentMSecsSinceEpoch();
-
-        request.set_id(nid);
-        request.set_ntime(time1);
-        nid++;
-        // The actual RPC.
-        Status status = stub_->upload(&context, request, &reply);
-        if (status.ok()) {
-            std::cout<<nid<<" upload successfully"<<std::endl;
-//            qint64 time2;
+static QCoreApplication * gApp;
 
-//            memcpy(&time2,reply.data().data(),8);
-//            qint64 time3 = QDateTime::currentMSecsSinceEpoch();
-//            std::cout<<"reply data size is "<<reply.data().size()<<std::endl;
-//            std::cout<<" latency is "<<(time2 - time1)<<" 2 is "<<(time3 - time2)<<std::endl;
-//          return reply.message();
-        } else {
-          std::cout << status.error_code() << ": " << status.error_message()
-                    << std::endl;
-          std::cout<<"RPC failed"<<std::endl;
-          std::this_thread::sleep_for(std::chrono::milliseconds(900));
+static grpcclient * gpgrpcclient;
 
-//          delete pcontext;
-//          pcontext = new ClientContext;
-
-//          channel = grpc::CreateCustomChannel(
-//                   target_str, grpc::InsecureChannelCredentials(),cargs);
-
-//          stub_ = iv::Upload::NewStub(channel);
-        }
-    }
-}
-
-std::string gstrserverip =  "0.0.0.0";//"123.57.212.138";
-std::string gstrserverport = "50051";//"9000";
-std::string gstruploadinterval = "1000";
-void * gpa;
-QMutex gMutexMsg;
-std::thread * guploadthread;
-
-
-
-
-std::vector<iv::msgunit> mvectormsgunit;
-
-std::vector<iv::msgunit> mvectorctrlmsgunit;
-
-
-std::string gstrVIN = "AAAAAAAAAAAAAAAAA";
-std::string gstrqueryMD5 = "5d41402abc4b2a76b9719d911017c591";//"5d41402abc4b2a76b9719d911017c592";
-std::string gstrctrlMD5 = "5d41402abc4b2a76b9719d911017c591";
-
-
-
-int gindex = 0;
-
-void ListenData(const char * strdata,const unsigned int nSize,const unsigned int index,const QDateTime * dt,const char * strmemname)
+void ExitFunc()
 {
-
-    int nsize = mvectormsgunit.size();
-    int i;
-    for(i=0;i<nsize;i++)
-    {
-        if(strncmp(strmemname,mvectormsgunit[i].mstrmsgname,255) == 0)
-        {
-            gMutexMsg.lock();
-            char * strtem = new char[nSize];
-            memcpy(strtem,strdata,nSize);
-            mvectormsgunit[i].mpstrmsgdata.reset(strtem);
-            mvectormsgunit[i].mndatasize = nSize;
-            mvectormsgunit[i].mbRefresh = true;
-            gMutexMsg.unlock();
-            break;
-        }
-    }
+//    gApp->quit();
+    delete gpgrpcclient;
+    std::cout<<"driver_cloud_grpc_thread exit."<<std::endl;
+    gApp->quit();
 }
 
-
-void sharectrlmsg(iv::cloud::cloudmsg * pxmsg)
+void signal_handler(int sig)
 {
-    int i;
-    int nsize = pxmsg->xclouddata_size();
-    for(i=0;i<nsize;i++)
+    if(sig == SIGINT)
     {
-        int j;
-        int nquerysize = mvectorctrlmsgunit.size();
-        for(j=0;j<nquerysize;j++)
-        {
-            if(strncmp(pxmsg->xclouddata(i).msgname().data(), mvectorctrlmsgunit[j].mstrmsgname,255) == 0)
-            {
- //               qDebug("size is %d ",pxmsg->xclouddata(i).data().size());
-                iv::modulecomm::ModuleSendMsg(mvectorctrlmsgunit[j].mpa,pxmsg->xclouddata(i).data().data(),pxmsg->xclouddata(i).data().size());
-                break;
-            }
-        }
+        ExitFunc();
     }
 }
 
-
-void threadupload()
-{
-    int nsize = mvectormsgunit.size();
-    int i;
-
-    int ninterval = atoi(gstruploadinterval.data());
-    if(ninterval<=0)ninterval = 100;
-
-    QTime xTime;
-    xTime.start();
-    int nlastsend = xTime.elapsed();
-
-    std::string target_str = gstrserverip+":";
-    target_str = target_str + gstrserverport ;//std::to_string()
-    auto cargs = grpc::ChannelArguments();
-    cargs.SetMaxReceiveMessageSize(1024 * 1024 * 1024); // 1 GB
-    cargs.SetMaxSendMessageSize(1024 * 1024 * 1024);
-
-    std::shared_ptr<Channel> channel = grpc::CreateCustomChannel(
-             target_str, grpc::InsecureChannelCredentials(),cargs);
-
-    std::unique_ptr<iv::Upload::Stub> stub_ = iv::Upload::NewStub(channel);
-
-
-    iv::UploadRequest request;
-
-    int nid = 0;
-
-    // Container for the data we expect from the server.
-    iv::UploadReply reply;
-
-    gpr_timespec timespec;
-      timespec.tv_sec = 30;//设置阻塞时间为2秒
-      timespec.tv_nsec = 0;
-      timespec.clock_type = GPR_TIMESPAN;
-
- //   ClientContext context;
-
-
-
-    while(true)
-    {
-        std::this_thread::sleep_for(std::chrono::milliseconds(1));
-        if((xTime.elapsed()-nlastsend)<ninterval)
-        {
-            continue;
-        }
-
-            bool bImportant = false;
-            int nkeeptime = 0;
-            iv::cloud::cloudmsg xmsg;
-            xmsg.set_xtime(QDateTime::currentMSecsSinceEpoch());
-            gMutexMsg.lock();
-            for(i=0;i<nsize;i++)
-            {
-                if(mvectormsgunit[i].mbRefresh)
-                {
-                    mvectormsgunit[i].mbRefresh = false;
-                    if(mvectormsgunit[i].mbImportant)
-                    {
-                        bImportant = true;
-                    }
-                    if(mvectormsgunit[i].mnkeeptime > nkeeptime)
-                    {
-                        nkeeptime = mvectormsgunit[i].mnkeeptime;
-                    }
-                    iv::cloud::cloudunit xcloudunit;
-                    xcloudunit.set_msgname(mvectormsgunit[i].mstrmsgname);
-                    xcloudunit.set_data(mvectormsgunit[i].mpstrmsgdata.get(),mvectormsgunit[i].mndatasize);
-                    iv::cloud::cloudunit * pcu = xmsg.add_xclouddata();
-                    pcu->CopyFrom(xcloudunit);
-                }
-
-            }
-            gMutexMsg.unlock();
-
-            int nbytesize = xmsg.ByteSize();
-            char * strbuf = new char[nbytesize];
-            std::shared_ptr<char> pstrbuf;
-            pstrbuf.reset(strbuf);
-            if(xmsg.SerializeToArray(strbuf,nbytesize))
-            {
-
-                ClientContext context ;
-                context.set_deadline(timespec);
-                qint64 time1 = QDateTime::currentMSecsSinceEpoch();
-
-                request.set_id(nid);
-                request.set_ntime(time1);
-                request.set_strquerymd5(gstrqueryMD5);
-                request.set_strctrlmd5(gstrctrlMD5);
-                request.set_strvin(gstrVIN);
-                request.set_xdata(strbuf,nbytesize);
-                request.set_kepptime(nkeeptime);
-                request.set_bimportant(bImportant);
-                nid++;
-                // The actual RPC.
-                Status status = stub_->upload(&context, request, &reply);
-                if (status.ok()) {
-                    std::cout<<nid<<" upload successfully"<<std::endl;
-                    if(reply.nres() == 1)
-                    {
-                        iv::cloud::cloudmsg xmsg;
-                        if(xmsg.ParseFromArray(reply.xdata().data(),reply.xdata().size()))
-                        {
-                            sharectrlmsg(&xmsg);
-                        }
-                    }
-                } else {
-                  std::cout << status.error_code() << ": " << status.error_message()
-                            << std::endl;
-                  std::cout<<"RPC failed"<<std::endl;
-                  if(status.error_code() == 4)
-                  {
-                      std::cout<<" RPC Exceed Time, Create New stub_"<<std::endl;
-                      channel = grpc::CreateCustomChannel(
-                               target_str, grpc::InsecureChannelCredentials(),cargs);
-
-                      stub_ = iv::Upload::NewStub(channel);
-                  }
-                  std::this_thread::sleep_for(std::chrono::milliseconds(900));
-
-                }
-
-            }
-            nlastsend = xTime.elapsed();
-
-    }
-}
-
-
-void dec_yaml(const char * stryamlpath)
+int main(int argc, char *argv[])
 {
+    showversion("driver_cloud_grpc_client");
 
-    YAML::Node config;
-    try
-    {
-        config = YAML::LoadFile(stryamlpath);
-    }
-    catch(YAML::BadFile e)
-    {
-        qDebug("load error.");
-        return;
-    }
-
-    std::vector<std::string> vecmodulename;
-
-
-    if(config["server"])
-    {
-        gstrserverip = config["server"].as<std::string>();
-    }
-    if(config["port"])
-    {
-        gstrserverport = config["port"].as<std::string>();
-    }
-    if(config["uploadinterval"])
-    {
-        gstruploadinterval = config["uploadinterval"].as<std::string>();
-    }
-
-    if(config["VIN"])
-    {
-        gstrVIN = config["VIN"].as<std::string>();
-    }
-
-    if(config["queryMD5"])
-    {
-        gstrqueryMD5 = config["queryMD5"].as<std::string>();
-    }
-    else
-    {
-        return;
-    }
-
-    if(config["ctrlMD5"])
-    {
-        gstrctrlMD5 = config["ctrlMD5"].as<std::string>();
-    }
-
-
-    std::string strmsgname;
-
-    if(config["uploadmessage"])
-    {
-
-        for(YAML::const_iterator it= config["uploadmessage"].begin(); it != config["uploadmessage"].end();++it)
-        {
-            std::string strtitle = it->first.as<std::string>();
-            std::cout<<strtitle<<std::endl;
-
-            if(config["uploadmessage"][strtitle]["msgname"]&&config["uploadmessage"][strtitle]["buffersize"]&&config["uploadmessage"][strtitle]["buffercount"])
-            {
-                iv::msgunit xmu;
-                strmsgname = config["uploadmessage"][strtitle]["msgname"].as<std::string>();
-                strncpy(xmu.mstrmsgname,strmsgname.data(),255);
-                xmu.mnBufferSize = config["uploadmessage"][strtitle]["buffersize"].as<int>();
-                xmu.mnBufferCount = config["uploadmessage"][strtitle]["buffercount"].as<int>();
-                if(config["uploadmessage"][strtitle]["bimportant"])
-                {
-                   std::string strimportant =    config["uploadmessage"][strtitle]["bimportant"].as<std::string>();
-                   if(strimportant == "true")
-                   {
-                       xmu.mbImportant = true;
-                   }
-                }
-                if(config["uploadmessage"][strtitle]["keeptime"])
-                {
-                   std::string strkeep =    config["uploadmessage"][strtitle]["keeptime"].as<std::string>();
-                   xmu.mnkeeptime = atoi(strkeep.data());
-                }
-                mvectormsgunit.push_back(xmu);
-            }
-        }
-    }
-    else
-    {
-
-
-    }
-
-    if(!config["ctrlMD5"])
-    {
-       return;
-    }
-
-    if(config["ctrlmessage"])
-    {
-        std::string strnodename = "ctrlmessage";
-        for(YAML::const_iterator it= config[strnodename].begin(); it != config[strnodename].end();++it)
-        {
-            std::string strtitle = it->first.as<std::string>();
-            std::cout<<strtitle<<std::endl;
-
-            if(config[strnodename][strtitle]["msgname"]&&config[strnodename][strtitle]["buffersize"]&&config[strnodename][strtitle]["buffercount"])
-            {
-                iv::msgunit xmu;
-                strmsgname = config[strnodename][strtitle]["msgname"].as<std::string>();
-                strncpy(xmu.mstrmsgname,strmsgname.data(),255);
-                xmu.mnBufferSize = config[strnodename][strtitle]["buffersize"].as<int>();
-                xmu.mnBufferCount = config[strnodename][strtitle]["buffercount"].as<int>();
-                mvectorctrlmsgunit.push_back(xmu);
-            }
-        }
-    }
-    else
-    {
-
-    }
-
-    return;
-
-}
+    RegisterIVBackTrace();
 
 
-*/
 
-int main(int argc, char *argv[])
-{
-    showversion("driver_cloud_grpc_client");
     QCoreApplication a(argc, argv);
+    gApp = &a;
 
  //   std::thread * ptest = new std::thread(test);
 
@@ -453,20 +57,11 @@ int main(int argc, char *argv[])
 
     grpcclient * pgrpcclient = new grpcclient(stryamlpath);
     pgrpcclient->start();
+    gpgrpcclient = pgrpcclient;
 
-//    int i;
-//    for(i=0;i<mvectormsgunit.size();i++)
-//    {
-//        mvectormsgunit[i].mpa = iv::modulecomm::RegisterRecv(mvectormsgunit[i].mstrmsgname,ListenData);
-//    }
-
-//    for(i=0;i<mvectorctrlmsgunit.size();i++)
-//    {
-//        mvectorctrlmsgunit[i].mpa = iv::modulecomm::RegisterSend(mvectorctrlmsgunit[i].mstrmsgname,mvectorctrlmsgunit[i].mnBufferSize,
-//                                                                 mvectorctrlmsgunit[i].mnBufferCount);
-//    }
+    signal(SIGINT,signal_handler);
 
-//    guploadthread = new std::thread(threadupload);
+    iv::ivexit::RegIVExitCall(ExitFunc);
 
     return a.exec();
 }