* closing this socket, otherwise an application could re-use the socket ID
* and race with the teardown, using the same hash table entry.
*/
- close(sock);
+ ret = close(sock);
+ if (ret) {
+ PERROR("close");
+ }
DBG2("UST app pid %d deleted", app->key.pid);
free(app);
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;
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;
ret = ustctl_create_session(app->key.sock);
if (ret < 0) {
ERR("Creating session for app pid %d", app->key.pid);
+ /* This means that the tracer is gone... */
+ ua_sess = (void*) -1UL;
goto error;
}
int ust_app_register(struct ust_register_msg *msg, int sock)
{
struct ust_app *lta;
+ int ret;
if ((msg->bits_per_long == 64 && ust_consumerd64_fd == -EINVAL)
|| (msg->bits_per_long == 32 && ust_consumerd32_fd == -EINVAL)) {
ERR("Registration failed: application \"%s\" (pid: %d) has "
"%d-bit long, but no consumerd for this long size is available.\n",
msg->name, msg->pid, msg->bits_per_long);
- close(sock);
+ ret = close(sock);
+ if (ret) {
+ PERROR("close");
+ }
+ 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);
+ ret = close(sock);
+ if (ret) {
+ PERROR("close");
+ }
return -EINVAL;
}
lta = zmalloc(sizeof(struct ust_app));
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;
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",
}
}
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;
/* 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;
/* 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;
/* 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 */
/* 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);
/* 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
*/
ua_sess = create_ust_app_session(usess, app);
if (ua_sess == NULL) {
- /* Major problem here and it's maybe the tracer or malloc() */
+ /* The malloc() failed. */
goto error;
+ } else if (ua_sess == (void *) -1UL) {
+ /* The application's socket is not valid. Contiuing */
+ continue;
}
/* Create channel onto application */
/* 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);
/* 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);
rcu_read_lock();
+ if (!app->compatible) {
+ goto end;
+ }
+
ua_sess = lookup_session_by_app(usess, app);
if (ua_sess == NULL) {
goto error_rcu_unlock;
goto skip_setup;
}
+ /* Indicate that the session has been started once */
+ ua_sess->started = 1;
+
ret = create_ust_app_metadata(ua_sess, usess->pathname, app);
if (ret < 0) {
goto error_rcu_unlock;
if (ret < 0) {
goto error_rcu_unlock;
}
- ua_sess->started = 1;
skip_setup:
/* This start the UST tracing */
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:
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 */
goto error_rcu_unlock;
}
- /* Not started, continuing. */
- if (ua_sess->started == 0) {
- goto end;
- }
+ /*
+ * If started = 0, it means that stop trace has been called for a session
+ * that was never started. This is a code flow error and should never
+ * happen.
+ */
+ assert(ua_sess->started == 1);
/* This inhibits UST tracing */
ret = ustctl_stop_session(app->key.sock, ua_sess->handle);
ret);
}
- ua_sess->started = 0;
-
end:
rcu_read_unlock();
return 0;
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) {
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:
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");
goto error;
}
+ if (!app->compatible) {
+ goto error;
+ }
+
ua_sess = create_ust_app_session(usess, app);
if (ua_sess == NULL) {
goto error;
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) {
/* 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;
+ }
+ }
}
}
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;
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;
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);
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);
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;
+}
projects / lttng-tools.git / blobdiff