* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#define _GNU_SOURCE
#include <limits.h>
#include <stdint.h>
#include <stdio.h>
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, ®_msg, sizeof(reg_msg));
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:
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:
{
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: