From 72f8c6a1f3f4aa1b3c373ced13e8d0ec06825ddc Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Tue, 27 Nov 2018 00:17:57 -0700 Subject: [PATCH] log: remove "trace" from internal API Signed-off-by: Jim Harris Change-Id: I8b1c0d4b00d5d41aae89d3b33f18d1ae957567dc Reviewed-on: https://review.gerrithub.io/435344 Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Xiaodong Liu Reviewed-by: Shuhei Matsumoto --- include/spdk_internal/log.h | 14 +++++++------- lib/bdev/virtio/bdev_virtio_scsi.c | 4 ++-- lib/blob/blobstore.c | 4 ++-- lib/blobfs/blobfs.c | 2 +- lib/iscsi/iscsi.c | 18 +++++++++--------- lib/log/log_flags.c | 20 ++++++++++---------- lib/log/rpc/log_rpc.c | 4 ++-- lib/nvme/nvme_ctrlr.c | 2 +- lib/nvmf/subsystem.c | 2 +- lib/scsi/scsi_bdev.c | 4 ++-- lib/vhost/vhost_scsi.c | 9 ++++----- test/unit/lib/log/log.c/log_ut.c | 4 ++-- 12 files changed, 43 insertions(+), 44 deletions(-) diff --git a/include/spdk_internal/log.h b/include/spdk_internal/log.h index 5ec5645fe..0c44a4f07 100644 --- a/include/spdk_internal/log.h +++ b/include/spdk_internal/log.h @@ -52,19 +52,19 @@ struct spdk_log_flag { bool enabled; }; -void spdk_log_register_trace_flag(const char *name, struct spdk_log_flag *flag); +void spdk_log_register_flag(const char *name, struct spdk_log_flag *flag); -struct spdk_log_flag *spdk_log_get_first_trace_flag(void); -struct spdk_log_flag *spdk_log_get_next_trace_flag(struct spdk_log_flag *flag); +struct spdk_log_flag *spdk_log_get_first_flag(void); +struct spdk_log_flag *spdk_log_get_next_flag(struct spdk_log_flag *flag); #define SPDK_LOG_REGISTER_COMPONENT(str, flag) \ struct spdk_log_flag flag = { \ .enabled = false, \ .name = str, \ }; \ -__attribute__((constructor)) static void register_trace_flag_##flag(void) \ +__attribute__((constructor)) static void register_flag_##flag(void) \ { \ - spdk_log_register_trace_flag(str, &flag); \ + spdk_log_register_flag(str, &flag); \ } #define SPDK_INFOLOG(FLAG, ...) \ @@ -85,7 +85,7 @@ __attribute__((constructor)) static void register_trace_flag_##flag(void) \ } \ } while (0) -#define SPDK_TRACEDUMP(FLAG, LABEL, BUF, LEN) \ +#define SPDK_LOGDUMP(FLAG, LABEL, BUF, LEN) \ do { \ extern struct spdk_log_flag FLAG; \ if ((FLAG.enabled) && (LEN)) { \ @@ -95,7 +95,7 @@ __attribute__((constructor)) static void register_trace_flag_##flag(void) \ #else #define SPDK_DEBUGLOG(...) do { } while (0) -#define SPDK_TRACEDUMP(...) do { } while (0) +#define SPDK_LOGDUMP(...) do { } while (0) #endif #endif /* SPDK_INTERNAL_LOG_H */ diff --git a/lib/bdev/virtio/bdev_virtio_scsi.c b/lib/bdev/virtio/bdev_virtio_scsi.c index 4ff3db4a3..36cd278e6 100644 --- a/lib/bdev/virtio/bdev_virtio_scsi.c +++ b/lib/bdev/virtio/bdev_virtio_scsi.c @@ -1448,8 +1448,8 @@ process_scan_resp(struct virtio_scsi_scan_base *base) base->retries--; if (base->retries == 0) { SPDK_NOTICELOG("Target %"PRIu8" is present, but unavailable.\n", target_id); - SPDK_TRACEDUMP(SPDK_LOG_VIRTIO, "CDB", req->cdb, sizeof(req->cdb)); - SPDK_TRACEDUMP(SPDK_LOG_VIRTIO, "SENSE DATA", resp->sense, sizeof(resp->sense)); + SPDK_LOGDUMP(SPDK_LOG_VIRTIO, "CDB", req->cdb, sizeof(req->cdb)); + SPDK_LOGDUMP(SPDK_LOG_VIRTIO, "SENSE DATA", resp->sense, sizeof(resp->sense)); _virtio_scsi_dev_scan_next(base, -EBUSY); return; } diff --git a/lib/blob/blobstore.c b/lib/blob/blobstore.c index 3b2941802..b71e20d0c 100644 --- a/lib/blob/blobstore.c +++ b/lib/blob/blobstore.c @@ -3082,8 +3082,8 @@ _spdk_bs_load_super_cpl(spdk_bs_sequence_t *seq, void *cb_arg, int bserrno) SPDK_DEBUGLOG(SPDK_LOG_BLOB, "Bstype wildcard used - loading blobstore regardless bstype\n"); } else { SPDK_DEBUGLOG(SPDK_LOG_BLOB, "Unexpected bstype\n"); - SPDK_TRACEDUMP(SPDK_LOG_BLOB, "Expected:", ctx->bs->bstype.bstype, SPDK_BLOBSTORE_TYPE_LENGTH); - SPDK_TRACEDUMP(SPDK_LOG_BLOB, "Found:", ctx->super->bstype.bstype, SPDK_BLOBSTORE_TYPE_LENGTH); + SPDK_LOGDUMP(SPDK_LOG_BLOB, "Expected:", ctx->bs->bstype.bstype, SPDK_BLOBSTORE_TYPE_LENGTH); + SPDK_LOGDUMP(SPDK_LOG_BLOB, "Found:", ctx->super->bstype.bstype, SPDK_BLOBSTORE_TYPE_LENGTH); _spdk_bs_load_ctx_fail(seq, ctx, -ENXIO); return; } diff --git a/lib/blobfs/blobfs.c b/lib/blobfs/blobfs.c index 48e9f4812..5466f7dcf 100644 --- a/lib/blobfs/blobfs.c +++ b/lib/blobfs/blobfs.c @@ -668,7 +668,7 @@ load_cb(void *ctx, struct spdk_blob_store *bs, int bserrno) spdk_bs_set_bstype(bs, blobfs_type); } else if (memcmp(&bstype, &blobfs_type, sizeof(bstype))) { SPDK_DEBUGLOG(SPDK_LOG_BLOB, "not blobfs\n"); - SPDK_TRACEDUMP(SPDK_LOG_BLOB, "bstype", &bstype, sizeof(bstype)); + SPDK_LOGDUMP(SPDK_LOG_BLOB, "bstype", &bstype, sizeof(bstype)); args->fn.fs_op_with_handle(args->arg, NULL, bserrno); free_fs_request(req); free(fs); diff --git a/lib/iscsi/iscsi.c b/lib/iscsi/iscsi.c index e9d2383ab..83ea286b1 100644 --- a/lib/iscsi/iscsi.c +++ b/lib/iscsi/iscsi.c @@ -1021,7 +1021,7 @@ spdk_iscsi_reject(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *pdu, to_be32(&rsph->max_cmd_sn, 1); } - SPDK_TRACEDUMP(SPDK_LOG_ISCSI, "PDU", (void *)&rsp_pdu->bhs, ISCSI_BHS_LEN); + SPDK_LOGDUMP(SPDK_LOG_ISCSI, "PDU", (void *)&rsp_pdu->bhs, ISCSI_BHS_LEN); spdk_iscsi_conn_write_pdu(conn, rsp_pdu); @@ -1090,8 +1090,8 @@ spdk_iscsi_op_login_response(struct spdk_iscsi_conn *conn, to_be32(&rsph->max_cmd_sn, rsp_pdu->cmd_sn); } - SPDK_TRACEDUMP(SPDK_LOG_ISCSI, "PDU", (uint8_t *)rsph, ISCSI_BHS_LEN); - SPDK_TRACEDUMP(SPDK_LOG_ISCSI, "DATA", rsp_pdu->data, rsp_pdu->data_segment_len); + SPDK_LOGDUMP(SPDK_LOG_ISCSI, "PDU", (uint8_t *)rsph, ISCSI_BHS_LEN); + SPDK_LOGDUMP(SPDK_LOG_ISCSI, "DATA", rsp_pdu->data, rsp_pdu->data_segment_len); /* Set T/CSG/NSG to reserved if login error. */ if (rsph->status_class != 0) { @@ -1762,7 +1762,7 @@ spdk_iscsi_op_login_rsp_init(struct spdk_iscsi_conn *conn, rsph->stat_sn = reqh->exp_stat_sn; } - SPDK_TRACEDUMP(SPDK_LOG_ISCSI, "PDU", (uint8_t *)&pdu->bhs, ISCSI_BHS_LEN); + SPDK_LOGDUMP(SPDK_LOG_ISCSI, "PDU", (uint8_t *)&pdu->bhs, ISCSI_BHS_LEN); SPDK_DEBUGLOG(SPDK_LOG_ISCSI, "T=%d, C=%d, CSG=%d, NSG=%d, Min=%d, Max=%d, ITT=%x\n", @@ -1879,8 +1879,8 @@ spdk_iscsi_op_login_rsp_handle_csg_bit(struct spdk_iscsi_conn *conn, } } - SPDK_TRACEDUMP(SPDK_LOG_ISCSI, "Negotiated Auth Params", - rsp_pdu->data, rsp_pdu->data_segment_len); + SPDK_LOGDUMP(SPDK_LOG_ISCSI, "Negotiated Auth Params", + rsp_pdu->data, rsp_pdu->data_segment_len); } break; @@ -2054,7 +2054,7 @@ spdk_iscsi_op_login_rsp_handle(struct spdk_iscsi_conn *conn, } rsp_pdu->data_segment_len = rc; - SPDK_TRACEDUMP(SPDK_LOG_ISCSI, "Negotiated Params", rsp_pdu->data, rc); + SPDK_LOGDUMP(SPDK_LOG_ISCSI, "Negotiated Params", rsp_pdu->data, rc); /* handle the CSG bit case */ rc = spdk_iscsi_op_login_rsp_handle_csg_bit(conn, rsp_pdu, *params, @@ -2266,7 +2266,7 @@ spdk_iscsi_op_text(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *pdu) } } - SPDK_TRACEDUMP(SPDK_LOG_ISCSI, "Negotiated Params", data, data_len); + SPDK_LOGDUMP(SPDK_LOG_ISCSI, "Negotiated Params", data, data_len); /* response PDU */ rsp_pdu = spdk_get_pdu(); @@ -2857,7 +2857,7 @@ spdk_iscsi_op_scsi(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *pdu) transfer_len = from_be32(&reqh->expected_data_xfer_len); cdb = reqh->cdb; - SPDK_TRACEDUMP(SPDK_LOG_ISCSI, "CDB", cdb, 16); + SPDK_LOGDUMP(SPDK_LOG_ISCSI, "CDB", cdb, 16); task = spdk_iscsi_task_get(conn, NULL, spdk_iscsi_task_cpl); if (!task) { diff --git a/lib/log/log_flags.c b/lib/log/log_flags.c index 572ad5fe7..edaca8283 100644 --- a/lib/log/log_flags.c +++ b/lib/log/log_flags.c @@ -35,7 +35,7 @@ #include "spdk_internal/log.h" -static TAILQ_HEAD(, spdk_log_flag) g_trace_flags = TAILQ_HEAD_INITIALIZER(g_trace_flags); +static TAILQ_HEAD(, spdk_log_flag) g_log_flags = TAILQ_HEAD_INITIALIZER(g_log_flags); enum spdk_log_level g_spdk_log_level = SPDK_LOG_NOTICE; enum spdk_log_level g_spdk_log_print_level = SPDK_LOG_NOTICE; @@ -89,7 +89,7 @@ get_log_flag(const char *name) { struct spdk_log_flag *flag; - TAILQ_FOREACH(flag, &g_trace_flags, tailq) { + TAILQ_FOREACH(flag, &g_log_flags, tailq) { if (strcasecmp(name, flag->name) == 0) { return flag; } @@ -99,7 +99,7 @@ get_log_flag(const char *name) } void -spdk_log_register_trace_flag(const char *name, struct spdk_log_flag *flag) +spdk_log_register_flag(const char *name, struct spdk_log_flag *flag) { struct spdk_log_flag *iter; @@ -115,14 +115,14 @@ spdk_log_register_trace_flag(const char *name, struct spdk_log_flag *flag) return; } - TAILQ_FOREACH(iter, &g_trace_flags, tailq) { + TAILQ_FOREACH(iter, &g_log_flags, tailq) { if (strcasecmp(iter->name, flag->name) > 0) { TAILQ_INSERT_BEFORE(iter, flag, tailq); return; } } - TAILQ_INSERT_TAIL(&g_trace_flags, flag, tailq); + TAILQ_INSERT_TAIL(&g_log_flags, flag, tailq); } bool @@ -143,7 +143,7 @@ set_log_flag(const char *name, bool value) struct spdk_log_flag *flag; if (strcasecmp(name, "all") == 0) { - TAILQ_FOREACH(flag, &g_trace_flags, tailq) { + TAILQ_FOREACH(flag, &g_log_flags, tailq) { flag->enabled = value; } return 0; @@ -172,13 +172,13 @@ spdk_log_clear_flag(const char *name) } struct spdk_log_flag * -spdk_log_get_first_trace_flag(void) +spdk_log_get_first_flag(void) { - return TAILQ_FIRST(&g_trace_flags); + return TAILQ_FIRST(&g_log_flags); } struct spdk_log_flag * -spdk_log_get_next_trace_flag(struct spdk_log_flag *flag) +spdk_log_get_next_flag(struct spdk_log_flag *flag) { return TAILQ_NEXT(flag, tailq); } @@ -190,7 +190,7 @@ spdk_log_usage(FILE *f, const char *log_arg) struct spdk_log_flag *flag; fprintf(f, " %s, --traceflag enable debug log flag (all", log_arg); - TAILQ_FOREACH(flag, &g_trace_flags, tailq) { + TAILQ_FOREACH(flag, &g_log_flags, tailq) { fprintf(f, ", %s", flag->name); } diff --git a/lib/log/rpc/log_rpc.c b/lib/log/rpc/log_rpc.c index dc53ef287..c705cfdc3 100644 --- a/lib/log/rpc/log_rpc.c +++ b/lib/log/rpc/log_rpc.c @@ -335,11 +335,11 @@ spdk_rpc_get_trace_flags(struct spdk_jsonrpc_request *request, } spdk_json_write_object_begin(w); - flag = spdk_log_get_first_trace_flag(); + flag = spdk_log_get_first_flag(); while (flag) { spdk_json_write_name(w, flag->name); spdk_json_write_bool(w, flag->enabled); - flag = spdk_log_get_next_trace_flag(flag); + flag = spdk_log_get_next_flag(flag); } spdk_json_write_object_end(w); spdk_jsonrpc_end_result(request, w); diff --git a/lib/nvme/nvme_ctrlr.c b/lib/nvme/nvme_ctrlr.c index 7dcf9b11e..ddef7399b 100644 --- a/lib/nvme/nvme_ctrlr.c +++ b/lib/nvme/nvme_ctrlr.c @@ -1359,7 +1359,7 @@ nvme_ctrlr_set_host_id(struct spdk_nvme_ctrlr *ctrlr) return 0; } - SPDK_TRACEDUMP(SPDK_LOG_NVME, "host_id", host_id, host_id_size); + SPDK_LOGDUMP(SPDK_LOG_NVME, "host_id", host_id, host_id_size); nvme_ctrlr_set_state(ctrlr, NVME_CTRLR_STATE_WAIT_FOR_HOST_ID, ctrlr->opts.admin_timeout_ms); diff --git a/lib/nvmf/subsystem.c b/lib/nvmf/subsystem.c index ca71c3c48..fa9ae5faa 100644 --- a/lib/nvmf/subsystem.c +++ b/lib/nvmf/subsystem.c @@ -1180,7 +1180,7 @@ spdk_nvmf_subsystem_set_sn(struct spdk_nvmf_subsystem *subsystem, const char *sn if (!spdk_nvmf_valid_ascii_string(sn, len)) { SPDK_DEBUGLOG(SPDK_LOG_NVMF, "Non-ASCII sn\n"); - SPDK_TRACEDUMP(SPDK_LOG_NVMF, "sn", sn, len); + SPDK_LOGDUMP(SPDK_LOG_NVMF, "sn", sn, len); return -1; } diff --git a/lib/scsi/scsi_bdev.c b/lib/scsi/scsi_bdev.c index 66346c3ef..5190ef1b4 100644 --- a/lib/scsi/scsi_bdev.c +++ b/lib/scsi/scsi_bdev.c @@ -1854,7 +1854,7 @@ spdk_bdev_scsi_process_primary(struct spdk_scsi_task *task) break; } - SPDK_TRACEDUMP(SPDK_LOG_SCSI, "INQUIRY", data, data_len); + SPDK_LOGDUMP(SPDK_LOG_SCSI, "INQUIRY", data, data_len); break; case SPDK_SPC_REPORT_LUNS: { @@ -1882,7 +1882,7 @@ spdk_bdev_scsi_process_primary(struct spdk_scsi_task *task) break; } - SPDK_TRACEDUMP(SPDK_LOG_SCSI, "REPORT LUNS", data, data_len); + SPDK_LOGDUMP(SPDK_LOG_SCSI, "REPORT LUNS", data, data_len); break; } diff --git a/lib/vhost/vhost_scsi.c b/lib/vhost/vhost_scsi.c index aefa4c451..2f4348563 100644 --- a/lib/vhost/vhost_scsi.c +++ b/lib/vhost/vhost_scsi.c @@ -289,7 +289,7 @@ spdk_vhost_scsi_task_init_target(struct spdk_vhost_scsi_task *task, const __u8 * struct spdk_scsi_dev *dev; uint16_t lun_id = (((uint16_t)lun[2] << 8) | lun[3]) & 0x3FFF; - SPDK_TRACEDUMP(SPDK_LOG_VHOST_SCSI_QUEUE, "LUN", lun, 8); + SPDK_LOGDUMP(SPDK_LOG_VHOST_SCSI_QUEUE, "LUN", lun, 8); /* First byte must be 1 and second is target */ if (lun[0] != 1 || lun[1] >= SPDK_VHOST_SCSI_CTRLR_MAX_DEVS) { @@ -339,8 +339,7 @@ process_ctrl_request(struct spdk_vhost_scsi_task *task) "Processing controlq descriptor: desc %d/%p, desc_addr %p, len %d, flags %d, last_used_idx %d; kickfd %d; size %d\n", task->req_idx, desc, (void *)desc->addr, desc->len, desc->flags, task->vq->vring.last_used_idx, task->vq->vring.kickfd, task->vq->vring.size); - SPDK_TRACEDUMP(SPDK_LOG_VHOST_SCSI_QUEUE, "Request descriptor", (uint8_t *)ctrl_req, - desc->len); + SPDK_LOGDUMP(SPDK_LOG_VHOST_SCSI_QUEUE, "Request descriptor", (uint8_t *)ctrl_req, desc->len); spdk_vhost_scsi_task_init_target(task, ctrl_req->lun); @@ -473,7 +472,7 @@ task_data_setup(struct spdk_vhost_scsi_task *task, */ SPDK_DEBUGLOG(SPDK_LOG_VHOST_SCSI_DATA, "No payload descriptors for FROM DEV command req_idx=%"PRIu16".\n", task->req_idx); - SPDK_TRACEDUMP(SPDK_LOG_VHOST_SCSI_DATA, "CDB=", (*req)->cdb, VIRTIO_SCSI_CDB_SIZE); + SPDK_LOGDUMP(SPDK_LOG_VHOST_SCSI_DATA, "CDB=", (*req)->cdb, VIRTIO_SCSI_CDB_SIZE); task->used_len = sizeof(struct virtio_scsi_cmd_resp); task->scsi.iovcnt = 1; task->scsi.iovs[0].iov_len = 0; @@ -563,7 +562,7 @@ process_request(struct spdk_vhost_scsi_task *task) } task->scsi.cdb = req->cdb; - SPDK_TRACEDUMP(SPDK_LOG_VHOST_SCSI_DATA, "request CDB", req->cdb, VIRTIO_SCSI_CDB_SIZE); + SPDK_LOGDUMP(SPDK_LOG_VHOST_SCSI_DATA, "request CDB", req->cdb, VIRTIO_SCSI_CDB_SIZE); if (spdk_unlikely(task->scsi.lun == NULL)) { spdk_scsi_task_process_null_lun(&task->scsi); diff --git a/test/unit/lib/log/log.c/log_ut.c b/test/unit/lib/log/log.c/log_ut.c index 19fe3d210..c12e43964 100644 --- a/test/unit/lib/log/log.c/log_ut.c +++ b/test/unit/lib/log/log.c/log_ut.c @@ -77,8 +77,8 @@ log_test(void) spdk_log_open(); spdk_log_set_flag("log"); SPDK_WARNLOG("log warning unit test\n"); - SPDK_DEBUGLOG(SPDK_LOG_LOG, "log trace test\n"); - SPDK_TRACEDUMP(SPDK_LOG_LOG, "log trace dump test:", "trace dump", 10); + SPDK_DEBUGLOG(SPDK_LOG_LOG, "log test\n"); + SPDK_LOGDUMP(SPDK_LOG_LOG, "log dump test:", "log dump", 8); spdk_log_dump(stderr, "spdk dump test:", "spdk dump", 9); spdk_log_close();