mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Revert "Speed up shutdown of multicast thread" 

This broke Windows rigctl quit
This reverts commit b25b496051.
pull/1458/head
Mike Black W9MDB 2023-12-09 15:57:47 -06:00
rodzic 5f0c8691d7
commit 27d7e8bd2d
1 zmienionych plików z 6 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

13
src/network.c
Wyświetl plik

@ -469,7 +469,6 @@ extern void sync_callback(int lock);
//! @cond Doxygen_Suppress //! @cond Doxygen_Suppress
#define MULTICAST_DATA_PIPE_TIMEOUT_MILLIS 1000 #define MULTICAST_DATA_PIPE_TIMEOUT_MILLIS 1000
#define MULTICAST_DATA_PIPE_TIMEOUT_USEC 100000
#if defined(WIN32) && defined(HAVE_WINDOWS_H) #if defined(WIN32) && defined(HAVE_WINDOWS_H)
@ -536,7 +535,7 @@ static int multicast_publisher_read_data(multicast_publisher_args
ssize_t result; ssize_t result;
result = async_pipe_wait_for_data(mcast_publisher_args->data_pipe, result = async_pipe_wait_for_data(mcast_publisher_args->data_pipe,
MULTICAST_DATA_PIPE_TIMEOUT_USEC); MULTICAST_DATA_PIPE_TIMEOUT_MILLIS);
if (result < 0) if (result < 0)
{ {
@ -660,8 +659,8 @@ static int multicast_publisher_read_data(const multicast_publisher_args
ssize_t result; ssize_t result;
int retval; int retval;
timeout.tv_sec = 0; timeout.tv_sec = MULTICAST_DATA_PIPE_TIMEOUT_MILLIS / 1000;
timeout.tv_usec = MULTICAST_DATA_PIPE_TIMEOUT_USEC; timeout.tv_usec = 0;
FD_ZERO(&rfds); FD_ZERO(&rfds);
FD_SET(fd, &rfds); FD_SET(fd, &rfds);
@ -1180,8 +1179,8 @@ void *multicast_receiver(void *arg)
int select_result; int select_result;
ssize_t result; ssize_t result;
timeout.tv_sec = 0; timeout.tv_sec = 1;
timeout.tv_usec = 100000; timeout.tv_usec = 0;
FD_ZERO(&rfds); FD_ZERO(&rfds);
FD_SET(socket_fd, &rfds); FD_SET(socket_fd, &rfds);
efds = rfds; efds = rfds;
@ -1197,7 +1196,7 @@ void *multicast_receiver(void *arg)
if (select_result == 0) if (select_result == 0)
{ {
// Select timed out // Select timed out
//rig_debug(RIG_DEBUG_ERR, "%s: select timeout\n", __FILE__); // rig_debug(RIG_DEBUG_ERR, "%s: select timeout\n", __FILE__);
continue; continue;
} }