Bugs in newest patches

Bugs in newest patches

[Keunhong Lee]

Hi.
I just pulled new patches from the master branch, and found that it doesn't
work with C++.

in  lib/librte_eal/common/include/generic/rte_cycles.h
missing opening extern "C" in
commit fa4001c30ee9d9ecfb3ca5d93d68ef0394e9950a

here is the fix.

-----

  * Simple Time Reference Functions (Cycles and HPET).
  */

+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <stdint.h>
 #include <rte_debug.h>
 #include <rte_atomic.h>

----

Keunhong.

Re: Bugs in newest patches

[Thomas Monjalon]

Hi,

2014-11-07 05:21, Keunhong Lee:
> I just pulled new patches from the master branch, and found that it doesn't
> work with C++.
> 
> in  lib/librte_eal/common/include/generic/rte_cycles.h
> +#ifdef __cplusplus
> +extern "C" {
> +#endif

It's already included in lib/librte_eal/common/include/arch/x86/rte_cycles.h
which includes lib/librte_eal/common/include/generic/rte_cycles.h.

You shouldn't include the generic header directly.

-- 
Thomas

Re: Bugs in newest patches

[Keunhong Lee]

I did not included the generic header directly.
I thought that this nested "extern C" is intended,
however, according to your reply, this might be removed at all.

There is a remaining
"""
#ifdef _cplusplus
}
#endif
"""
at the end of "generic/rte_cycles.h".
I think this should be removed. This causes compile error on C++.

Keunhong.


2014-11-07 6:05 GMT+09:00 Thomas Monjalon <thomas.monjalon-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>:

> Hi,
>
> 2014-11-07 05:21, Keunhong Lee:
> > I just pulled new patches from the master branch, and found that it
> doesn't
> > work with C++.
> >
> > in  lib/librte_eal/common/include/generic/rte_cycles.h
> > +#ifdef __cplusplus
> > +extern "C" {
> > +#endif
>
> It's already included in
> lib/librte_eal/common/include/arch/x86/rte_cycles.h
> which includes lib/librte_eal/common/include/generic/rte_cycles.h.
>
> You shouldn't include the generic header directly.
>
> --
> Thomas
>

Re: Bugs in newest patches

[David Marchand]

Hello,

On Fri, Nov 7, 2014 at 2:26 AM, Keunhong Lee <dlrmsghd-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:

> I did not included the generic header directly.
> I thought that this nested "extern C" is intended,
> however, according to your reply, this might be removed at all.
>
> There is a remaining
> """
> #ifdef _cplusplus
> }
> #endif
> """
> at the end of "generic/rte_cycles.h".
> I think this should be removed. This causes compile error on C++.
>

Argh, good catch.
I will send a fix (it looks to be the only one remaining).


-- 
David Marchand

[PATCH] eal: fix C++ compilation issue after headers rework

[David Marchand]

Following the big headers rework, all C++ stuff has moved to arch-specific
headers. The generic headers should not contain this so that this is done only
once.
There was a remaining #ifdef __cplusplus in "eal: split CPU cycle operation to
architecture specific" (fa4001c30ee9).

Reported-by: Keunhong Lee <dlrmsghd-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Signed-off-by: David Marchand <david.marchand-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
---
 lib/librte_eal/common/include/generic/rte_cycles.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/librte_eal/common/include/generic/rte_cycles.h b/lib/librte_eal/common/include/generic/rte_cycles.h
index c42b90b..7700f41 100644
--- a/lib/librte_eal/common/include/generic/rte_cycles.h
+++ b/lib/librte_eal/common/include/generic/rte_cycles.h
@@ -202,8 +202,4 @@ rte_delay_ms(unsigned ms)
 	rte_delay_us(ms * 1000);
 }
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _RTE_CYCLES_H_ */
-- 
2.1.1

Re: [PATCH] eal: fix C++ compilation issue after headers rework

[Thomas Monjalon]

> Following the big headers rework, all C++ stuff has moved to arch-specific
> headers. The generic headers should not contain this so that this is done only
> once.
> There was a remaining #ifdef __cplusplus in "eal: split CPU cycle operation to
> architecture specific" (fa4001c30ee9).
> 
> Reported-by: Keunhong Lee <dlrmsghd-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Signed-off-by: David Marchand <david.marchand-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>

Acked-by: Thomas Monjalon <thomas.monjalon-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>

Applied

Thanks
-- 
Thomas