[dpdk-dev,v2] example/performance-thread: lthread support C++

Message ID 1490149583-32371-1-git-send-email-slank.dev@gmail.com (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Hiroki SHIROKURA March 22, 2017, 2:26 a.m. UTC
  Lthread is awesome but it doesn't support C++.
So I write patch to support lthread to support C++.
Added "extern C {}" to lthread-headers

Signed-off-by: Hiroki SHIROKURA <slank.dev@gmail.com>
Acked-by: Keith Wiles <keith.wi...@intel.com>
---
 examples/performance-thread/common/arch/x86/ctx.h     | 8 ++++++++
 examples/performance-thread/common/lthread.h          | 8 ++++++++
 examples/performance-thread/common/lthread_api.h      | 8 ++++++++
 examples/performance-thread/common/lthread_cond.h     | 8 ++++++++
 examples/performance-thread/common/lthread_diag.h     | 9 +++++++++
 examples/performance-thread/common/lthread_diag_api.h | 8 ++++++++
 examples/performance-thread/common/lthread_int.h      | 8 ++++++++
 examples/performance-thread/common/lthread_mutex.h    | 8 ++++++++
 examples/performance-thread/common/lthread_objcache.h | 7 +++++++
 examples/performance-thread/common/lthread_pool.h     | 7 +++++++
 examples/performance-thread/common/lthread_queue.h    | 7 +++++++
 examples/performance-thread/common/lthread_sched.h    | 7 +++++++
 examples/performance-thread/common/lthread_timer.h    | 7 +++++++
 examples/performance-thread/common/lthread_tls.h      | 7 +++++++
 14 files changed, 107 insertions(+)

--
2.7.4
  

Comments

Thomas Monjalon April 21, 2017, 12:37 a.m. UTC | #1
22/03/2017 03:26, Hiroki SHIROKURA:
> Lthread is awesome but it doesn't support C++.
> So I write patch to support lthread to support C++.
> Added "extern C {}" to lthread-headers
> 
> Signed-off-by: Hiroki SHIROKURA <slank.dev@gmail.com>
> Acked-by: Keith Wiles <keith.wi...@intel.com>

Applied, thanks
  

Patch

diff --git a/examples/performance-thread/common/arch/x86/ctx.h b/examples/performance-thread/common/arch/x86/ctx.h
index 0386050..a41ce05 100644
--- a/examples/performance-thread/common/arch/x86/ctx.h
+++ b/examples/performance-thread/common/arch/x86/ctx.h
@@ -35,6 +35,10 @@ 
 #ifndef CTX_H
 #define CTX_H

+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * CPU context registers
  */
@@ -54,4 +58,8 @@  void
 ctx_switch(struct ctx *new_ctx, struct ctx *curr_ctx);


+#ifdef __cplusplus
+}
+#endif
+
 #endif /* RTE_CTX_H_ */
diff --git a/examples/performance-thread/common/lthread.h b/examples/performance-thread/common/lthread.h
index 8c77af8..5c2c1a5 100644
--- a/examples/performance-thread/common/lthread.h
+++ b/examples/performance-thread/common/lthread.h
@@ -62,6 +62,10 @@ 
 #ifndef LTHREAD_H_
 #define LTHREAD_H_

+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <rte_per_lcore.h>

 #include "lthread_api.h"
@@ -96,4 +100,8 @@  _lthread_init(struct lthread *lt,

 void _lthread_set_stack(struct lthread *lt, void *stack, size_t stack_size);

+#ifdef __cplusplus
+}
+#endif
+
 #endif				/* LTHREAD_H_ */
diff --git a/examples/performance-thread/common/lthread_api.h b/examples/performance-thread/common/lthread_api.h
index ec97610..ff245a0 100644
--- a/examples/performance-thread/common/lthread_api.h
+++ b/examples/performance-thread/common/lthread_api.h
@@ -124,6 +124,10 @@ 
 #ifndef LTHREAD_H
 #define LTHREAD_H

+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <stdint.h>
 #include <sys/socket.h>
 #include <fcntl.h>
@@ -829,4 +833,8 @@  int lthread_cond_signal(struct lthread_cond *c);
   */
 int lthread_cond_broadcast(struct lthread_cond *c);

