mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-16 08:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2020-06-10 16:51:21 +02:00
parent 4f3059c608
commit 66451f3ef0
1 changed files with 63 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
network/netplay/netplay_buf.c
View File

@ -56,7 +56,8 @@ static size_t buf_remaining(struct socket_buffer *sbuf)
* *
* Initialize a new socket buffer. * Initialize a new socket buffer.
*/ */
bool netplay_init_socket_buffer(struct socket_buffer *sbuf, size_t size) bool netplay_init_socket_buffer(
struct socket_buffer *sbuf, size_t size)
{ {
sbuf->data = (unsigned char*)malloc(size); sbuf->data = (unsigned char*)malloc(size);
if (!sbuf->data) if (!sbuf->data)
@ -71,7 +72,8 @@ bool netplay_init_socket_buffer(struct socket_buffer *sbuf, size_t size)
* *
* Resize the given socket_buffer's buffer to the requested size. * Resize the given socket_buffer's buffer to the requested size.
*/ */
bool netplay_resize_socket_buffer(struct socket_buffer *sbuf, size_t newsize) bool netplay_resize_socket_buffer(
struct socket_buffer *sbuf, size_t newsize)
{ {
unsigned char *newdata = (unsigned char*)malloc(newsize); unsigned char *newdata = (unsigned char*)malloc(newsize);
if (!newdata) if (!newdata)
@ -80,11 +82,17 @@ bool netplay_resize_socket_buffer(struct socket_buffer *sbuf, size_t newsize)
/* Copy in the old data */ /* Copy in the old data */
if (sbuf->end < sbuf->start) if (sbuf->end < sbuf->start)
{ {
memcpy(newdata, sbuf->data + sbuf->start, sbuf->bufsz - sbuf->start); memcpy(newdata,
memcpy(newdata + sbuf->bufsz - sbuf->start, sbuf->data, sbuf->end); sbuf->data + sbuf->start,
sbuf->bufsz - sbuf->start);
memcpy(newdata + sbuf->bufsz - sbuf->start,
sbuf->data,
sbuf->end);
} }
else if (sbuf->end > sbuf->start) else if (sbuf->end > sbuf->start)
memcpy(newdata, sbuf->data + sbuf->start, sbuf->end - sbuf->start); memcpy(newdata,
sbuf->data + sbuf->start,
sbuf->end - sbuf->start);
/* Adjust our read offset */ /* Adjust our read offset */
if (sbuf->read < sbuf->start) if (sbuf->read < sbuf->start)
@ -93,13 +101,14 @@ bool netplay_resize_socket_buffer(struct socket_buffer *sbuf, size_t newsize)
sbuf->read -= sbuf->start; sbuf->read -= sbuf->start;
/* Adjust start and end */ /* Adjust start and end */
sbuf->end = buf_used(sbuf); sbuf->end = buf_used(sbuf);
sbuf->start = 0; sbuf->start = 0;
/* Free the old one and replace it with the new one */ /* Free the old one and replace it with the new one */
free(sbuf->data); free(sbuf->data);
sbuf->data = newdata; sbuf->data = newdata;
sbuf->bufsz = newsize; sbuf->bufsz = newsize;
return true; return true;
} }
@ -124,8 +133,10 @@ void netplay_clear_socket_buffer(struct socket_buffer *sbuf)
* *
* Queue the given data for sending. * Queue the given data for sending.
*/ */
bool netplay_send(struct socket_buffer *sbuf, int sockfd, const void *buf, bool netplay_send(
size_t len) struct socket_buffer *sbuf,
int sockfd, const void *buf,
size_t len)
{ {
if (buf_remaining(sbuf) < len) if (buf_remaining(sbuf) < len)
{ {
@ -136,8 +147,9 @@ bool netplay_send(struct socket_buffer *sbuf, int sockfd, const void *buf,
if (buf_remaining(sbuf) < len) if (buf_remaining(sbuf) < len)
{ {
/* Can only be that this is simply too big for our buffer, in which case /* Can only be that this is simply too big
* we just need to do a blocking send */ * for our buffer, in which case we just
* need to do a blocking send */
if (!socket_send_all_blocking(sockfd, buf, len, false)) if (!socket_send_all_blocking(sockfd, buf, len, false))
return false; return false;
return true; return true;
@ -150,7 +162,7 @@ bool netplay_send(struct socket_buffer *sbuf, int sockfd, const void *buf,
size_t chunka = sbuf->bufsz - sbuf->end, size_t chunka = sbuf->bufsz - sbuf->end,
chunkb = len - chunka; chunkb = len - chunka;
memcpy(sbuf->data + sbuf->end, buf, chunka); memcpy(sbuf->data + sbuf->end, buf, chunka);
memcpy(sbuf->data, (const unsigned char *) buf + chunka, chunkb); memcpy(sbuf->data, (const unsigned char *)buf + chunka, chunkb);
sbuf->end = chunkb; sbuf->end = chunkb;
} }
@ -159,7 +171,6 @@ bool netplay_send(struct socket_buffer *sbuf, int sockfd, const void *buf,
/* Straight in */ /* Straight in */
memcpy(sbuf->data + sbuf->end, buf, len); memcpy(sbuf->data + sbuf->end, buf, len);
sbuf->end += len; sbuf->end += len;
} }
return true; return true;
@ -186,49 +197,57 @@ bool netplay_send_flush(struct socket_buffer *sbuf, int sockfd, bool block)
if (block) if (block)
{ {
if (!socket_send_all_blocking( if (!socket_send_all_blocking(
sockfd, sbuf->data + sbuf->start, buf_used(sbuf), true)) sockfd, sbuf->data + sbuf->start,
buf_used(sbuf), true))
return false; return false;
sbuf->start = sbuf->end = 0;
sbuf->start = sbuf->end = 0;
} }
else else
{ {
sent = socket_send_all_nonblocking(sockfd, sbuf->data + sbuf->start, buf_used(sbuf), true); sent = socket_send_all_nonblocking(
sockfd, sbuf->data + sbuf->start,
buf_used(sbuf), true);
if (sent < 0) if (sent < 0)
return false; return false;
sbuf->start += sent; sbuf->start += sent;
if (sbuf->start == sbuf->end) if (sbuf->start == sbuf->end)
sbuf->start = sbuf->end = 0; sbuf->start = sbuf->end = 0;
} }
} }
else else
{ {
/* Unusual case: Buffer overlaps break */ /* Unusual case: Buffer overlaps break */
if (block) if (block)
{ {
if (!socket_send_all_blocking(sockfd, sbuf->data + sbuf->start, sbuf->bufsz - sbuf->start, true)) if (!socket_send_all_blocking(
sockfd, sbuf->data + sbuf->start,
sbuf->bufsz - sbuf->start, true))
return false; return false;
sbuf->start = 0;
return netplay_send_flush(sbuf, sockfd, true);
sbuf->start = 0;
return netplay_send_flush(sbuf, sockfd, true);
} }
else else
{ {
sent = socket_send_all_nonblocking(sockfd, sbuf->data + sbuf->start, sbuf->bufsz - sbuf->start, true); sent = socket_send_all_nonblocking(
sockfd, sbuf->data + sbuf->start,
sbuf->bufsz - sbuf->start, true);
if (sent < 0) if (sent < 0)
return false; return false;
sbuf->start += sent; sbuf->start += sent;
if (sbuf->start >= sbuf->bufsz) if (sbuf->start >= sbuf->bufsz)
{ {
sbuf->start = 0; sbuf->start = 0;
return netplay_send_flush(sbuf, sockfd, false); return netplay_send_flush(sbuf, sockfd, false);
} }
} }
} }
@ -246,39 +265,44 @@ bool netplay_send_flush(struct socket_buffer *sbuf, int sockfd, bool block)
ssize_t netplay_recv(struct socket_buffer *sbuf, int sockfd, void *buf, ssize_t netplay_recv(struct socket_buffer *sbuf, int sockfd, void *buf,
size_t len, bool block) size_t len, bool block)
{ {
bool error;
ssize_t recvd; ssize_t recvd;
bool error = false;
/* Receive whatever we can into the buffer */ /* Receive whatever we can into the buffer */
if (sbuf->end >= sbuf->start) if (sbuf->end >= sbuf->start)
{ {
error = false;
recvd = socket_receive_all_nonblocking(sockfd, &error, recvd = socket_receive_all_nonblocking(sockfd, &error,
sbuf->data + sbuf->end, sbuf->bufsz - sbuf->end - sbuf->data + sbuf->end, sbuf->bufsz - sbuf->end -
((sbuf->start == 0) ? 1 : 0)); ((sbuf->start == 0) ? 1 : 0));
if (recvd < 0 || error) if (recvd < 0 || error)
return -1; return -1;
sbuf->end += recvd; sbuf->end += recvd;
if (sbuf->end >= sbuf->bufsz) if (sbuf->end >= sbuf->bufsz)
{ {
sbuf->end = 0; sbuf->end = 0;
error = false; error = false;
recvd = socket_receive_all_nonblocking(sockfd, &error, sbuf->data, sbuf->start - 1); recvd = socket_receive_all_nonblocking(
sockfd, &error, sbuf->data, sbuf->start - 1);
if (recvd < 0 || error) if (recvd < 0 || error)
return -1; return -1;
sbuf->end += recvd; sbuf->end += recvd;
} }
} }
else else
{ {
error = false; recvd = socket_receive_all_nonblocking(
recvd = socket_receive_all_nonblocking(sockfd, &error, sbuf->data + sbuf->end, sbuf->start - sbuf->end - 1); sockfd, &error, sbuf->data + sbuf->end,
sbuf->start - sbuf->end - 1);
if (recvd < 0 || error) if (recvd < 0 || error)
return -1; return -1;
sbuf->end += recvd;
sbuf->end += recvd;
} }
/* Now copy it into the reader */ /* Now copy it into the reader */
@ -321,10 +345,10 @@ ssize_t netplay_recv(struct socket_buffer *sbuf, int sockfd, void *buf,
sbuf->start = sbuf->read; sbuf->start = sbuf->read;
if (recvd < 0 || recvd < (ssize_t) len) if (recvd < 0 || recvd < (ssize_t) len)
{ {
if (!socket_receive_all_blocking(sockfd, (unsigned char *) buf + recvd, len - recvd)) if (!socket_receive_all_blocking(
sockfd, (unsigned char *)buf + recvd, len - recvd))
return -1; return -1;
recvd = len; recvd = len;
} }
} }
@ -334,8 +358,8 @@ ssize_t netplay_recv(struct socket_buffer *sbuf, int sockfd, void *buf,
/** /**
* netplay_recv_reset * netplay_recv_reset
* *
* Reset our recv buffer so that future netplay_recvs will read the same data * Reset our recv buffer so that future netplay_recvs
* again. * will read the same data again.
*/ */
void netplay_recv_reset(struct socket_buffer *sbuf) void netplay_recv_reset(struct socket_buffer *sbuf)
{ {