diff options
| -rw-r--r-- | src/vlibmemory/memory_api.c | 23 | ||||
| -rwxr-xr-x | src/vnet/ip/ip6_neighbor.c | 30 |
2 files changed, 45 insertions, 8 deletions
diff --git a/src/vlibmemory/memory_api.c b/src/vlibmemory/memory_api.c index 1727c28cca1..9fc26b986f5 100644 --- a/src/vlibmemory/memory_api.c +++ b/src/vlibmemory/memory_api.c @@ -735,11 +735,28 @@ vl_mem_api_handle_rpc (vlib_main_t * vm, vlib_node_runtime_t * node) vm->pending_rpc_requests = tmp; clib_spinlock_unlock_if_init (&vm->pending_rpc_lock); - for (i = 0; i < vec_len (vm->processing_rpc_requests); i++) + /* + * RPCs are used to reflect function calls to thread 0 + * when the underlying code is not thread-safe. + * + * Grabbing the thread barrier across a set of RPCs + * greatly increases efficiency, and avoids + * running afoul of the barrier sync holddown timer. + * The barrier sync code supports recursive locking. + * + * We really need to rewrite RPC-based code... + */ + if (PREDICT_TRUE (vec_len (vm->processing_rpc_requests))) { - mp = vm->processing_rpc_requests[i]; - vl_msg_api_handler_with_vm_node (am, (void *) mp, vm, node); + vl_msg_api_barrier_sync (); + for (i = 0; i < vec_len (vm->processing_rpc_requests); i++) + { + mp = vm->processing_rpc_requests[i]; + vl_msg_api_handler_with_vm_node (am, (void *) mp, vm, node); + } + vl_msg_api_barrier_release (); } + return 0; } diff --git a/src/vnet/ip/ip6_neighbor.c b/src/vnet/ip/ip6_neighbor.c index ded5b868702..649f4b7a4ba 100755 --- a/src/vnet/ip/ip6_neighbor.c +++ b/src/vnet/ip/ip6_neighbor.c @@ -1021,6 +1021,10 @@ show_ip6_neighbors (vlib_main_t * vm, ip6_neighbor_t *n, *ns; clib_error_t *error = 0; u32 sw_if_index; + int verbose = 0; + + if (unformat (input, "verbose")) + verbose = 1; /* Filter entries by interface if given. */ sw_if_index = ~0; @@ -1029,13 +1033,29 @@ show_ip6_neighbors (vlib_main_t * vm, ns = ip6_neighbors_entries (sw_if_index); if (ns) { - vlib_cli_output (vm, "%U", format_ip6_neighbor_ip6_entry, vm, 0); - vec_foreach (n, ns) - { - vlib_cli_output (vm, "%U", format_ip6_neighbor_ip6_entry, vm, n); - } + /* + * Show the entire table if it's not too big, otherwise just + * show the size of the table. + */ + if (vec_len (ns) < 50) + verbose = 1; + if (verbose) + { + vlib_cli_output (vm, "%U", format_ip6_neighbor_ip6_entry, vm, 0); + vec_foreach (n, ns) + { + vlib_cli_output (vm, "%U", format_ip6_neighbor_ip6_entry, vm, n); + } + } + else + vlib_cli_output + (vm, "There are %u ip6 neighbors, " + "'show ip6 neighbors verbose' to display the entire table...", + vec_len (ns)); vec_free (ns); } + else + vlib_cli_output (vm, "No ip6 neighbors"); return error; } |