Skip to content

Commit

Permalink
tests/channel-helper: set blocking in main thread
Browse files Browse the repository at this point in the history
The /io/channel/command/echo tests run the reader side and the writer
side with the same underlying command channel. Setting the blocking mode
of the fd/handles while the other end is already reading/writing may
create issues (deadlock in win32 when earlier attempt of this series
were using SetNamedPipeHandleState). Let's just do it before spawning
the threads to avoid further concurrency issues.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20221006113657.2656108-4-marcandre.lureau@redhat.com>
  • Loading branch information
elmarco committed Oct 12, 2022
1 parent 3f08376 commit bb06b01
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions tests/unit/io-channel-helpers.c
Expand Up @@ -25,7 +25,6 @@
struct QIOChannelTest {
QIOChannel *src;
QIOChannel *dst;
bool blocking;
size_t len;
size_t niov;
char *input;
Expand All @@ -42,8 +41,6 @@ static gpointer test_io_thread_writer(gpointer opaque)
{
QIOChannelTest *data = opaque;

qio_channel_set_blocking(data->src, data->blocking, NULL);

qio_channel_writev_all(data->src,
data->inputv,
data->niov,
Expand All @@ -58,8 +55,6 @@ static gpointer test_io_thread_reader(gpointer opaque)
{
QIOChannelTest *data = opaque;

qio_channel_set_blocking(data->dst, data->blocking, NULL);

qio_channel_readv_all(data->dst,
data->outputv,
data->niov,
Expand Down Expand Up @@ -113,7 +108,9 @@ void qio_channel_test_run_threads(QIOChannelTest *test,

test->src = src;
test->dst = dst;
test->blocking = blocking;

qio_channel_set_blocking(test->dst, blocking, NULL);
qio_channel_set_blocking(test->src, blocking, NULL);

reader = g_thread_new("reader",
test_io_thread_reader,
Expand Down

0 comments on commit bb06b01

Please sign in to comment.