Initial VNA Service Files

ni · Aug 5, 2024 · 1b19afd · 1b19afd
1 parent 08d1ae3
commit 1b19afd
Show file tree

Hide file tree

Showing 17 changed files with 2,944 additions and 54 deletions.
diff --git a/generated/nirfmxvna/nirfmxvna.proto b/generated/nirfmxvna/nirfmxvna.proto
@@ -61,4 +61,5 @@ message InitializeResponse {
   int32 status = 1;
   nidevice_grpc.Session instrument = 2;
   int32 is_new_session = 3;
-}
+}
+
diff --git a/generated/nirfmxvna/nirfmxvna_client.cpp b/generated/nirfmxvna/nirfmxvna_client.cpp
@@ -89,4 +89,4 @@ initialize(const StubPtr& stub, const std::string& resource_name, const std::str
 }
 
 
-} // namespace nirfmxvna_grpc::experimental::client
+} // namespace nirfmxvna_grpc::experimental::client
diff --git a/generated/nirfmxvna/nirfmxvna_client.h b/generated/nirfmxvna/nirfmxvna_client.h
@@ -29,4 +29,4 @@ InitializeResponse initialize(const StubPtr& stub, const std::string& resource_n
 
 } // namespace nirfmxvna_grpc::experimental::client
 
-#endif /* NIRFMXVNA_GRPC_CLIENT_H */
+#endif /* NIRFMXVNA_GRPC_CLIENT_H */
diff --git a/generated/nirfmxvna/nirfmxvna_compilation_test.cpp b/generated/nirfmxvna/nirfmxvna_compilation_test.cpp
@@ -27,4 +27,4 @@ int32 Initialize(char resourceName[], char optionString[], niRFmxInstrHandle* ha
   return RFmxVNA_Initialize(resourceName, optionString, handleOut, isNewSession);
 }
 
-}  // namespace nirfmxvna_grpc
+}  // namespace nirfmxvna_grpc
diff --git a/generated/nirfmxvna/nirfmxvna_library.cpp b/generated/nirfmxvna/nirfmxvna_library.cpp
@@ -4,6 +4,9 @@
 // Service implementation for the NI-rfmxvna Metadata
 //---------------------------------------------------------------------
 #include "nirfmxvna_library.h"
+#include <server/shared_library.h>
+
+#include <memory>
 
 #if defined(_MSC_VER)
 static const char* kLibraryName = "niRFmxVNA.dll";
@@ -13,18 +16,21 @@ static const char* kLibraryName = "libnirfmxvna.so.1";
 
 namespace nirfmxvna_grpc {
 
-NiRFmxVNALibrary::NiRFmxVNALibrary() : shared_library_(kLibraryName)
+NiRFmxVNALibrary::NiRFmxVNALibrary() : NiRFmxVNALibrary(std::make_shared<nidevice_grpc::SharedLibrary>()) {}
+
+NiRFmxVNALibrary::NiRFmxVNALibrary(std::shared_ptr<nidevice_grpc::SharedLibraryInterface> shared_library) : shared_library_(shared_library)
 {
-  shared_library_.load();
-  bool loaded = shared_library_.is_loaded();
+  shared_library_->set_library_name(kLibraryName);
+  shared_library_->load();
+  bool loaded = shared_library_->is_loaded();
   memset(&function_pointers_, 0, sizeof(function_pointers_));
   if (!loaded) {
     return;
   }
-  function_pointers_.Close = reinterpret_cast<ClosePtr>(shared_library_.get_function_pointer("RFmxVNA_Close"));
-  function_pointers_.GetError = reinterpret_cast<GetErrorPtr>(shared_library_.get_function_pointer("RFmxVNA_GetError"));
-  function_pointers_.GetErrorString = reinterpret_cast<GetErrorStringPtr>(shared_library_.get_function_pointer("RFmxVNA_GetErrorString"));
-  function_pointers_.Initialize = reinterpret_cast<InitializePtr>(shared_library_.get_function_pointer("RFmxVNA_Initialize"));
+  function_pointers_.Close = reinterpret_cast<ClosePtr>(shared_library_->get_function_pointer("RFmxVNA_Close"));
+  function_pointers_.GetError = reinterpret_cast<GetErrorPtr>(shared_library_->get_function_pointer("RFmxVNA_GetError"));
+  function_pointers_.GetErrorString = reinterpret_cast<GetErrorStringPtr>(shared_library_->get_function_pointer("RFmxVNA_GetErrorString"));
+  function_pointers_.Initialize = reinterpret_cast<InitializePtr>(shared_library_->get_function_pointer("RFmxVNA_Initialize"));
 }
 
 NiRFmxVNALibrary::~NiRFmxVNALibrary()
@@ -33,7 +39,7 @@ NiRFmxVNALibrary::~NiRFmxVNALibrary()
 
 ::grpc::Status NiRFmxVNALibrary::check_function_exists(std::string functionName)
 {
-  return shared_library_.function_exists(functionName.c_str())
+  return shared_library_->function_exists(functionName.c_str())
     ? ::grpc::Status::OK
     : ::grpc::Status(::grpc::NOT_FOUND, "Could not find the function " + functionName);
 }
@@ -70,4 +76,4 @@ int32 NiRFmxVNALibrary::Initialize(char resourceName[], char optionString[], niR
   return function_pointers_.Initialize(resourceName, optionString, handleOut, isNewSession);
 }
 
-}  // namespace nirfmxvna_grpc
+}  // namespace nirfmxvna_grpc
diff --git a/generated/nirfmxvna/nirfmxvna_library.h b/generated/nirfmxvna/nirfmxvna_library.h
@@ -8,20 +8,23 @@
 
 #include "nirfmxvna_library_interface.h"
 
