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

Handle timeout behavior of read functions in NI-DAQmx #935

Merged
merged 14 commits into from
Jun 12, 2023

Conversation

Sakthi-SM
Copy link
Contributor

What does this Pull Request accomplish?

In Ni-DAQmx functions, whenever a timeout exception has occurred instead of raising a gRPC exception, the error and the partially read data should be sent through the gRPC response.
,

Why should this Pull Request be merged?

This implements Bug 2399915: Partial reads report samps-per-chan-read via DaqReadError but don't update read_array

What testing has been done?

The changes have been tested manually

Sakthi Subramanian Muthuramalingam and others added 2 commits May 24, 2023 16:02
@Sakthi-SM Sakthi-SM requested review from bkeryan and keer1111 May 24, 2023 14:38
@Sakthi-SM Sakthi-SM marked this pull request as ready for review June 2, 2023 13:29
source/tests/system/nidaqmx_driver_api_tests.cpp Outdated Show resolved Hide resolved
source/tests/system/nidaqmx_driver_api_tests.cpp Outdated Show resolved Hide resolved
source/tests/system/nidaqmx_driver_api_tests.cpp Outdated Show resolved Hide resolved
source/tests/system/nidaqmx_driver_api_tests.cpp Outdated Show resolved Hide resolved
source/tests/system/nidaqmx_driver_api_tests.cpp Outdated Show resolved Hide resolved
source/tests/system/nidaqmx_driver_api_tests.cpp Outdated Show resolved Hide resolved
source/tests/system/nidaqmx_driver_api_tests.cpp Outdated Show resolved Hide resolved
source/tests/system/nidaqmx_driver_api_tests.cpp Outdated Show resolved Hide resolved
source/tests/system/nidaqmx_driver_api_tests.cpp Outdated Show resolved Hide resolved
source/tests/system/nidaqmx_driver_api_tests.cpp Outdated Show resolved Hide resolved
source/tests/system/nidaqmx_driver_api_tests.cpp Outdated Show resolved Hide resolved
Copy link
Contributor

@bkeryan bkeryan left a comment

Choose a reason for hiding this comment

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

Once the test passes, this looks good to go.

source/tests/system/nidaqmx_driver_api_tests.cpp Outdated Show resolved Hide resolved
@bkeryan
Copy link
Contributor

bkeryan commented Jun 9, 2023

@Sakthi-SM These system test failures do not appear to be related to this PR.

Windows:

[ RUN      ] NiRFmxWCDMADriverApiTests.ModAccMarkerModeFromExample_FetchData_DataLooksReasonable
D:\a\grpc-device\grpc-device\source\tests\system\nirfmxwcdma_driver_api_tests.cpp(330): error: Expected: (0.0) < (mod_acc_fetch_reference_waveform_response.reference_waveform(0).real()), actual: 0 vs -0.00347697
[  FAILED  ] NiRFmxWCDMADriverApiTests.ModAccMarkerModeFromExample_FetchData_DataLooksReasonable (13146 ms)

Linux:

[ RUN      ] NiFgenDriverApiTest.PerformReset_CompletesSuccessfuly
/home/runner/work/grpc-device/grpc-device/source/tests/system/nifgen_driver_api_tests.cpp:71: Failure
Value of: status.ok()
  Actual: false
Expected: true
/home/runner/work/grpc-device/grpc-device/source/tests/system/nifgen_driver_api_tests.cpp:101: Failure
Value of: status.ok()
  Actual: false
Expected: true
[  FAILED  ] NiFgenDriverApiTest.PerformReset_CompletesSuccessfuly (112 ms)

@keer1111 keer1111 merged commit a1ad91c into main Jun 12, 2023
@keer1111 keer1111 deleted the users/sakthi/fix-timeout-exceptions branch June 12, 2023 15:31
@bkeryan bkeryan added the binary-breaking Change to proto file that requires client updates label Jun 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
binary-breaking Change to proto file that requires client updates
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants