Merged in master, stable-2.10, and stable-2.9.

Thanks!
Jérémie

On Mon, Feb 26, 2018 at 04:03:02PM -0500, Jonathan Rajotte wrote:
> Handling of the following enum are added:
>     LTTNG_EVENT_CONTEXT_INTERRUPTIBLE
>     LTTNG_EVENT_CONTEXT_PREEMPTIBLE
>     LTTNG_EVENT_CONTEXT_NEED_RESCHEDULE
>     LTTNG_EVENT_CONTEXT_MIGRATABLE
> 
> Signed-off-by: Jonathan Rajotte <[email protected]>
> ---
>  src/common/mi-lttng-3.0.xsd | 4 ++++
>  src/common/mi-lttng.c       | 8 ++++++++
>  2 files changed, 12 insertions(+)
> 
> diff --git a/src/common/mi-lttng-3.0.xsd b/src/common/mi-lttng-3.0.xsd
> index 0304635..ae00ee8 100644
> --- a/src/common/mi-lttng-3.0.xsd
> +++ b/src/common/mi-lttng-3.0.xsd
> @@ -112,6 +112,10 @@ THE SOFTWARE.
>                       <xs:enumeration value="PTHREAD_ID" />
>                       <xs:enumeration value="HOSTNAME" />
>                       <xs:enumeration value="IP" />
> +                     <xs:enumeration value="INTERRUPTIBLE" />
> +                     <xs:enumeration value="PREEMPTIBLE" />
> +                     <xs:enumeration value="NEED_RESCHEDULE" />
> +                     <xs:enumeration value="MIGRATABLE" />
>               </xs:restriction>
>       </xs:simpleType>
>  
> diff --git a/src/common/mi-lttng.c b/src/common/mi-lttng.c
> index 9c1597b..f0244d9 100644
> --- a/src/common/mi-lttng.c
> +++ b/src/common/mi-lttng.c
> @@ -375,6 +375,14 @@ const char *mi_lttng_event_contexttype_string(enum 
> lttng_event_context_type val)
>               return config_event_context_hostname;
>       case LTTNG_EVENT_CONTEXT_IP:
>               return config_event_context_ip;
> +     case LTTNG_EVENT_CONTEXT_INTERRUPTIBLE:
> +             return config_event_context_interruptible;
> +     case LTTNG_EVENT_CONTEXT_PREEMPTIBLE:
> +             return config_event_context_preemptible;
> +     case LTTNG_EVENT_CONTEXT_NEED_RESCHEDULE:
> +             return config_event_context_need_reschedule;
> +     case LTTNG_EVENT_CONTEXT_MIGRATABLE:
> +             return config_event_context_migratable;
>       default:
>               return NULL;
>       }
> -- 
> 2.7.4
> 
_______________________________________________
lttng-dev mailing list
[email protected]
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

Reply via email to