*
* Connect to unix socket using the path name.
*/
-int ustcomm_connect_unix_sock(const char *pathname)
+int ustcomm_connect_unix_sock(const char *pathname, long timeout)
{
struct sockaddr_un sun;
int fd, ret;
ret = -errno;
goto error;
}
+ if (timeout >= 0) {
+ /* Give at least 10ms. */
+ if (timeout < 10)
+ timeout = 10;
+ ret = ustcomm_setsockopt_snd_timeout(fd, timeout);
+ if (ret < 0) {
+ WARN("Error setting connect socket send timeout");
+ }
+ }
ret = fcntl(fd, F_SETFD, FD_CLOEXEC);
if (ret < 0) {
PERROR("fcntl");
}
static
-int serialize_string_encoding(enum ustctl_string_encodings *ue,
+int serialize_string_encoding(int32_t *ue,
enum lttng_string_encodings le)
{
switch (le) {
uentry = &entries[i];
lentry = <tng_entries[i];
- uentry->start = lentry->start;
- uentry->end = lentry->end;
+ uentry->start.value = lentry->start.value;
+ uentry->start.signedness = lentry->start.signedness;
+ uentry->end.value = lentry->end.value;
+ uentry->end.signedness = lentry->end.signedness;
strncpy(uentry->string, lentry->string, LTTNG_UST_SYM_NAME_LEN);
uentry->string[LTTNG_UST_SYM_NAME_LEN - 1] = '\0';
+
+ if (lentry->u.extra.options & LTTNG_ENUM_ENTRY_OPTION_IS_AUTO) {
+ uentry->u.extra.options |=
+ USTCTL_UST_ENUM_ENTRY_OPTION_IS_AUTO;
+ }
}
*_entries = entries;
return 0;