Skip to contentSkip to conversation

Fix: make 'hello.cxx' compile with g++

PATCH Mathieu Desnoyers 2 participants 3 messages Apr 21, 2013 3 messages not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

Hi,

Thanks for submitting this patch. Here are a couple of comments to improve it.

Quoted 1 line · * Zifei Tong ([email protected]) wrote:

Fixes #338

Are those changes also compatible with the LLVM c++ compiler ?

By the way, we should add a "-Wc++-compat" when compiling those headers under C, so we quickly spot the changes that are not compatible across both C and C++.

Quoted 19 lines
---
 include/lttng/ringbuffer-config.h    |  5 +++++
 include/lttng/tracepoint-event.h     | 12 ++++++------
 include/lttng/ust-events.h           |  8 ++++----
 include/lttng/ust-tracepoint-event.h | 19 ++++++++++---------
 tests/hello.cxx/Makefile.am          |  2 +-
 tests/hello.cxx/tp.c                 | 26 --------------------------
 tests/hello.cxx/tp.cpp               | 26 ++++++++++++++++++++++++++
 7 files changed, 52 insertions(+), 46 deletions(-)
 delete mode 100644 tests/hello.cxx/tp.c
 create mode 100644 tests/hello.cxx/tp.cpp
include/lttng/ringbuffer-config.h +0 -0
index ca52fc7..bb01eab 100644

include/lttng/ringbuffer-config.h int lib_ring_buffer_check_config(const struct lttng_ust_lib_ring_buffer_config * · line 356

Quoted 10 lines
include/lttng/ringbuffer-config.h +5 -0
@@ -347,8 +347,13 @@ int lib_ring_buffer_check_config(const struct lttng_ust_lib_ring_buffer_config *
 			     unsigned int switch_timer_interval,
 			     unsigned int read_timer_interval)
 {
+	#ifdef __cplusplus
+	if (config->alloc == lttng_ust_lib_ring_buffer_config::RING_BUFFER_ALLOC_GLOBAL
+	    && config->sync == lttng_ust_lib_ring_buffer_config::RING_BUFFER_SYNC_PER_CPU
+	#else
 	if (config->alloc == RING_BUFFER_ALLOC_GLOBAL
 	    && config->sync == RING_BUFFER_SYNC_PER_CPU
+	#endif

inlined precompiler directives like this make the function hard to follow (mix of #if/#else/#endif and if/else).

We should find a better way to encapsulate this change.

Why is this lttng_ust_lib_ring_buffer_config:: scoping needed in c++ ?

Quoted 63 lines
include/lttng/ringbuffer-config.h +0 -0
 	    && switch_timer_interval)
 		return -EINVAL;
 	return 0;
include/lttng/tracepoint-event.h +6 -6
index 077eaa0..4630788 100644
@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
+#ifdef TRACEPOINT_CREATE_PROBES
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifdef TRACEPOINT_CREATE_PROBES
-
 #define __tp_stringify1(x)	#x
 #define __tp_stringify(x)	__tp_stringify1(x)
 
@@ -65,10 +65,10 @@ extern "C" {
 #undef TRACEPOINT_INCLUDE_FILE
 #undef TRACEPOINT_INCLUDE
 
-#define TRACEPOINT_CREATE_PROBES
-
-#endif /* TRACEPOINT_CREATE_PROBES */
-
 #ifdef __cplusplus
 }
 #endif
+
+#define TRACEPOINT_CREATE_PROBES
+
+#endif /* TRACEPOINT_CREATE_PROBES */
include/lttng/ust-events.h +2 -2
index 749478a..4ef918b 100644
@@ -90,7 +90,7 @@ struct lttng_enum_entry {
 #define __type_integer(_type, _byte_order, _base, _encoding)	\
 	{							\
 	    .atype = atype_integer,				\
-	    .u.basic.integer =					\
+	    .u = {.basic = {.integer =				\
 		{						\
 		  .size = sizeof(_type) * CHAR_BIT,		\
 		  .alignment = lttng_alignof(_type) * CHAR_BIT,	\
@@ -98,7 +98,7 @@ struct lttng_enum_entry {
 		  .reverse_byte_order = _byte_order != BYTE_ORDER,	\
 		  .base = _base,				\
 		  .encoding = lttng_encode_##_encoding,		\
-		},						\
+		}}},						\
 	}							\
 
 #define LTTNG_UST_INTEGER_TYPE_PADDING	24
@@ -124,14 +124,14 @@ struct lttng_integer_type {
 #define __type_float(_type)					\
 	{							\
 	    .atype = atype_float,				\

include/lttng/ust-events.h struct lttng_integer_type { · line 134

Quoted 10 lines
include/lttng/ust-events.h +2 -2
-	    .u.basic._float =					\
+	    .u = {.basic = {._float =				\
 		{						\
 		  .exp_dig = sizeof(_type) * CHAR_BIT		\
 				- _float_mant_dig(_type),	\
 		  .mant_dig = _float_mant_dig(_type),		\
 		  .alignment = lttng_alignof(_type) * CHAR_BIT,	\
 		  .reverse_byte_order = BYTE_ORDER != FLOAT_WORD_ORDER, \
-		},						\
+		}}},						\

changes to this file (above) do not respect coding style.

Missing spaces before ".", missing newlines and indendation for added { }.

Quoted 38 lines
include/lttng/ust-events.h +0 -0
 	}							\
 
 #define LTTNG_UST_FLOAT_TYPE_PADDING	24
include/lttng/ust-tracepoint-event.h +5 -5
index e46cc1a..f8df87c 100644
@@ -147,12 +147,12 @@ static const char							\
 	  .type =						\
 		{						\
 		  .atype = atype_array,				\
-		  .u.array =					\
+		  .u = {.array =				\
 			{					\
-			    .length = _length,			\
 			    .elem_type = __type_integer(_type, BYTE_ORDER, 10, _encoding), \
+			    .length = _length,			\
 			},					\
-		},						\
+		}},						\
 	  .nowrite = _nowrite,					\
 	},
 
@@ -164,11 +164,11 @@ static const char							\
 	  .type =						\
 		{						\
 		  .atype = atype_sequence,			\
-		  .u.sequence =					\
+		  .u = {.sequence =				\
 			{					\
 			    .length_type = __type_integer(_length_type, BYTE_ORDER, 10, none), \
 			    .elem_type = __type_integer(_type, BYTE_ORDER, 10, _encoding), \
-			},					\
+			}},					\
 		},						\
 	  .nowrite = _nowrite,					\
 	},

include/lttng/ust-tracepoint-event.h static const char \ · line 185

Quoted 7 lines
include/lttng/ust-tracepoint-event.h +1 -1
@@ -180,7 +180,7 @@ static const char							\
 	  .type =						\
 		{						\
 		  .atype = atype_string,			\
-		  .u.basic.string.encoding = lttng_encode_UTF8,	\
+		  .u = {.basic = {.string = {.encoding = lttng_encode_UTF8}}},	\
 		},						\
 	  .nowrite = _nowrite,					\

same above about coding style.

include/lttng/ust-tracepoint-event.h void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args)); \ · line 486

Quoted 7 lines
include/lttng/ust-tracepoint-event.h +1 -1
 	},
