Disable lttng ust domain not implemented

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

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index e1d50974bfc2f3c220fd7cf219e6145b005f5ae4..1b837c1fc52ed201bcc2e553d2c67ce71189bddc 100644 (file)
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -1110,10 +1110,16 @@ static void *thread_manage_apps(void *data)
                                        }
 
                                        /*
-                                        * Add channel(s) and event(s) to newly registered apps
-                                        * from lttng global UST domain.
+                                        * Validate UST version compatibility.
                                         */
-                                       update_ust_app(ust_cmd.sock);
+                                       ret = ust_app_validate_version(ust_cmd.sock);
+                                       if (ret >= 0) {
+                                               /*
+                                                * Add channel(s) and event(s) to newly registered apps
+                                                * from lttng global UST domain.
+                                                */
+                                               update_ust_app(ust_cmd.sock);
+                                       }
 
                                        ret = ust_app_register_done(ust_cmd.sock);
                                        if (ret < 0) {
@@ -2153,11 +2159,11 @@ static int cmd_disable_channel(struct ltt_session *session,
                }
                break;
        }
+#if 0
        case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
        case LTTNG_DOMAIN_UST_EXEC_NAME:
        case LTTNG_DOMAIN_UST_PID:
-               ret = LTTCOMM_NOT_IMPLEMENTED;
-               goto error;
+#endif
        default:
                ret = LTTCOMM_UNKNOWN_DOMAIN;
                goto error;
@@ -2216,11 +2222,11 @@ static int cmd_enable_channel(struct ltt_session *session,
                }
                break;
        }
+#if 0
        case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
        case LTTNG_DOMAIN_UST_EXEC_NAME:
        case LTTNG_DOMAIN_UST_PID:
-               ret = LTTCOMM_NOT_IMPLEMENTED;
-               goto error;
+#endif
        default:
                ret = LTTCOMM_UNKNOWN_DOMAIN;
                goto error;
@@ -2283,9 +2289,11 @@ static int cmd_disable_event(struct ltt_session *session, int domain,
                                channel_name);
                break;
        }
+#if 0
        case LTTNG_DOMAIN_UST_EXEC_NAME:
        case LTTNG_DOMAIN_UST_PID:
        case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
+#endif
        default:
                ret = LTTCOMM_NOT_IMPLEMENTED;
                goto error;
@@ -2350,9 +2358,11 @@ static int cmd_disable_event_all(struct ltt_session *session, int domain,
 
                break;
        }
+#if 0
        case LTTNG_DOMAIN_UST_EXEC_NAME:
        case LTTNG_DOMAIN_UST_PID:
        case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
+#endif
        default:
                ret = LTTCOMM_NOT_IMPLEMENTED;
                goto error;
@@ -2391,9 +2401,11 @@ static int cmd_add_context(struct ltt_session *session, int domain,
                }
                break;
        }
+#if 0
        case LTTNG_DOMAIN_UST_EXEC_NAME:
        case LTTNG_DOMAIN_UST_PID:
        case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
+#endif
        default:
                ret = LTTCOMM_NOT_IMPLEMENTED;
                goto error;
@@ -2506,9 +2518,11 @@ static int cmd_enable_event(struct ltt_session *session, int domain,
                }
                break;
        }
+#if 0
        case LTTNG_DOMAIN_UST_EXEC_NAME:
        case LTTNG_DOMAIN_UST_PID:
        case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
+#endif
        default:
                ret = LTTCOMM_NOT_IMPLEMENTED;
                goto error;
@@ -2641,9 +2655,11 @@ static int cmd_enable_event_all(struct ltt_session *session, int domain,
 
                break;
        }
+#if 0
        case LTTNG_DOMAIN_UST_EXEC_NAME:
        case LTTNG_DOMAIN_UST_PID:
        case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
+#endif
        default:
                ret = LTTCOMM_NOT_IMPLEMENTED;
                goto error;
@@ -3535,7 +3551,7 @@ static void *thread_manage_clients(void *data)
         * Notify parent pid that we are ready to accept command for client side.
         */
        if (opt_sig_parent) {
-               kill(ppid, SIGCHLD);
+               kill(ppid, SIGUSR1);
        }
 
        while (1) {