-#include <server/shared_library.h>
+#include <server/shared_library_interface.h>
+
+#include <memory>
 
 namespace nirfmxvna_grpc {
 
 class NiRFmxVNALibrary : public nirfmxvna_grpc::NiRFmxVNALibraryInterface {
  public:
   NiRFmxVNALibrary();
+  explicit NiRFmxVNALibrary(std::shared_ptr<nidevice_grpc::SharedLibraryInterface> shared_library);
   virtual ~NiRFmxVNALibrary();
 
   ::grpc::Status check_function_exists(std::string functionName);
-  int32 Close(niRFmxInstrHandle instrumentHandle, int32 forceDestroy);
-  int32 GetError(niRFmxInstrHandle instrumentHandle, int32* errorCode, int32 errorDescriptionBufferSize, char errorDescription[]);
-  int32 GetErrorString(niRFmxInstrHandle instrumentHandle, int32 errorCode, int32 errorDescriptionBufferSize, char errorDescription[]);
-  int32 Initialize(char resourceName[], char optionString[], niRFmxInstrHandle* handleOut, int32* isNewSession);
+  int32 Close(niRFmxInstrHandle instrumentHandle, int32 forceDestroy) override;
+  int32 GetError(niRFmxInstrHandle instrumentHandle, int32* errorCode, int32 errorDescriptionBufferSize, char errorDescription[]) override;
+  int32 GetErrorString(niRFmxInstrHandle instrumentHandle, int32 errorCode, int32 errorDescriptionBufferSize, char errorDescription[]) override;
+  int32 Initialize(char resourceName[], char optionString[], niRFmxInstrHandle* handleOut, int32* isNewSession) override;
 
  private:
   using ClosePtr = decltype(&RFmxVNA_Close);
@@ -36,10 +39,10 @@ class NiRFmxVNALibrary : public nirfmxvna_grpc::NiRFmxVNALibraryInterface {
     InitializePtr Initialize;
   } FunctionLoadStatus;
 
-  nidevice_grpc::SharedLibrary shared_library_;
+  std::shared_ptr<nidevice_grpc::SharedLibraryInterface> shared_library_;
   FunctionPointers function_pointers_;
 };
 
 }  // namespace nirfmxvna_grpc
 
-#endif  // NIRFMXVNA_GRPC_LIBRARY_H
+#endif  // NIRFMXVNA_GRPC_LIBRARY_H
diff --git a/generated/nirfmxvna/nirfmxvna_library_interface.h b/generated/nirfmxvna/nirfmxvna_library_interface.h
@@ -22,4 +22,4 @@ class NiRFmxVNALibraryInterface {
 };
 
 }  // namespace nirfmxvna_grpc
-#endif  // NIRFMXVNA_GRPC_LIBRARY_WRAPPER_H
+#endif  // NIRFMXVNA_GRPC_LIBRARY_WRAPPER_H
diff --git a/generated/nirfmxvna/nirfmxvna_mock_library.h b/generated/nirfmxvna/nirfmxvna_mock_library.h
@@ -26,4 +26,4 @@ class NiRFmxVNAMockLibrary : public nirfmxvna_grpc::NiRFmxVNALibraryInterface {
 }  // namespace unit
 }  // namespace tests
 }  // namespace ni
