d0kuhn/mosquitto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated uhpa code with "move" function.

Browse Source
This commit is contained in:
Roger A. Light 2015-06-28 16:59:03 +01:00
parent 6fe5de46b4
commit bfd743f42d
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mosquitto_broker.h
View File

@ -98,6 +98,7 @@ typedef union {
#define UHPA_ALLOC_PAYLOAD(A) UHPA_ALLOC((A)->payload, (A)->payloadlen)
#define UHPA_ACCESS_PAYLOAD(A) UHPA_ACCESS((A)->payload, (A)->payloadlen)
#define UHPA_FREE_PAYLOAD(A) UHPA_FREE((A)->payload, (A)->payloadlen)
#define UHPA_MOVE_PAYLOAD(DEST, SRC) UHPA_MOVE((DEST)->payload, (SRC)->payload, (SRC)->payloadlen)
#define MOSQ_TOPIC_ELEMENT_UNION_SIZE 8
typedef union {
@ -107,6 +108,7 @@ typedef union {
#define UHPA_ALLOC_TOPIC(A) UHPA_ALLOC((A)->topic, (A)->topic_len+1)
#define UHPA_ACCESS_TOPIC(A) UHPA_ACCESS((A)->topic, (A)->topic_len+1)
#define UHPA_FREE_TOPIC(A) UHPA_FREE((A)->topic, (A)->topic_len+1)
#define UHPA_MOVE_TOPIC(DEST, SRC) UHPA_MOVE((DEST)->topic, (SRC)->topic, (SRC)->topic_len+1)
/* ========================================
* End UHPA data types

23
src/uhpa.h
View File

@ -1,5 +1,5 @@
/*
Copyright (c) 2015 Roger Light <roger@atchoo.org>
Copyright (c) 2015-2016 Roger Light <roger@atchoo.org>
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
@ -83,6 +83,14 @@ Contributors:
* u : the uhpa data type that has already had memory allocated.
* size : the length of the stored data, in bytes.
*
* UHPA_MOVE(dest, src, src_size)
* Call to move memory stored in one uhpa variable to another. If the data
* is stored with heap allocated memory, then dest.ptr is set to src.ptr.
* If the data is stored as an array, memmove is used to copy data from
* src to dest. In both cases the data stored in src is invalidated by
* setting src.ptr to NULL and calling memset(src.array, 0, src_size)
* respectively.
*
* =============================================================================
* String Functions
* =============================================================================
@ -94,6 +102,7 @@ Contributors:
* UHPA_ALLOC_STR(u, size)
* UHPA_ACCESS_STR(u, size)
* UHPA_FREE_STR(u, size)
* UHPA_MOVE_STR(dest, src, size)
*
* =============================================================================
* Forcing use of malloc
@ -133,18 +142,30 @@ Contributors:
(u).ptr = NULL; \
}
#define UHPA_MOVE_CHK(dest, src, src_size) \
if((src_size) > sizeof((src).array) && (src).ptr){ \
(dest).ptr = (src).ptr; \
(src).ptr = NULL; \
}else{ \
memmove((dest).array, (src).array, (src_size)); \
memset((src).array, 0, (src_size)); \
}
#ifdef UHPA_FORCE_MALLOC
# define UHPA_ALLOC(u, size) ((u).ptr = uhpa_malloc(size))
# define UHPA_ACCESS(u, size) (u).ptr
# define UHPA_FREE(u, size) uhpa_free((u).ptr); (u).ptr = NULL;
# define UHPA_MOVE(dest, src, src_size) {(dest).ptr = (src).ptr; (src).ptr = NULL}
#else
# define UHPA_ALLOC(u, size) UHPA_ALLOC_CHK(u, size)
# define UHPA_ACCESS(u, size) UHPA_ACCESS_CHK(u, size)
# define UHPA_FREE(u, size) UHPA_FREE_CHK(u, size)
# define UHPA_MOVE(dest, src, src_size) UHPA_MOVE_CHK(dest, src, src_size)
#endif
#define UHPA_ALLOC_STR(u, size) UHPA_ALLOC((u), (size)+1)
#define UHPA_ACCESS_STR(u, size) ((char *)UHPA_ACCESS((u), (size)+1))
#define UHPA_FREE_STR(u, size) UHPA_FREE((u), (size)+1)
#define UHPA_MOVE_STR(dest, src, src_size) UHPA_MOVE((dest), (src), (src_size)+1)
#endif