n5ac/smartsdr-dsp
1
0
Fork 0
mirror of https://github.com/n5ac/smartsdr-dsp.git synced 2025-12-06 03:01:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Blocking read instead of polling for _thumbDV_readThread()

Browse source
This commit is contained in:
Ed Gonzalez 2016-10-24 14:12:02 -05:00
parent c5bd30c090
commit 06cf3e975c
1 changed files with 31 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
DSP_API/ThumbDV/thumbDV.c
View file

@ -715,33 +715,45 @@ static void * _thumbDV_readThread( void * param )
FT_STATUS status = FT_OK; FT_STATUS status = FT_OK;
FT_HANDLE handle = *( FT_HANDLE * )param; FT_HANDLE handle = *( FT_HANDLE * )param;
EVENT_HANDLE event_handle;
prctl(PR_SET_NAME, "DV-Read"); prctl(PR_SET_NAME, "DV-Read");
pthread_mutex_init(&event_handle.eMutex, NULL);
pthread_cond_init(&event_handle.eCondVar, NULL);
while ( !_readThreadAbort ) while ( !_readThreadAbort )
{ {
status = FT_GetStatus(handle, &rx_bytes, &tx_bytes, &event_dword); // Setup RX or Status change event notification
status = FT_SetEventNotification(handle, FT_EVENT_RXCHAR | FT_EVENT_MODEM_STATUS, (PVOID)&event_handle);
if ( status != FT_OK ) // Will block until
{ pthread_mutex_lock(&event_handle.eMutex);
fprintf( stderr, "ThumbDV: error from select, status=%d\n", status ); pthread_cond_wait(&event_handle.eCondVar, &event_handle.eMutex);
pthread_mutex_unlock(&event_handle.eMutex);
/* Set invalid FD in sched_waveform so we don't call write functions */ do
handle = NULL;
sched_waveform_setHandle(&handle);
/* This function hangs until a new connection is made */
_connectSerial( &handle );
/* Update the sched_waveform to new valid serial */
sched_waveform_setHandle( &handle );
}
else if ( rx_bytes > 0 )
{ {
ret = thumbDV_processSerial( handle ); rx_bytes = 0;
} status = FT_GetStatus(handle, &rx_bytes, &tx_bytes, &event_dword);
else
{ if ( status != FT_OK )
usleep(50000); {
} fprintf( stderr, "ThumbDV: error from select, status=%d\n", status );
/* Set invalid FD in sched_waveform so we don't call write functions */
handle = NULL;
sched_waveform_setHandle(&handle);
/* This function hangs until a new connection is made */
_connectSerial( &handle );
/* Update the sched_waveform to new valid serial */
sched_waveform_setHandle( &handle );
}
else if ( rx_bytes > 0 )
{
ret = thumbDV_processSerial( handle );
}
} while ( rx_bytes > 0 );
} }
output( ANSI_YELLOW "thumbDV_readThread has exited\n" ANSI_WHITE ); output( ANSI_YELLOW "thumbDV_readThread has exited\n" ANSI_WHITE );