+#ifdef __cplusplus
+}
+#endif
+
 #endif				/* LTHREAD_H */
diff --git a/examples/performance-thread/common/lthread_cond.h b/examples/performance-thread/common/lthread_cond.h
index 5bd02a7..5e5f14b 100644
--- a/examples/performance-thread/common/lthread_cond.h
+++ b/examples/performance-thread/common/lthread_cond.h
@@ -62,6 +62,10 @@ 
 #ifndef LTHREAD_COND_H_
 #define LTHREAD_COND_H_

+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "lthread_queue.h"

 #define MAX_COND_NAME_SIZE 64
@@ -74,4 +78,8 @@  struct lthread_cond {
 	uint64_t diag_ref;	/* optional ref to user diag data */
 } __rte_cache_aligned;

+#ifdef __cplusplus
+}
+#endif
+
 #endif				/* LTHREAD_COND_H_ */
diff --git a/examples/performance-thread/common/lthread_diag.h b/examples/performance-thread/common/lthread_diag.h
index 2877d31..3dce8e0 100644
--- a/examples/performance-thread/common/lthread_diag.h
+++ b/examples/performance-thread/common/lthread_diag.h
@@ -34,6 +34,10 @@ 
 #ifndef LTHREAD_DIAG_H_
 #define LTHREAD_DIAG_H_

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

@@ -129,4 +133,9 @@  extern uint64_t diag_mask;
 #define DIAG_USED __rte_unused

 #endif				/* LTHREAD_DIAG */
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif				/* LTHREAD_DIAG_H_ */
diff --git a/examples/performance-thread/common/lthread_diag_api.h b/examples/performance-thread/common/lthread_diag_api.h
index 7ee514f..2fda095 100644
--- a/examples/performance-thread/common/lthread_diag_api.h
+++ b/examples/performance-thread/common/lthread_diag_api.h
@@ -33,6 +33,10 @@ 
 #ifndef LTHREAD_DIAG_API_H_
 #define LTHREAD_DIAG_API_H_

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

@@ -322,4 +326,8 @@  lthread_cond_diag_ref(struct lthread_cond *c);
 uint64_t
 lthread_mutex_diag_ref(struct lthread_mutex *m);

+#ifdef __cplusplus
+}
+#endif
+
 #endif				/* LTHREAD_DIAG_API_H_ */
diff --git a/examples/performance-thread/common/lthread_int.h b/examples/performance-thread/common/lthread_int.h
index 031d8af..3f7fb92 100644
--- a/examples/performance-thread/common/lthread_int.h
+++ b/examples/performance-thread/common/lthread_int.h
@@ -62,6 +62,10 @@ 
 #include <lthread_api.h>
 #define LTHREAD_INT_H

+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <stdint.h>
 #include <sys/time.h>
 #include <sys/types.h>
@@ -197,4 +201,8 @@  struct lthread {
 	uint64_t diag_ref;			/* ref to user diag data */
 } __rte_cache_aligned;

+#ifdef __cplusplus
+}
+#endif
+
 #endif				/* LTHREAD_INT_H */
diff --git a/examples/performance-thread/common/lthread_mutex.h b/examples/performance-thread/common/lthread_mutex.h
index 4d30b2e..e78db91 100644
--- a/examples/performance-thread/common/lthread_mutex.h
+++ b/examples/performance-thread/common/lthread_mutex.h
@@ -35,6 +35,10 @@ 
 #ifndef LTHREAD_MUTEX_H_
 #define LTHREAD_MUTEX_H_

+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "lthread_queue.h"


@@ -49,4 +53,8 @@  struct lthread_mutex {
 	uint64_t		diag_ref; /* optional ref to user diag data */
 } __rte_cache_aligned;

+#ifdef __cplusplus
+}
+#endif
+
 #endif /* LTHREAD_MUTEX_H_ */
diff --git a/examples/performance-thread/common/lthread_objcache.h b/examples/performance-thread/common/lthread_objcache.h
index d7e3582..6e5195b 100644
--- a/examples/performance-thread/common/lthread_objcache.h
+++ b/examples/performance-thread/common/lthread_objcache.h
@@ -33,6 +33,10 @@ 
 #ifndef LTHREAD_OBJCACHE_H_
 #define LTHREAD_OBJCACHE_H_

