Skip to content

Commit

Permalink
tipc: Minor optimizations to name table translation code
Browse files Browse the repository at this point in the history
Optimizes TIPC's name table translation code to avoid unnecessary
manipulation of the node address field of the resulting port id when
name translation fails.  This change is possible because a valid port
id cannot have a reference field of zero, so examining the reference
only is sufficient to determine if the translation was successful.

Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Allan Stephens authored and David S. Miller committed Sep 7, 2010
1 parent dcfc5d7 commit 5d9c54c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
4 changes: 1 addition & 3 deletions net/tipc/name_table.c
Original file line number Diff line number Diff line change
Expand Up @@ -613,8 +613,7 @@ struct publication *tipc_nametbl_remove_publ(u32 type, u32 lower,
}

/*
* tipc_nametbl_translate(): Translate tipc_name -> tipc_portid.
* Very time-critical.
* tipc_nametbl_translate - translate name to port id
*
* Note: on entry 'destnode' is the search domain used during translation;
* on exit it passes back the node address of the matching port (if any)
Expand Down Expand Up @@ -685,7 +684,6 @@ u32 tipc_nametbl_translate(u32 type, u32 instance, u32 *destnode)
}
spin_unlock_bh(&seq->lock);
not_found:
*destnode = 0;
read_unlock_bh(&tipc_nametbl_lock);
return 0;
}
Expand Down
4 changes: 2 additions & 2 deletions net/tipc/port.c
Original file line number Diff line number Diff line change
Expand Up @@ -1464,7 +1464,7 @@ int tipc_forward2name(u32 ref,
msg_set_destnode(msg, destnode);
msg_set_destport(msg, destport);

if (likely(destport || destnode)) {
if (likely(destport)) {
p_ptr->sent++;
if (likely(destnode == tipc_own_addr))
return tipc_port_recv_sections(p_ptr, num_sect, msg_sect);
Expand Down Expand Up @@ -1542,7 +1542,7 @@ int tipc_forward_buf2name(u32 ref,
skb_push(buf, LONG_H_SIZE);
skb_copy_to_linear_data(buf, msg, LONG_H_SIZE);
msg_dbg(buf_msg(buf),"PREP:");
if (likely(destport || destnode)) {
if (likely(destport)) {
p_ptr->sent++;
if (destnode == tipc_own_addr)
return tipc_port_recv_msg(buf);
Expand Down

0 comments on commit 5d9c54c

Please sign in to comment.