- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; only version 2
- * of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2 only,
+ * as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
* closing this socket, otherwise an application could re-use the socket ID
* and race with the teardown, using the same hash table entry.
*/
* closing this socket, otherwise an application could re-use the socket ID
* and race with the teardown, using the same hash table entry.
*/
ret = ustctl_create_session(app->key.sock);
if (ret < 0) {
ERR("Creating session for app pid %d", app->key.pid);
ret = ustctl_create_session(app->key.sock);
if (ret < 0) {
ERR("Creating session for app pid %d", app->key.pid);
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);
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);
+ 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");
+ }
- /* 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);
/* This inhibits UST tracing */
ret = ustctl_stop_session(app->key.sock, ua_sess->handle);
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 *app;
struct ust_app_session *ua_sess;
struct ust_app_channel *ua_chan;
struct ust_app_event *ua_event;
+ 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) {
/* For each events */
cds_lfht_for_each_entry(ua_chan->events->ht, &uiter.iter, ua_event,
node.node) {
+
+ /* 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;
+ }
+ }