-#endif  // NIRFMXVNA_GRPC_MOCK_LIBRARY_H
+#endif  // NIRFMXVNA_GRPC_MOCK_LIBRARY_H
diff --git a/generated/nirfmxvna/nirfmxvna_service.cpp b/generated/nirfmxvna/nirfmxvna_service.cpp
@@ -25,7 +25,7 @@ namespace nirfmxvna_grpc {
   const auto kWarningCAPIStringTruncatedToFitBuffer = 200026;
 
   NiRFmxVNAService::NiRFmxVNAService(
-      NiRFmxVNALibraryInterface* library,
+      LibrarySharedPtr library,
       ResourceRepositorySharedPtr resource_repository,
       const NiRFmxVNAFeatureToggles& feature_toggles)
       : library_(library),
@@ -177,7 +177,9 @@ namespace nirfmxvna_grpc {
         return std::make_tuple(status, instrument);
       };
       std::string grpc_device_session_name = request->session_name();
-      auto cleanup_lambda = [&] (niRFmxInstrHandle id) { library_->Close(id, RFMXVNA_VAL_FALSE); };
+      // Capture the library shared_ptr by value. Do not capture `this` or any references.
+      LibrarySharedPtr library = library_;
+      auto cleanup_lambda = [library] (niRFmxInstrHandle id) { library->Close(id, RFMXVNA_VAL_FALSE); };
       int status = session_repository_->add_session(grpc_device_session_name, init_lambda, cleanup_lambda);
       if (!status_ok(status)) {
         return ConvertApiErrorStatusForNiRFmxInstrHandle(context, status, 0);
@@ -199,4 +201,5 @@ namespace nirfmxvna_grpc {
         feature_toggles.is_feature_enabled("nirfmxvna", CodeReadiness::kNextRelease))
   {
   }
-} // namespace nirfmxvna_grpc
+} // namespace nirfmxvna_grpc
+
diff --git a/generated/nirfmxvna/nirfmxvna_service.h b/generated/nirfmxvna/nirfmxvna_service.h
@@ -33,26 +33,27 @@ struct NiRFmxVNAFeatureToggles
 
 class NiRFmxVNAService final : public NiRFmxVNA::Service {
 public:
+  using LibrarySharedPtr = std::shared_ptr<NiRFmxVNALibraryInterface>;
   using ResourceRepositorySharedPtr = std::shared_ptr<nidevice_grpc::SessionResourceRepository<niRFmxInstrHandle>>;
 
   NiRFmxVNAService(
-    NiRFmxVNALibraryInterface* library,
+    LibrarySharedPtr library,
     ResourceRepositorySharedPtr resource_repository,
     const NiRFmxVNAFeatureToggles& feature_toggles = {});
   virtual ~NiRFmxVNAService();
-  
+
   ::grpc::Status Close(::grpc::ServerContext* context, const CloseRequest* request, CloseResponse* response) override;
   ::grpc::Status GetError(::grpc::ServerContext* context, const GetErrorRequest* request, GetErrorResponse* response) override;
   ::grpc::Status GetErrorString(::grpc::ServerContext* context, const GetErrorStringRequest* request, GetErrorStringResponse* response) override;
   ::grpc::Status Initialize(::grpc::ServerContext* context, const InitializeRequest* request, InitializeResponse* response) override;
 private:
-  NiRFmxVNALibraryInterface* library_;
+  LibrarySharedPtr library_;
   ResourceRepositorySharedPtr session_repository_;
-  ::grpc::Status ConvertApiErrorStatusForNiRFmxInstrHandle(::grpc::ServerContext* context, int32_t status, niRFmxInstrHandle instrumentHandle);
+  ::grpc::Status ConvertApiErrorStatusForNiRFmxInstrHandle(::grpc::ServerContextBase* context, int32_t status, niRFmxInstrHandle instrumentHandle);
 
   NiRFmxVNAFeatureToggles feature_toggles_;
 };
 
 } // namespace nirfmxvna_grpc
 
-#endif  // NIRFMXVNA_GRPC_SERVICE_H
+#endif  // NIRFMXVNA_GRPC_SERVICE_H
diff --git a/generated/nirfmxvna/nirfmxvna_service_registrar.cpp b/generated/nirfmxvna/nirfmxvna_service_registrar.cpp
@@ -1,4 +1,4 @@
-cdma2k
+
 //---------------------------------------------------------------------
 // This file is automatically generated. All manual edits will be lost.
 //---------------------------------------------------------------------
