Commit 72f8c6a1 authored by Jim Harris's avatar Jim Harris
Browse files

log: remove "trace" from internal API 



Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I8b1c0d4b00d5d41aae89d3b33f18d1ae957567dc

Reviewed-on: https://review.gerrithub.io/435344


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarXiaodong Liu <xiaodong.liu@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent b4b7d5d3

include/spdk_internal/log.h

+7 −7
Original line number Diff line number Diff line
@@ -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 */

lib/bdev/virtio/bdev_virtio_scsi.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

		}

lib/blob/blobstore.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

	}

lib/blobfs/blobfs.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

lib/iscsi/iscsi.c

+9 −9
Original line number Diff line number Diff line
@@ -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,7 +1879,7 @@ spdk_iscsi_op_login_rsp_handle_csg_bit(struct spdk_iscsi_conn *conn, 
				}

			}



			SPDK_TRACEDUMP(SPDK_LOG_ISCSI, "Negotiated Auth Params",

			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) {