From 78326e722f051360a890000fa3f6c8bac5073345 Mon Sep 17 00:00:00 2001 From: Darek Stojaczyk Date: Thu, 2 May 2019 11:27:48 +0200 Subject: [PATCH] blobfs: remove trace short names They were removed from the trace API and BlobFS doesn't compile right now. Change-Id: Ie98339f19353e4db901af551c706f57c18b89fc5 Signed-off-by: Darek Stojaczyk Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/452863 Tested-by: SPDK CI Jenkins --- lib/blobfs/blobfs.c | 8 ++++---- test/unit/lib/blobfs/blobfs_async_ut/blobfs_async_ut.c | 2 +- test/unit/lib/blobfs/blobfs_sync_ut/blobfs_sync_ut.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/blobfs/blobfs.c b/lib/blobfs/blobfs.c index 2eb6ca8ee..bcf435f44 100644 --- a/lib/blobfs/blobfs.c +++ b/lib/blobfs/blobfs.c @@ -69,22 +69,22 @@ static pthread_spinlock_t g_caches_lock; SPDK_TRACE_REGISTER_FN(blobfs_trace, "blobfs", TRACE_GROUP_BLOBFS) { - spdk_trace_register_description("BLOBFS_XATTR_START", "", + spdk_trace_register_description("BLOBFS_XATTR_START", TRACE_BLOBFS_XATTR_START, OWNER_NONE, OBJECT_NONE, 0, SPDK_TRACE_ARG_TYPE_STR, "file: "); - spdk_trace_register_description("BLOBFS_XATTR_END", "", + spdk_trace_register_description("BLOBFS_XATTR_END", TRACE_BLOBFS_XATTR_END, OWNER_NONE, OBJECT_NONE, 0, SPDK_TRACE_ARG_TYPE_STR, "file: "); - spdk_trace_register_description("BLOBFS_OPEN", "", + spdk_trace_register_description("BLOBFS_OPEN", TRACE_BLOBFS_OPEN, OWNER_NONE, OBJECT_NONE, 0, SPDK_TRACE_ARG_TYPE_STR, "file: "); - spdk_trace_register_description("BLOBFS_CLOSE", "", + spdk_trace_register_description("BLOBFS_CLOSE", TRACE_BLOBFS_CLOSE, OWNER_NONE, OBJECT_NONE, 0, SPDK_TRACE_ARG_TYPE_STR, diff --git a/test/unit/lib/blobfs/blobfs_async_ut/blobfs_async_ut.c b/test/unit/lib/blobfs/blobfs_async_ut/blobfs_async_ut.c index d7b4aabd5..bd02dd397 100644 --- a/test/unit/lib/blobfs/blobfs_async_ut/blobfs_async_ut.c +++ b/test/unit/lib/blobfs/blobfs_async_ut/blobfs_async_ut.c @@ -51,7 +51,7 @@ 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, const char *short_name, +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)); diff --git a/test/unit/lib/blobfs/blobfs_sync_ut/blobfs_sync_ut.c b/test/unit/lib/blobfs/blobfs_sync_ut/blobfs_sync_ut.c index 502cfb204..4102a0f79 100644 --- a/test/unit/lib/blobfs/blobfs_sync_ut/blobfs_sync_ut.c +++ b/test/unit/lib/blobfs/blobfs_sync_ut/blobfs_sync_ut.c @@ -52,7 +52,7 @@ int g_fserrno; struct spdk_thread *g_dispatch_thread = NULL; 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, const char *short_name, +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));