Add UST uid/gid contexts

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>

diff --git a/src/bin/lttng-sessiond/lttng-ust-abi.h b/src/bin/lttng-sessiond/lttng-ust-abi.h
index c57dc90c7353e5b1bbdbe103ed5815d077f5420e..7cfb186463452e2cb7e0939a5195d35b406d3ac2 100644 (file)
--- a/src/bin/lttng-sessiond/lttng-ust-abi.h
+++ b/src/bin/lttng-sessiond/lttng-ust-abi.h
@@ -152,6 +152,12 @@ enum lttng_ust_context_type {
        LTTNG_UST_CONTEXT_PID_NS                = 12,
        LTTNG_UST_CONTEXT_USER_NS               = 13,
        LTTNG_UST_CONTEXT_UTS_NS                = 14,
+       LTTNG_UST_CONTEXT_VUID                  = 15,
+       LTTNG_UST_CONTEXT_VEUID                 = 16,
+       LTTNG_UST_CONTEXT_VSUID                 = 17,
+       LTTNG_UST_CONTEXT_VGID                  = 18,
+       LTTNG_UST_CONTEXT_VEGID                 = 19,
+       LTTNG_UST_CONTEXT_VSGID                 = 20,
 };
 
 struct lttng_ust_perf_counter_ctx {

diff --git a/src/bin/lttng-sessiond/save.c b/src/bin/lttng-sessiond/save.c
index 993c3716a657bdd7026f10ff83118561f60cab61..d3a702ab6888f5e94d66fd0e94e6111d7457cac1 100644 (file)
--- a/src/bin/lttng-sessiond/save.c
+++ b/src/bin/lttng-sessiond/save.c
@@ -404,6 +404,24 @@ const char *get_ust_context_type_string(
        case LTTNG_UST_CONTEXT_UTS_NS:
                context_type_string = config_event_context_uts_ns;
                break;
+       case LTTNG_UST_CONTEXT_VUID:
+               context_type_string = config_event_context_vuid;
+               break;
+       case LTTNG_UST_CONTEXT_VEUID:
+               context_type_string = config_event_context_veuid;
+               break;
+       case LTTNG_UST_CONTEXT_VSUID:
+               context_type_string = config_event_context_vsuid;
+               break;
+       case LTTNG_UST_CONTEXT_VGID:
+               context_type_string = config_event_context_vgid;
+               break;
+       case LTTNG_UST_CONTEXT_VEGID:
+               context_type_string = config_event_context_vegid;
+               break;
+       case LTTNG_UST_CONTEXT_VSGID:
+               context_type_string = config_event_context_vsgid;
+               break;
        case LTTNG_UST_CONTEXT_PERF_THREAD_COUNTER:
                /*
                 * Error, should not be stored in the XML, perf contexts

diff --git a/src/bin/lttng-sessiond/trace-ust.c b/src/bin/lttng-sessiond/trace-ust.c
index a37161865ddc297620b6cac7e6e027022f06b165..3095c86175cf1e00faaa780876e98134d86cefec 100644 (file)
--- a/src/bin/lttng-sessiond/trace-ust.c
+++ b/src/bin/lttng-sessiond/trace-ust.c
@@ -584,6 +584,24 @@ int trace_ust_context_type_event_to_ust(
        case LTTNG_EVENT_CONTEXT_UTS_NS:
                utype = LTTNG_UST_CONTEXT_UTS_NS;
                break;
+       case LTTNG_EVENT_CONTEXT_VUID:
+               utype = LTTNG_UST_CONTEXT_VUID;
+               break;
+       case LTTNG_EVENT_CONTEXT_VEUID:
+               utype = LTTNG_UST_CONTEXT_VEUID;
+               break;
+       case LTTNG_EVENT_CONTEXT_VSUID:
+               utype = LTTNG_UST_CONTEXT_VSUID;
+               break;
+       case LTTNG_EVENT_CONTEXT_VGID:
+               utype = LTTNG_UST_CONTEXT_VGID;
+               break;
+       case LTTNG_EVENT_CONTEXT_VEGID:
+               utype = LTTNG_UST_CONTEXT_VEGID;
+               break;
+       case LTTNG_EVENT_CONTEXT_VSGID:
+               utype = LTTNG_UST_CONTEXT_VSGID;
+               break;
        default:
                utype = -1;
                break;