Commit db35950a authored by Konrad Sztyber's avatar Konrad Sztyber Committed by Tomasz Zawadzki
Browse files

mk/unit: link with trace library 



Linking each unit test with spdk_trace allows for getting rid of lots of
stub definitions for the trace functions.  The behavior stays the same,
as the trace calls result in no-op anyway because none of the unit test
apps enable tracing.

Signed-off-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Change-Id: I904dac92205aadd644100af2c38989bb7979e47c
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/7231


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
parent 62aa8bd8

mk/spdk.unittest.mk

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ CFLAGS += -I$(SPDK_ROOT_DIR)/test 
CFLAGS += -ffunction-sections

LDFLAGS += -Wl,--gc-sections



SPDK_LIB_LIST += thread util log

SPDK_LIB_LIST += thread util log trace



LIBS += -lcunit $(SPDK_STATIC_LIB_LINKER_ARGS)

test/unit/lib/bdev/bdev.c/bdev_ut.c

+0 −11
Original line number Diff line number Diff line
@@ -42,20 +42,9 @@ 


#include "bdev/bdev.c"



struct spdk_trace_histories *g_trace_histories;

DEFINE_STUB_V(spdk_trace_add_register_fn, (struct spdk_trace_register_fn *reg_fn));

DEFINE_STUB_V(spdk_trace_register_owner, (uint8_t type, char id_prefix));

DEFINE_STUB_V(spdk_trace_register_object, (uint8_t type, char id_prefix));

DEFINE_STUB_V(spdk_trace_register_description, (const char *name,

		uint16_t tpoint_id, uint8_t owner_type,

		uint8_t object_type, uint8_t new_object,

		uint8_t arg1_type, const char *arg1_name));

DEFINE_STUB_V(_spdk_trace_record, (uint64_t tsc, uint16_t tpoint_id, uint16_t poller_id,

				   uint32_t size, uint64_t object_id, uint64_t arg1));

DEFINE_STUB(spdk_notify_send, uint64_t, (const char *type, const char *ctx), 0);

DEFINE_STUB(spdk_notify_type_register, struct spdk_notify_type *, (const char *type), NULL);





int g_status;

int g_count;

enum spdk_bdev_event_type g_event_type1;

test/unit/lib/bdev/mt/bdev.c/bdev_ut.c

+0 −10
Original line number Diff line number Diff line
@@ -44,16 +44,6 @@ 


#define BDEV_UT_NUM_THREADS 3



struct spdk_trace_histories *g_trace_histories;

DEFINE_STUB_V(spdk_trace_add_register_fn, (struct spdk_trace_register_fn *reg_fn));

DEFINE_STUB_V(spdk_trace_register_owner, (uint8_t type, char id_prefix));

DEFINE_STUB_V(spdk_trace_register_object, (uint8_t type, char id_prefix));

DEFINE_STUB_V(spdk_trace_register_description, (const char *name,

		uint16_t tpoint_id, uint8_t owner_type,

		uint8_t object_type, uint8_t new_object,

		uint8_t arg1_type, const char *arg1_name));

DEFINE_STUB_V(_spdk_trace_record, (uint64_t tsc, uint16_t tpoint_id, uint16_t poller_id,

				   uint32_t size, uint64_t object_id, uint64_t arg1));

DEFINE_STUB(spdk_notify_send, uint64_t, (const char *type, const char *ctx), 0);

DEFINE_STUB(spdk_notify_type_register, struct spdk_notify_type *, (const char *type), NULL);

DEFINE_STUB_V(spdk_scsi_nvme_translate, (const struct spdk_bdev_io *bdev_io, int *sc, int *sk,

test/unit/lib/bdev/part.c/part_ut.c

+0 −10
Original line number Diff line number Diff line
@@ -43,16 +43,6 @@ 
#include "bdev/bdev.c"

#include "bdev/part.c"



struct spdk_trace_histories *g_trace_histories;

DEFINE_STUB_V(spdk_trace_add_register_fn, (struct spdk_trace_register_fn *reg_fn));

DEFINE_STUB_V(spdk_trace_register_owner, (uint8_t type, char id_prefix));

DEFINE_STUB_V(spdk_trace_register_object, (uint8_t type, char id_prefix));

DEFINE_STUB_V(spdk_trace_register_description, (const char *name,

		uint16_t tpoint_id, uint8_t owner_type,

		uint8_t object_type, uint8_t new_object,

		uint8_t arg1_type, const char *arg1_name));

DEFINE_STUB_V(_spdk_trace_record, (uint64_t tsc, uint16_t tpoint_id, uint16_t poller_id,

				   uint32_t size, uint64_t object_id, uint64_t arg1));

DEFINE_STUB(spdk_notify_send, uint64_t, (const char *type, const char *ctx), 0);

DEFINE_STUB(spdk_notify_type_register, struct spdk_notify_type *, (const char *type), NULL);

test/unit/lib/blobfs/blobfs_async_ut/blobfs_async_ut.c

+0 −8
Original line number Diff line number Diff line
@@ -47,14 +47,6 @@ 
struct spdk_filesystem *g_fs;

struct spdk_file *g_file;

int g_fserrno;

struct spdk_trace_histories *g_trace_histories;

DEFINE_STUB_V(spdk_trace_add_register_fn, (struct spdk_trace_register_fn *reg_fn));

DEFINE_STUB_V(spdk_trace_register_description, (const char *name,

		uint16_t tpoint_id, uint8_t owner_type,

		uint8_t object_type, uint8_t new_object,

		uint8_t arg1_is_ptr, const char *arg1_name));

DEFINE_STUB_V(_spdk_trace_record, (uint64_t tsc, uint16_t tpoint_id, uint16_t poller_id,

				   uint32_t size, uint64_t object_id, uint64_t arg1));



static void

fs_op_complete(void *ctx, int fserrno)