port: fix pthread_setname_np integration

[lttng-ust.git] / liblttng-ust-comm / lttng-ust-comm.c

diff --git a/liblttng-ust-comm/lttng-ust-comm.c b/liblttng-ust-comm/lttng-ust-comm.c
index d7991f19b6098b97f1333f013e332df426c3bf0d..2447c9a938492f78f491a5868b7102f07ef157a2 100644 (file)
--- a/liblttng-ust-comm/lttng-ust-comm.c
+++ b/liblttng-ust-comm/lttng-ust-comm.c
@@ -17,7 +17,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
 #include <limits.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -755,7 +754,7 @@ int ustcomm_send_reg_msg(int sock,
        reg_msg.uint64_t_alignment = uint64_t_alignment;
        reg_msg.long_alignment = long_alignment;
        reg_msg.socket_type = type;
-       lttng_ust_getprocname(reg_msg.name);
+       lttng_pthread_getname_np(reg_msg.name, LTTNG_UST_ABI_PROCNAME_LEN);
        memset(reg_msg.padding, 0, sizeof(reg_msg.padding));
 
        len = ustcomm_send_unix_sock(sock, &reg_msg, sizeof(reg_msg));
@@ -779,7 +778,7 @@ ssize_t count_one_type(const struct lttng_type *lt)
                return 1;
        case atype_struct:
                return count_fields_recursive(lt->u.legacy._struct.nr_fields,
-                               lt->u.legacy._struct.fields);
+                               lt->u.legacy._struct.fields) + 1;
        case atype_enum_nestable:
                return count_one_type(lt->u.enum_nestable.container_type) + 1;
        case atype_array_nestable:
@@ -788,7 +787,7 @@ ssize_t count_one_type(const struct lttng_type *lt)
                return count_one_type(lt->u.sequence_nestable.elem_type) + 1;
        case atype_struct_nestable:
                return count_fields_recursive(lt->u.struct_nestable.nr_fields,
-                               lt->u.struct_nestable.fields);
+                               lt->u.struct_nestable.fields) + 1;
 
        case atype_dynamic:
        {
@@ -801,10 +800,10 @@ ssize_t count_one_type(const struct lttng_type *lt)
                if (ret)
                        return ret;
                /*
-                * One field for enum, one field for variant, and
+                * Two fields for enum, one field for variant, and
                 * one field per choice.
                 */
-               return count_fields_recursive(nr_choices, choices) + 2;
+               return count_fields_recursive(nr_choices, choices) + 3;
        }
 
        default: