sven
/
can-utils
mirror of https://github.com/linux-can/can-utils.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #144 from olerem/errq-2019.05.25 

queue status
pull/146/head
Marc Kleine-Budde 2019-06-27 12:05:52 +02:00 committed by GitHub
parent a965086356 c4e68aff78
commit bb2cc1140f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
jcat.c
View File

@ -48,7 +48,8 @@ struct jcat_priv {
int infile; int infile;
int outfile; int outfile;
size_t max_transfer; size_t max_transfer;
int repeat; unsigned long repeat;
unsigned long round;
int todo_prio; int todo_prio;
bool valid_peername; bool valid_peername;
@ -296,7 +297,8 @@ static int jcat_recv_err(struct jcat_priv *priv)
static int jcat_send_loop(struct jcat_priv *priv, int out_fd, char *buf, static int jcat_send_loop(struct jcat_priv *priv, int out_fd, char *buf,
size_t buf_size) size_t buf_size)
{ {
ssize_t count, num_sent = 0; struct jcat_stats *stats = &priv->stats;
ssize_t count;
char *tmp_buf = buf; char *tmp_buf = buf;
unsigned int events = POLLOUT | POLLERR; unsigned int events = POLLOUT | POLLERR;
bool tx_done = false; bool tx_done = false;
@ -304,6 +306,8 @@ static int jcat_send_loop(struct jcat_priv *priv, int out_fd, char *buf,
count = buf_size; count = buf_size;
while (!tx_done) { while (!tx_done) {
ssize_t num_sent = 0;
if (priv->polltimeout) { if (priv->polltimeout) {
struct pollfd fds = { struct pollfd fds = {
.fd = priv->sock, .fd = priv->sock,
@ -330,7 +334,7 @@ static int jcat_send_loop(struct jcat_priv *priv, int out_fd, char *buf,
continue; continue;
else if (ret) else if (ret)
return ret; return ret;
else else if ((priv->repeat - 1) == stats->tskey)
tx_done = true; tx_done = true;
} }
@ -353,8 +357,12 @@ static int jcat_send_loop(struct jcat_priv *priv, int out_fd, char *buf,
__func__); __func__);
return -EINVAL; return -EINVAL;
} }
if (!count) if (!count) {
if (priv->repeat == priv->round)
events = POLLERR; events = POLLERR;
else
tx_done = true;
}
} }
return 0; return 0;
} }
@ -456,6 +464,7 @@ static int jcat_send(struct jcat_priv *priv)
return EXIT_FAILURE; return EXIT_FAILURE;
for (i = 0; i < priv->repeat; i++) { for (i = 0; i < priv->repeat; i++) {
priv->round++;
ret = jcat_sendfile(priv, priv->sock, priv->infile, NULL, size); ret = jcat_sendfile(priv, priv->sock, priv->infile, NULL, size);
if (ret) if (ret)
break; break;
@ -605,7 +614,7 @@ static int jcat_parse_args(struct jcat_priv *priv, int argc, char *argv[])
priv->todo_connect = 1; priv->todo_connect = 1;
break; break;
case 'R': case 'R':
priv->repeat = atoi(optarg); priv->repeat = strtoul(optarg, NULL, 0);
if (priv->repeat < 1) if (priv->repeat < 1)
err(EXIT_FAILURE, "send/repeat count can't be less then 1\n"); err(EXIT_FAILURE, "send/repeat count can't be less then 1\n");
break; break;