chao
/
linuxptp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid calling msg_pre_send/post_recv unless actually forwarding a message

master
Geoff Salmon 2012-12-31 15:12:54 -05:00 committed by Richard Cochran
parent 8b40f4305b
commit 7607774f30
1 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
clock.c
View File

@ -577,10 +577,36 @@ void clock_install_fda(struct clock *c, struct port *p, struct fdarray fda)
} }
} }
static void clock_forward_mgmt_msg(struct clock *c, struct port *p, struct ptp_message *msg)
{
int i, pdulen, msg_ready = 0;
struct port *fwd;
if (forwarding(c, p) && msg->management.boundaryHops) {
for (i = 0; i < c->nports + 1; i++) {
fwd = c->port[i];
if (fwd != p && forwarding(c, fwd)) {
/* delay calling msg_pre_send until
* actually forwarding */
if (!msg_ready) {
msg_ready = 1;
pdulen = msg->header.messageLength;
msg->management.boundaryHops--;
msg_pre_send(msg);
}
if (port_forward(fwd, msg, pdulen))
pr_err("port %d: management forward failed", i);
}
}
if (msg_ready) {
msg_post_recv(msg, pdulen);
msg->management.boundaryHops++;
}
}
}
void clock_manage(struct clock *c, struct port *p, struct ptp_message *msg) void clock_manage(struct clock *c, struct port *p, struct ptp_message *msg)
{ {
int i, pdulen; int i;
struct port *fwd;
struct management_tlv *mgt; struct management_tlv *mgt;
struct PortIdentity pid; struct PortIdentity pid;
struct ClockIdentity *tcid, wildcard = { struct ClockIdentity *tcid, wildcard = {
@ -588,19 +614,7 @@ void clock_manage(struct clock *c, struct port *p, struct ptp_message *msg)
}; };
/* Forward this message out all eligible ports. */ /* Forward this message out all eligible ports. */
if (forwarding(c, p) && msg->management.boundaryHops) { clock_forward_mgmt_msg(c, p, msg);
pdulen = msg->header.messageLength;
msg->management.boundaryHops--;
msg_pre_send(msg);
for (i = 0; i < c->nports + 1; i++) {
fwd = c->port[i];
if (fwd != p && forwarding(c, fwd) &&
port_forward(fwd, msg, pdulen))
pr_err("port %d: management forward failed", i);
}
msg_post_recv(msg, pdulen);
msg->management.boundaryHops++;
}
/* Apply this message to the local clock and ports. */ /* Apply this message to the local clock and ports. */
tcid = &msg->management.targetPortIdentity.clockIdentity; tcid = &msg->management.targetPortIdentity.clockIdentity;