Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add client pool to measurementlink-labview #262

Merged
merged 7 commits into from
Aug 29, 2023
Merged

Add client pool to measurementlink-labview #262

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
39cd566
add client pool class and fgv
pbirkhol-ni Aug 22, 2023
010545a
add nonsense LV changes
pbirkhol-ni Aug 22, 2023
71d5433
Unknown changes. :)
pbirkhol-ni Aug 22, 2023
4d89ea8
Some renames and add some tests
pbirkhol-ni Aug 24, 2023
b9f9495
fix up tests
pbirkhol-ni Aug 25, 2023
e2986ae
Add tests
pbirkhol-ni Aug 25, 2023
a7c5ee7
Only destroy when client has been created
pbirkhol-ni Aug 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions Source/Runtime/Measurement Server.lvproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,8 @@
<Item Name="MeasurementLink Measurement Service Base V2" Type="Folder">
<Item Name="MeasurementLink Measurement Service Base V2.lvlib" Type="Library" URL="../MeasurementLink Measurement Service Base V2/MeasurementLink Measurement Service Base V2.lvlib"/>
</Item>
<Item Name="Tests.Runtime" Type="Folder">
<Item Name="Measurement Server" Type="Folder" URL="../../Tests/Tests.Runtime/Measurement Server">
<Property Name="NI.DISK" Type="Bool">true</Property>
</Item>
<Item Name="Tests" Type="Folder">
<Item Name="MeasurementServerTests.lvlib" Type="Library" URL="../../Tests/Tests.Runtime/Measurement Server/MeasurementServerTests.lvlib"/>
</Item>
<Item Name="Dependencies" Type="Dependencies">
<Item Name="vi.lib" Type="Folder">
Expand Down Expand Up @@ -76,10 +74,14 @@
<Item Name="Trim Whitespace.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Trim Whitespace.vi"/>
<Item Name="whitespace.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/whitespace.ctl"/>
</Item>
<Item Name="ConfigurationParameter_AnnotationsEntry.ctl" Type="VI" URL="../MeasurementLink Measurement Server/Helpers/TypeDefs/ConfigurationParameter_AnnotationsEntry.ctl"/>
<Item Name="kernel32.dll" Type="Document" URL="kernel32.dll">
<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
</Item>
<Item Name="MeasurementLink Discovery Client.lvlib" Type="Library" URL="../MeasurementLink Discovery Client/MeasurementLink Discovery Client.lvlib"/>
<Item Name="MeasurementLink Pin Map Client.lvlib" Type="Library" URL="../MeasurementLink Pin Map Client/MeasurementLink Pin Map Client.lvlib"/>
<Item Name="MeasurementLink Session Management Client.lvlib" Type="Library" URL="../MeasurementLink Session Management Client/MeasurementLink Session Management Client.lvlib"/>
<Item Name="Output.ctl" Type="VI" URL="../MeasurementLink Measurement Server/Helpers/TypeDefs/Output.ctl"/>
</Item>
<Item Name="Build Specifications" Type="Build"/>
</Item>
Expand Down
Binary file added Source/Runtime/MeasurementLink Measurement Server/Classes/GrpcClientPool/Client Pool FGV.vi
View file
Open in desktop
Binary file not shown.
Binary file added Source/Runtime/MeasurementLink Measurement Server/Classes/GrpcClientPool/Create.vi
View file
Open in desktop
Binary file not shown.
Binary file added Source/Runtime/MeasurementLink Measurement Server/Classes/GrpcClientPool/Destroy.vi
View file
Open in desktop
pbirkhol-ni marked this conversation as resolved.
Show resolved Hide resolved
Binary file not shown.
Binary file added Source/Runtime/MeasurementLink Measurement Server/Classes/GrpcClientPool/FGV Action.ctl
View file
Open in desktop
Binary file not shown.
Binary file added ...Runtime/MeasurementLink Measurement Server/Classes/GrpcClientPool/Get Discovery Client.vi
View file
Open in desktop
Binary file not shown.
Binary file added ...ce/Runtime/MeasurementLink Measurement Server/Classes/GrpcClientPool/Get Pinmap Client.vi
View file
Open in desktop
Binary file not shown.
Binary file added ...e/MeasurementLink Measurement Server/Classes/GrpcClientPool/Get Session Manager Client.vi
View file
Open in desktop
Binary file not shown.
105 changes: 105 additions & 0 deletions .../Runtime/MeasurementLink Measurement Server/Classes/GrpcClientPool/GrpcClientPool.lvclass
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified ...me/MeasurementLink Measurement Server/Classes/IMeasurementService/Invoke Measure Logic.vi
View file
Open in desktop
pbirkhol-ni marked this conversation as resolved.
Show resolved Hide resolved
Binary file not shown.
Binary file added Source/Runtime/MeasurementLink Measurement Server/Helpers/Location to Insecure Address.vi
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions Source/Runtime/MeasurementLink Measurement Server/MeasurementLink Measurement Server.lvlib
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
<Item Name="IsEnumArrayControl.vi" Type="VI" URL="../Helpers/IsEnumArrayControl.vi"/>
<Item Name="IsEnumControl.vi" Type="VI" URL="../Helpers/IsEnumControl.vi"/>
<Item Name="LabVIEW datatype to Measurement datatype.vi" Type="VI" URL="../Helpers/LabVIEW datatype to Measurement datatype.vi"/>
<Item Name="Location to Insecure Address.vi" Type="VI" URL="../Helpers/Location to Insecure Address.vi"/>
<Item Name="Read Discovery Service Key File.vi" Type="VI" URL="../Helpers/Read Discovery Service Key File.vi"/>
<Item Name="Register Configuration and Results.vi" Type="VI" URL="../Helpers/Register Configuration and Results.vi"/>
<Item Name="Register to Discovery Service.vi" Type="VI" URL="../Helpers/Register to Discovery Service.vi"/>
Expand Down Expand Up @@ -71,6 +72,7 @@
<Item Name="Type Specialization.ctl" Type="VI" URL="../Helpers/TypeDefs/Type Specialization.ctl"/>
<Item Name="UI Information.ctl" Type="VI" URL="../Helpers/TypeDefs/UI Information.ctl"/>
</Item>
<Item Name="GrpcClientPool.lvclass" Type="LVClass" URL="../Classes/GrpcClientPool/GrpcClientPool.lvclass"/>
<Item Name="IMeasurementService.lvclass" Type="LVClass" URL="../Classes/IMeasurementService/IMeasurementService.lvclass">
<Property Name="NI.LibItem.Scope" Type="Int">4</Property>
</Item>
Expand Down
Binary file added ...nt Server/ClientPool_CreateDestroyAndRecreateClients_ClientsCreatedWithDifferentGrpcId.vi
View file
Open in desktop
Binary file not shown.
Binary file added ...Tests.Runtime/Measurement Server/ClientPool_GetClients_ClientsCreatedWithNonZeroGrpcId.vi
View file
Open in desktop
Binary file not shown.
Binary file modified ...ement Server/DiscoveryServiceNotRunning_LaunchDiscoveryService_DiscoveryServiceStarted.vi
View file
Open in desktop
Binary file not shown.
Binary file modified ...e/Tests/Tests.Runtime/Measurement Server/Helpers/Check If Discovery Service is Running.vi
View file
Open in desktop
Binary file not shown.
Binary file added Source/Tests/Tests.Runtime/Measurement Server/Helpers/Get Enum Getters.vi
View file
Open in desktop
pbirkhol-ni marked this conversation as resolved.
Show resolved Hide resolved
Binary file not shown.
Binary file modified Source/Tests/Tests.Runtime/Measurement Server/Helpers/Kill Discovery Service.vi
View file
Open in desktop
Binary file not shown.
15 changes: 15 additions & 0 deletions Source/Tests/Tests.Runtime/Measurement Server/MeasurementServerTests.lvlib
View file
Open in desktop
pbirkhol-ni marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version='1.0' encoding='UTF-8'?>
<Library LVVersion="20008000">
<Property Name="NI.Lib.Icon" Type="Bin">)!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!(]!!!*Q(C=\&gt;8"&lt;2MR%!813:!!O;K$1#V-#WJ",5Q,OPKI&amp;K9&amp;N;!7JA7VI";=JQVBZ"4F%#-ZG/O26X_ZZ$/87%&gt;M\6P%FXB^VL\_NHV=@X&lt;^39O0^N(_&lt;8NZOEH@@=^_CM?,3)VK63LD-&gt;8LS%=_]J'0@/1N&lt;XH,7^\SFJ?]Z#5P?=F,HP+5JTTF+5`Z&gt;MB$(P+1)YX*RU2DU$(![)Q3YW.YBG&gt;YBM@8'*\B':\B'2Z&gt;9HC':XC':XD=&amp;M-T0--T0-.DK%USWS(H'2\$2`-U4`-U4`/9-JKH!&gt;JE&lt;?!W#%;UC_WE?:KH?:R']T20]T20]\A=T&gt;-]T&gt;-]T?/7&lt;66[UTQ//9^BIHC+JXC+JXA-(=640-640-6DOCC?YCG)-G%:(#(+4;6$_6)]R?.8&amp;%`R&amp;%`R&amp;)^,WR/K&lt;75?GM=BZUG?Z%G?Z%E?1U4S*%`S*%`S'$;3*XG3*XG3RV320-G40!G3*D6^J-(3D;F4#J,(T\:&lt;=HN+P5FS/S,7ZIWV+7.NNFC&lt;+.&lt;GC0819TX-7!]JVO,(7N29CR6L%7,^=&lt;(1M4#R*IFV][.DX(X?V&amp;6&gt;V&amp;G&gt;V&amp;%&gt;V&amp;\N(L@_Z9\X_TVONVN=L^?Y8#ZR0J`D&gt;$L&amp;]8C-Q_%1_`U_&gt;LP&gt;WWPAO_0NB@$TP@4C`%`KH@[8`A@PRPA=PYZLD8Y![_ML^!!!!!!</Property>
<Property Name="NI.Lib.SourceVersion" Type="Int">536903680</Property>
<Property Name="NI.Lib.Version" Type="Str">1.0.0.0</Property>
<Property Name="NI.LV.All.SourceOnly" Type="Bool">true</Property>
<Item Name="Helpers" Type="Folder">
<Item Name="Check If Discovery Service is Running.vi" Type="VI" URL="../Helpers/Check If Discovery Service is Running.vi"/>
<Item Name="Kill Discovery Service.vi" Type="VI" URL="../Helpers/Kill Discovery Service.vi"/>
</Item>
<Item Name="ClientPool_GetClients_ClientsCreatedWithNonZeroGrpcId.vi" Type="VI" URL="../ClientPool_GetClients_ClientsCreatedWithNonZeroGrpcId.vi"/>
<Item Name="ClientPool_GetPinmapClient_PinmapClientCreatedWithNonZeroGrpcId.vi" Type="VI" URL="../ClientPool_GetPinmapClient_PinmapClientCreatedWithNonZeroGrpcId.vi"/>
<Item Name="ClientPool_GetSessionManagerClient_SessionManagerClientCreatedWithNonZeroGrpcId.vi" Type="VI" URL="../ClientPool_GetSessionManagerClient_SessionManagerClientCreatedWithNonZeroGrpcId.vi"/>
<Item Name="DiscoveryServiceNotRunning_LaunchDiscoveryService_DiscoveryServiceStarted.vi" Type="VI" URL="../DiscoveryServiceNotRunning_LaunchDiscoveryService_DiscoveryServiceStarted.vi"/>
</Library>