Upgrade grpc library to v1.78.1

CMakeLists.txt

@@ -8,7 +8,7 @@ project(labview-grpc C CXX)
 set(ABSL_ENABLE_INSTALL ON)
 
 if(NOT MSVC)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++20")
   # Set default visibility to hidden, only export LIBRARY_EXPORT symbols from the shared library
   add_compile_options(-fvisibility=hidden)
 else()
@@ -19,7 +19,7 @@ else()
   set(protobuf_MSVC_STATIC_RUNTIME ON CACHE BOOL "Use static runtime for protobuf" FORCE)
   set(ABSL_MSVC_STATIC_RUNTIME ON CACHE BOOL "Use static runtime for Abseil")
   set(CARES_MSVC_STATIC_RUNTIME ON CACHE BOOL "Use static runtime for c-ares")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++17")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++20")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4267 /wd4244")
   add_compile_options("$<$<NOT:$<CONFIG:Debug>>:/Zi>")
   add_link_options("$<$<NOT:$<CONFIG:Debug>>:/DEBUG>")
@@ -46,6 +46,15 @@ add_definitions(-D_PS_${CMAKE_SIZEOF_VOID_P})
 #----------------------------------------------------------------------
 add_subdirectory(third_party/grpc ${CMAKE_CURRENT_BINARY_DIR}/grpc EXCLUDE_FROM_ALL)
 
+#----------------------------------------------------------------------
+# Workaround for MSVC C1001 ICE in descriptor_visitor.h on 32-bit builds
+# Force protobuf to use C++20 to avoid compiler internal error
+# See: https://github.com/google/bloaty/pull/410
+#----------------------------------------------------------------------
+if(MSVC)
+  set_target_properties(libprotobuf libprotobuf-lite libprotoc PROPERTIES CXX_STANDARD 20)
+endif()
+
 #----------------------------------------------------------------------
 # Use the grpc targets directly from this build.
 #----------------------------------------------------------------------
@@ -95,6 +104,7 @@ add_library(labview_grpc_server SHARED
   src/lv_message_value.cc
   src/lv_proto_server_reflection_plugin.cc
   src/lv_proto_server_reflection_service.cc
+  src/lv_serialization_traits.cc
   src/message_element_metadata_owner.cc
   src/message_metadata.cc
   src/path_support.cc
@@ -217,6 +227,42 @@ target_link_libraries(test_server
  ${_GRPC_GRPCPP}
  ${_PROTOBUF_LIBPROTOBUF})
 
+#######################################################################
+# Unit Tests (Google Test)
+#######################################################################
+
+# Google Test is bundled with gRPC
+set(GTEST_DIR "${CMAKE_SOURCE_DIR}/third_party/grpc/third_party/googletest")
+add_subdirectory(${GTEST_DIR} ${CMAKE_CURRENT_BINARY_DIR}/googletest EXCLUDE_FROM_ALL)
+
+add_executable(unit_tests
+  tests/unit/lv_message_tests.cc
+  src/lv_message.cc
+  src/lv_message_value.cc
+  src/lv_serialization_traits.cc
+  src/string_utils.cc
+  src/feature_toggles.cc
+  src/message_metadata.cc
+  src/message_element_metadata_owner.cc
+  src/lv_interop.cc
+  src/path_support.cc
+  src/exceptions.cc
+  src/well_known_messages.cc
+)
+target_link_libraries(unit_tests
+  gtest
+  ${_GRPC_GRPCPP}
+  ${_PROTOBUF_LIBPROTOBUF}
+)
+target_include_directories(unit_tests PRIVATE
+  "${CMAKE_SOURCE_DIR}/src"
+  "${CMAKE_CURRENT_BINARY_DIR}"
+  "${GTEST_DIR}/googletest/include"
+)
+
+enable_testing()
+add_test(NAME unit_tests COMMAND unit_tests)
+
 add_dependencies(labview_grpc_server Detect_Compatibility_Breaks)
 add_dependencies(labview_grpc_generator Detect_Compatibility_Breaks)
 add_dependencies(test_client Detect_Compatibility_Breaks)

src/event_data.cc

@@ -3,10 +3,6 @@
 #include <grpc_server.h>
 #include <lv_message.h>
 
-//---------------------------------------------------------------------
-//---------------------------------------------------------------------
-using namespace google::protobuf::internal;
-
 namespace grpc_labview
 {
     //---------------------------------------------------------------------

src/grpc_client.h

@@ -4,11 +4,13 @@
 #pragma once
 
 //---------------------------------------------------------------------
+// IMPORTANT: lv_serialization_traits.h MUST be included BEFORE grpc headers
+// This registers our custom SerializationTraits<LVMessage> specialization
 //---------------------------------------------------------------------
-#include <metadata_owner.h>
+#include <lv_serialization_traits.h>
 #include <grpcpp/grpcpp.h>
-#include <lv_message.h>
 #include <grpcpp/impl/codegen/sync_stream.h>
+#include <metadata_owner.h>
 #include <future>
 #include <unordered_map>
 

src/grpc_server.h

@@ -7,11 +7,15 @@
 //---------------------------------------------------------------------
 #ifdef __WIN32__
 #define WIN32_LEAN_AND_MEAN
+#define NOMINMAX
 #include <windows.h>
 #endif
 
 //---------------------------------------------------------------------
+// IMPORTANT: lv_serialization_traits.h MUST be included BEFORE grpc headers
+// This registers our custom SerializationTraits<LVMessage> specialization
 //---------------------------------------------------------------------
+#include <lv_serialization_traits.h>
 #include <grpcpp/grpcpp.h>
 #include <grpcpp/impl/codegen/async_generic_service.h>
 #include <grpcpp/impl/codegen/completion_queue.h>
@@ -27,7 +31,7 @@
 #include <map>
 #include <event_data.h>
 #include <metadata_owner.h>
-#include <semaphore.h>
+#include <lv_semaphore.h>
 
 //---------------------------------------------------------------------
 //---------------------------------------------------------------------

src/lv_interop.h

@@ -6,6 +6,7 @@
 //---------------------------------------------------------------------
 #ifdef _WIN32
 #define WIN32_LEAN_AND_MEAN
+#define NOMINMAX
 #include <windows.h>
 #endif