From: Qi Zhang <qi.z.zhang@intel.com>
To: thomas.monjalon@6wind.com
Cc: dev@dpdk.org, Qi Zhang <qi.z.zhang@intel.com>
Subject: [dpdk-dev] [PATCH 2/2] test: update test code
Date: Wed, 22 Feb 2017 17:17:02 -0500 [thread overview]
Message-ID: <1487801822-30938-3-git-send-email-qi.z.zhang@intel.com> (raw)
In-Reply-To: <1487801822-30938-1-git-send-email-qi.z.zhang@intel.com>
Update the test code to algin with callback function change.
interface is changed.
Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
---
app/test/test_interrupts.c | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/app/test/test_interrupts.c b/app/test/test_interrupts.c
index 371101f..5377292 100644
--- a/app/test/test_interrupts.c
+++ b/app/test/test_interrupts.c
@@ -199,8 +199,9 @@ test_interrupt_handle_compare(struct rte_intr_handle *intr_handle_l,
* Callback for the test interrupt.
*/
static void
-test_interrupt_callback(struct rte_intr_handle *intr_handle, void *arg)
+test_interrupt_callback(void *arg)
{
+ struct rte_intr_handle *intr_handle = (struct rte_intr_handle *)arg;
if (test_intr_type >= TEST_INTERRUPT_HANDLE_MAX) {
printf("invalid interrupt type\n");
flag = -1;
@@ -230,9 +231,9 @@ test_interrupt_callback(struct rte_intr_handle *intr_handle, void *arg)
* Callback for the test interrupt.
*/
static void
-test_interrupt_callback_1(struct rte_intr_handle *intr_handle,
- __attribute__((unused)) void *arg)
+test_interrupt_callback_1(void *arg)
{
+ struct rte_intr_handle *intr_handle = (struct rte_intr_handle *)arg;
if (test_interrupt_handle_sanity_check(intr_handle) < 0) {
printf("null or invalid intr_handle for %s\n", __func__);
flag = -1;
@@ -364,7 +365,7 @@ test_interrupt_full_path_check(enum test_interrupt_handle_type intr_type)
test_intr_handle = intr_handles[intr_type];
test_intr_type = intr_type;
if (rte_intr_callback_register(&test_intr_handle,
- test_interrupt_callback, NULL) < 0) {
+ test_interrupt_callback, &test_intr_handle) < 0) {
printf("fail to register callback\n");
return -1;
}
@@ -378,7 +379,7 @@ test_interrupt_full_path_check(enum test_interrupt_handle_type intr_type)
rte_delay_ms(TEST_INTERRUPT_CHECK_INTERVAL);
if (rte_intr_callback_unregister(&test_intr_handle,
- test_interrupt_callback, NULL) < 0)
+ test_interrupt_callback, &test_intr_handle) < 0)
return -1;
if (flag == 0) {
@@ -441,7 +442,7 @@ test_interrupt(void)
/* check if it will fail to register cb with invalid intr_handle */
test_intr_handle = intr_handles[TEST_INTERRUPT_HANDLE_INVALID];
if (rte_intr_callback_register(&test_intr_handle,
- test_interrupt_callback, NULL) == 0) {
+ test_interrupt_callback, &test_intr_handle) == 0) {
printf("unexpectedly register successfully with invalid "
"intr_handle\n");
goto out;
@@ -449,7 +450,7 @@ test_interrupt(void)
/* check if it will fail to register without callback */
test_intr_handle = intr_handles[TEST_INTERRUPT_HANDLE_VALID];
- if (rte_intr_callback_register(&test_intr_handle, NULL, NULL) == 0) {
+ if (rte_intr_callback_register(&test_intr_handle, NULL, &test_intr_handle) == 0) {
printf("unexpectedly register successfully with "
"null callback\n");
goto out;
@@ -466,7 +467,7 @@ test_interrupt(void)
/* check if it will fail to unregister cb with invalid intr_handle */
test_intr_handle = intr_handles[TEST_INTERRUPT_HANDLE_INVALID];
if (rte_intr_callback_unregister(&test_intr_handle,
- test_interrupt_callback, NULL) > 0) {
+ test_interrupt_callback, &test_intr_handle) > 0) {
printf("unexpectedly unregister successfully with "
"invalid intr_handle\n");
goto out;
@@ -475,12 +476,12 @@ test_interrupt(void)
/* check if it is ok to register the same intr_handle twice */
test_intr_handle = intr_handles[TEST_INTERRUPT_HANDLE_VALID];
if (rte_intr_callback_register(&test_intr_handle,
- test_interrupt_callback, NULL) < 0) {
+ test_interrupt_callback, &test_intr_handle) < 0) {
printf("it fails to register test_interrupt_callback\n");
goto out;
}
if (rte_intr_callback_register(&test_intr_handle,
- test_interrupt_callback_1, NULL) < 0) {
+ test_interrupt_callback_1, &test_intr_handle) < 0) {
printf("it fails to register test_interrupt_callback_1\n");
goto out;
}
@@ -492,7 +493,7 @@ test_interrupt(void)
goto out;
}
if (rte_intr_callback_unregister(&test_intr_handle,
- test_interrupt_callback, NULL) <= 0) {
+ test_interrupt_callback, &test_intr_handle) <= 0) {
printf("it fails to unregister test_interrupt_callback\n");
goto out;
}
--
2.7.4
next prev parent reply other threads:[~2017-02-23 5:21 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-22 22:17 [dpdk-dev] [PATCH 0/2] eal: clean up interrupt handle Qi Zhang
2017-02-22 22:17 ` [dpdk-dev] [PATCH 1/2] " Qi Zhang
2017-02-27 16:19 ` Jan Blunck
2017-02-28 1:22 ` Zhang, Qi Z
2017-02-22 22:17 ` Qi Zhang [this message]
2017-03-07 9:19 ` [dpdk-dev] [PATCH v2 0/3] " Qi Zhang
2017-03-07 9:19 ` [dpdk-dev] [PATCH v2 1/3] vfio: keep interrupt source read only Qi Zhang
2017-03-10 13:05 ` Thomas Monjalon
2017-03-10 13:26 ` Burakov, Anatoly
2017-03-07 9:19 ` [dpdk-dev] [PATCH v2 2/3] eal: clean up interrupt handle Qi Zhang
2017-03-30 16:39 ` Thomas Monjalon
2017-03-31 0:57 ` Zhang, Qi Z
2017-03-07 9:19 ` [dpdk-dev] [PATCH v2 3/3] app/test: update test code Qi Zhang
2017-03-10 13:04 ` Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1487801822-30938-3-git-send-email-qi.z.zhang@intel.com \
--to=qi.z.zhang@intel.com \
--cc=dev@dpdk.org \
--cc=thomas.monjalon@6wind.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).