* [dpdk-dev] [PATCH] test: fix build when pdump config is disabled
@ 2019-03-20 11:33 Reshma Pattan
2019-03-20 11:33 ` Reshma Pattan
2019-03-20 15:17 ` Rami Rosen
0 siblings, 2 replies; 6+ messages in thread
From: Reshma Pattan @ 2019-03-20 11:33 UTC (permalink / raw)
To: dev; +Cc: rami.rosen, stable, Reshma Pattan
pdump unit test has dependency on pthread code
in test.c and process.h to run send_pkts(),
this code should be enabled only when
CONFIG_RTE_LIBRTE_PDUMP is enabled.
Bugzilla ID: 222
Fixes: 086eb64db3 ("test/pdump: add unit test for pdump library")
CC: stable@dpdk.org
Signed-off-by: Reshma Pattan <reshma.pattan@intel.com>
---
app/test/process.h | 8 ++++++++
app/test/test.c | 4 ++++
2 files changed, 12 insertions(+)
diff --git a/app/test/process.h b/app/test/process.h
index 2701127a2..513bc9420 100644
--- a/app/test/process.h
+++ b/app/test/process.h
@@ -19,9 +19,11 @@
#define exe "exe"
#endif
+#ifdef RTE_LIBRTE_PDUMP
#include <pthread.h>
extern void *send_pkts(void *empty);
extern uint16_t flag_for_send_pkts;
+#endif
/*
* launches a second copy of the test process using the given argv parameters,
@@ -36,7 +38,9 @@ process_dup(const char *const argv[], int numargs, const char *env_value)
char *argv_cpy[numargs + 1];
int i, fd, status;
char path[32];
+#ifdef RTE_LIBRTE_PDUMP
pthread_t thread;
+#endif
pid_t pid = fork();
if (pid < 0)
@@ -67,15 +71,19 @@ process_dup(const char *const argv[], int numargs, const char *env_value)
rte_panic("Cannot exec\n");
}
/* parent process does a wait */
+#ifdef RTE_LIBRTE_PDUMP
if ((strcmp(env_value, "run_pdump_server_tests") == 0))
pthread_create(&thread, NULL, &send_pkts, NULL);
+#endif
while (wait(&status) != pid)
;
+#ifdef RTE_LIBRTE_PDUMP
if ((strcmp(env_value, "run_pdump_server_tests") == 0)) {
flag_for_send_pkts = 0;
pthread_join(thread, NULL);
}
+#endif
return status;
}
diff --git a/app/test/test.c b/app/test/test.c
index d646f5160..1c91ed675 100644
--- a/app/test/test.c
+++ b/app/test/test.c
@@ -30,7 +30,9 @@ extern cmdline_parse_ctx_t main_ctx[];
#endif
#include "test.h"
+#ifdef RTE_LIBRTE_PDUMP
#include "test_pdump.h"
+#endif
#define RTE_LOGTYPE_APP RTE_LOGTYPE_USER1
@@ -50,7 +52,9 @@ do_recursive_call(void)
int (*action_fn)(void);
} actions[] = {
{ "run_secondary_instances", test_mp_secondary },
+#ifdef RTE_LIBRTE_PDUMP
{ "run_pdump_server_tests", test_pdump },
+#endif
{ "test_missing_c_flag", no_action },
{ "test_master_lcore_flag", no_action },
{ "test_invalid_n_flag", no_action },
--
2.17.1
^ permalink raw reply [flat|nested] 6+ messages in thread* [dpdk-dev] [PATCH] test: fix build when pdump config is disabled
2019-03-20 11:33 [dpdk-dev] [PATCH] test: fix build when pdump config is disabled Reshma Pattan
@ 2019-03-20 11:33 ` Reshma Pattan
2019-03-20 15:17 ` Rami Rosen
1 sibling, 0 replies; 6+ messages in thread
From: Reshma Pattan @ 2019-03-20 11:33 UTC (permalink / raw)
To: dev; +Cc: rami.rosen, stable, Reshma Pattan
pdump unit test has dependency on pthread code
in test.c and process.h to run send_pkts(),
this code should be enabled only when
CONFIG_RTE_LIBRTE_PDUMP is enabled.
Bugzilla ID: 222
Fixes: 086eb64db3 ("test/pdump: add unit test for pdump library")
CC: stable@dpdk.org
Signed-off-by: Reshma Pattan <reshma.pattan@intel.com>
---
app/test/process.h | 8 ++++++++
app/test/test.c | 4 ++++
2 files changed, 12 insertions(+)
diff --git a/app/test/process.h b/app/test/process.h
index 2701127a2..513bc9420 100644
--- a/app/test/process.h
+++ b/app/test/process.h
@@ -19,9 +19,11 @@
#define exe "exe"
#endif
+#ifdef RTE_LIBRTE_PDUMP
#include <pthread.h>
extern void *send_pkts(void *empty);
extern uint16_t flag_for_send_pkts;
+#endif
/*
* launches a second copy of the test process using the given argv parameters,
@@ -36,7 +38,9 @@ process_dup(const char *const argv[], int numargs, const char *env_value)
char *argv_cpy[numargs + 1];
int i, fd, status;
char path[32];
+#ifdef RTE_LIBRTE_PDUMP
pthread_t thread;
+#endif
pid_t pid = fork();
if (pid < 0)
@@ -67,15 +71,19 @@ process_dup(const char *const argv[], int numargs, const char *env_value)
rte_panic("Cannot exec\n");
}
/* parent process does a wait */
+#ifdef RTE_LIBRTE_PDUMP
if ((strcmp(env_value, "run_pdump_server_tests") == 0))
pthread_create(&thread, NULL, &send_pkts, NULL);
+#endif
while (wait(&status) != pid)
;
+#ifdef RTE_LIBRTE_PDUMP
if ((strcmp(env_value, "run_pdump_server_tests") == 0)) {
flag_for_send_pkts = 0;
pthread_join(thread, NULL);
}
+#endif
return status;
}
diff --git a/app/test/test.c b/app/test/test.c
index d646f5160..1c91ed675 100644
--- a/app/test/test.c
+++ b/app/test/test.c
@@ -30,7 +30,9 @@ extern cmdline_parse_ctx_t main_ctx[];
#endif
#include "test.h"
+#ifdef RTE_LIBRTE_PDUMP
#include "test_pdump.h"
+#endif
#define RTE_LOGTYPE_APP RTE_LOGTYPE_USER1
@@ -50,7 +52,9 @@ do_recursive_call(void)
int (*action_fn)(void);
} actions[] = {
{ "run_secondary_instances", test_mp_secondary },
+#ifdef RTE_LIBRTE_PDUMP
{ "run_pdump_server_tests", test_pdump },
+#endif
{ "test_missing_c_flag", no_action },
{ "test_master_lcore_flag", no_action },
{ "test_invalid_n_flag", no_action },
--
2.17.1
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [dpdk-dev] [PATCH] test: fix build when pdump config is disabled
2019-03-20 11:33 [dpdk-dev] [PATCH] test: fix build when pdump config is disabled Reshma Pattan
2019-03-20 11:33 ` Reshma Pattan
@ 2019-03-20 15:17 ` Rami Rosen
2019-03-20 15:17 ` Rami Rosen
2019-03-27 0:08 ` [dpdk-dev] [dpdk-stable] " Thomas Monjalon
1 sibling, 2 replies; 6+ messages in thread
From: Rami Rosen @ 2019-03-20 15:17 UTC (permalink / raw)
To: Reshma Pattan; +Cc: dev, Rosen, Rami, stable
pdump unit test has dependency on pthread code
in test.c and process.h to run send_pkts(),
this code should be enabled only when
CONFIG_RTE_LIBRTE_PDUMP is enabled.
Bugzilla ID: 222
Fixes: 086eb64db3 ("test/pdump: add unit test for pdump library")
CC: stable@dpdk.org
Signed-off-by: Reshma Pattan <reshma.pattan@intel.com>
+1
Checked when CONFIG_RTE_LIBRTE_PDUMP=n
with latest code from master, build completes succesfully
Reviewed-by: Rami Rosen <ramirose@gmail.com>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [dpdk-dev] [PATCH] test: fix build when pdump config is disabled
2019-03-20 15:17 ` Rami Rosen
@ 2019-03-20 15:17 ` Rami Rosen
2019-03-27 0:08 ` [dpdk-dev] [dpdk-stable] " Thomas Monjalon
1 sibling, 0 replies; 6+ messages in thread
From: Rami Rosen @ 2019-03-20 15:17 UTC (permalink / raw)
To: Reshma Pattan; +Cc: dev, Rosen, Rami, stable
pdump unit test has dependency on pthread code
in test.c and process.h to run send_pkts(),
this code should be enabled only when
CONFIG_RTE_LIBRTE_PDUMP is enabled.
Bugzilla ID: 222
Fixes: 086eb64db3 ("test/pdump: add unit test for pdump library")
CC: stable@dpdk.org
Signed-off-by: Reshma Pattan <reshma.pattan@intel.com>
+1
Checked when CONFIG_RTE_LIBRTE_PDUMP=n
with latest code from master, build completes succesfully
Reviewed-by: Rami Rosen <ramirose@gmail.com>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [dpdk-dev] [dpdk-stable] [PATCH] test: fix build when pdump config is disabled
2019-03-20 15:17 ` Rami Rosen
2019-03-20 15:17 ` Rami Rosen
@ 2019-03-27 0:08 ` Thomas Monjalon
2019-03-27 0:08 ` Thomas Monjalon
1 sibling, 1 reply; 6+ messages in thread
From: Thomas Monjalon @ 2019-03-27 0:08 UTC (permalink / raw)
To: Reshma Pattan; +Cc: stable, Rami Rosen, dev, Rosen, Rami, bruce.richardson
20/03/2019 16:17, Rami Rosen:
> pdump unit test has dependency on pthread code
> in test.c and process.h to run send_pkts(),
> this code should be enabled only when
> CONFIG_RTE_LIBRTE_PDUMP is enabled.
>
> Bugzilla ID: 222
>
> Fixes: 086eb64db3 ("test/pdump: add unit test for pdump library")
> CC: stable@dpdk.org
>
> Signed-off-by: Reshma Pattan <reshma.pattan@intel.com>
>
> +1
>
> Checked when CONFIG_RTE_LIBRTE_PDUMP=n
> with latest code from master, build completes succesfully
>
> Reviewed-by: Rami Rosen <ramirose@gmail.com>
Applied, thanks
Note that such #ifdef will be removed when the "make build system"
will be removed from DPDK (far target).
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [dpdk-dev] [dpdk-stable] [PATCH] test: fix build when pdump config is disabled
2019-03-27 0:08 ` [dpdk-dev] [dpdk-stable] " Thomas Monjalon
@ 2019-03-27 0:08 ` Thomas Monjalon
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Monjalon @ 2019-03-27 0:08 UTC (permalink / raw)
To: Reshma Pattan; +Cc: stable, Rami Rosen, dev, Rosen, Rami, bruce.richardson
20/03/2019 16:17, Rami Rosen:
> pdump unit test has dependency on pthread code
> in test.c and process.h to run send_pkts(),
> this code should be enabled only when
> CONFIG_RTE_LIBRTE_PDUMP is enabled.
>
> Bugzilla ID: 222
>
> Fixes: 086eb64db3 ("test/pdump: add unit test for pdump library")
> CC: stable@dpdk.org
>
> Signed-off-by: Reshma Pattan <reshma.pattan@intel.com>
>
> +1
>
> Checked when CONFIG_RTE_LIBRTE_PDUMP=n
> with latest code from master, build completes succesfully
>
> Reviewed-by: Rami Rosen <ramirose@gmail.com>
Applied, thanks
Note that such #ifdef will be removed when the "make build system"
will be removed from DPDK (far target).
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-03-27 0:09 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-20 11:33 [dpdk-dev] [PATCH] test: fix build when pdump config is disabled Reshma Pattan
2019-03-20 11:33 ` Reshma Pattan
2019-03-20 15:17 ` Rami Rosen
2019-03-20 15:17 ` Rami Rosen
2019-03-27 0:08 ` [dpdk-dev] [dpdk-stable] " Thomas Monjalon
2019-03-27 0:08 ` Thomas Monjalon
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).