mirrors/diag
0
0
Fork 0
mirror of https://github.com/linux-msm/diag.git synced 2024-11-23 10:04:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

dm: Allow broadcasters to pass a flow context

Browse Source 
Allow users of dm_broadcast() to pass a flow context, which will
associate the created mbufs with the given flow.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
This commit is contained in:
Bjorn Andersson 2020-02-19 15:50:50 -08:00
parent a3395140dd
commit 040982dbda
4 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
router/dm.c
View File

@ -163,6 +163,20 @@ int dm_recv(int fd, void* data)
return dm_recv_raw(dm);
}
static ssize_t dm_send_flow(struct diag_client *dm, const void *ptr, size_t len,
struct watch_flow *flow)
{
if (!dm->enabled)
return 0;
if (dm->hdlc_encoded)
hdlc_enqueue_flow(&dm->outq, ptr, len, flow);
else
queue_push_flow(&dm->outq, ptr, len, flow);
return 0;
}
/**
* dm_send() - enqueue message to DM
* @dm: dm to be receiving the message
@ -171,23 +185,16 @@ int dm_recv(int fd, void* data)
*/
ssize_t dm_send(struct diag_client *dm, const void *ptr, size_t len)
{
if (!dm->enabled)
return 0;
if (dm->hdlc_encoded)
hdlc_enqueue(&dm->outq, ptr, len);
else
queue_push(&dm->outq, ptr, len);
return 0;
return dm_send_flow(dm, ptr, len, NULL);
}
/**
* dm_broadcast() - send message to all registered DMs
* @ptr: pointer to raw message to be sent
* @len: length of message
* @flow: flow control context for the peripheral
*/
void dm_broadcast(const void *ptr, size_t len)
void dm_broadcast(const void *ptr, size_t len, struct watch_flow *flow)
{
struct diag_client *dm;
struct list_head *item;
@ -195,7 +202,7 @@ void dm_broadcast(const void *ptr, size_t len)
list_for_each(item, &diag_clients) {
dm = container_of(item, struct diag_client, node);
dm_send(dm, ptr, len);
dm_send_flow(dm, ptr, len, flow);
}
}

2
router/dm.h
View File

@ -39,7 +39,7 @@ struct diag_client;
struct diag_client *dm_add(const char *name, int in_fd, int out_fd, bool hdlc_encoded);
int dm_recv(int fd, void* data);
ssize_t dm_send(struct diag_client *dm, const void *ptr, size_t len);
void dm_broadcast(const void *ptr, size_t len);
void dm_broadcast(const void *ptr, size_t len, struct watch_flow *flow);
void dm_enable(struct diag_client *dm);
void dm_disable(struct diag_client *dm);

4
router/peripheral-qrtr.c
View File

@ -165,7 +165,7 @@ static int qrtr_cmd_recv(int fd, void *data)
break;
}
dm_broadcast(frame->payload, frame->length);
dm_broadcast(frame->payload, frame->length, NULL);
break;
case QRTR_TYPE_NEW_SERVER:
if (pkt.node == 0 && pkt.port == 0)
@ -243,7 +243,7 @@ static int qrtr_data_recv(int fd, void *data)
fprintf(stderr, "non-HDLC frame is not truncated\n");
break;
}
dm_broadcast(frame->payload, frame->length);
dm_broadcast(frame->payload, frame->length, NULL);
break;
case QRTR_TYPE_BYE:
watch_remove_writeq(perif->data_fd);

6
router/peripheral-rpmsg.c
View File

@ -104,7 +104,7 @@ static int diag_cmd_recv(int fd, void *data)
return 0;
}
dm_broadcast(frame->payload, frame->length);
dm_broadcast(frame->payload, frame->length, NULL);
return 0;
}
@ -127,7 +127,7 @@ static int diag_data_recv_hdlc(int fd, struct peripheral *peripheral)
if (!msg)
break;
dm_broadcast(msg, msglen);
dm_broadcast(msg, msglen, NULL);
}
}
@ -144,7 +144,7 @@ static int diag_data_recv_raw(int fd, struct peripheral *peripheral)
if (n < 0)
return -errno;
dm_broadcast(buf, n);
dm_broadcast(buf, n, NULL);
}
/* Not reached */