Rename "blob" type to "byte"

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/include/side/trace.h b/include/side/trace.h
index a8df65d43b28704901f6e48e4645007e37bd7b90..f09463d7f7e1bcd5ade93ea8a05b63bc46fad729 100644 (file)
--- a/include/side/trace.h
+++ b/include/side/trace.h
@@ -42,7 +42,7 @@ enum side_type {
        SIDE_TYPE_S16,
        SIDE_TYPE_S32,
        SIDE_TYPE_S64,
-       SIDE_TYPE_BLOB,
+       SIDE_TYPE_BYTE,
        SIDE_TYPE_FLOAT_BINARY16,
        SIDE_TYPE_FLOAT_BINARY32,
        SIDE_TYPE_FLOAT_BINARY64,
@@ -63,7 +63,7 @@ enum side_type {
        SIDE_TYPE_ARRAY_S16,
        SIDE_TYPE_ARRAY_S32,
        SIDE_TYPE_ARRAY_S64,
-       SIDE_TYPE_ARRAY_BLOB,
+       SIDE_TYPE_ARRAY_BYTE,
 
        SIDE_TYPE_VLA_U8,
        SIDE_TYPE_VLA_U16,
@@ -73,7 +73,7 @@ enum side_type {
        SIDE_TYPE_VLA_S16,
        SIDE_TYPE_VLA_S32,
        SIDE_TYPE_VLA_S64,
-       SIDE_TYPE_VLA_BLOB,
+       SIDE_TYPE_VLA_BYTE,
 
        /* Enumeration types */
        SIDE_TYPE_ENUM,
@@ -95,7 +95,7 @@ enum side_dynamic_type {
        SIDE_DYNAMIC_TYPE_S16,
        SIDE_DYNAMIC_TYPE_S32,
        SIDE_DYNAMIC_TYPE_S64,
-       SIDE_DYNAMIC_TYPE_BLOB,
+       SIDE_DYNAMIC_TYPE_BYTE,
        SIDE_DYNAMIC_TYPE_FLOAT_BINARY16,
        SIDE_DYNAMIC_TYPE_FLOAT_BINARY32,
        SIDE_DYNAMIC_TYPE_FLOAT_BINARY64,
@@ -319,7 +319,7 @@ struct side_arg_dynamic_vec {
                                int16_t side_s16;
                                int32_t side_s32;
                                int64_t side_s64;
-                               uint8_t side_blob;
+                               uint8_t side_byte;
 #if __HAVE_FLOAT16
                                _Float16 side_float_binary16;
 #endif
@@ -386,7 +386,7 @@ struct side_arg_vec {
                int16_t side_s16;
                int32_t side_s32;
                int64_t side_s64;
-               uint8_t side_blob;
+               uint8_t side_byte;
 #if __HAVE_FLOAT16
                _Float16 side_float_binary16;
 #endif
@@ -492,7 +492,7 @@ struct side_tracer_dynamic_vla_visitor_ctx {
 #define side_type_s16(_attr)                           _side_type_basic(SIDE_TYPE_S16, SIDE_PARAM(_attr))
 #define side_type_s32(_attr)                           _side_type_basic(SIDE_TYPE_S32, SIDE_PARAM(_attr))
 #define side_type_s64(_attr)                           _side_type_basic(SIDE_TYPE_S64, SIDE_PARAM(_attr))
-#define side_type_blob(_attr)                          _side_type_basic(SIDE_TYPE_BLOB, SIDE_PARAM(_attr))
+#define side_type_byte(_attr)                          _side_type_basic(SIDE_TYPE_BYTE, SIDE_PARAM(_attr))
 #define side_type_float_binary16(_attr)                        _side_type_basic(SIDE_TYPE_FLOAT_BINARY16, SIDE_PARAM(_attr))
 #define side_type_float_binary32(_attr)                        _side_type_basic(SIDE_TYPE_FLOAT_BINARY32, SIDE_PARAM(_attr))
 #define side_type_float_binary64(_attr)                        _side_type_basic(SIDE_TYPE_FLOAT_BINARY64, SIDE_PARAM(_attr))
@@ -515,7 +515,7 @@ struct side_tracer_dynamic_vla_visitor_ctx {
 #define side_field_s16(_name, _attr)                   _side_field(_name, side_type_s16(SIDE_PARAM(_attr)))
 #define side_field_s32(_name, _attr)                   _side_field(_name, side_type_s32(SIDE_PARAM(_attr)))
 #define side_field_s64(_name, _attr)                   _side_field(_name, side_type_s64(SIDE_PARAM(_attr)))
-#define side_field_blob(_name, _attr)                  _side_field(_name, side_type_blob(SIDE_PARAM(_attr)))
+#define side_field_byte(_name, _attr)                  _side_field(_name, side_type_byte(SIDE_PARAM(_attr)))
 #define side_field_float_binary16(_name, _attr)                _side_field(_name, side_type_float_binary16(SIDE_PARAM(_attr)))
 #define side_field_float_binary32(_name, _attr)                _side_field(_name, side_type_float_binary32(SIDE_PARAM(_attr)))
 #define side_field_float_binary64(_name, _attr)                _side_field(_name, side_type_float_binary64(SIDE_PARAM(_attr)))
@@ -635,7 +635,7 @@ struct side_tracer_dynamic_vla_visitor_ctx {
 #define side_arg_s16(_val)             { .type = SIDE_TYPE_S16, .u = { .side_s16 = (_val) } }
 #define side_arg_s32(_val)             { .type = SIDE_TYPE_S32, .u = { .side_s32 = (_val) } }
 #define side_arg_s64(_val)             { .type = SIDE_TYPE_S64, .u = { .side_s64 = (_val) } }
-#define side_arg_blob(_val)            { .type = SIDE_TYPE_BLOB, .u = { .side_blob = (_val) } }
+#define side_arg_byte(_val)            { .type = SIDE_TYPE_BYTE, .u = { .side_byte = (_val) } }
 #define side_arg_enum_bitmap8(_val)    { .type = SIDE_TYPE_ENUM_BITMAP8, .u = { .side_u8 = (_val) } }
 #define side_arg_enum_bitmap16(_val)   { .type = SIDE_TYPE_ENUM_BITMAP16, .u = { .side_u16 = (_val) } }
 #define side_arg_enum_bitmap32(_val)   { .type = SIDE_TYPE_ENUM_BITMAP32, .u = { .side_u32 = (_val) } }
@@ -661,7 +661,7 @@ struct side_tracer_dynamic_vla_visitor_ctx {
 #define side_arg_array_s16(_ptr)       { .type = SIDE_TYPE_ARRAY_S16, .u = { .side_array_fixint  = (_ptr) } }
 #define side_arg_array_s32(_ptr)       { .type = SIDE_TYPE_ARRAY_S32, .u = { .side_array_fixint = (_ptr) } }
 #define side_arg_array_s64(_ptr)       { .type = SIDE_TYPE_ARRAY_S64, .u = { .side_array_fixint = (_ptr) } }
-#define side_arg_array_blob(_ptr)      { .type = SIDE_TYPE_ARRAY_BLOB, .u = { .side_array_fixint = (_ptr) } }
+#define side_arg_array_byte(_ptr)      { .type = SIDE_TYPE_ARRAY_BYTE, .u = { .side_array_fixint = (_ptr) } }
 
 #define side_arg_vla_u8(_ptr, _length) { .type = SIDE_TYPE_VLA_U8, .u = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } }
 #define side_arg_vla_u16(_ptr, _length)        { .type = SIDE_TYPE_VLA_U16, .u = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } }
@@ -671,7 +671,7 @@ struct side_tracer_dynamic_vla_visitor_ctx {
 #define side_arg_vla_s16(_ptr, _length)        { .type = SIDE_TYPE_VLA_S16, .u = { .side_vla_fixint  = { .p = (_ptr), .length = (_length) } } }
 #define side_arg_vla_s32(_ptr, _length)        { .type = SIDE_TYPE_VLA_S32, .u = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } }
 #define side_arg_vla_s64(_ptr, _length)        { .type = SIDE_TYPE_VLA_S64, .u = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } }
-#define side_arg_vla_blob(_ptr, _length) { .type = SIDE_TYPE_VLA_BLOB, .u = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } }
+#define side_arg_vla_byte(_ptr, _length) { .type = SIDE_TYPE_VLA_BYTE, .u = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } }
 
 #define side_arg_dynamic(_dynamic_arg_type) \
        { \
@@ -813,15 +813,15 @@ struct side_tracer_dynamic_vla_visitor_ctx {
                        }, \
                }, \
        }
-#define side_arg_dynamic_blob(_val, _attr) \
+#define side_arg_dynamic_byte(_val, _attr) \
        { \
-               .dynamic_type = SIDE_DYNAMIC_TYPE_BLOB, \
+               .dynamic_type = SIDE_DYNAMIC_TYPE_BYTE, \
                .u = { \
                        .side_basic = { \
                                .attr = _attr, \
                                .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \
                                .u = { \
-                                       .side_blob = (_val), \
+                                       .side_byte = (_val), \
                                }, \
                        }, \
                }, \

diff --git a/src/test.c b/src/test.c
index 396a3f0d5fa6da1fa5e3c089f947e1ccf03401e0..173aae55992763d1e9edd41d39dddbf646a8eb53 100644 (file)
--- a/src/test.c
+++ b/src/test.c
@@ -1076,10 +1076,10 @@ static uint8_t blob_fixint[] = { 0x55, 0x44, 0x33, 0x22, 0x11 };
 
 static side_define_event_variadic(my_provider_event_blob, "myprovider", "myeventblob", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
-               side_field_blob("blobfield", side_attr_list()),
-               side_field_array("arrayblob", side_elem(side_type_blob(side_attr_list())), 3, side_attr_list()),
-               side_field_array("arrayblobfix", side_elem(side_type_blob(side_attr_list())), SIDE_ARRAY_SIZE(blob_fixint), side_attr_list()),
-               side_field_vla("vlablobfix", side_elem(side_type_blob(side_attr_list())), side_attr_list()),
+               side_field_byte("blobfield", side_attr_list()),
+               side_field_array("arrayblob", side_elem(side_type_byte(side_attr_list())), 3, side_attr_list()),
+               side_field_array("arrayblobfix", side_elem(side_type_byte(side_attr_list())), SIDE_ARRAY_SIZE(blob_fixint), side_attr_list()),
+               side_field_vla("vlablobfix", side_elem(side_type_byte(side_attr_list())), side_attr_list()),
        ),
        side_attr_list()
 );
@@ -1089,24 +1089,24 @@ void test_blob(void)
 {
        my_provider_event_blob_enabled = 1;
        side_event_cond(my_provider_event_blob) {
-               side_arg_define_vec(myarray, side_arg_list(side_arg_blob(1), side_arg_blob(2), side_arg_blob(3)));
+               side_arg_define_vec(myarray, side_arg_list(side_arg_byte(1), side_arg_byte(2), side_arg_byte(3)));
                side_arg_dynamic_define_vec(myvla,
                        side_arg_list(
-                               side_arg_dynamic_blob(0x22, side_attr_list()),
-                               side_arg_dynamic_blob(0x33, side_attr_list()),
+                               side_arg_dynamic_byte(0x22, side_attr_list()),
+                               side_arg_dynamic_byte(0x33, side_attr_list()),
                        ),
                        side_attr_list()
                );
                side_event_call_variadic(my_provider_event_blob,
                        side_arg_list(
-                               side_arg_blob(0x55),
+                               side_arg_byte(0x55),
                                side_arg_array(&myarray),
-                               side_arg_array_blob(blob_fixint),
-                               side_arg_vla_blob(blob_fixint, SIDE_ARRAY_SIZE(blob_fixint)),
+                               side_arg_array_byte(blob_fixint),
+                               side_arg_vla_byte(blob_fixint, SIDE_ARRAY_SIZE(blob_fixint)),
                        ),
                        side_arg_list(
                                side_arg_dynamic_field("varblobfield",
-                                       side_arg_dynamic_blob(0x55, side_attr_list())
+                                       side_arg_dynamic_byte(0x55, side_attr_list())
                                ),
                                side_arg_dynamic_field("varblobvla", side_arg_dynamic_vla(&myvla)),
                        ),

diff --git a/src/tracer.c b/src/tracer.c
index 1ac3fcb56b266c1ff03792a9ee21a512010d3ade..7643155dc351baf3e66e91e2a60af74a64fb065f 100644 (file)
--- a/src/tracer.c
+++ b/src/tracer.c
@@ -330,7 +330,7 @@ void tracer_print_type(const struct side_type_description *type_desc, const stru
                case SIDE_TYPE_ARRAY_S16:
                case SIDE_TYPE_ARRAY_S32:
                case SIDE_TYPE_ARRAY_S64:
-               case SIDE_TYPE_ARRAY_BLOB:
+               case SIDE_TYPE_ARRAY_BYTE:
                case SIDE_TYPE_ARRAY:
                        break;
                default:
@@ -350,7 +350,7 @@ void tracer_print_type(const struct side_type_description *type_desc, const stru
                case SIDE_TYPE_VLA_S16:
                case SIDE_TYPE_VLA_S32:
                case SIDE_TYPE_VLA_S64:
-               case SIDE_TYPE_VLA_BLOB:
+               case SIDE_TYPE_VLA_BYTE:
                case SIDE_TYPE_VLA:
                        break;
                default:
@@ -445,9 +445,9 @@ void tracer_print_type(const struct side_type_description *type_desc, const stru
                tracer_print_basic_type_header(type_desc);
                printf("%" PRId64, item->u.side_s64);
                break;
-       case SIDE_TYPE_BLOB:
+       case SIDE_TYPE_BYTE:
                tracer_print_basic_type_header(type_desc);
-               printf("0x%" PRIx8, item->u.side_blob);
+               printf("0x%" PRIx8, item->u.side_byte);
                break;
 
        case SIDE_TYPE_ENUM:
@@ -518,7 +518,7 @@ void tracer_print_type(const struct side_type_description *type_desc, const stru
        case SIDE_TYPE_ARRAY_S16:
        case SIDE_TYPE_ARRAY_S32:
        case SIDE_TYPE_ARRAY_S64:
-       case SIDE_TYPE_ARRAY_BLOB:
+       case SIDE_TYPE_ARRAY_BYTE:
                tracer_print_array_fixint(type_desc, item);
                break;
        case SIDE_TYPE_VLA_U8:
@@ -529,7 +529,7 @@ void tracer_print_type(const struct side_type_description *type_desc, const stru
        case SIDE_TYPE_VLA_S16:
        case SIDE_TYPE_VLA_S32:
        case SIDE_TYPE_VLA_S64:
-       case SIDE_TYPE_VLA_BLOB:
+       case SIDE_TYPE_VLA_BYTE:
                tracer_print_vla_fixint(type_desc, item);
                break;
        case SIDE_TYPE_DYNAMIC:
@@ -699,8 +699,8 @@ void tracer_print_array_fixint(const struct side_type_description *type_desc, co
                if (elem_type->type != SIDE_TYPE_S64)
                        goto type_error;
                break;
-       case SIDE_TYPE_ARRAY_BLOB:
-               if (elem_type->type != SIDE_TYPE_BLOB)
+       case SIDE_TYPE_ARRAY_BYTE:
+               if (elem_type->type != SIDE_TYPE_BYTE)
                        goto type_error;
                break;
        default:
@@ -739,8 +739,8 @@ void tracer_print_array_fixint(const struct side_type_description *type_desc, co
                case SIDE_TYPE_S64:
                        sav_elem.u.side_s64 = ((const int64_t *) p)[i];
                        break;
-               case SIDE_TYPE_BLOB:
-                       sav_elem.u.side_blob = ((const uint8_t *) p)[i];
+               case SIDE_TYPE_BYTE:
+                       sav_elem.u.side_byte = ((const uint8_t *) p)[i];
                        break;
 
                default:
@@ -803,8 +803,8 @@ void tracer_print_vla_fixint(const struct side_type_description *type_desc, cons
                if (elem_type->type != SIDE_TYPE_S64)
                        goto type_error;
                break;
-       case SIDE_TYPE_VLA_BLOB:
-               if (elem_type->type != SIDE_TYPE_BLOB)
+       case SIDE_TYPE_VLA_BYTE:
+               if (elem_type->type != SIDE_TYPE_BYTE)
                        goto type_error;
                break;
        default:
@@ -843,8 +843,8 @@ void tracer_print_vla_fixint(const struct side_type_description *type_desc, cons
                case SIDE_TYPE_S64:
                        sav_elem.u.side_s64 = ((const int64_t *) p)[i];
                        break;
-               case SIDE_TYPE_BLOB:
-                       sav_elem.u.side_blob = ((const uint8_t *) p)[i];
+               case SIDE_TYPE_BYTE:
+                       sav_elem.u.side_byte = ((const uint8_t *) p)[i];
                        break;
 
                default:
@@ -1042,9 +1042,9 @@ void tracer_print_dynamic(const struct side_arg_dynamic_vec *item)
                tracer_print_dynamic_basic_type_header(item);
                printf("%" PRId64, item->u.side_basic.u.side_s64);
                break;
-       case SIDE_DYNAMIC_TYPE_BLOB:
+       case SIDE_DYNAMIC_TYPE_BYTE:
                tracer_print_dynamic_basic_type_header(item);
-               printf("0x%" PRIx8, item->u.side_basic.u.side_blob);
+               printf("0x%" PRIx8, item->u.side_basic.u.side_byte);
                break;
 
        case SIDE_DYNAMIC_TYPE_FLOAT_BINARY16: