projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Mismatch of field name between ust and tools
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
ust-app.c
diff --git
a/src/bin/lttng-sessiond/ust-app.c
b/src/bin/lttng-sessiond/ust-app.c
index 7f4e9f1e0c928df31c5b5a39b1614e54f22361f8..3202cd4e04c12a49a8c6db284def42ae8a08a77f 100644
(file)
--- a/
src/bin/lttng-sessiond/ust-app.c
+++ b/
src/bin/lttng-sessiond/ust-app.c
@@
-1667,6
+1667,7
@@
int ust_app_list_event_fields(struct lttng_event_field **fields)
memcpy(tmp[count].field_name, uiter.field_name, LTTNG_UST_SYM_NAME_LEN);
tmp[count].type = uiter.type;
memcpy(tmp[count].field_name, uiter.field_name, LTTNG_UST_SYM_NAME_LEN);
tmp[count].type = uiter.type;
+ tmp[count].nowrite = uiter.nowrite;
memcpy(tmp[count].event.name, uiter.event_name, LTTNG_UST_SYM_NAME_LEN);
tmp[count].event.loglevel = uiter.loglevel;
memcpy(tmp[count].event.name, uiter.event_name, LTTNG_UST_SYM_NAME_LEN);
tmp[count].event.loglevel = uiter.loglevel;
@@
-2196,6
+2197,7
@@
int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app)
ret = create_ust_app_metadata(ua_sess, usess->pathname, app);
if (ret < 0) {
ret = create_ust_app_metadata(ua_sess, usess->pathname, app);
if (ret < 0) {
+ ret = LTTNG_ERR_UST_META_FAIL;
goto error_rcu_unlock;
}
goto error_rcu_unlock;
}
@@
-2227,6
+2229,7
@@
int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app)
/* Got all streams */
lttng_fd_put(LTTNG_FD_APPS, 2);
free(ustream);
/* Got all streams */
lttng_fd_put(LTTNG_FD_APPS, 2);
free(ustream);
+ ret = LTTNG_ERR_UST_STREAM_FAIL;
break;
}
ustream->handle = ustream->obj->handle;
break;
}
ustream->handle = ustream->obj->handle;
@@
-2925,7
+2928,7
@@
int ust_app_validate_version(int sock)
goto error;
}
goto error;
}
- DBG2("UST app PID %d is compatible with major version %d "
+ DBG2("UST app PID %d is compatible with
internal
major version %d "
"(supporting == %d)", app->pid, app->version.major,
UST_APP_MAJOR_VERSION);
app->compatible = 1;
"(supporting == %d)", app->pid, app->version.major,
UST_APP_MAJOR_VERSION);
app->compatible = 1;
@@
-2934,7
+2937,7
@@
int ust_app_validate_version(int sock)
return 0;
error:
return 0;
error:
- DBG2("UST app PID %d is not compatible with major version %d "
+ DBG2("UST app PID %d is not compatible with
internal
major version %d "
"(supporting == %d)", app->pid, app->version.major,
UST_APP_MAJOR_VERSION);
app->compatible = 0;
"(supporting == %d)", app->pid, app->version.major,
UST_APP_MAJOR_VERSION);
app->compatible = 0;
This page took
0.024008 seconds
and
4
git commands to generate.