Fix: relayd: erroneous rundir permission logging message
[lttng-tools.git] / src / bin / lttng / commands / remove_trigger.c
index 401b597420dcb82407a3203433a9cc8ebc49eb57..48b91bf486f9f27546e97075fae62e800a7c1376 100644 (file)
@@ -7,6 +7,8 @@
 
 #include "../command.h"
 #include "common/argpar/argpar.h"
+#include "common/argpar-utils/argpar-utils.h"
+#include "common/mi-lttng.h"
 #include <lttng/lttng.h>
 #include <stdio.h>
 
@@ -58,9 +60,11 @@ end:
 
 int cmd_remove_trigger(int argc, const char **argv)
 {
+       enum lttng_error_code ret_code;
        int ret;
-       struct argpar_parse_ret argpar_parse_ret = {};
-       const char *id = NULL;
+       struct argpar_iter *argpar_iter = NULL;
+       const struct argpar_item *argpar_item = NULL;
+       const char *name = NULL;
        int i;
        struct lttng_triggers *triggers = NULL;
        unsigned int triggers_count;
@@ -68,23 +72,62 @@ int cmd_remove_trigger(int argc, const char **argv)
        const struct lttng_trigger *trigger_to_remove = NULL;
        char *owner_uid = NULL;
        long long uid;
+       struct mi_writer *mi_writer = NULL;
+
+       if (lttng_opt_mi) {
+               mi_writer = mi_lttng_writer_create(
+                               fileno(stdout), lttng_opt_mi);
+               if (!mi_writer) {
+                       ret = CMD_ERROR;
+                       goto error;
+               }
+
+               /* Open command element. */
+               ret = mi_lttng_writer_command_open(mi_writer,
+                               mi_lttng_element_command_remove_trigger);
+               if (ret) {
+                       ret = CMD_ERROR;
+                       goto error;
+               }
+
+               /* Open output element. */
+               ret = mi_lttng_writer_open_element(
+                               mi_writer, mi_lttng_element_command_output);
+               if (ret) {
+                       ret = CMD_ERROR;
+                       goto error;
+               }
+       }
 
-       argpar_parse_ret = argpar_parse(argc - 1, argv + 1,
-               remove_trigger_options, true);
-       if (!argpar_parse_ret.items) {
-               ERR("%s", argpar_parse_ret.error);
+       argc--;
+       argv++;
+
+       argpar_iter = argpar_iter_create(argc, argv, remove_trigger_options);
+       if (!argpar_iter) {
+               ERR("Failed to allocate an argpar iter.");
                goto error;
        }
 
-       for (i = 0; i < argpar_parse_ret.items->n_items; i++) {
-               const struct argpar_item *item =
-                               argpar_parse_ret.items->items[i];
+       while (true) {
+               enum parse_next_item_status status;
+
+               status = parse_next_item(argpar_iter, &argpar_item, 1, argv,
+                       true, NULL, NULL);
+               if (status == PARSE_NEXT_ITEM_STATUS_ERROR ||
+                               status == PARSE_NEXT_ITEM_STATUS_ERROR_MEMORY) {
+                       goto error;
+               } else if (status == PARSE_NEXT_ITEM_STATUS_END) {
+                       break;
+               }
+
+               assert(status == PARSE_NEXT_ITEM_STATUS_OK);
 
-               if (item->type == ARGPAR_ITEM_TYPE_OPT) {
-                       const struct argpar_item_opt *item_opt =
-                                       (const struct argpar_item_opt *) item;
+               if (argpar_item_type(argpar_item) == ARGPAR_ITEM_TYPE_OPT) {
+                       const struct argpar_opt_descr *descr =
+                               argpar_item_opt_descr(argpar_item);
+                       const char *arg = argpar_item_opt_arg(argpar_item);
 
-                       switch (item_opt->descr->id) {
+                       switch (descr->id) {
                        case OPT_HELP:
                                SHOW_HELP();
                                ret = 0;
@@ -96,7 +139,7 @@ int cmd_remove_trigger(int argc, const char **argv)
                                goto end;
                        case OPT_OWNER_UID:
                        {
-                               if (!assign_string(&owner_uid, item_opt->arg,
+                               if (!assign_string(&owner_uid, arg,
                                                "--owner-uid")) {
                                        goto error;
                                }
@@ -106,20 +149,19 @@ int cmd_remove_trigger(int argc, const char **argv)
                                abort();
                        }
                } else {
-                       const struct argpar_item_non_opt *item_non_opt =
-                                       (const struct argpar_item_non_opt *) item;
+                       const char *arg = argpar_item_non_opt_arg(argpar_item);
 
-                       if (id) {
-                               ERR("Unexpected argument '%s'", item_non_opt->arg);
+                       if (name) {
+                               ERR("Unexpected argument '%s'", arg);
                                goto error;
                        }
 
-                       id = item_non_opt->arg;
+                       name = arg;
                }
        }
 
-       if (!id) {
-               ERR("Missing `id` argument.");
+       if (!name) {
+               ERR("Missing `name` argument.");
                goto error;
        }
 
@@ -151,30 +193,45 @@ int cmd_remove_trigger(int argc, const char **argv)
 
                trigger = lttng_triggers_get_at_index(triggers, i);
                trigger_status = lttng_trigger_get_name(trigger, &trigger_name);
-               assert(trigger_status == LTTNG_TRIGGER_STATUS_OK);
+               switch (trigger_status) {
+               case LTTNG_TRIGGER_STATUS_OK:
+                       break;
+               case LTTNG_TRIGGER_STATUS_UNSET:
+                       /* Don't compare against anonymous triggers. */
+                       continue;
+               default:
+                       abort();
+               }
 
                trigger_status = lttng_trigger_get_owner_uid(
                                trigger, &trigger_uid);
                assert(trigger_status == LTTNG_TRIGGER_STATUS_OK);
 
-               if (trigger_uid == uid && strcmp(trigger_name, id) == 0) {
+               if (trigger_uid == uid && strcmp(trigger_name, name) == 0) {
                        trigger_to_remove = trigger;
                        break;
                }
        }
 
        if (!trigger_to_remove) {
-               ERR("Couldn't find trigger with id `%s`.", id);
+               ERR("Couldn't find trigger with name `%s`.", name);
                goto error;
        }
 
        ret = lttng_unregister_trigger(trigger_to_remove);
        if (ret != 0) {
-               ERR("Failed to unregister trigger `%s`.", id);
+               ERR("Failed to unregister trigger `%s`.", name);
                goto error;
        }
 
-       MSG("Removed trigger `%s`.", id);
+       if (lttng_opt_mi) {
+               ret_code = lttng_trigger_mi_serialize(
+                               trigger_to_remove, mi_writer, NULL);
+               if (ret_code != LTTNG_OK) {
+                       goto error;
+               }
+       }
+       MSG("Removed trigger `%s`.", name);
 
        ret = 0;
        goto end;
@@ -183,9 +240,39 @@ error:
        ret = 1;
 
 end:
-       argpar_parse_ret_fini(&argpar_parse_ret);
+       /* Mi closing. */
+       if (lttng_opt_mi && mi_writer) {
+               /* Close output element. */
+               int mi_ret = mi_lttng_writer_close_element(mi_writer);
+               if (mi_ret) {
+                       ret = 1;
+                       goto cleanup;
+               }
+
+               mi_ret = mi_lttng_writer_write_element_bool(mi_writer,
+                               mi_lttng_element_command_success, ret ? 0 : 1);
+               if (mi_ret) {
+                       ret = 1;
+                       goto cleanup;
+               }
+
+               /* Command element close. */
+               mi_ret = mi_lttng_writer_command_close(mi_writer);
+               if (mi_ret) {
+                       ret = 1;
+                       goto cleanup;
+               }
+       }
+
+cleanup:
+       argpar_item_destroy(argpar_item);
+       argpar_iter_destroy(argpar_iter);
        lttng_triggers_destroy(triggers);
        free(owner_uid);
 
+       if (mi_writer && mi_lttng_writer_destroy(mi_writer)) {
+               /* Preserve original error code. */
+               ret = ret ? ret : CMD_ERROR;
+       }
        return ret;
 }
This page took 0.028279 seconds and 4 git commands to generate.