@@ -13,40 +13,25 @@ cdma2k
 
 namespace nirfmxvna_grpc {
 
-namespace {
-struct LibraryAndService {
-  LibraryAndService(
-    const std::shared_ptr<nidevice_grpc::SessionResourceRepository<niRFmxInstrHandle>>& resource_repository,
-    const NiRFmxVNAFeatureToggles& feature_toggles) 
-      : library(), 
-      service(
-        &library, 
-        resource_repository,
-        feature_toggles) {
-  }
-  NiRFmxVNALibrary library;
-  NiRFmxVNAService service;
-};
-}
-
 std::shared_ptr<void> register_service(
-  grpc::ServerBuilder& builder, 
+  grpc::ServerBuilder& builder,
   const std::shared_ptr<nidevice_grpc::SessionResourceRepository<niRFmxInstrHandle>>& resource_repository,
   const nidevice_grpc::FeatureToggles& feature_toggles)
 {
   auto toggles = NiRFmxVNAFeatureToggles(feature_toggles);
 
   if (toggles.is_enabled)
   {
-    auto library_and_service_ptr = std::make_shared<LibraryAndService>(
+    auto library = std::make_shared<NiRFmxVNALibrary>();
+    auto service = std::make_shared<NiRFmxVNAService>(
+      library,
       resource_repository,
       toggles);
-    auto& service = library_and_service_ptr->service;
-    builder.RegisterService(&service);
-    return library_and_service_ptr;
+    builder.RegisterService(service.get());
+    return service;
   }
 
   return {};
 }
 
-} // nirfmxvna_grpc
+} // nirfmxvna_grpc
diff --git a/generated/nirfmxvna/nirfmxvna_service_registrar.h b/generated/nirfmxvna/nirfmxvna_service_registrar.h
@@ -27,4 +27,4 @@ std::shared_ptr<void> register_service(
 
 } // nirfmxvna_grpc
 
-#endif  // NIRFMXVNA_GRPC_SERVICE_REGISTRAR_H
+#endif  // NIRFMXVNA_GRPC_SERVICE_REGISTRAR_H
diff --git a/generated/register_all_services.cpp b/generated/register_all_services.cpp
@@ -54,6 +54,9 @@
 #include "nirfmxtdscdma/nirfmxtdscdma_service_registrar.h"
 #endif // defined(_MSC_VER)
 #if defined(_MSC_VER)
+#include "nirfmxvna/nirfmxvna_service_registrar.h"
+#endif // defined(_MSC_VER)
+#if defined(_MSC_VER)
 #include "nirfmxwcdma/nirfmxwcdma_service_registrar.h"
 #endif // defined(_MSC_VER)
 #if defined(_MSC_VER)
@@ -224,6 +227,13 @@ std::shared_ptr<std::vector<std::shared_ptr<void>>> register_all_services(
       vi_session_repository,
       feature_toggles));
 #endif // defined(_MSC_VER)
+#if defined(_MSC_VER)
+  service_vector->push_back(
+    nirfmxvna_grpc::register_service(
+      server_builder, 
+      ni_r_fmx_instr_handle_repository,
+      feature_toggles));
+#endif // defined(_MSC_VER)
 #if defined(_MSC_VER)
   service_vector->push_back(
     nirfmxwcdma_grpc::register_service(
Original file line number	Diff line number	Diff line change
Expand Up		@@ -89,4 +89,4 @@ initialize(const StubPtr& stub, const std::string& resource_name, const std::str
		}


		} // namespace nirfmxvna_grpc::experimental::client
		} // namespace nirfmxvna_grpc::experimental::client
Original file line number	Diff line number	Diff line change
Expand Up		@@ -29,4 +29,4 @@ InitializeResponse initialize(const StubPtr& stub, const std::string& resource_n

		} // namespace nirfmxvna_grpc::experimental::client

		#endif /* NIRFMXVNA_GRPC_CLIENT_H */
		#endif /* NIRFMXVNA_GRPC_CLIENT_H */
Original file line number	Diff line number	Diff line change
Expand Up		@@ -27,4 +27,4 @@ std::shared_ptr<void> register_service(

		} // nirfmxvna_grpc

		#endif // NIRFMXVNA_GRPC_SERVICE_REGISTRAR_H
		#endif // NIRFMXVNA_GRPC_SERVICE_REGISTRAR_H