Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
LARN
PRRT
Commits
1a02ced7
Commit
1a02ced7
authored
Feb 16, 2018
by
Andreas Schmidt
Browse files
Propagate ETIMEDOUT.
parent
135abbab
Pipeline
#1939
passed with stages
in 1 minute and 24 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
prrt/proto/socket.c
View file @
1a02ced7
...
@@ -305,6 +305,9 @@ int32_t PrrtSocket_receive_asap_timedwait(PrrtSocket *s, void *buf_ptr, struct t
...
@@ -305,6 +305,9 @@ int32_t PrrtSocket_receive_asap_timedwait(PrrtSocket *s, void *buf_ptr, struct t
check
(
s
->
isSender
==
false
,
"Cannot receive on sender socket."
)
check
(
s
->
isSender
==
false
,
"Cannot receive on sender socket."
)
PrrtPacket
*
packet
=
PrrtPacketDeliveryStore_get_packet_timedwait
(
s
->
packetDeliveryStore
,
0
,
MAX_TIMESTAMP
,
deadline
);
PrrtPacket
*
packet
=
PrrtPacketDeliveryStore_get_packet_timedwait
(
s
->
packetDeliveryStore
,
0
,
MAX_TIMESTAMP
,
deadline
);
if
(
packet
==
NULL
&&
errno
==
ETIMEDOUT
)
{
return
-
1
*
ETIMEDOUT
;
}
return
deliver_packet
(
s
,
buf_ptr
,
packet
);
return
deliver_packet
(
s
,
buf_ptr
,
packet
);
error:
error:
...
@@ -355,6 +358,10 @@ int32_t PrrtSocket_receive_ordered_timedwait(PrrtSocket *s, void *buf_ptr, prrtT
...
@@ -355,6 +358,10 @@ int32_t PrrtSocket_receive_ordered_timedwait(PrrtSocket *s, void *buf_ptr, prrtT
PrrtPacket
*
packet
=
PrrtPacketDeliveryStore_get_packet_timedwait
(
s
->
packetDeliveryStore
,
now
-
time_window_us
,
PrrtPacket
*
packet
=
PrrtPacketDeliveryStore_get_packet_timedwait
(
s
->
packetDeliveryStore
,
now
-
time_window_us
,
now
+
time_window_us
,
deadline
);
now
+
time_window_us
,
deadline
);
if
(
packet
==
NULL
&&
errno
==
ETIMEDOUT
)
{
return
-
1
*
ETIMEDOUT
;
}
return
deliver_packet
(
s
,
buf_ptr
,
packet
);
return
deliver_packet
(
s
,
buf_ptr
,
packet
);
error:
error:
PERROR
(
"There was a failure while receiving from socket.%s"
,
""
);
PERROR
(
"There was a failure while receiving from socket.%s"
,
""
);
...
...
prrt/proto/stores/packetDeliveryStore.c
View file @
1a02ced7
...
@@ -31,7 +31,11 @@ PrrtPacket * PrrtPacketDeliveryStore_get_packet_timedwait(PrrtPacketDeliveryStor
...
@@ -31,7 +31,11 @@ PrrtPacket * PrrtPacketDeliveryStore_get_packet_timedwait(PrrtPacketDeliveryStor
packet
=
PrrtPacketDeliveryStore_get_packet
(
q
,
start
,
stop
);
packet
=
PrrtPacketDeliveryStore_get_packet
(
q
,
start
,
stop
);
if
(
!
packet
&&
!
atomic_load_explicit
(
&
q
->
closing
,
memory_order_acquire
))
{
if
(
!
packet
&&
!
atomic_load_explicit
(
&
q
->
closing
,
memory_order_acquire
))
{
pthread_cond_timedwait
(
&
q
->
wait_for_data
,
&
q
->
lock
,
deadline
);
int
res
=
pthread_cond_timedwait
(
&
q
->
wait_for_data
,
&
q
->
lock
,
deadline
);
if
(
res
==
ETIMEDOUT
)
{
errno
=
ETIMEDOUT
;
return
NULL
;
}
packet
=
PrrtPacketDeliveryStore_get_packet
(
q
,
start
,
stop
);
packet
=
PrrtPacketDeliveryStore_get_packet
(
q
,
start
,
stop
);
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment