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.

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

Parallel TX/RX RDMA Support #25

Merged
merged 23 commits into from
Jun 27, 2022
Merged

Parallel TX/RX RDMA Support #25

merged 23 commits into from
Jun 27, 2022

Conversation

jmartinez44
Copy link
Contributor

TODO: Check the above box with an 'x' indicating you've read and followed CONTRIBUTING.md.

What does this Pull Request accomplish?

Adds parallel TX/RX session support on a single RDMA interface to the RDMA plugin.

Why should this Pull Request be merged?

RDMA interfaces should not be constrained to being either TX or RX, so this removes that limitation.

What testing has been done?

  • Manual VeriStand tests using RDMA modules
  • Validated original functionality after these changes

@niveristand-diff-bot

This comment was marked as resolved.

@niveristand-diff-bot

This comment was marked as resolved.

Copy link
Collaborator

@buckd buckd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are no changes to the following VIs. They should be reverted to what is in ni/main.

  • Transceiver/Initialize.vi
  • Transceiver/Read From RDMA Buffer.vi
  • Transceiver/Read Transfer Buffer.vi
  • Transceiver/Read Transfer Group Buffer.vi
  • Transceiver/Receive.vi
  • Transceiver/Shutdown.vi
  • Transceiver/Transmit.vi
  • Transceiver/Write Transfer Buffer.vi
  • Transceiver/Write Transfer Group Buffer.vi
  • Transceiver/Write to RDMA Buffer.vi

@niveristand-diff-bot
Copy link
Collaborator

Bleep bloop!

LabVIEW Diff Robot here with some diffs served up hot for your pull request.

Notice something funny? Help fix me on my GitHub repo.

The following VIs could not be diffed:

  • C:\jenkins\workspace\work-custom-device-plugins_PR-25\Components\Transceivers\RDMA\Transceiver\Get RDMA Error Info.vi
  • C:\jenkins\workspace\work-custom-device-plugins_PR-25\Components\Transceivers\RDMA\Transceiver\Initialize RX Transfer.vi
  • C:\jenkins\workspace\work-custom-device-plugins_PR-25\Components\Transceivers\RDMA\Transceiver\Initialize TX Transfer.vi
  • C:\jenkins\workspace\work-custom-device-plugins_PR-25\Components\Transceivers\RDMA\Transceiver\Initialize Transfers.vi
  • C:\jenkins\workspace\work-custom-device-plugins_PR-25\Components\Transceivers\RDMA\Transceiver\Throw Error.vi
  • C:\jenkins\workspace\work-custom-device-plugins_PR-25\Components\Transceivers\RDMA\Transceiver\Throw Invalid RDMA Configuration Error.vi
  • C:\jenkins\workspace\work-custom-device-plugins_PR-25\Components\Transceivers\RDMA\Transceiver\Transmit Transfer Data.vi

@niveristand-diff-bot
Copy link
Collaborator

Bleep bloop!

LabVIEW Diff Robot here with some diffs served up hot for your pull request.

Notice something funny? Help fix me on my GitHub repo.

The following VIs could not be diffed:

  • C:\jenkins\workspace\work-custom-device-plugins_PR-25\Components\Transceivers\RDMA\Transceiver\Get RDMA Error Info.vi
  • C:\jenkins\workspace\work-custom-device-plugins_PR-25\Components\Transceivers\RDMA\Transceiver\Initialize RX Transfer.vi
  • C:\jenkins\workspace\work-custom-device-plugins_PR-25\Components\Transceivers\RDMA\Transceiver\Initialize TX Transfer.vi
  • C:\jenkins\workspace\work-custom-device-plugins_PR-25\Components\Transceivers\RDMA\Transceiver\Initialize Transfers.vi
  • C:\jenkins\workspace\work-custom-device-plugins_PR-25\Components\Transceivers\RDMA\Transceiver\Throw Error.vi
  • C:\jenkins\workspace\work-custom-device-plugins_PR-25\Components\Transceivers\RDMA\Transceiver\Throw Invalid RDMA Configuration Error.vi
  • C:\jenkins\workspace\work-custom-device-plugins_PR-25\Components\Transceivers\RDMA\Transceiver\Transmit Transfer Data.vi

@buckd
Copy link
Collaborator

buckd commented Jun 24, 2022

The new errors file will not get installed with the RDMA build specs the way they are. See the GE Reflective Memory Windows.lvproj build spec for how to correctly include the errors txt file so that it is installed by the nipkg. It needs to be Always Included and its destination should be the Errors directory.

@jmartinez44
Copy link
Contributor Author

Added the error files to the build spec.

@niveristand-diff-bot
Copy link
Collaborator

Bleep bloop!

LabVIEW Diff Robot here with some diffs served up hot for your pull request.

Notice something funny? Help fix me on my GitHub repo.

