From b8dfb3487e6b30e0ae8e0c8e337ae46885e9761b Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Fri, 24 Nov 2023 14:14:44 -0500 Subject: [PATCH] Move ABI headers under side/abi/ Signed-off-by: Mathieu Desnoyers --- include/side/{attribute-abi.h => abi/attribute.h} | 8 ++++---- .../event-description.h} | 6 +++--- .../{type-argument-abi.h => abi/type-argument.h} | 14 +++++++------- .../type-description.h} | 12 ++++++------ .../side/{type-value-abi.h => abi/type-value.h} | 6 +++--- include/side/{visitor-abi.h => abi/visitor.h} | 6 +++--- include/side/instrumentation-c-api.h | 6 +++--- include/side/trace.h | 4 ++-- 8 files changed, 31 insertions(+), 31 deletions(-) rename include/side/{attribute-abi.h => abi/attribute.h} (89%) rename include/side/{event-description-abi.h => abi/event-description.h} (91%) rename include/side/{type-argument-abi.h => abi/type-argument.h} (94%) rename include/side/{type-description-abi.h => abi/type-description.h} (97%) rename include/side/{type-value-abi.h => abi/type-value.h} (93%) rename include/side/{visitor-abi.h => abi/visitor.h} (93%) diff --git a/include/side/attribute-abi.h b/include/side/abi/attribute.h similarity index 89% rename from include/side/attribute-abi.h rename to include/side/abi/attribute.h index 710e992..7bc9e9d 100644 --- a/include/side/attribute-abi.h +++ b/include/side/abi/attribute.h @@ -3,14 +3,14 @@ * Copyright 2022-2023 Mathieu Desnoyers */ -#ifndef SIDE_ATTRIBUTE_ABI_H -#define SIDE_ATTRIBUTE_ABI_H +#ifndef SIDE_ABI_ATTRIBUTE_H +#define SIDE_ABI_ATTRIBUTE_H #include #include #include -#include +#include enum side_attr_type { SIDE_ATTR_TYPE_NULL, @@ -50,4 +50,4 @@ struct side_attr { } SIDE_PACKED; side_check_size(struct side_attr, 54); -#endif /* SIDE_ATTRIBUTE_ABI_H */ +#endif /* SIDE_ABI_ATTRIBUTE_H */ diff --git a/include/side/event-description-abi.h b/include/side/abi/event-description.h similarity index 91% rename from include/side/event-description-abi.h rename to include/side/abi/event-description.h index beff152..c72a959 100644 --- a/include/side/event-description-abi.h +++ b/include/side/abi/event-description.h @@ -3,8 +3,8 @@ * Copyright 2022-2023 Mathieu Desnoyers */ -#ifndef SIDE_EVENT_DESCRIPTION_ABI_H -#define SIDE_EVENT_DESCRIPTION_ABI_H +#ifndef SIDE_ABI_EVENT_DESCRIPTION_H +#define SIDE_ABI_EVENT_DESCRIPTION_H #include #include @@ -49,4 +49,4 @@ struct side_event_description { char end[]; /* End with a flexible array to account for extensibility. */ } SIDE_PACKED; -#endif /* SIDE_EVENT_DESCRIPTION_ABI_H */ +#endif /* SIDE_ABI_EVENT_DESCRIPTION_H */ diff --git a/include/side/type-argument-abi.h b/include/side/abi/type-argument.h similarity index 94% rename from include/side/type-argument-abi.h rename to include/side/abi/type-argument.h index 40960e5..9d0f0cb 100644 --- a/include/side/type-argument-abi.h +++ b/include/side/abi/type-argument.h @@ -3,17 +3,17 @@ * Copyright 2022-2023 Mathieu Desnoyers */ -#ifndef SIDE_TYPE_ARGUMENT_ABI_H -#define SIDE_TYPE_ARGUMENT_ABI_H +#ifndef SIDE_ABI_TYPE_ARGUMENT_H +#define SIDE_ABI_TYPE_ARGUMENT_H #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #if (SIDE_BYTE_ORDER == SIDE_LITTLE_ENDIAN) # define SIDE_TYPE_BYTE_ORDER_HOST SIDE_TYPE_BYTE_ORDER_LE @@ -155,4 +155,4 @@ struct side_arg_dynamic_field { } SIDE_PACKED; side_check_size(struct side_arg_dynamic_field, 16 + sizeof(const struct side_arg)); -#endif /* SIDE_TYPE_ARGUMENT_ABI_H */ +#endif /* SIDE_ABI_TYPE_ARGUMENT_H */ diff --git a/include/side/type-description-abi.h b/include/side/abi/type-description.h similarity index 97% rename from include/side/type-description-abi.h rename to include/side/abi/type-description.h index c25e134..47056ba 100644 --- a/include/side/type-description-abi.h +++ b/include/side/abi/type-description.h @@ -3,16 +3,16 @@ * Copyright 2022-2023 Mathieu Desnoyers */ -#ifndef SIDE_TYPE_DESCRIPTION_ABI_H -#define SIDE_TYPE_DESCRIPTION_ABI_H +#ifndef SIDE_ABI_TYPE_DESCRIPTION_H +#define SIDE_ABI_TYPE_DESCRIPTION_H #include #include #include -#include -#include -#include +#include +#include +#include enum side_type_label { /* Stack-copy basic types */ @@ -348,4 +348,4 @@ struct side_event_field { } SIDE_PACKED; side_check_size(struct side_event_field, 16 + sizeof(struct side_type)); -#endif /* SIDE_TYPE_DESCRIPTION_ABI_H */ +#endif /* SIDE_ABI_TYPE_DESCRIPTION_H */ diff --git a/include/side/type-value-abi.h b/include/side/abi/type-value.h similarity index 93% rename from include/side/type-value-abi.h rename to include/side/abi/type-value.h index ac49590..9d489ef 100644 --- a/include/side/type-value-abi.h +++ b/include/side/abi/type-value.h @@ -3,8 +3,8 @@ * Copyright 2022-2023 Mathieu Desnoyers */ -#ifndef SIDE_TYPE_VALUE_ABI_H -#define SIDE_TYPE_VALUE_ABI_H +#ifndef SIDE_ABI_TYPE_VALUE_H +#define SIDE_ABI_TYPE_VALUE_H #include #include @@ -62,4 +62,4 @@ struct side_type_raw_string { } SIDE_PACKED; side_check_size(struct side_type_raw_string, 18); -#endif /* SIDE_TYPE_VALUE_ABI_H */ +#endif /* SIDE_ABI_TYPE_VALUE_H */ diff --git a/include/side/visitor-abi.h b/include/side/abi/visitor.h similarity index 93% rename from include/side/visitor-abi.h rename to include/side/abi/visitor.h index 59cad69..b79dffc 100644 --- a/include/side/visitor-abi.h +++ b/include/side/abi/visitor.h @@ -3,8 +3,8 @@ * Copyright 2022-2023 Mathieu Desnoyers */ -#ifndef SIDE_VISITOR_ABI_H -#define SIDE_VISITOR_ABI_H +#ifndef SIDE_ABI_VISITOR_H +#define SIDE_ABI_VISITOR_H #include #include @@ -41,4 +41,4 @@ struct side_tracer_dynamic_struct_visitor_ctx { void *priv; /* Private tracer context. */ } SIDE_PACKED; -#endif /* SIDE_VISITOR_ABI_H */ +#endif /* SIDE_ABI_VISITOR_H */ diff --git a/include/side/instrumentation-c-api.h b/include/side/instrumentation-c-api.h index 13f8524..c6e0576 100644 --- a/include/side/instrumentation-c-api.h +++ b/include/side/instrumentation-c-api.h @@ -10,9 +10,9 @@ #include #include -#include -#include -#include +#include +#include +#include #if (SIDE_BYTE_ORDER == SIDE_LITTLE_ENDIAN) # define SIDE_TYPE_BYTE_ORDER_HOST SIDE_TYPE_BYTE_ORDER_LE diff --git a/include/side/trace.h b/include/side/trace.h index 91de083..25ec2aa 100644 --- a/include/side/trace.h +++ b/include/side/trace.h @@ -102,8 +102,8 @@ #define SIDE_EVENT_STATE_ABI_VERSION 0 -#include -#include +#include +#include #include enum side_error { -- 2.34.1