Skip to content

Commit

Permalink
format
Browse files Browse the repository at this point in the history
  • Loading branch information
@DenisBiryukov91
DenisBiryukov91 committed Sep 17, 2024
1 parent 43cc286 commit b525f9f
Show file tree
Hide file tree
Showing 13 changed files with 203 additions and 206 deletions.
184 changes: 92 additions & 92 deletions include/zenoh-pico/api/handlers.h
View file

Large diffs are not rendered by default.

92 changes: 46 additions & 46 deletions include/zenoh-pico/api/olv_macros.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@

#define _Z_OWNED_FUNCTIONS_DEF(name) \
void z_internal_##name##_null(z_owned_##name##_t *obj); \
bool z_internal_##name##_check(const z_owned_##name##_t *obj); \
bool z_internal_##name##_check(const z_owned_##name##_t *obj); \
const z_loaned_##name##_t *z_##name##_loan(const z_owned_##name##_t *obj); \
z_loaned_##name##_t *z_##name##_loan_mut(z_owned_##name##_t *obj); \
z_moved_##name##_t *z_##name##_move(z_owned_##name##_t *obj); \
Expand All @@ -67,7 +67,7 @@

#define _Z_OWNED_FUNCTIONS_NO_COPY_DEF(name) \
void z_internal_##name##_null(z_owned_##name##_t *obj); \
bool z_internal_##name##_check(const z_owned_##name##_t *obj); \
bool z_internal_##name##_check(const z_owned_##name##_t *obj); \
const z_loaned_##name##_t *z_##name##_loan(const z_owned_##name##_t *obj); \
z_loaned_##name##_t *z_##name##_loan_mut(z_owned_##name##_t *obj); \
z_moved_##name##_t *z_##name##_move(z_owned_##name##_t *obj); \
Expand All @@ -82,7 +82,7 @@
z_moved_##name##_t *z_##name##_move(z_owned_##name##_t *obj);

#define _Z_VIEW_FUNCTIONS_DEF(name) \
bool z_view_##name##_is_empty(const z_view_##name##_t *obj); \
bool z_view_##name##_is_empty(const z_view_##name##_t *obj); \
const z_loaned_##name##_t *z_view_##name##_loan(const z_view_##name##_t *name); \
z_loaned_##name##_t *z_view_##name##_loan_mut(z_view_##name##_t *name); \
void z_view_##name##_empty(z_view_##name##_t *name);
Expand All @@ -97,7 +97,7 @@
#define _Z_OWNED_FUNCTIONS_VALUE_IMPL(type, name, f_check, f_null, f_copy, f_drop) \
_Z_OWNED_FUNCTIONS_IMPL_MOVE_TAKE(name) \
void z_internal_##name##_null(z_owned_##name##_t *obj) { obj->_val = f_null(); } \
bool z_internal_##name##_check(const z_owned_##name##_t *obj) { return f_check((&obj->_val)); } \
bool z_internal_##name##_check(const z_owned_##name##_t *obj) { return f_check((&obj->_val)); } \
const z_loaned_##name##_t *z_##name##_loan(const z_owned_##name##_t *obj) { return &obj->_val; } \
z_loaned_##name##_t *z_##name##_loan_mut(z_owned_##name##_t *obj) { return &obj->_val; } \
int8_t z_##name##_clone(z_owned_##name##_t *obj, const z_loaned_##name##_t *src) { \
Expand All @@ -109,7 +109,7 @@

#define _Z_OWNED_FUNCTIONS_VALUE_NO_COPY_IMPL_INNER(type, name, f_check, f_null, f_drop, attribute) \
attribute void z_internal_##name##_null(z_owned_##name##_t *obj) { obj->_val = f_null(); } \
attribute bool z_internal_##name##_check(const z_owned_##name##_t *obj) { return f_check((&obj->_val)); } \
attribute bool z_internal_##name##_check(const z_owned_##name##_t *obj) { return f_check((&obj->_val)); } \
attribute const z_loaned_##name##_t *z_##name##_loan(const z_owned_##name##_t *obj) { return &obj->_val; } \
attribute z_loaned_##name##_t *z_##name##_loan_mut(z_owned_##name##_t *obj) { return &obj->_val; } \
attribute z_moved_##name##_t *z_##name##_move(z_owned_##name##_t *obj) { return (z_moved_##name##_t *)(obj); } \
Expand All @@ -129,24 +129,24 @@
#define _Z_OWNED_FUNCTIONS_VALUE_NO_COPY_INLINE_IMPL(type, name, f_check, f_null, f_drop) \
_Z_OWNED_FUNCTIONS_VALUE_NO_COPY_IMPL_INNER(type, name, f_check, f_null, f_drop, static inline)