The following VIs could not be diffed:

  • C:\jenkins\workspace\work-custom-device-plugins_PR-25\Components\Transceivers\RDMA\Transceiver\Get RDMA Error Info.vi
  • C:\jenkins\workspace\work-custom-device-plugins_PR-25\Components\Transceivers\RDMA\Transceiver\Initialize RX Transfer.vi
  • C:\jenkins\workspace\work-custom-device-plugins_PR-25\Components\Transceivers\RDMA\Transceiver\Initialize TX Transfer.vi
  • C:\jenkins\workspace\work-custom-device-plugins_PR-25\Components\Transceivers\RDMA\Transceiver\Initialize Transfers.vi
  • C:\jenkins\workspace\work-custom-device-plugins_PR-25\Components\Transceivers\RDMA\Transceiver\Throw Error.vi
  • C:\jenkins\workspace\work-custom-device-plugins_PR-25\Components\Transceivers\RDMA\Transceiver\Throw Invalid RDMA Configuration Error.vi
  • C:\jenkins\workspace\work-custom-device-plugins_PR-25\Components\Transceivers\RDMA\Transceiver\Transmit Transfer Data.vi

@@ -431,8 +435,11 @@ AddOutputFilter chunkFilter
<Property Name="Destination[1].destName" Type="Str">Support Directory</Property>
<Property Name="Destination[1].path" Type="Path">/Components</Property>
<Property Name="Destination[1].path.type" Type="Str">&lt;none&gt;</Property>
<Property Name="DestinationCount" Type="Int">2</Property>
<Property Name="Source[0].itemID" Type="Str">{143C9DB3-6F08-483B-8C9A-420653A3ACD1}</Property>
<Property Name="Destination[2].destName" Type="Str">Errors</Property>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be in the Windows project instead of the Linux project. The Post-Build Action.vi that copies the errors files to the correct location is looking for output in Windows\Components\Errors.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now it should be correct.

@niveristand-diff-bot
Copy link
Collaborator

Bleep bloop!

LabVIEW Diff Robot here with some diffs served up hot for your pull request.

Notice something funny? Help fix me on my GitHub repo.

The following VIs could not be diffed:

  • C:\jenkins\workspace\work-custom-device-plugins_PR-25\Components\Transceivers\RDMA\Transceiver\Get RDMA Error Info.vi
  • C:\jenkins\workspace\work-custom-device-plugins_PR-25\Components\Transceivers\RDMA\Transceiver\Initialize RX Transfer.vi
  • C:\jenkins\workspace\work-custom-device-plugins_PR-25\Components\Transceivers\RDMA\Transceiver\Initialize TX Transfer.vi
  • C:\jenkins\workspace\work-custom-device-plugins_PR-25\Components\Transceivers\RDMA\Transceiver\Initialize Transfers.vi
  • C:\jenkins\workspace\work-custom-device-plugins_PR-25\Components\Transceivers\RDMA\Transceiver\Throw Error.vi
  • C:\jenkins\workspace\work-custom-device-plugins_PR-25\Components\Transceivers\RDMA\Transceiver\Throw Invalid RDMA Configuration Error.vi
  • C:\jenkins\workspace\work-custom-device-plugins_PR-25\Components\Transceivers\RDMA\Transceiver\Transmit Transfer Data.vi

<Property Name="Source[2].destinationIndex" Type="Int">0</Property>
<Property Name="Source[2].itemID" Type="Ref">/My Computer/Documents/dsf-RDMA-errors.txt</Property>
<Property Name="Source[2].sourceInclusion" Type="Str">Include</Property>
<Property Name="Source[3].destinationIndex" Type="Int">0</Property>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The files need to be explicitly added to the Errors directory.
image

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm just not functioning properly today. I've made the change.

@niveristand-diff-bot
Copy link
Collaborator

Bleep bloop!

LabVIEW Diff Robot here with some diffs served up hot for your pull request.

Notice something funny? Help fix me on my GitHub repo.

The following VIs could not be diffed:

  • C:\jenkins\workspace\work-custom-device-plugins_PR-25\Components\Transceivers\RDMA\Transceiver\Get RDMA Error Info.vi
  • C:\jenkins\workspace\work-custom-device-plugins_PR-25\Components\Transceivers\RDMA\Transceiver\Initialize RX Transfer.vi
  • C:\jenkins\workspace\work-custom-device-plugins_PR-25\Components\Transceivers\RDMA\Transceiver\Initialize TX Transfer.vi
  • C:\jenkins\workspace\work-custom-device-plugins_PR-25\Components\Transceivers\RDMA\Transceiver\Initialize Transfers.vi
  • C:\jenkins\workspace\work-custom-device-plugins_PR-25\Components\Transceivers\RDMA\Transceiver\Throw Error.vi
  • C:\jenkins\workspace\work-custom-device-plugins_PR-25\Components\Transceivers\RDMA\Transceiver\Throw Invalid RDMA Configuration Error.vi
  • C:\jenkins\workspace\work-custom-device-plugins_PR-25\Components\Transceivers\RDMA\Transceiver\Transmit Transfer Data.vi

@buckd buckd merged commit 0b176fc into ni:main Jun 27, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants