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;
}
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");
}
}
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 = uiter.loglevel;
tmp[count].type = LTTNG_UST_TRACEPOINT;
- tmp[count].loglevel_value = uiter.loglevel_value;
tmp[count].pid = app->key.pid;
tmp[count].enabled = -1;
count++;
*/
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 */
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;
}
- /* 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;