Skip to content
GitLab
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
8b5538db
Commit
8b5538db
authored
Feb 24, 2016
by
Andreas Schmidt
Browse files
Replace malloc with calloc.
parent
66e94abc
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
src/prrt/block.c
View file @
8b5538db
...
...
@@ -76,10 +76,10 @@ void PrrtBlock_encode(PrrtBlock *block_ptr, uint16_t *seqno) {
PrrtCoder_get_coder
(
&
coder
,
n
,
k
);
gf
**
src
=
m
alloc
(
sizeof
(
gf
*
)
*
k
);
gf
**
src
=
c
alloc
(
1
,
sizeof
(
gf
*
)
*
k
);
LIST_FOREACH
(
block_ptr
->
data_blocks
,
first
,
next
,
cur
)
{
src
[
j
]
=
m
alloc
(
sizeof
(
gf
)
*
length
);
src
[
j
]
=
c
alloc
(
1
,
sizeof
(
gf
)
*
length
);
memset
(
src
[
j
],
0
,
sizeof
(
gf
)
*
length
);
PrrtPacket
*
pkt
=
cur
->
value
;
pkt
->
index
=
(
uint8_t
)
j
;
...
...
@@ -90,9 +90,9 @@ void PrrtBlock_encode(PrrtBlock *block_ptr, uint16_t *seqno) {
PrrtPacket
*
first_packet
=
(
PrrtPacket
*
)
block_ptr
->
data_blocks
->
first
->
value
;
uint16_t
base_seqno
=
first_packet
->
seqno
;
gf
**
fec
=
m
alloc
(
sizeof
(
gf
*
)
*
r
);
gf
**
fec
=
c
alloc
(
1
,
sizeof
(
gf
*
)
*
r
);
for
(
j
=
0
;
j
<
r
;
j
++
)
{
fec
[
j
]
=
m
alloc
(
sizeof
(
gf
)
*
length
);
fec
[
j
]
=
c
alloc
(
1
,
sizeof
(
gf
)
*
length
);
memset
(
fec
[
j
],
0
,
sizeof
(
gf
)
*
length
);
PrrtCoder_encode
(
coder
,
src
,
fec
[
j
],
j
+
k
,
length
);
// gf **src, gf *fec, int index, int sz
PrrtPacket
*
red_packet_ptr
=
PrrtPacket_create_redundancy_packet
(
0
,
(
void
*
)
fec
[
j
],
length
,
*
seqno
,
...
...
@@ -122,8 +122,8 @@ void PrrtBlock_decode(PrrtBlock *block_ptr) {
PrrtCoder_get_coder
(
&
coder
,
n
,
k
);
gf
**
fec
=
m
alloc
(
sizeof
(
gf
*
)
*
n
);
int
*
idx_p
=
m
alloc
(
k
*
sizeof
(
int
));
gf
**
fec
=
c
alloc
(
n
,
sizeof
(
gf
*
));
int
*
idx_p
=
c
alloc
(
k
,
sizeof
(
int
));
gather_data_packets
(
block_ptr
,
fec
,
idx_p
);
...
...
src/prrt/packet.c
View file @
8b5538db
...
...
@@ -223,7 +223,7 @@ int PrrtPacket_decode(void *buf_ptr, uint16_t buf_size, PrrtPacket *packet_ptr)
packet_ptr
->
seqno
=
ntohs
(
*
seqno_prt
);
buf_ptr
+=
2
;
void
*
payload_buffer
=
m
alloc
(
payload_len
);
void
*
payload_buffer
=
c
alloc
(
1
,
payload_len
);
check_mem
(
payload_buffer
);
packet_ptr
->
payload
=
payload_buffer
;
...
...
@@ -354,7 +354,7 @@ int PrrtPacket_create_data_packet(PrrtPacket *packet_ptr, uint8_t priority, cons
packet_ptr
->
index
=
0
;
packet_ptr
->
seqno
=
seqno
;
void
*
content_buf
=
m
alloc
(
sizeof
(
PrrtPacketDataPayload
)
+
data_len
);
void
*
content_buf
=
c
alloc
(
1
,
sizeof
(
PrrtPacketDataPayload
)
+
data_len
);
check_mem
(
content_buf
);
PrrtPacketDataPayload
*
source_payload
=
content_buf
;
...
...
@@ -382,7 +382,7 @@ PrrtPacket *PrrtPacket_create_redundancy_packet(uint8_t priority, void *data_ptr
PrrtCodingParams
codingParams
)
{
uint32_t
payload_length
=
(
uint32_t
)
(
data_len
+
sizeof
(
PrrtPacketRedundancyPayload
));
PrrtPacket
*
packet_ptr
=
m
alloc
(
sizeof
(
PrrtPacket
));
PrrtPacket
*
packet_ptr
=
c
alloc
(
1
,
sizeof
(
PrrtPacket
));
check_mem
(
packet_ptr
);
packet_ptr
->
type_priority
=
PACKET_TYPE_REDUNDANCY
<<
4
;
...
...
@@ -390,7 +390,7 @@ PrrtPacket *PrrtPacket_create_redundancy_packet(uint8_t priority, void *data_ptr
packet_ptr
->
index
=
index
;
packet_ptr
->
seqno
=
seqno
;
void
*
content_buf
=
m
alloc
(
sizeof
(
PrrtPacketRedundancyPayload
)
+
data_len
);
void
*
content_buf
=
c
alloc
(
1
,
sizeof
(
PrrtPacketRedundancyPayload
)
+
data_len
);
check_mem
(
content_buf
);
PrrtPacketRedundancyPayload
*
redundancy_payload
=
content_buf
;
...
...
@@ -414,14 +414,14 @@ PrrtPacket *PrrtPacket_create_feedback_packet(uint8_t priority, uint8_t index, u
uint16_t
ngap
,
uint16_t
burst
,
uint16_t
nburst
,
uint32_t
bandwidth
,
uint32_t
buffer_feedback
)
{
PrrtPacket
*
packet_ptr
=
m
alloc
(
sizeof
(
PrrtPacket
));
PrrtPacket
*
packet_ptr
=
c
alloc
(
1
,
sizeof
(
PrrtPacket
));
check_mem
(
packet_ptr
);
packet_ptr
->
type_priority
=
PACKET_TYPE_FEEDBACK
<<
4
;
packet_ptr
->
type_priority
|=
priority
&
0x0F
;
packet_ptr
->
index
=
index
;
packet_ptr
->
seqno
=
seqno
;
PrrtPacketFeedbackPayload
*
payload
=
m
alloc
(
sizeof
(
PrrtPacketFeedbackPayload
));
PrrtPacketFeedbackPayload
*
payload
=
c
alloc
(
1
,
sizeof
(
PrrtPacketFeedbackPayload
));
check_mem
(
payload
);
payload
->
group_round_trip_time
=
round_trip_time
;
...
...
src/prrt/processes/data_receiver.c
View file @
8b5538db
...
...
@@ -51,7 +51,7 @@ void *receive_data_loop(void *ptr) {
remote_port
=
ntohs
(
remote
.
sin_port
);
remote_host
=
inet_ntoa
(
remote
.
sin_addr
);
packet
=
m
alloc
(
sizeof
(
PrrtPacket
));
packet
=
c
alloc
(
1
,
sizeof
(
PrrtPacket
));
check_mem
(
packet
);
PrrtPacket_decode
(
buffer
,
(
uint16_t
)
n
,
packet
);
...
...
@@ -92,7 +92,7 @@ void *receive_data_loop(void *ptr) {
block
=
BPTree_get
(
sock_ptr
->
blockStore
,
redundancyPayload
->
base_seqno
);
if
(
block
==
NULL
)
{
PrrtCodingParams
*
cpar
=
m
alloc
(
sizeof
(
PrrtCodingParams
));
PrrtCodingParams
*
cpar
=
c
alloc
(
1
,
sizeof
(
PrrtCodingParams
));
PrrtCodingParams_init
(
cpar
);
cpar
->
k
=
redundancyPayload
->
k
;
cpar
->
n
=
redundancyPayload
->
n
;
...
...
src/prrt/processes/data_transmitter.c
View file @
8b5538db
...
...
@@ -47,7 +47,7 @@ void *send_data_loop(void *ptr) {
PrrtSocket
*
sock_ptr
=
ptr
;
PrrtBlock
*
block
=
NULL
;
PrrtCodingParams
*
cpar
=
m
alloc
(
sizeof
(
PrrtCodingParams
));
PrrtCodingParams
*
cpar
=
c
alloc
(
1
,
sizeof
(
PrrtCodingParams
));
PrrtCodingParams_init
(
cpar
);
PrrtBlock_alloc
(
&
block
,
cpar
);
...
...
src/prrt/socket.c
View file @
8b5538db
...
...
@@ -48,7 +48,7 @@ int PrrtSocket_create(PrrtSocket *sock_ptr, const uint16_t port, const uint8_t i
address
.
sin_port
=
htons
(
port
);
check
(
bind
(
sock_ptr
->
dataSocketFd
,
(
struct
sockaddr
*
)
&
address
,
sizeof
(
address
))
==
EXIT_SUCCESS
,
"Cannot bind data socket."
);
sock_ptr
->
forwardPacketTable
=
m
alloc
(
sizeof
(
PrrtForwardPacketTable
));
sock_ptr
->
forwardPacketTable
=
c
alloc
(
1
,
sizeof
(
PrrtForwardPacketTable
));
PrrtForwardPacketTable_create
(
sock_ptr
->
forwardPacketTable
);
pthread_mutex_init
(
&
sock_ptr
->
inQueueFilledMutex
,
NULL
);
...
...
@@ -83,7 +83,7 @@ int PrrtSocket_connect(PrrtSocket *sock_ptr, const char *host, const uint16_t po
int
PrrtSocket_send
(
PrrtSocket
*
sock_ptr
,
const
void
*
data
,
const
size_t
data_len
)
{
pthread_mutex_lock
(
&
sock_ptr
->
outQueueFilledMutex
);
PrrtPacket
*
packet
=
m
alloc
(
sizeof
(
PrrtPacket
));
PrrtPacket
*
packet
=
c
alloc
(
1
,
sizeof
(
PrrtPacket
));
check_mem
(
packet
);
PrrtPacket_create_data_packet
(
packet
,
5
,
data
,
(
uint32_t
)
data_len
,
sock_ptr
->
sequenceNumberSource
++
);
...
...
@@ -144,7 +144,7 @@ PrrtPacket *PrrtSocket_recv_feedback(const PrrtSocket *sock_ptr, void *bufin, co
char
*
remote_host
=
inet_ntoa
(
remote
.
sin_addr
);
debug
(
"Received feedback %s:%d"
,
remote_host
,
remote_port
);
PrrtPacket
*
packet_ptr
=
m
alloc
(
sizeof
(
PrrtPacket
));
PrrtPacket
*
packet_ptr
=
c
alloc
(
1
,
sizeof
(
PrrtPacket
));
check_mem
(
packet_ptr
);
PrrtPacket_decode
(
bufin
,
(
uint16_t
)
n
,
packet_ptr
);
return
packet_ptr
;
...
...
src/util/bptree.c
View file @
8b5538db
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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