#define _Z_OWNED_FUNCTIONS_RC_IMPL(name) \
_Z_OWNED_FUNCTIONS_IMPL_MOVE_TAKE(name) \
void z_internal_##name##_null(z_owned_##name##_t *val) { val->_rc = _z_##name##_rc_null(); } \
#define _Z_OWNED_FUNCTIONS_RC_IMPL(name) \
_Z_OWNED_FUNCTIONS_IMPL_MOVE_TAKE(name) \
void z_internal_##name##_null(z_owned_##name##_t *val) { val->_rc = _z_##name##_rc_null(); } \
bool z_internal_##name##_check(const z_owned_##name##_t *val) { return !_Z_RC_IS_NULL(&val->_rc); } \
const z_loaned_##name##_t *z_##name##_loan(const z_owned_##name##_t *val) { return &val->_rc; } \
z_loaned_##name##_t *z_##name##_loan_mut(z_owned_##name##_t *val) { return &val->_rc; } \
int8_t z_##name##_clone(z_owned_##name##_t *obj, const z_loaned_##name##_t *src) { \
int8_t ret = _Z_RES_OK; \
obj->_rc = _z_##name##_rc_clone((z_loaned_##name##_t *)src); \
if (_Z_RC_IS_NULL(&obj->_rc)) { \
ret = _Z_ERR_SYSTEM_OUT_OF_MEMORY; \
} \
return ret; \
} \
void z_##name##_drop(z_moved_##name##_t *obj) { \
if (!_Z_RC_IS_NULL(&obj->_this._rc)) { \
_z_##name##_rc_drop(&obj->_this._rc); \
} \
const z_loaned_##name##_t *z_##name##_loan(const z_owned_##name##_t *val) { return &val->_rc; } \
z_loaned_##name##_t *z_##name##_loan_mut(z_owned_##name##_t *val) { return &val->_rc; } \
int8_t z_##name##_clone(z_owned_##name##_t *obj, const z_loaned_##name##_t *src) { \
int8_t ret = _Z_RES_OK; \
obj->_rc = _z_##name##_rc_clone((z_loaned_##name##_t *)src); \
if (_Z_RC_IS_NULL(&obj->_rc)) { \
ret = _Z_ERR_SYSTEM_OUT_OF_MEMORY; \
} \
return ret; \
} \
void z_##name##_drop(z_moved_##name##_t *obj) { \
if (!_Z_RC_IS_NULL(&obj->_this._rc)) { \
_z_##name##_rc_drop(&obj->_this._rc); \
} \
}

#define _Z_OWNED_FUNCTIONS_SYSTEM_IMPL(type, name) \
Expand All @@ -156,42 +156,42 @@
z_loaned_##name##_t *z_##name##_loan_mut(z_owned_##name##_t *obj) { return &obj->_val; }

#define _Z_VIEW_FUNCTIONS_IMPL(type, name, f_check, f_null) \
bool z_view_##name##_is_empty(const z_view_##name##_t *obj) { return !f_check((&obj->_val)); } \
bool z_view_##name##_is_empty(const z_view_##name##_t *obj) { return !f_check((&obj->_val)); } \
const z_loaned_##name##_t *z_view_##name##_loan(const z_view_##name##_t *obj) { return &obj->_val; } \
z_loaned_##name##_t *z_view_##name##_loan_mut(z_view_##name##_t *obj) { return &obj->_val; } \
void z_view_##name##_empty(z_view_##name##_t *obj) { obj->_val = f_null(); }

#define _Z_OWNED_FUNCTIONS_CLOSURE_DEF(name) \
void z_internal_##name##_null(z_owned_##name##_t *name); \
bool z_internal_##name##_check(const z_owned_##name##_t *val); \
bool z_internal_##name##_check(const z_owned_##name##_t *val); \
z_moved_##name##_t *z_##name##_move(z_owned_##name##_t *val); \
void z_##name##_take(z_owned_##name##_t *obj, z_moved_##name##_t *src); \
void z_##name##_drop(z_moved_##name##_t *obj); \
const z_loaned_##name##_t *z_##name##_loan(const z_owned_##name##_t *val);

