Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
PRRT
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
37
Issues
37
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
LARN
PRRT
Commits
86f60908
Commit
86f60908
authored
Jun 02, 2017
by
Andreas Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add cleanup method instead of separate thread.
parent
c8769948
Pipeline
#966
failed with stages
in 1 minute
Changes
6
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
51 additions
and
72 deletions
+51
-72
prrt/proto/CMakeLists.txt
prrt/proto/CMakeLists.txt
+0
-1
prrt/proto/processes/cleaner.c
prrt/proto/processes/cleaner.c
+0
-48
prrt/proto/processes/dataReceiver.c
prrt/proto/processes/dataReceiver.c
+9
-8
prrt/proto/socket.c
prrt/proto/socket.c
+41
-10
prrt/proto/socket.h
prrt/proto/socket.h
+1
-2
prrt/prrt.pyx
prrt/prrt.pyx
+0
-3
No files found.
prrt/proto/CMakeLists.txt
View file @
86f60908
...
...
@@ -14,7 +14,6 @@ add_library(PRRT ../defines.h
processes/dataReceiver.c processes/dataReceiver.h
processes/feedbackReceiver.c processes/feedbackReceiver.h
processes/dataTransmitter.c processes/dataTransmitter.h
processes/cleaner.c processes/cleaner.h
stores/repairBlockStore.c stores/repairBlockStore.h
stores/packetTimeoutTable.c stores/packetTimeoutTable.h
stores/dataPacketStore.c stores/dataPacketStore.h
)
...
...
prrt/proto/processes/cleaner.c
deleted
100644 → 0
View file @
c8769948
#include <unistd.h>
#include <stdatomic.h>
#include "../socket.h"
#include"../../util/dbg.h"
#include "cleaner.h"
void
*
cleanup
(
void
*
ptr
)
{
PrrtSocket
*
socket
=
ptr
;
while
(
1
)
{
if
(
socket
->
isSender
)
{
}
else
{
if
(
socket
->
packetTimeoutTable
!=
NULL
)
{
List
*
expired_packets
=
PrrtPacketTimeoutTable_expire_packets
(
socket
->
packetTimeoutTable
,
PrrtClock_get_prrt_time_us
(
&
socket
->
clock
));
if
(
List_count
(
expired_packets
)
>
0
)
{
PrrtPacket
*
first
=
List_first
(
expired_packets
);
prrtSequenceNumber_t
firstSequenceNumberBase
=
first
->
sequenceNumber
-
first
->
index
-
SEQNO_SPACE
/
4
;
PrrtPacket
*
last
=
List_last
(
expired_packets
);
prrtSequenceNumber_t
lastSequenceNumberBase
=
last
->
sequenceNumber
-
last
->
index
-
1
;
PrrtRepairBlockStore_expire_block_range
(
socket
->
repairBlockStore
,
firstSequenceNumberBase
,
lastSequenceNumberBase
);
List
*
list
=
List_create
();
PrrtDataPacketStore_remove_range
(
socket
->
dataPacketStore
,
list
,
firstSequenceNumberBase
,
last
->
sequenceNumber
);
List_destroy
(
list
);
while
(
List_count
(
expired_packets
)
>
0
)
{
PrrtPacket
*
packet
=
(
PrrtPacket
*
)
List_shift
(
expired_packets
);
PrrtPacket_destroy
(
packet
);
}
}
List_destroy
(
expired_packets
);
}
}
if
(
!
atomic_load_explicit
(
&
socket
->
closing
,
memory_order_acquire
))
break
;
usleep
(
1000000
);
}
return
NULL
;
}
prrt/proto/processes/dataReceiver.c
View file @
86f60908
...
...
@@ -27,26 +27,25 @@ static void retrieve_data_blocks(PrrtSocket *sock_ptr, prrtSequenceNumber_t base
List_destroy
(
res
);
}
static
void
decode_block
(
PrrtSocket
*
sock
et
,
PrrtBlock
*
block
)
static
void
decode_block
(
PrrtSocket
*
sock
_ptr
,
PrrtBlock
*
block
)
{
if
(
block
!=
NULL
&&
PrrtBlock_decode_ready
(
block
))
{
check
(
PrrtBlock_decode
(
block
),
"Decoding failed"
);
while
(
List_count
(
block
->
dataPackets
)
>
0
)
{
PrrtPacket
*
pkt
=
List_shift
(
block
->
dataPackets
);
if
(
PrrtForwardPacketTable_test_set_is_number_relevant
(
sock
et
->
forwardPacketTable
,
pkt
->
sequenceNumber
))
{
check
(
pthread_mutex_lock
(
&
sock
et
->
inQueueFilledMutex
)
==
0
,
"Lock failed."
);
List_push
(
sock
et
->
inQueue
,
pkt
);
check
(
pthread_cond_broadcast
(
&
sock
et
->
inQueueFilledCv
)
==
0
,
"Signal failed."
);
check
(
pthread_mutex_unlock
(
&
sock
et
->
inQueueFilledMutex
)
==
0
,
"Unlock failed."
);
if
(
PrrtForwardPacketTable_test_set_is_number_relevant
(
sock
_ptr
->
forwardPacketTable
,
pkt
->
sequenceNumber
))
{
check
(
pthread_mutex_lock
(
&
sock
_ptr
->
inQueueFilledMutex
)
==
0
,
"Lock failed."
);
List_push
(
sock
_ptr
->
inQueue
,
pkt
);
check
(
pthread_cond_broadcast
(
&
sock
_ptr
->
inQueueFilledCv
)
==
0
,
"Signal failed."
);
check
(
pthread_mutex_unlock
(
&
sock
_ptr
->
inQueueFilledMutex
)
==
0
,
"Unlock failed."
);
}
else
{
PrrtPacket_destroy
(
pkt
);
}
}
PrrtRepairBlockStore_delete
(
sock_ptr
->
repairBlockStore
,
block
->
baseSequenceNumber
);
PrrtBlock_destroy
(
block
);
PrrtRepairBlockStore_delete
(
socket
->
repairBlockStore
,
block
->
baseSequenceNumber
);
}
return
;
...
...
@@ -243,6 +242,8 @@ void *receive_data_loop(void *ptr)
PrrtPacket_print
(
packet
);
PrrtPacket_destroy
(
packet
);
}
PrrtSocket_cleanup
(
sock_ptr
);
}
error:
...
...
prrt/proto/socket.c
View file @
86f60908
...
...
@@ -12,7 +12,6 @@
#include "packet.h"
#include "../util/dbg.h"
#include "../util/common.h"
#include "processes/cleaner.h"
#include "processes/dataTransmitter.h"
#include "processes/dataReceiver.h"
#include "processes/feedbackReceiver.h"
...
...
@@ -137,9 +136,6 @@ bool PrrtSocket_bind(PrrtSocket *sock_ptr, const char *ipAddress, const uint16_t
"Cannot create data receiving thread."
);
}
check
(
pthread_create
(
&
sock_ptr
->
cleanupThread
,
NULL
,
cleanup
,
(
void
*
)
sock_ptr
)
==
EXIT_SUCCESS
,
"Cannot create cleanup thread."
);
return
true
;
error:
PrrtSocket_close
(
sock_ptr
);
...
...
@@ -295,12 +291,6 @@ int PrrtSocket_interrupt(PrrtSocket *sock_ptr)
sock_ptr
->
receiveFeedbackThread
=
0
;
}
if
(
sock_ptr
->
cleanupThread
!=
0
)
{
check
(
pthread_join
(
sock_ptr
->
cleanupThread
,
res
)
==
0
,
"Join failed."
);
sock_ptr
->
cleanupThread
=
0
;
}
return
EXIT_SUCCESS
;
error:
...
...
@@ -423,3 +413,44 @@ bool PrrtSocket_set_coding_parameters(PrrtSocket *sock_ptr, uint8_t k, uint8_t n
PrrtCodingParams_update
(
sock_ptr
->
codingParameters
,
k
,
n
);
return
true
;
}
bool
PrrtSocket_cleanup
(
PrrtSocket
*
socket
)
{
if
(
socket
->
isSender
)
{
}
else
{
if
(
socket
->
packetTimeoutTable
!=
NULL
)
{
List
*
expired_packets
=
PrrtPacketTimeoutTable_expire_packets
(
socket
->
packetTimeoutTable
,
PrrtClock_get_prrt_time_us
(
&
socket
->
clock
));
if
(
List_count
(
expired_packets
)
>
0
)
{
PrrtPacket
*
first
=
List_first
(
expired_packets
);
prrtSequenceNumber_t
firstSequenceNumberBase
=
(
prrtSequenceNumber_t
)
(
first
->
sequenceNumber
-
first
->
index
-
SEQNO_SPACE
/
2
);
PrrtPacket
*
last
=
List_last
(
expired_packets
);
prrtSequenceNumber_t
lastSequenceNumberBase
=
(
prrtSequenceNumber_t
)
(
last
->
sequenceNumber
-
last
->
index
-
1
);
PrrtRepairBlockStore_expire_block_range
(
socket
->
repairBlockStore
,
firstSequenceNumberBase
,
lastSequenceNumberBase
);
List
*
list
=
List_create
();
PrrtDataPacketStore_remove_range
(
socket
->
dataPacketStore
,
list
,
firstSequenceNumberBase
,
last
->
sequenceNumber
);
while
(
List_count
(
list
)
>
0
)
{
PrrtPacket
*
packet
=
(
PrrtPacket
*
)
List_shift
(
list
);
PrrtPacket_destroy
(
packet
);
}
List_destroy
(
list
);
while
(
List_count
(
expired_packets
)
>
0
)
{
PrrtPacket
*
packet
=
(
PrrtPacket
*
)
List_shift
(
expired_packets
);
PrrtPacket_destroy
(
packet
);
}
}
List_destroy
(
expired_packets
);
}
}
return
true
;
}
prrt/proto/socket.h
View file @
86f60908
...
...
@@ -37,8 +37,6 @@ typedef struct prrtSocket {
pthread_cond_t
inQueueFilledCv
;
List
*
inQueue
;
pthread_t
cleanupThread
;
PrrtPacketTimeoutTable
*
packetTimeoutTable
;
PrrtDataPacketStore
*
dataPacketStore
;
PrrtRepairBlockStore
*
repairBlockStore
;
...
...
@@ -84,5 +82,6 @@ int PrrtSocket_connect(PrrtSocket *sock_ptr, const char *host, const uint16_t po
int
PrrtSocket_send
(
PrrtSocket
*
sock_ptr
,
const
uint8_t
*
data
,
const
size_t
data_len
);
int32_t
PrrtSocket_recv
(
PrrtSocket
*
sock_ptr
,
void
*
buf_ptr
);
int32_t
PrrtSocket_timedrecv
(
PrrtSocket
*
sock_ptr
,
void
*
buf_ptr
,
const
uint32_t
wait_time
);
bool
PrrtSocket_cleanup
(
PrrtSocket
*
socket
);
#endif // PRRT_SOCKET_H
prrt/prrt.pyx
View file @
86f60908
...
...
@@ -27,9 +27,6 @@ cdef extern from "proto/stores/repairBlockStore.c":
cdef
extern
from
"proto/processes/feedbackReceiver.c"
:
pass
cdef
extern
from
"proto/processes/cleaner.c"
:
pass
cdef
extern
from
"proto/processes/dataReceiver.c"
:
pass
...
...
Write
Preview
Markdown
is supported
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