mirror of
https://github.com/obgm/libcoap.git
synced 2026-11-18 05:39:04 +03:00
resource.[hc]: Replaced custom list structures by utlist macros.
The CoAP resource management is based on uthash and utlist for platform POSIX but used a custom list implementation for Contiki. This modification replaces the list handling by utlist macros entirely. A set of convenience macros has been defined to access the resources stored in a CoAP context with respect to the preprocessor symbol COAP_RESOURCES_NOHASH.
This commit is contained in:
1 parent
b9adebec93
commit
65620fde3e
4 files changed
+130
-320
No files matched your search
+54
-27
@@ -15,7 +15,6 @@
|
||||
#define _COAP_RESOURCE_H_
|
||||
|
||||
#include "coap_config.h"
|
||||
#include "t_list.h"
|
||||
|
||||
#if defined(HAVE_ASSERT_H) && !defined(assert)
|
||||
# include <assert.h>
|
||||
@@ -26,14 +25,12 @@
|
||||
#define COAP_RESOURCE_CHECK_TIME 2
|
||||
#endif /* COAP_RESOURCE_CHECK_TIME */
|
||||
|
||||
#ifndef WITH_CONTIKI
|
||||
# ifdef COAP_RESOURCES_NOHASH
|
||||
# include "utlist.h"
|
||||
# else
|
||||
# include "uthash.h"
|
||||
# endif
|
||||
#else /* WITH_CONTIKI */
|
||||
#endif /* WITH_CONTIKI */
|
||||
#ifdef COAP_RESOURCES_NOHASH
|
||||
# include "utlist.h"
|
||||
#else
|
||||
# include "uthash.h"
|
||||
#endif
|
||||
|
||||
#include "hashkey.h"
|
||||
#include "async.h"
|
||||
#include "str.h"
|
||||
@@ -74,20 +71,14 @@ typedef struct coap_resource_t {
|
||||
|
||||
coap_key_t key; /**< the actual key bytes for this resource */
|
||||
|
||||
#ifndef WITH_CONTIKI
|
||||
#ifdef COAP_RESOURCES_NOHASH
|
||||
struct coap_resource_t *next;
|
||||
#else
|
||||
UT_hash_handle hh;
|
||||
#endif
|
||||
#endif /* WITH_CONTIKI */
|
||||
|
||||
#ifndef WITH_CONTIKI
|
||||
coap_attr_t *link_attr; /**< attributes to be included with the link format */
|
||||
#else /* WITH_CONTIKI */
|
||||
LIST_STRUCT(link_attr); /**< attributes to be included with the link format */
|
||||
#endif /* WITH_CONTIKI */
|
||||
LIST_STRUCT(subscribers); /**< list of observers for this resource */
|
||||
coap_subscription_t *subscribers; /**< list of observers for this resource */
|
||||
|
||||
|
||||
/**
|
||||
@@ -132,6 +123,13 @@ void coap_add_resource(coap_context_t *context, coap_resource_t *resource);
|
||||
*/
|
||||
int coap_delete_resource(coap_context_t *context, coap_key_t key);
|
||||
|
||||
/**
|
||||
* Deletes all resources from given @p context and frees their storage.
|
||||
*
|
||||
* @param context The CoAP context with the resources to be deleted.
|
||||
*/
|
||||
void coap_delete_all_resources(coap_context_t *context);
|
||||
|
||||
/**
|
||||
* Registers a new attribute with the given @p resource. As the
|
||||
* attributes str fields will point to @p name and @p val the
|
||||
@@ -322,19 +320,48 @@ int coap_delete_observer(coap_resource_t *resource,
|
||||
*/
|
||||
void coap_check_notify(coap_context_t *context);
|
||||
|
||||
#ifdef COAP_RESOURCES_NOHASH
|
||||
|
||||
#define RESOURCES_ADD(r, obj) \
|
||||
LL_PREPEND((r), (obj))
|
||||
|
||||
#define RESOURCES_DELETE(r, obj) \
|
||||
LL_DELETE((r), (obj))
|
||||
|
||||
#define RESOURCES_ITER(r,tmp) \
|
||||
coap_resource_t *tmp; \
|
||||
LL_FOREACH((r), tmp)
|
||||
|
||||
#define RESOURCES_FIND(r, k, res) { \
|
||||
coap_resource_t *tmp; \
|
||||
(res) = tmp = NULL; \
|
||||
LL_FOREACH((r), tmp) { \
|
||||
if (memcmp((k), tmp->key, sizeof(coap_key_t)) == 0) { \
|
||||
(res) = tmp; \
|
||||
break; \
|
||||
} \
|
||||
} \
|
||||
}
|
||||
#else /* COAP_RESOURCES_NOHASH */
|
||||
|
||||
#define RESOURCES_ADD(r, obj) \
|
||||
HASH_ADD(hh, (r), key, sizeof(coap_key_t), (obj))
|
||||
|
||||
#define RESOURCES_DELETE(r, obj) \
|
||||
HASH_DELETE(hh, (r), (obj))
|
||||
|
||||
#define RESOURCES_ITER(r,tmp) \
|
||||
coap_resource_t *tmp, *rtmp; \
|
||||
HASH_ITER(hh, (r), tmp, rtmp)
|
||||
|
||||
#define RESOURCES_FIND(r, k, res) { \
|
||||
HASH_FIND(hh, (r), (k), sizeof(coap_key_t), (res)); \
|
||||
}
|
||||
|
||||
#endif /* COAP_RESOURCES_NOHASH */
|
||||
|
||||
/** @} */
|
||||
|
||||
typedef struct coap_iterator_t {
|
||||
void *data; /**< opaque iterator state */
|
||||
unsigned int pos; /**< current item number */
|
||||
} coap_iterator_t ;
|
||||
|
||||
coap_iterator_t *
|
||||
coap_resource_iterator_init(coap_resource_t *resources,
|
||||
coap_iterator_t *ri);
|
||||
|
||||
coap_resource_t *coap_resource_next(coap_iterator_t *ri);
|
||||
|
||||
coap_print_status_t coap_print_wellknown(coap_context_t *, unsigned char *, size_t *, size_t, coap_opt_t *);
|
||||
void coap_handle_failed_notify(coap_context_t *, const coap_address_t *, const str *);
|
||||
|
||||
|
||||
Reference in new issue
Block a user