Merge pull request #1277 from qwu16/cascrefine

Remove unused code and fix klockwork issue

Author: qwu16

source/agent/addons/quicCascading/QuicTransportServer.cc

@@ -12,7 +12,6 @@
 #include "owt/quic/quic_transport_factory.h"
 #include "owt/quic/quic_transport_session_interface.h"
 
-//using namespace net;
 using namespace owt_base;
 using v8::Function;
 using v8::FunctionTemplate;
@@ -30,7 +29,6 @@ Nan::Persistent<v8::Function> QuicTransportServer::s_constructor;
 QuicTransportServer::QuicTransportServer(unsigned int port, const std::string& cert_file, const std::string& key_file)
         : m_quicServer(QuicFactory::getQuicTransportFactory()->CreateQuicTransportServer(port, cert_file.c_str(), key_file.c_str())) {
   m_quicServer->SetVisitor(this);
-  printf("point address:%p\n", this);
 }
 
 QuicTransportServer::~QuicTransportServer() {
@@ -78,7 +76,6 @@ NAN_METHOD(QuicTransportServer::newInstance)
     Nan::Utf8String pfxPath(Nan::To<v8::String>(info[1]).ToLocalChecked());
     Nan::Utf8String password(Nan::To<v8::String>(info[2]).ToLocalChecked());
     QuicTransportServer* obj = new QuicTransportServer(port, *pfxPath, *password);
-    //owt_base::Utils::ZeroMemory(*password, password.length());
     obj->Wrap(info.This());
     uv_async_init(uv_default_loop(), &obj->m_asyncOnNewSession, &QuicTransportServer::onNewSessionCallback);
     uv_async_init(uv_default_loop(), &obj->m_asyncOnClosedSession, &QuicTransportServer::onClosedSessionCallback);
@@ -150,7 +147,7 @@ NAUV_WORK_CB(QuicTransportServer::onClosedSessionCallback){
     Nan::HandleScope scope;
     QuicTransportServer* obj = reinterpret_cast<QuicTransportServer*>(async->data);
     if (!obj) {
-        printf("QuicTransportServer::onClosedSessionCallback obj is null");
+        ELOG_DEBUG("QuicTransportServer::onClosedSessionCallback obj is null");
         return;
     }
 
@@ -167,7 +164,6 @@ NAUV_WORK_CB(QuicTransportServer::onClosedSessionCallback){
 }
 
 void QuicTransportServer::OnSession(owt::quic::QuicTransportSessionInterface* session) {
-    //sessions_[session->Id()] = session;
     ELOG_DEBUG("QuicTransportServer::OnSession");
     boost::mutex::scoped_lock lock(mutex);
     this->session_messages.push(session);

source/agent/addons/quicCascading/QuicTransportSession.cc

@@ -7,9 +7,7 @@
 #include <thread>
 #include <chrono>
 #include <iostream>
-//#include <get-uv-event-loop-napi.h>
 
-//using namespace net;
 using namespace owt_base;
 using v8::Function;
 using v8::FunctionTemplate;
@@ -118,8 +116,6 @@ NAN_METHOD(QuicTransportSession::close) {
   QuicTransportSession* obj = Nan::ObjectWrap::Unwrap<QuicTransportSession>(info.Holder());
   obj->m_session->Stop();
   obj->m_session->SetVisitor(nullptr);
-  /*delete obj->asyncResource_;
-  delete obj->asyncResourceStreamClosed_;*/
 
   obj->has_stream_callback_ = false;
   delete obj->stream_callback_;
@@ -168,9 +164,6 @@ NAUV_WORK_CB(QuicTransportSession::onClosedStreamCallback){
       boost::mutex::scoped_lock lock(obj->mutex);
       while (!obj->streamclosed_messages.empty()) {
           ELOG_INFO("streamclosed_messages is not empty");
-          //auto streamid = obj->streamclosed_messages.front();
-          //v8::Local<v8::Object> streamObject = QuicTransportStream::newInstance(quicStream);
-          //Local<Value> args[] = { streamObject };
           Local<Value> args[] = { Nan::New(obj->streamclosed_messages.front()) };
 
           if (obj->streamClosed_callback_) {
@@ -184,9 +177,6 @@ NAUV_WORK_CB(QuicTransportSession::onClosedStreamCallback){
 
 NAN_METHOD(QuicTransportSession::getId) {
   QuicTransportSession* obj = Nan::ObjectWrap::Unwrap<QuicTransportSession>(info.Holder());
-  /*uint8_t length = obj->m_session->length();
-  std::string s_data(obj->m_session->Id(), length);
-  ELOG_INFO("QuicTransportSession::getId:%s\n",s_data.c_str());*/
   info.GetReturnValue().Set(Nan::New(obj->m_session->Id()).ToLocalChecked());
 }
 
@@ -206,7 +196,6 @@ void QuicTransportSession::OnIncomingStream(owt::quic::QuicTransportStreamInterf
     } else {
         ELOG_INFO("OnIncomingStream uv_async_send failed");
     };
-    //assert(false);
     ELOG_INFO("OnIncomingStream stream:%d in session:%s in thread:%d end\n", stream->Id(), m_session->Id(), std::this_thread::get_id());
 }
 

source/agent/addons/quicCascading/QuicTransportSession.h

@@ -60,7 +60,6 @@ class QuicTransportSession : public owt::quic::QuicTransportSessionInterface::Vi
     Nan::AsyncResource *asyncResourceNewStream_;
     Nan::AsyncResource *asyncResourceClosedStream_;
     boost::mutex mutex;
-    //std::unordered_map<uint32_t, v8::Local<v8::Object>> streams_;
     static Nan::Persistent<v8::Function> s_constructor;
 };
 

source/agent/addons/quicCascading/QuicTransportStream.h

@@ -38,8 +38,6 @@ class QuicTransportStream : public owt_base::FrameSource, public owt_base::Frame
     static NAN_METHOD(newInstance);
     static NAN_METHOD(addDestination);
     static NAN_METHOD(removeDestination);
-    // addInputStream(stream, kind)
-    // kind could be "data", "audio" or "video".
     static NAN_METHOD(addInputStream);
     static NAN_METHOD(close);
     static NAN_METHOD(send);

source/agent/analytics/videoGstPipeline/VideoGstAnalyzer.cc

@@ -194,7 +194,7 @@ gboolean VideoGstAnalyzer::StreamEventCallBack(GstBus *bus, GstMessage *message,
                 str.append(std::to_string(width));
                 str.append(",\"height\":");
                 str.append(std::to_string(height));
-                str.append("}");
+                str.append("}\0");
                 pStreamObj->notifyAsyncEvent("streamadded", str.c_str());
 
                 gst_caps_unref (caps);