warren/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test-tool: rename async write dispatch/complete counters

Browse Source 
Add an io_ prefix, to differentiate between I/O and future iSCSI Logout
request tracking.

Signed-off-by: David Disseldorp <ddiss@suse.de>
This commit is contained in:
David Disseldorp
2020-08-18 13:32:48 +02:00
parent 3f50a1462c
commit 4080c09839
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test-tool/test_async_write.c
+9 -8
View File
@@ -27,8 +27,8 @@
#include "iscsi-test-cu.h" #include "iscsi-test-cu.h"
struct tests_async_write_state { struct tests_async_write_state {
uint32_t dispatched; uint32_t io_dispatched;
uint32_t completed; uint32_t io_completed;
uint32_t prev_cmdsn; uint32_t prev_cmdsn;
}; };
@@ -39,12 +39,13 @@ test_async_write_cb(struct iscsi_context *iscsi __attribute__((unused)),
struct scsi_task *atask = command_data; struct scsi_task *atask = command_data;
struct tests_async_write_state *state = private_data; struct tests_async_write_state *state = private_data;
state->completed++; state->io_completed++;
logging(LOG_VERBOSE, "WRITE10 completed: %d of %d (CmdSN=%d)", logging(LOG_VERBOSE, "WRITE10 completed: %d of %d (CmdSN=%d)",
state->completed, state->dispatched, atask->cmdsn); state->io_completed, state->io_dispatched, atask->cmdsn);
CU_ASSERT_NOT_EQUAL(status, SCSI_STATUS_CHECK_CONDITION); CU_ASSERT_NOT_EQUAL(status, SCSI_STATUS_CHECK_CONDITION);
if ((state->completed > 1) && (atask->cmdsn != state->prev_cmdsn + 1)) { if ((state->io_completed > 1)
&& (atask->cmdsn != state->prev_cmdsn + 1)) {
logging(LOG_VERBOSE, logging(LOG_VERBOSE,
"out of order completion (CmdSN=%d, prev=%d)", "out of order completion (CmdSN=%d, prev=%d)",
atask->cmdsn, state->prev_cmdsn); atask->cmdsn, state->prev_cmdsn);
@@ -97,12 +98,12 @@ test_async_write(void)
&state); &state);
CU_ASSERT_EQUAL(ret, 0); CU_ASSERT_EQUAL(ret, 0);
state.dispatched++; state.io_dispatched++;
logging(LOG_VERBOSE, "WRITE10 dispatched: %d of %d (cmdsn=%d)", logging(LOG_VERBOSE, "WRITE10 dispatched: %d of %d (cmdsn=%d)",
state.dispatched, num_ios, atask->cmdsn); state.io_dispatched, num_ios, atask->cmdsn);
} }
while (state.completed < state.dispatched) { while (state.io_completed < state.io_dispatched) {
struct pollfd pfd; struct pollfd pfd;
pfd.fd = iscsi_get_fd(sd->iscsi_ctx); pfd.fd = iscsi_get_fd(sd->iscsi_ctx);