Release v0.8

Author: arobenko

.appveyor.yml

@@ -36,7 +36,7 @@ build_script:
     - if exist %BUILD_DIR% rmdir /S /Q %BUILD_DIR%
     - mkdir %BUILD_DIR%
     - cd %BUILD_DIR%
-    - cmake .. -DCMAKE_BUILD_TYPE=%CONFIGURATION% -G "NMake Makefiles" -DBOOST_ROOT="C:\Libraries\boost_1_65_1" -DBoost_USE_STATIC_LIBS=ON 
+    - cmake .. -DCMAKE_BUILD_TYPE=%CONFIGURATION% -G "NMake Makefiles" -DBOOST_ROOT="C:/Libraries/boost_1_65_1" -DBoost_USE_STATIC_LIBS=ON 
     - nmake
     - mkdir output.build
     - cd output.build

CMakeLists.txt

@@ -17,14 +17,14 @@ option (DEMO1_NO_WARN_AS_ERR "Don't treat compilation warnings as errors." OFF)
 #     is not provided and examples are not disabled.
 
 if ("${COMMSDSL_TAG}" STREQUAL "")
-    set(COMMSDSL_TAG "v2.0.2")
+    set(COMMSDSL_TAG "v2.1")
 endif ()
 
 if ("${COMMS_TAG}" STREQUAL "")
-    set(COMMS_TAG "v1.3")
+    set(COMMS_TAG "v2.0")
 endif ()
 
-set (VERSION "0.7.2")
+set (VERSION "0.8")
 
 set (COMMSDSL_TGT "commsdsl_tgt")
 if ("${COMMSDSL2COMMS}" STREQUAL "")
@@ -63,15 +63,12 @@ endif ()
 
 set (schema_file "${CMAKE_SOURCE_DIR}/dsl/schema.xml")
 set (tmp_dir "${CMAKE_BINARY_DIR}/output.tmp")
-#set (code_input_dir "${CMAKE_SOURCE_DIR}/src")
 
 if ("${OUTPUT_DIR}" STREQUAL "")
     set (OUTPUT_DIR "${CMAKE_BINARY_DIR}/output")
 endif ()
 
 
-#file (GLOB_RECURSE src_files ${code_input_dir})
-
 set (extra_dep)
 if (TARGET ${COMMSDSL_TGT})
     set (extra_dep ${COMMSDSL_TGT})

examples/client/Client.cpp

@@ -5,6 +5,7 @@
 
 #include "demo1/MsgId.h"
 #include "comms/units.h"
+#include "comms/process.h"
 
 namespace demo1
 {
@@ -328,38 +329,10 @@ void Client::waitForAck()
 
 void Client::processInput()
 {
-    std::size_t consumed = 0U;
-    while (consumed < m_inputBuf.size()) {
-        // Smart pointer to the message object.
-        Frame::MsgPtr msgPtr; 
-
-        // Get the iterator for reading
-        auto begIter = comms::readIteratorFor<InputMsg>(&m_inputBuf[0] + consumed);
-        auto iter = begIter;
-
-        // Do the read
-        auto es = m_frame.read(msgPtr, iter, m_inputBuf.size() - consumed);
-        if (es == comms::ErrorStatus::NotEnoughData) {
-            break; // Not enough data in the buffer, stop processing
-        } 
-    
-        if (es == comms::ErrorStatus::ProtocolError) {
-            // Something is not right with the data, remove one character and try again
-            std::cerr << "WARNING: Corrupted buffer" << std::endl;
-            ++consumed;
-            continue;
-        }
-
-        if (es == comms::ErrorStatus::Success) {
-            assert(msgPtr); // If read is successful, msgPtr is expected to hold a valid pointer
-            msgPtr->dispatch(*this); // Call appropriate handle() function
-        }
-
-        // The iterator for reading has been advanced, update the difference
-        consumed += std::distance(begIter, iter);
+    if (!m_inputBuf.empty()) {
+        auto consumed = comms::processAllWithDispatch(&m_inputBuf[0], m_inputBuf.size(), m_frame, *this);
+        m_inputBuf.erase(m_inputBuf.begin(), m_inputBuf.begin() + consumed);
     }
-
-    m_inputBuf.erase(m_inputBuf.begin(), m_inputBuf.begin() + consumed);
 }
 
 } // namespace client

examples/server/Session.cpp

@@ -6,6 +6,7 @@
 
 #include "demo1/message/Ack.h"
 #include "comms/units.h"
+#include "comms/process.h"
 
 namespace demo1
 {
@@ -349,39 +350,10 @@ void Session::terminateSession()
 
 void Session::processInput()
 {
-    std::size_t consumed = 0U;
-    while (consumed < m_inputBuf.size()) {
-        // Smart pointer to the message object.
-        Frame::MsgPtr msgPtr; 
-
-        // Get the iterator for reading
-        auto begIter = comms::readIteratorFor<InputMsg>(&m_inputBuf[0] + consumed);
-        auto iter = begIter;
-
-        // Do the read
-        auto es = m_frame.read(msgPtr, iter, m_inputBuf.size() - consumed);
-        if (es == comms::ErrorStatus::NotEnoughData) {
-            break; // Not enough data in the buffer, stop processing
-        } 
-    
-        if (es == comms::ErrorStatus::ProtocolError) {
-            // Something is not right with the data, remove one character and try again
-            std::cerr << "WARNING: Corrupted buffer" << std::endl;
-            ++consumed;
-            continue;
-        }
-
-        if (es == comms::ErrorStatus::Success) {
-            assert(msgPtr); // If read is successful, msgPtr is expected to hold a valid pointer
-            std::cout << "INFO: New message: " << msgPtr->name() << std::endl;
-            msgPtr->dispatch(*this); // Call appropriate handle() function
-        }
-
-        // The iterator for reading has been advanced, update the difference
-        consumed += std::distance(begIter, iter);
+    if (!m_inputBuf.empty()) {
+        auto consumed = comms::processAllWithDispatch(&m_inputBuf[0], m_inputBuf.size(), m_frame, *this);
+        m_inputBuf.erase(m_inputBuf.begin(), m_inputBuf.begin() + consumed);
     }
-
-    m_inputBuf.erase(m_inputBuf.begin(), m_inputBuf.begin() + consumed);
 }
 
 void Session::sendAck(demo1::MsgId id)

script/appveyor_install.bat

@@ -23,17 +23,17 @@ IF "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" (
     exit -1
 )
 
-set QTDIR_PREFIX=C:\Qt\%QT_VER%
+set QTDIR_PREFIX=C:/Qt/%QT_VER%
 IF "%PLATFORM%"=="x86" (
     set QTDIR_SUFFIX=
 ) ELSE (
     set QTDIR_SUFFIX=_64
 )
 
-set QTDIR=%QTDIR_PREFIX%\%QT_SUBDIR%%QTDIR_SUFFIX%
+set QTDIR=%QTDIR_PREFIX%/%QT_SUBDIR%%QTDIR_SUFFIX%
 IF NOT EXIST %QTDIR% (
     echo WARNING: %QTDIR% does not exist!!!
-    set QTDIR=%QTDIR_PREFIX%\msvc2015%QTDIR_SUFFIX%
+    set QTDIR=%QTDIR_PREFIX%/msvc2015%QTDIR_SUFFIX%
 )
 
 echo Using Qt5 from %QTDIR%