@@ -483,7 +483,7 @@ void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args));      \
 static									      \
 void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args))	      \
 {									      \
-	struct lttng_event *__event = __tp_data;			      \
+	struct lttng_event *__event = (struct lttng_event*) __tp_data;			      \

coding style: space before *

include/lttng/ust-tracepoint-event.h static const char * \ · line 617

Quoted 11 lines
include/lttng/ust-tracepoint-event.h +1 -1
 	struct lttng_channel *__chan = __event->chan;			      \
 	struct lttng_ust_lib_ring_buffer_ctx __ctx;			      \
 	size_t __event_len, __event_align;				      \
@@ -612,13 +612,14 @@ static const char *							       \
 	__ref_model_emf_uri___##_provider##___##_name			       \
 	__attribute__((weakref ("_model_emf_uri___" #_provider "___" #_name)));\
 const struct lttng_event_desc __event_desc___##_provider##_##_name = {	       \
-	.fields = __event_fields___##_provider##___##_template,		       \
 	.name = #_provider ":" #_name,					       \
 	.probe_callback = (void (*)(void)) &__event_probe__##_provider##___##_template,\
+	.ctx = NULL,							       \

So each field need to be listed ? We usually don't put NULL initialization for structures that are always in zero-initialized memory. (coding style)

include/lttng/ust-tracepoint-event.h static const char * \ · line 622

Quoted 6 lines
include/lttng/ust-tracepoint-event.h +2 -1
+	.fields = __event_fields___##_provider##___##_template,		       \
 	.nr_fields = _TP_ARRAY_SIZE(__event_fields___##_provider##___##_template), \
 	.loglevel = &__ref_loglevel___##_provider##___##_name,		       \
 	.signature = __tp_event_signature___##_provider##___##_template,       \
-	.u.ext.model_emf_uri = &__ref_model_emf_uri___##_provider##___##_name, \
+	.u = {.ext = {.model_emf_uri = &__ref_model_emf_uri___##_provider##___##_name}},\

coding style (missing spaces).

Thanks,

Mathieu

Quoted 83 lines
include/lttng/ust-tracepoint-event.h +0 -0
 };
 
 #include TRACEPOINT_INCLUDE
tests/hello.cxx/Makefile.am +1 -1
index 897416d..5f6c615 100644
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -Wsystem-headers
 
 noinst_PROGRAMS = hello
-hello_SOURCES = hello.cpp tp.c ust_tests_hello.h
+hello_SOURCES = hello.cpp tp.cpp ust_tests_hello.h
 hello_LDADD = $(top_builddir)/liblttng-ust/liblttng-ust.la
 
 if LTTNG_UST_BUILD_WITH_LIBDL
tests/hello.cxx/tp.c deleted +0 -26
deleted file mode 100644
index 4790965..0000000
@@ -1,26 +0,0 @@
-/*
- * tp.c
- *
- * Copyright (c) 2011 Mathieu Desnoyers <[email protected]>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#define TRACEPOINT_CREATE_PROBES
-#include "ust_tests_hello.h"
tests/hello.cxx/tp.cpp new file +26 -0
new file mode 100644
index 0000000..a2099ab
@@ -0,0 +1,26 @@
+/*
+ * tp.cpp
+ *
+ * Copyright (c) 2011 Mathieu Desnoyers <[email protected]>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#define TRACEPOINT_CREATE_PROBES
+#include "ust_tests_hello.h"
Signature · 1 line
1.8.2.1
Signature · 3 lines
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com

A message that is not in the archive (sent off-list or not yet received): 20130421133753.GA26620@Krystal

#3 lore raw

Hi,

Thanks for your review.

Quoted 1 line

Why is this lttng_ust_lib_ring_buffer_config:: scoping needed in c++ ?

C++ will hide enumeration defined inside class/struct.

Quote from http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3242.pdf,
page 158:

Quoted 1 line

An enumerator declared in class scope can be referred to using the class

member access

Quoted 9 lines

operators (::, . (dot) and -> (arrow)) [Example:

struct X {
    enum direction { left=’l’, right=’r’ };
};
void g(X* p) {
    int i;
    i = p->f(left); // error: left not in scope
    i = p->f(X::right); // OK
}
Quoted 5 lines

— end example ]

inlined precompiler directives like this make the function hard to follow (mix of #if/#else/#endif and if/else).

I agree inlined precompiler directives is bad style. Could you suggest a way to remove the mix of #if/#else/#endif and if/else?

Quoted 3 lines

So each field need to be listed ? We usually don't put NULL initialization for structures that are always in zero-initialized memory. (coding style)

This is related to a known issue of g++:
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=55606 (Bug 55606 - sorry,
unimplemented: non-trivial designated initializers not supported).

g++'s 'trivial designated initializers' means no out-of-order initialization, no missing
initialization (except the fields on the tail of a struct), and nested initialization should be done in the form {.foo = {.bar = 1}} instead of {.foo.bar = 1}. That's why I made such modification.

Quoted 1 line

Are those changes also compatible with the LLVM c++ compiler ?

Actually, clang++ have designated initializers better supported than g++. All the modification about designated initializers are not required for clang++. No need to add NULL initialization, reorder initializations or change {.foo.bar = 1} into {.foo = {.bar = 1}}. These (ugly) hacks are just to make g++ happy.

Cleaned-up patch attached.

Thanks.

From 36930fdfa25a6ea67de551300263dee353df43e5 Mon Sep 17 00:00:00 2001
From: Zifei Tong <[email protected]>
Date: Sat, 20 Apr 2013 19:38:39 +0800
Subject: [PATCH lttng-ust] Fix: make 'hello.cxx' compile with g++

Fixes #338

---
 include/lttng/ringbuffer-config.h    |  5 +++++
 include/lttng/tracepoint-event.h     | 12 +++++------
 include/lttng/ust-events.h           | 42
+++++++++++++++++++++++-------------
 include/lttng/ust-tracepoint-event.h | 32 +++++++++++++++++----------
 tests/hello.cxx/Makefile.am          |  2 +-
 tests/hello.cxx/tp.c                 | 26 ----------------------
 tests/hello.cxx/tp.cpp               | 26 ++++++++++++++++++++++
 7 files changed, 86 insertions(+), 59 deletions(-)
 delete mode 100644 tests/hello.cxx/tp.c
 create mode 100644 tests/hello.cxx/tp.cpp
(quoted diff) +0 -0

b/include/lttng/ringbuffer-config.h
index ca52fc7..bb01eab 100644

include/lttng/ringbuffer-config.h +0 -0
@@ -347,8 +347,13 @@ int lib_ring_buffer_check_config(const struct

lttng_ust_lib_ring_buffer_config *
unsigned int switch_timer_interval, unsigned int read_timer_interval)
{
+ #ifdef __cplusplus
+ if (config->alloc == lttng_ust_lib_ring_buffer_config::RING_BUFFER_ALLOC_GLOBAL
+ && config->sync ==
lttng_ust_lib_ring_buffer_config::RING_BUFFER_SYNC_PER_CPU
+ #else
if (config->alloc == RING_BUFFER_ALLOC_GLOBAL

     && config->sync == RING_BUFFER_SYNC_PER_CPU
+ #endif
     && switch_timer_interval)

return -EINVAL;
return 0;

(quoted diff) +0 -0

b/include/lttng/tracepoint-event.h
index 077eaa0..4630788 100644

include/lttng/tracepoint-event.h +6 -6
@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
+#ifdef TRACEPOINT_CREATE_PROBES
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifdef TRACEPOINT_CREATE_PROBES
-
 #define __tp_stringify1(x) #x
 #define __tp_stringify(x) __tp_stringify1(x)
 
@@ -65,10 +65,10 @@ extern "C" {
 #undef TRACEPOINT_INCLUDE_FILE
 #undef TRACEPOINT_INCLUDE
 
-#define TRACEPOINT_CREATE_PROBES
-
-#endif /* TRACEPOINT_CREATE_PROBES */
-
 #ifdef __cplusplus
 }
 #endif
+
+#define TRACEPOINT_CREATE_PROBES
+
+#endif /* TRACEPOINT_CREATE_PROBES */
include/lttng/ust-events.h +27 -15

56 lines not on this page · raw message

(quoted diff) +0 -0

b/include/lttng/ust-tracepoint-event.h
index e46cc1a..3aa946d 100644

include/lttng/ust-tracepoint-event.h +17 -8
@@ -147,11 +147,14 @@ static const char \
   .type = \
  { \
   .atype = atype_array, \
-  .u.array = \
+  .u = \
  { \
-    .length = _length, \
-    .elem_type = __type_integer(_type, BYTE_ORDER, 10, _encoding), \
- }, \
+  .array = \
+ { \
+  .elem_type = __type_integer(_type, BYTE_ORDER, 10, _encoding), \
+  .length = _length, \
+ } \
+ } \
  }, \
   .nowrite = _nowrite, \
  },
@@ -164,10 +167,13 @@ static const char \
   .type = \
  { \
   .atype = atype_sequence, \
-  .u.sequence = \
+  .u = \
  { \
-    .length_type = __type_integer(_length_type, BYTE_ORDER, 10, none), \
-    .elem_type = __type_integer(_type, BYTE_ORDER, 10, _encoding), \
+  .sequence =
+ { \
+  .length_type = __type_integer(_length_type, BYTE_ORDER, 10, none), \
+  .elem_type = __type_integer(_type, BYTE_ORDER, 10, _encoding), \
+ }, \
  }, \
  }, \
   .nowrite = _nowrite, \
@@ -180,7 +186,10 @@ static const char \
   .type = \
  { \
   .atype = atype_string, \
-  .u.basic.string.encoding = lttng_encode_UTF8, \
+  .u =
+ {
+  .basic = { .string = { .encoding = lttng_encode_UTF8 } } \
+ }, \
  }, \
   .nowrite = _nowrite, \
  },
@@ -483,7 +492,7 @@ void

__event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args)); \
static \
void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args))
\
{ \
- struct lttng_event *__event = __tp_data; \
+ struct lttng_event *__event = (struct lttng_event *) __tp_data; \
struct lttng_channel *__chan = __event->chan; \
struct lttng_ust_lib_ring_buffer_ctx __ctx; \
size_t __event_len, __event_align; \
@@ -612,13 +621,14 @@ static const char * \
__ref_model_emf_uri___##_provider##___##_name \
__attribute__((weakref ("_model_emf_uri___" #_provider "___" #_name)));\
const struct lttng_event_desc __event_desc___##_provider##_##_name = {
\
- .fields = __event_fields___##_provider##___##_template, \
.name = #_provider ":" #_name, \
.probe_callback = (void (*)(void))
&__event_probe__##_provider##___##_template,\
+ .ctx = NULL, \
+ .fields = __event_fields___##_provider##___##_template, \
.nr_fields =
_TP_ARRAY_SIZE(__event_fields___##_provider##___##_template), \
.loglevel = &__ref_loglevel___##_provider##___##_name, \
.signature = __tp_event_signature___##_provider##___##_template, \
- .u.ext.model_emf_uri = &__ref_model_emf_uri___##_provider##___##_name, \
+ .u = { .ext = { .model_emf_uri = &__ref_model_emf_uri___##_provider##___##_name } }, \
};

#include TRACEPOINT_INCLUDE

tests/hello.cxx/Makefile.am +1 -2
index 897416d..5f6c615 100644
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
-Wsystem-headers
 
 noinst_PROGRAMS = hello
-hello_SOURCES = hello.cpp tp.c ust_tests_hello.h
+hello_SOURCES = hello.cpp tp.cpp ust_tests_hello.h
 hello_LDADD = $(top_builddir)/liblttng-ust/liblttng-ust.la
 

if LTTNG_UST_BUILD_WITH_LIBDL

tests/hello.cxx/tp.c deleted +0 -6
deleted file mode 100644
index 4790965..0000000
@@ -1,26 +0,0 @@
-/*
- * tp.c
- *
- * Copyright (c) 2011 Mathieu Desnoyers <[email protected]>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a

copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#define TRACEPOINT_CREATE_PROBES
-#include "ust_tests_hello.h"

tests/hello.cxx/tp.cpp new file +6 -0
new file mode 100644
index 0000000..a2099ab
@@ -0,0 +1,26 @@
+/*
+ * tp.cpp
+ *
+ * Copyright (c) 2011 Mathieu Desnoyers <[email protected]>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a

copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#define TRACEPOINT_CREATE_PROBES
+#include "ust_tests_hello.h"

Signature · 8 lines
1.8.2.1

--
Best Regards,
仝子飞 (Zifei Tong)
College of Computer Science and Technology, Zhejiang University

[email protected] / [email protected]

_______________________________________________
lttng-dev mailing list
[email protected]
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

A message that is not in the archive (sent off-list or not yet received): CAJ7wx-GTRKhaZi-BryAF_mLxDoDY7xwChStmLKNxoUrOizVJLg@mail.gmail.com

#5 lore raw
Quoted 24 lines · * Zifei Tong ([email protected]) wrote:

Hi,

Thanks for your review.

Quoted 1 line

Why is this lttng_ust_lib_ring_buffer_config:: scoping needed in c++ ?

C++ will hide enumeration defined inside class/struct.

Quote from http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3242.pdf,
page 158:

Quoted 1 line

An enumerator declared in class scope can be referred to using the class

member access

Quoted 10 lines

operators (::, . (dot) and -> (arrow)) [Example:

struct X {
    enum direction { left=’l’, right=’r’ };
};
void g(X* p) {
    int i;
    i = p->f(left); // error: left not in scope
    i = p->f(X::right); // OK
}

— end example ]

Quoted 5 lines
Quoted 2 lines

inlined precompiler directives like this make the function hard to follow (mix of #if/#else/#endif and if/else).

I agree inlined precompiler directives is bad style. Could you suggest a way to remove the mix of #if/#else/#endif and if/else?

Maybe we could simply left the numeration outside of the structure declaration ? This would make its scope global in both c and c++. Please try making this change, and make sure you keep this documentation on the reasons why we need to do this change in the patch changelog. It will be useful for future reference.

Quoted 9 lines
Quoted 4 lines

So each field need to be listed ? We usually don't put NULL initialization for structures that are always in zero-initialized memory. (coding style)

This is related to a known issue of g++:
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=55606 (Bug 55606 - sorry,
unimplemented: non-trivial designated initializers not supported).

Quoted 5 lines

g++'s 'trivial designated initializers' means no out-of-order initialization, no missing
initialization (except the fields on the tail of a struct), and nested initialization should be done in the form {.foo = {.bar = 1}} instead of {.foo.bar = 1}. That's why I made such modification.

OK, this justifies the style to coding style. Please document in the patch changelog.

Quoted 7 lines
Quoted 2 lines

Are those changes also compatible with the LLVM c++ compiler ?

Actually, clang++ have designated initializers better supported than g++. All the modification about designated initializers are not required for clang++. No need to add NULL initialization, reorder initializations or change {.foo.bar = 1} into {.foo = {.bar = 1}}. These (ugly) hacks are just to make g++ happy.

ok, good to know.

Quoted 2 lines

Cleaned-up patch attached.

More comments below,

Quoted 67 lines

Thanks.

From 36930fdfa25a6ea67de551300263dee353df43e5 Mon Sep 17 00:00:00 2001
From: Zifei Tong <[email protected]>
Date: Sat, 20 Apr 2013 19:38:39 +0800
Subject: [PATCH lttng-ust] Fix: make 'hello.cxx' compile with g++

Fixes #338

---
 include/lttng/ringbuffer-config.h    |  5 +++++
 include/lttng/tracepoint-event.h     | 12 +++++------
 include/lttng/ust-events.h           | 42
+++++++++++++++++++++++-------------
 include/lttng/ust-tracepoint-event.h | 32 +++++++++++++++++----------
 tests/hello.cxx/Makefile.am          |  2 +-
 tests/hello.cxx/tp.c                 | 26 ----------------------
 tests/hello.cxx/tp.cpp               | 26 ++++++++++++++++++++++
 7 files changed, 86 insertions(+), 59 deletions(-)
 delete mode 100644 tests/hello.cxx/tp.c
 create mode 100644 tests/hello.cxx/tp.cpp
include/lttng/ringbuffer-config.h +0 -0
index ca52fc7..bb01eab 100644
@@ -347,8 +347,13 @@ int lib_ring_buffer_check_config(const struct

lttng_ust_lib_ring_buffer_config *
unsigned int switch_timer_interval, unsigned int read_timer_interval)
{
+ #ifdef __cplusplus
+ if (config->alloc == lttng_ust_lib_ring_buffer_config::RING_BUFFER_ALLOC_GLOBAL
+ && config->sync ==
lttng_ust_lib_ring_buffer_config::RING_BUFFER_SYNC_PER_CPU
+ #else
if (config->alloc == RING_BUFFER_ALLOC_GLOBAL

     && config->sync == RING_BUFFER_SYNC_PER_CPU
+ #endif
     && switch_timer_interval)

return -EINVAL;
return 0;

include/lttng/tracepoint-event.h +2 -2
index 077eaa0..4630788 100644
@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
+#ifdef TRACEPOINT_CREATE_PROBES
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifdef TRACEPOINT_CREATE_PROBES
-
 #define __tp_stringify1(x) #x
 #define __tp_stringify(x) __tp_stringify1(x)
 

include/lttng/tracepoint-event.h extern "C" { · line 70

Quoted 6 lines
include/lttng/tracepoint-event.h +0 -3
@@ -65,10 +65,10 @@ extern "C" {
 #undef TRACEPOINT_INCLUDE_FILE
 #undef TRACEPOINT_INCLUDE
 
-#define TRACEPOINT_CREATE_PROBES
-
-#endif /* TRACEPOINT_CREATE_PROBES */

Hrm, I don't get what this is supposed to fix ?

Normall

Quoted 21 lines
include/lttng/tracepoint-event.h +4 -1
-
 #ifdef __cplusplus
 }
 #endif
+
+#define TRACEPOINT_CREATE_PROBES
+
+#endif /* TRACEPOINT_CREATE_PROBES */
include/lttng/ust-events.h +2 -2
index 749478a..e97cc1b 100644
@@ -89,15 +89,21 @@ struct lttng_enum_entry {
 
 #define __type_integer(_type, _byte_order, _base, _encoding) \
  { \
-    .atype = atype_integer, \
-    .u.basic.integer = \
+  .atype = atype_integer, \
+  .u = \
  { \

include/lttng/ust-events.h struct lttng_enum_entry { · line 98

Quoted 10 lines
include/lttng/ust-events.h +4 -6
-  .size = sizeof(_type) * CHAR_BIT, \
-  .alignment = lttng_alignof(_type) * CHAR_BIT, \
-  .signedness = lttng_is_signed_type(_type), \
-  .reverse_byte_order = _byte_order != BYTE_ORDER, \
-  .base = _base, \
-  .encoding = lttng_encode_##_encoding, \
+  .basic = \
+ { \
+  .integer = \
+ { \

Please ensure that each nested "{" has its own indent level.

I also think your mail client turned tabs into spaces.

Thanks,

Mathieu

Quoted 229 lines
include/lttng/ust-events.h +21 -7
+  .size = sizeof(_type) * CHAR_BIT, \
+  .alignment = lttng_alignof(_type) * CHAR_BIT, \
+  .signedness = lttng_is_signed_type(_type), \
+  .reverse_byte_order = _byte_order != BYTE_ORDER, \
+  .base = _base, \
+  .encoding = lttng_encode_##_encoding, \
+ } \
+ } \
  }, \
  } \
 
@@ -123,14 +129,20 @@ struct lttng_integer_type {
 
 #define __type_float(_type) \
  { \
-    .atype = atype_float, \
-    .u.basic._float = \
+  .atype = atype_float, \
+  .u = \
  { \
-  .exp_dig = sizeof(_type) * CHAR_BIT \
- - _float_mant_dig(_type), \
-  .mant_dig = _float_mant_dig(_type), \
-  .alignment = lttng_alignof(_type) * CHAR_BIT, \
-  .reverse_byte_order = BYTE_ORDER != FLOAT_WORD_ORDER, \
+  .basic = \
+ { \
+  ._float = \
+ { \
+  .exp_dig = sizeof(_type) * CHAR_BIT \
+  - _float_mant_dig(_type), \
+  .mant_dig = _float_mant_dig(_type), \
+  .alignment = lttng_alignof(_type) * CHAR_BIT, \
+  .reverse_byte_order = BYTE_ORDER != FLOAT_WORD_ORDER, \
+ }
+ }
  }, \
  } \
 
include/lttng/ust-tracepoint-event.h +18 -9
index e46cc1a..3aa946d 100644
@@ -147,11 +147,14 @@ static const char \
   .type = \
  { \
   .atype = atype_array, \
-  .u.array = \
+  .u = \
  { \
-    .length = _length, \
-    .elem_type = __type_integer(_type, BYTE_ORDER, 10, _encoding), \
- }, \
+  .array = \
+ { \
+  .elem_type = __type_integer(_type, BYTE_ORDER, 10, _encoding), \
+  .length = _length, \
+ } \
+ } \
  }, \
   .nowrite = _nowrite, \
  },
@@ -164,10 +167,13 @@ static const char \
   .type = \
  { \
   .atype = atype_sequence, \
-  .u.sequence = \
+  .u = \
  { \
-    .length_type = __type_integer(_length_type, BYTE_ORDER, 10, none), \
-    .elem_type = __type_integer(_type, BYTE_ORDER, 10, _encoding), \
+  .sequence =
+ { \
+  .length_type = __type_integer(_length_type, BYTE_ORDER, 10, none), \
+  .elem_type = __type_integer(_type, BYTE_ORDER, 10, _encoding), \
+ }, \
  }, \
  }, \
   .nowrite = _nowrite, \
@@ -180,7 +186,10 @@ static const char \
   .type = \
  { \
   .atype = atype_string, \
-  .u.basic.string.encoding = lttng_encode_UTF8, \
+  .u =
+ {
+  .basic = { .string = { .encoding = lttng_encode_UTF8 } } \
+ }, \
  }, \
   .nowrite = _nowrite, \
  },
@@ -483,7 +492,7 @@ void
 __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args));      \
 static      \
 void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args))
   \
 {      \
- struct lttng_event *__event = __tp_data;      \
+ struct lttng_event *__event = (struct lttng_event *) __tp_data;      \
  struct lttng_channel *__chan = __event->chan;      \
  struct lttng_ust_lib_ring_buffer_ctx __ctx;      \
  size_t __event_len, __event_align;      \
include/lttng/ust-tracepoint-event.h +3 -2
@@ -612,13 +621,14 @@ static const char *       \
  __ref_model_emf_uri___##_provider##___##_name       \
  __attribute__((weakref ("_model_emf_uri___" #_provider "___" #_name)));\
 const struct lttng_event_desc __event_desc___##_provider##_##_name = {
  \
- .fields = __event_fields___##_provider##___##_template,       \
  .name = #_provider ":" #_name,       \
  .probe_callback = (void (*)(void))
 &__event_probe__##_provider##___##_template,\
+ .ctx = NULL,       \
+ .fields = __event_fields___##_provider##___##_template,       \
  .nr_fields =
 _TP_ARRAY_SIZE(__event_fields___##_provider##___##_template), \
  .loglevel = &__ref_loglevel___##_provider##___##_name,       \
  .signature = __tp_event_signature___##_provider##___##_template,       \
- .u.ext.model_emf_uri = &__ref_model_emf_uri___##_provider##___##_name, \
+ .u = { .ext = { .model_emf_uri =

&__ref_model_emf_uri___##_provider##___##_name } }, \
};

#include TRACEPOINT_INCLUDE

tests/hello.cxx/Makefile.am +1 -2
index 897416d..5f6c615 100644
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
-Wsystem-headers
 
 noinst_PROGRAMS = hello
-hello_SOURCES = hello.cpp tp.c ust_tests_hello.h
+hello_SOURCES = hello.cpp tp.cpp ust_tests_hello.h
 hello_LDADD = $(top_builddir)/liblttng-ust/liblttng-ust.la
 
 if LTTNG_UST_BUILD_WITH_LIBDL
tests/hello.cxx/tp.c deleted +0 -6
deleted file mode 100644
index 4790965..0000000
@@ -1,26 +0,0 @@
-/*
- * tp.c
- *
- * Copyright (c) 2011 Mathieu Desnoyers <[email protected]>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a

copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */

tests/hello.cxx/tp.c deleted +0 -3
-
-#define TRACEPOINT_CREATE_PROBES
-#include "ust_tests_hello.h"
tests/hello.cxx/tp.cpp new file +6 -0
new file mode 100644
index 0000000..a2099ab
@@ -0,0 +1,26 @@
+/*
+ * tp.cpp
+ *
+ * Copyright (c) 2011 Mathieu Desnoyers <[email protected]>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a

copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */

tests/hello.cxx/tp.cpp new file +3 -0
+
+#define TRACEPOINT_CREATE_PROBES
+#include "ust_tests_hello.h"
Signature · 8 lines
1.8.2.1

--
Best Regards,
仝子飞 (Zifei Tong)
College of Computer Science and Technology, Zhejiang University

[email protected] / [email protected]
Signature · 8 lines
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com

_______________________________________________
lttng-dev mailing list
[email protected]
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev