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

TEST: If we timeout a test, drop all wait/out pdus from the list

Browse Source 
we dont want the callbacks anymore.
This commit is contained in:
Ronnie Sahlberg
2012-08-31 16:12:21 -07:00
parent c526b9e954
commit 6a24b283f8
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test-tool/iscsi-test.c
+10 -1
View File
@@ -28,6 +28,7 @@
#include <poll.h> #include <poll.h>
#include <popt.h> #include <popt.h>
#include <fnmatch.h> #include <fnmatch.h>
#include "slist.h"
#include "iscsi.h" #include "iscsi.h"
#include "scsi-lowlevel.h" #include "scsi-lowlevel.h"
#include "iscsi-private.h" #include "iscsi-private.h"
@@ -282,7 +283,6 @@ struct iscsi_context *iscsi_context_login(const char *initiatorname, const char
return iscsi; return iscsi;
} }
void wait_until_test_finished(struct iscsi_context *iscsi, struct iscsi_async_state *state) void wait_until_test_finished(struct iscsi_context *iscsi, struct iscsi_async_state *state)
{ {
struct pollfd pfd; struct pollfd pfd;
@@ -300,9 +300,18 @@ void wait_until_test_finished(struct iscsi_context *iscsi, struct iscsi_async_st
} }
if (ret == 0) { if (ret == 0) {
if (count++ > 5) { if (count++ > 5) {
struct iscsi_pdu *pdu;
state->finished = 1; state->finished = 1;
state->status = SCSI_STATUS_CANCELLED; state->status = SCSI_STATUS_CANCELLED;
state->task->status = SCSI_STATUS_CANCELLED; state->task->status = SCSI_STATUS_CANCELLED;
/* this may leak memory since we dont free the pdu */
while ((pdu = iscsi->outqueue)) {
SLIST_REMOVE(&iscsi->outqueue, pdu);
}
while ((pdu = iscsi->waitpdu)) {
SLIST_REMOVE(&iscsi->waitpdu, pdu);
}
return; return;
} }
continue; continue;