Commit 9e822ce3 authored by Jim Harris's avatar Jim Harris
Browse files

trace: wrap spdk_trace_tpoint_enabled() with spdk_unlikely() 



We should optimize for the trace-disabled case.

While here, also remove now-superfluous spdk_unlikely() in
spdk_internal/sock.h.

Suggested-by: default avatarBen Walker <ben@nvidia.com>
Signed-off-by: default avatarJim Harris <jim.harris@samsung.com>
Change-Id: I6e814d2b84cbb5191112a0c1ac2d6b8815d4cf75
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/22484


Reviewed-by: default avatarBen Walker <ben@nvidia.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
parent d5901de3

include/spdk/trace.h

+2 −2
Original line number Diff line number Diff line
@@ -171,8 +171,8 @@ void _spdk_trace_record(uint64_t tsc, uint16_t tpoint_id, uint16_t poller_id, 
			uint32_t size, uint64_t object_id, int num_args, ...);



#define spdk_trace_tpoint_enabled(tpoint_id)	\

	(g_trace_file != NULL  && \

	((1ULL << (tpoint_id & 0x3F)) &	g_trace_file->tpoint_mask[tpoint_id >> 6]))

	spdk_unlikely((g_trace_file != NULL  && \

	((1ULL << (tpoint_id & 0x3F)) &	g_trace_file->tpoint_mask[tpoint_id >> 6])))



#define _spdk_trace_record_tsc(tsc, tpoint_id, poller_id, size, object_id, num_args, ...)	\

	do {											\

include/spdk_internal/sock.h

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static inline void 
spdk_sock_request_queue(struct spdk_sock *sock, struct spdk_sock_request *req)

{

	assert(req->internal.curr_list == NULL);

	if (spdk_unlikely(spdk_trace_tpoint_enabled(TRACE_SOCK_REQ_QUEUE))) {

	if (spdk_trace_tpoint_enabled(TRACE_SOCK_REQ_QUEUE)) {

		uint64_t len = 0;

		int i;