#define _Z_OWNED_FUNCTIONS_CLOSURE_IMPL(name, f_call, f_drop) \
_Z_OWNED_FUNCTIONS_IMPL_MOVE_TAKE(name) \
void z_internal_##name##_null(z_owned_##name##_t *val) { \
val->_val.call = NULL; \
val->_val.drop = NULL; \
val->_val.context = NULL; \
} \
#define _Z_OWNED_FUNCTIONS_CLOSURE_IMPL(name, f_call, f_drop) \
_Z_OWNED_FUNCTIONS_IMPL_MOVE_TAKE(name) \
void z_internal_##name##_null(z_owned_##name##_t *val) { \
val->_val.call = NULL; \
val->_val.drop = NULL; \
val->_val.context = NULL; \
} \
bool z_internal_##name##_check(const z_owned_##name##_t *val) { return val->_val.call != NULL; } \
void z_##name##_drop(z_moved_##name##_t *obj) { \
if (obj->_this._val.drop != NULL) { \
(obj->_this._val.drop)(obj->_this._val.context); \
obj->_this._val.drop = NULL; \
} \
obj->_this._val.call = NULL; \
obj->_this._val.context = NULL; \
} \
const z_loaned_##name##_t *z_##name##_loan(const z_owned_##name##_t *val) { return &val->_val; } \
int8_t z_##name(z_owned_##name##_t *closure, f_call call, f_drop drop, void *context) { \
closure->_val.call = call; \
closure->_val.drop = drop; \
closure->_val.context = context; \
\
return _Z_RES_OK; \
void z_##name##_drop(z_moved_##name##_t *obj) { \
if (obj->_this._val.drop != NULL) { \
(obj->_this._val.drop)(obj->_this._val.context); \
obj->_this._val.drop = NULL; \
} \
obj->_this._val.call = NULL; \
obj->_this._val.context = NULL; \
} \
const z_loaned_##name##_t *z_##name##_loan(const z_owned_##name##_t *val) { return &val->_val; } \
int8_t z_##name(z_owned_##name##_t *closure, f_call call, f_drop drop, void *context) { \
closure->_val.call = call; \
closure->_val.drop = drop; \
closure->_val.context = context; \
\
return _Z_RES_OK; \
}

#endif /* INCLUDE_ZENOH_PICO_API_OLV_MACROS_H */
2 changes: 1 addition & 1 deletion include/zenoh-pico/collections/array.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
} \
static inline type *name##_array_get(const name##_array_t *a, size_t k) { return &a->_val[k]; } \
static inline size_t name##_array_len(const name##_array_t *a) { return a->_len; } \
static inline bool name##_array_is_empty(const name##_array_t *a) { return a->_len == 0; } \
static inline bool name##_array_is_empty(const name##_array_t *a) { return a->_len == 0; } \
static inline void name##_array_clear(name##_array_t *a) { \
for (size_t i = 0; i < a->_len; i++) { \
name##_elem_clear(&a->_val[i]); \
Expand Down
2 changes: 1 addition & 1 deletion include/zenoh-pico/collections/element.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ typedef void *(*z_element_clone_f)(const void *e);
typedef bool (*z_element_eq_f)(const void *left, const void *right);

#define _Z_ELEM_DEFINE(name, type, elem_size_f, elem_clear_f, elem_copy_f) \
typedef bool (*name##_eq_f)(const type *left, const type *right); \
typedef bool (*name##_eq_f)(const type *left, const type *right); \
static inline void name##_elem_clear(void *e) { elem_clear_f((type *)e); } \
static inline void name##_elem_free(void **e) { \
type *ptr = (type *)*e; \
Expand Down
4 changes: 2 additions & 2 deletions include/zenoh-pico/collections/fifo.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ void _z_fifo_free(_z_fifo_t **xs, z_element_free_f f_f);
static inline name##_fifo_t name##_fifo_make(size_t capacity) { return _z_fifo_make(capacity); } \
static inline size_t name##_fifo_capacity(const name##_fifo_t *r) { return _z_fifo_capacity(r); } \
static inline size_t name##_fifo_len(const name##_fifo_t *r) { return _z_fifo_len(r); } \
static inline bool name##_fifo_is_empty(const name##_fifo_t *r) { return _z_fifo_is_empty(r); } \
static inline bool name##_fifo_is_full(const name##_fifo_t *r) { return _z_fifo_is_full(r); } \
static inline bool name##_fifo_is_empty(const name##_fifo_t *r) { return _z_fifo_is_empty(r); } \
static inline bool name##_fifo_is_full(const name##_fifo_t *r) { return _z_fifo_is_full(r); } \
static inline type *name##_fifo_push(name##_fifo_t *r, type *e) { return _z_fifo_push(r, (void *)e); } \
static inline void name##_fifo_push_drop(name##_fifo_t *r, type *e) { \
_z_fifo_push_drop(r, (void *)e, name##_elem_free); \
Expand Down
Loading

0 comments on commit b525f9f

Please sign in to comment.