X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=2b66b92c07d5e4b41043256c9a2695d0080f6746;hb=4ee14516054068e38d7dc5dbeaccd39151ca2d06;hp=057f675e43239d88ed68e5a7d9abb0f1bc704fde;hpb=10a8a2237343699e3923d87e24dbf2d7fe225377;p=lttng-tools.git diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c index 057f675e4..2b66b92c0 100644 --- a/src/bin/lttng-sessiond/ust-app.c +++ b/src/bin/lttng-sessiond/ust-app.c @@ -27,9 +27,7 @@ #include #include -#include -#include -#include +#include #include "ust-app.h" #include "ust-consumer.h" @@ -395,7 +393,7 @@ int create_ust_channel_context(struct ust_app_channel *ua_chan, ua_ctx->handle = ua_ctx->obj->handle; - DBG2("UST app context added to channel %s successfully", ua_chan->name); + DBG2("UST app context created successfully for channel %s", ua_chan->name); error: return ret; @@ -418,7 +416,7 @@ int create_ust_event_context(struct ust_app_event *ua_event, ua_ctx->handle = ua_ctx->obj->handle; - DBG2("UST app context added to event %s successfully", ua_event->name); + DBG2("UST app context created successfully for event %s", ua_event->name); error: return ret; @@ -1277,6 +1275,13 @@ int ust_app_register(struct ust_register_msg *msg, int sock) close(sock); return -EINVAL; } + if (msg->major != LTTNG_UST_COMM_MAJOR) { + ERR("Registration failed: application \"%s\" (pid: %d) has " + "communication protocol version %u.%u, but sessiond supports 2.x.\n", + msg->name, msg->pid, msg->major, msg->minor); + close(sock); + return -EINVAL; + } lta = zmalloc(sizeof(struct ust_app)); if (lta == NULL) { PERROR("malloc"); @@ -1286,6 +1291,7 @@ int ust_app_register(struct ust_register_msg *msg, int sock) lta->ppid = msg->ppid; lta->uid = msg->uid; lta->gid = msg->gid; + lta->compatible = 0; /* Not compatible until proven */ lta->bits_per_long = msg->bits_per_long; lta->v_major = msg->major; lta->v_minor = msg->minor; @@ -1393,6 +1399,13 @@ int ust_app_list_events(struct lttng_event **events) cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, node.node) { struct lttng_ust_tracepoint_iter uiter; + if (!app->compatible) { + /* + * TODO: In time, we should notice the caller of this error by + * telling him that this is a version error. + */ + continue; + } handle = ustctl_tracepoint_list(app->key.sock); if (handle < 0) { ERR("UST app list events getting handle failed for app pid %d", @@ -1414,8 +1427,7 @@ int ust_app_list_events(struct lttng_event **events) } } memcpy(tmp[count].name, uiter.name, LTTNG_UST_SYM_NAME_LEN); - memcpy(tmp[count].loglevel, uiter.loglevel, LTTNG_UST_SYM_NAME_LEN); - tmp[count].loglevel_value = uiter.loglevel_value; + tmp[count].loglevel = uiter.loglevel; tmp[count].type = LTTNG_UST_TRACEPOINT; tmp[count].pid = app->key.pid; tmp[count].enabled = -1; @@ -1501,6 +1513,13 @@ int ust_app_disable_channel_glb(struct ltt_ust_session *usess, /* For every registered applications */ cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, node.node) { struct lttng_ht_iter uiter; + if (!app->compatible) { + /* + * TODO: In time, we should notice the caller of this error by + * telling him that this is a version error. + */ + continue; + } ua_sess = lookup_session_by_app(usess, app); if (ua_sess == NULL) { continue; @@ -1554,6 +1573,13 @@ int ust_app_enable_channel_glb(struct ltt_ust_session *usess, /* For every registered applications */ cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, node.node) { + if (!app->compatible) { + /* + * TODO: In time, we should notice the caller of this error by + * telling him that this is a version error. + */ + continue; + } ua_sess = lookup_session_by_app(usess, app); if (ua_sess == NULL) { continue; @@ -1594,6 +1620,13 @@ int ust_app_disable_event_glb(struct ltt_ust_session *usess, /* For all registered applications */ cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, node.node) { + if (!app->compatible) { + /* + * TODO: In time, we should notice the caller of this error by + * telling him that this is a version error. + */ + continue; + } ua_sess = lookup_session_by_app(usess, app); if (ua_sess == NULL) { /* Next app */ @@ -1653,6 +1686,13 @@ int ust_app_disable_all_event_glb(struct ltt_ust_session *usess, /* For all registered applications */ cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, node.node) { + if (!app->compatible) { + /* + * TODO: In time, we should notice the caller of this error by + * telling him that this is a version error. + */ + continue; + } ua_sess = lookup_session_by_app(usess, app); /* If ua_sess is NULL, there is a code flow error */ assert(ua_sess); @@ -1703,6 +1743,13 @@ int ust_app_create_channel_glb(struct ltt_ust_session *usess, /* For every registered applications */ cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, node.node) { + if (!app->compatible) { + /* + * TODO: In time, we should notice the caller of this error by + * telling him that this is a version error. + */ + continue; + } /* * Create session on the tracer side and add it to app session HT. Note * that if session exist, it will simply return a pointer to the ust @@ -1757,6 +1804,13 @@ int ust_app_enable_event_glb(struct ltt_ust_session *usess, /* For all registered applications */ cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, node.node) { + if (!app->compatible) { + /* + * TODO: In time, we should notice the caller of this error by + * telling him that this is a version error. + */ + continue; + } ua_sess = lookup_session_by_app(usess, app); /* If ua_sess is NULL, there is a code flow error */ assert(ua_sess); @@ -1810,6 +1864,13 @@ int ust_app_create_event_glb(struct ltt_ust_session *usess, /* For all registered applications */ cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, node.node) { + if (!app->compatible) { + /* + * TODO: In time, we should notice the caller of this error by + * telling him that this is a version error. + */ + continue; + } ua_sess = lookup_session_by_app(usess, app); /* If ua_sess is NULL, there is a code flow error */ assert(ua_sess); @@ -1855,6 +1916,10 @@ int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app) rcu_read_lock(); + if (!app->compatible) { + goto end; + } + ua_sess = lookup_session_by_app(usess, app); if (ua_sess == NULL) { goto error_rcu_unlock; @@ -1931,11 +1996,11 @@ skip_setup: goto error_rcu_unlock; } - rcu_read_unlock(); - /* Quiescent wait after starting trace */ ustctl_wait_quiescent(app->key.sock); +end: + rcu_read_unlock(); return 0; error_rcu_unlock: @@ -1957,6 +2022,10 @@ int ust_app_stop_trace(struct ltt_ust_session *usess, struct ust_app *app) rcu_read_lock(); + if (!app->compatible) { + goto end; + } + ua_sess = lookup_session_by_app(usess, app); if (ua_sess == NULL) { /* Only malloc can failed so something is really wrong */ @@ -2023,6 +2092,10 @@ int ust_app_destroy_trace(struct ltt_ust_session *usess, struct ust_app *app) rcu_read_lock(); + if (!app->compatible) { + goto end; + } + __lookup_session_by_app(usess, app, &iter); node = lttng_ht_iter_get_node_ulong(&iter); if (node == NULL) { @@ -2040,11 +2113,11 @@ int ust_app_destroy_trace(struct ltt_ust_session *usess, struct ust_app *app) delete_ust_app_session(app->key.sock, ua_sess); - rcu_read_unlock(); - /* Quiescent wait after stopping trace */ ustctl_wait_quiescent(app->key.sock); +end: + rcu_read_unlock(); return 0; error_rcu_unlock: @@ -2136,11 +2209,12 @@ int ust_app_destroy_trace_all(struct ltt_ust_session *usess) void ust_app_global_update(struct ltt_ust_session *usess, int sock) { int ret = 0; - struct lttng_ht_iter iter, uiter; + struct lttng_ht_iter iter, uiter, iter_ctx; struct ust_app *app; struct ust_app_session *ua_sess; struct ust_app_channel *ua_chan; struct ust_app_event *ua_event; + struct ust_app_ctx *ua_ctx; if (usess == NULL) { ERR("No UST session on global update. Returning"); @@ -2158,6 +2232,10 @@ void ust_app_global_update(struct ltt_ust_session *usess, int sock) goto error; } + if (!app->compatible) { + goto error; + } + ua_sess = create_ust_app_session(usess, app); if (ua_sess == NULL) { goto error; @@ -2176,6 +2254,16 @@ void ust_app_global_update(struct ltt_ust_session *usess, int sock) continue; } + cds_lfht_for_each_entry(ua_chan->ctx->ht, &iter_ctx.iter, ua_ctx, + node.node) { + ret = create_ust_channel_context(ua_chan, ua_ctx, app); + if (ret < 0) { + /* FIXME: Should we quit here or continue... */ + continue; + } + } + + /* For each events */ cds_lfht_for_each_entry(ua_chan->events->ht, &uiter.iter, ua_event, node.node) { @@ -2184,6 +2272,16 @@ void ust_app_global_update(struct ltt_ust_session *usess, int sock) /* FIXME: Should we quit here or continue... */ continue; } + + /* Add context on events. */ + cds_lfht_for_each_entry(ua_event->ctx->ht, &iter_ctx.iter, + ua_ctx, node.node) { + ret = create_ust_event_context(ua_event, ua_ctx, app); + if (ret < 0) { + /* FIXME: Should we quit here or continue... */ + continue; + } + } } } @@ -2217,6 +2315,13 @@ int ust_app_add_ctx_channel_glb(struct ltt_ust_session *usess, rcu_read_lock(); cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, node.node) { + if (!app->compatible) { + /* + * TODO: In time, we should notice the caller of this error by + * telling him that this is a version error. + */ + continue; + } ua_sess = lookup_session_by_app(usess, app); if (ua_sess == NULL) { continue; @@ -2259,6 +2364,13 @@ int ust_app_add_ctx_event_glb(struct ltt_ust_session *usess, rcu_read_lock(); cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, node.node) { + if (!app->compatible) { + /* + * TODO: In time, we should notice the caller of this error by + * telling him that this is a version error. + */ + continue; + } ua_sess = lookup_session_by_app(usess, app); if (ua_sess == NULL) { continue; @@ -2316,6 +2428,11 @@ int ust_app_enable_event_pid(struct ltt_ust_session *usess, goto error; } + if (!app->compatible) { + ret = 0; + goto error; + } + ua_sess = lookup_session_by_app(usess, app); /* If ua_sess is NULL, there is a code flow error */ assert(ua_sess); @@ -2374,6 +2491,11 @@ int ust_app_disable_event_pid(struct ltt_ust_session *usess, goto error; } + if (!app->compatible) { + ret = 0; + goto error; + } + ua_sess = lookup_session_by_app(usess, app); /* If ua_sess is NULL, there is a code flow error */ assert(ua_sess); @@ -2404,3 +2526,85 @@ error: rcu_read_unlock(); return ret; } + +/* + * Validate version of UST apps and set the compatible bit. + */ +int ust_app_validate_version(int sock) +{ + int ret; + struct ust_app *app; + + rcu_read_lock(); + + app = find_app_by_sock(sock); + assert(app); + + ret = ustctl_tracer_version(sock, &app->version); + if (ret < 0) { + goto error; + } + + /* Validate version */ + if (app->version.major > UST_APP_MAJOR_VERSION) { + goto error; + } + + DBG2("UST app PID %d is compatible with major version %d " + "(supporting <= %d)", app->key.pid, app->version.major, + UST_APP_MAJOR_VERSION); + app->compatible = 1; + rcu_read_unlock(); + return 0; + +error: + DBG2("UST app PID %d is not compatible with major version %d " + "(supporting <= %d)", app->key.pid, app->version.major, + UST_APP_MAJOR_VERSION); + app->compatible = 0; + rcu_read_unlock(); + return -1; +} + +/* + * Calibrate registered applications. + */ +int ust_app_calibrate_glb(struct lttng_ust_calibrate *calibrate) +{ + int ret = 0; + struct lttng_ht_iter iter; + struct ust_app *app; + + rcu_read_lock(); + + cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, node.node) { + if (!app->compatible) { + /* + * TODO: In time, we should notice the caller of this error by + * telling him that this is a version error. + */ + continue; + } + + ret = ustctl_calibrate(app->key.sock, calibrate); + if (ret < 0) { + switch (ret) { + case -ENOSYS: + /* Means that it's not implemented on the tracer side. */ + ret = 0; + break; + default: + /* TODO: Report error to user */ + DBG2("Calibrate app PID %d returned with error %d", + app->key.pid, ret); + break; + } + } + } + + DBG("UST app global domain calibration finished"); + + rcu_read_unlock(); + + return ret; +}