Fix: relayd and sessiond: dispatch thread exit is shared across threads

[lttng-tools.git] / src / bin / lttng-sessiond / context.c

diff --git a/src/bin/lttng-sessiond/context.c b/src/bin/lttng-sessiond/context.c
index 7eaeb6665b177aa1771942fa444d3e1174a74436..af1c32dea90b6f64078b08c36fcffa65d21441be 100644 (file)
--- a/src/bin/lttng-sessiond/context.c
+++ b/src/bin/lttng-sessiond/context.c
@@ -1,18 +1,18 @@
 /*
  * Copyright (C)  2011 - David Goulet <david.goulet@polymtl.ca>
  *
- * 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.
  */
 
 #define _GNU_SOURCE
@@ -411,7 +411,7 @@ int context_ust_add(struct ltt_ust_session *usess, int domain,
                cds_lfht_for_each_entry(chan_ht->ht, &iter.iter, uchan, node.node) {
                        ret = add_uctx_to_channel(usess, domain, uchan, ctx);
                        if (ret < 0) {
-                               ERR("Context added to channel %s failed", uchan->name);
+                               ERR("Context failed for channel %s", uchan->name);
                                continue;
                        }
                }
@@ -426,7 +426,7 @@ end:
                ret = LTTCOMM_FATAL;
                break;
        case -EINVAL:
-               ret = LTTCOMM_UST_CONTEXT_FAIL;
+               ret = LTTCOMM_UST_CONTEXT_INVAL;
                break;
        case -ENOSYS:
                ret = LTTCOMM_UNKNOWN_DOMAIN;