Page MenuHomeFreeBSD
Files F171425164

D56647.id176593.diff
No OneTemporary
Actions

D56647.id176593.diff
View Options

diff --git a/sys/netinet/tcp_hpts_test.c b/sys/netinet/tcp_hpts_test.c
--- a/sys/netinet/tcp_hpts_test.c
+++ b/sys/netinet/tcp_hpts_test.c
@@ -90,6 +90,18 @@
} \
} while (0)
+#define KTEST_EQUAL_GOTO(x, y, label) do { \
+ if ((x) != (y)) { \
+ KTEST_ERR(ctx, "FAIL: %s != %s (%d != %d)", #x, #y, (x), (y)); \
+ if (test_exit_on_failure) { \
+ error = EINVAL; \
+ goto label; \
+ } \
+ } else { \
+ KTEST_LOG(ctx, "PASS: %s == %s", #x, #y); \
+ } \
+} while (0)
+
#define KTEST_NEQUAL(x, y) do { \
if ((x) == (y)) { \
KTEST_ERR(ctx, "FAIL: %s == %s (%d == %d)", #x, #y, (x), (y)); \
@@ -1461,6 +1473,7 @@
struct tcp_hptsi *pace;
struct tcpcb *tp;
struct tcp_hpts_entry *hpts;
+ int error;
test_hpts_init();
@@ -1477,8 +1490,8 @@
hpts->p_on_queue_cnt = 50; /* Below threshold */
hpts->p_hpts_wake_scheduled = 0;
tcp_hpts_wake(hpts);
- KTEST_EQUAL(hpts->p_hpts_wake_scheduled, 1);
- KTEST_EQUAL(call_counts[CCNT_SWI_SCHED], 1);
+ KTEST_EQUAL_GOTO(hpts->p_hpts_wake_scheduled, 1, cleanup_locked);
+ KTEST_EQUAL_GOTO(call_counts[CCNT_SWI_SCHED], 1, cleanup_locked);
HPTS_UNLOCK(hpts);
/* Reset for next test */
@@ -1490,9 +1503,9 @@
hpts->p_on_queue_cnt = 200; /* Above threshold */
hpts->p_direct_wake = 1; /* Request direct wake */
tcp_hpts_wake(hpts);
- KTEST_EQUAL(hpts->p_hpts_wake_scheduled, 0); /* Should be inhibited */
- KTEST_EQUAL(hpts->p_direct_wake, 0); /* Should be cleared */
- KTEST_EQUAL(call_counts[CCNT_SWI_SCHED], 0); /* No SWI scheduled */
+ KTEST_EQUAL_GOTO(hpts->p_hpts_wake_scheduled, 0, cleanup_locked);
+ KTEST_EQUAL_GOTO(hpts->p_direct_wake, 0, cleanup_locked);
+ KTEST_EQUAL_GOTO(call_counts[CCNT_SWI_SCHED], 0, cleanup_locked);
HPTS_UNLOCK(hpts);
test_hpts_free_tcpcb(tp);
@@ -1500,6 +1513,10 @@
tcp_hptsi_destroy(pace);
return (0);
+
+cleanup_locked:
+ HPTS_UNLOCK(hpts);
+ return (error);
}
/*

File Metadata

Mime Type
text/plain
Expires
Sat, Sep 12, 1:53 AM (5 m, 48 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
38751760
Default Alt Text
D56647.id176593.diff (1 KB)

Event Timeline