+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <string.h>

 #include <rte_per_lcore.h>
@@ -154,5 +158,8 @@  _lthread_objcache_free(struct lthread_objcache *c, void *obj)
 }


+#ifdef __cplusplus
+}
+#endif

 #endif				/* LTHREAD_OBJCACHE_H_ */
diff --git a/examples/performance-thread/common/lthread_pool.h b/examples/performance-thread/common/lthread_pool.h
index 27680ea..fb0c578 100644
--- a/examples/performance-thread/common/lthread_pool.h
+++ b/examples/performance-thread/common/lthread_pool.h
@@ -69,6 +69,10 @@ 
 #ifndef LTHREAD_POOL_H_
 #define LTHREAD_POOL_H_

+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <rte_malloc.h>
 #include <rte_per_lcore.h>
 #include <rte_log.h>
@@ -328,5 +332,8 @@  _qnode_pool_destroy(struct qnode_pool *p)
 	return 0;
 }

+#ifdef __cplusplus
+}
+#endif

 #endif				/* LTHREAD_POOL_H_ */
diff --git a/examples/performance-thread/common/lthread_queue.h b/examples/performance-thread/common/lthread_queue.h
index 2c55fce..4fc2074 100644
--- a/examples/performance-thread/common/lthread_queue.h
+++ b/examples/performance-thread/common/lthread_queue.h
@@ -69,6 +69,10 @@ 
 #ifndef LTHREAD_QUEUE_H_
 #define LTHREAD_QUEUE_H_

+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <string.h>

 #include <rte_prefetch.h>
@@ -298,5 +302,8 @@  _lthread_queue_remove(struct lthread_queue *q)
 	return NULL;
 }

+#ifdef __cplusplus
+}
+#endif

 #endif				/* LTHREAD_QUEUE_H_ */
diff --git a/examples/performance-thread/common/lthread_sched.h b/examples/performance-thread/common/lthread_sched.h
index 4ce56c2..7cddda9 100644
--- a/examples/performance-thread/common/lthread_sched.h
+++ b/examples/performance-thread/common/lthread_sched.h
@@ -62,6 +62,10 @@ 
 #ifndef LTHREAD_SCHED_H_
 #define LTHREAD_SCHED_H_

+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "lthread_int.h"
 #include "lthread_queue.h"
 #include "lthread_objcache.h"
@@ -148,5 +152,8 @@  extern struct lthread_sched *schedcore[];
 void _sched_timer_cb(struct rte_timer *tim, void *arg);
 void _sched_shutdown(__rte_unused void *arg);

+#ifdef __cplusplus
+}
+#endif

 #endif				/* LTHREAD_SCHED_H_ */
diff --git a/examples/performance-thread/common/lthread_timer.h b/examples/performance-thread/common/lthread_timer.h
index b5e6fb0..b044b90 100644
--- a/examples/performance-thread/common/lthread_timer.h
+++ b/examples/performance-thread/common/lthread_timer.h
@@ -35,6 +35,10 @@ 
 #ifndef LTHREAD_TIMER_H_
 #define LTHREAD_TIMER_H_

+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "lthread_int.h"
 #include "lthread_sched.h"

@@ -75,5 +79,8 @@  _timer_stop(struct lthread *lt)
 	}
 }

+#ifdef __cplusplus
+}
+#endif

 #endif /* LTHREAD_TIMER_H_ */
diff --git a/examples/performance-thread/common/lthread_tls.h b/examples/performance-thread/common/lthread_tls.h
index 86cbfad..fff3c0d 100644
--- a/examples/performance-thread/common/lthread_tls.h
+++ b/examples/performance-thread/common/lthread_tls.h
@@ -34,6 +34,10 @@ 
 #ifndef LTHREAD_TLS_H_
 #define LTHREAD_TLS_H_

+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "lthread_api.h"

 #define RTE_PER_LTHREAD_SECTION_SIZE \
@@ -53,5 +57,8 @@  void _lthread_tls_destroy(struct lthread *lt);
 void _lthread_key_pool_init(void);
 void _lthread_tls_alloc(struct lthread *lt);

+#ifdef __cplusplus
+}
+#endif

 #endif				/* LTHREAD_TLS_H_ */