niklas/cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix macros for testing presence of atomic LIFO

Browse source 
Signed-off-by: Erik Boasson <eb@ilities.com>
This commit is contained in:
Erik Boasson 2020-01-20 16:14:01 +01:00 • committed by eboasson
parent be327f5e56
commit 263d8016b8
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/core/ddsi/include/dds/ddsi/q_freelist.h
View file

@ -25,11 +25,11 @@ extern "C" {
#define FREELIST_TYPE FREELIST_DOUBLE
#if 0
#if HAVE_ATOMIC_LIFO
#ifndef FREELIST_TYPE
#if DDSRT_HAVE_ATOMIC_LIFO
#define FREELIST_TYPE FREELIST_ATOMIC_LIFO
#else
#define FREELIST_TYPE FREELIST_SIMPLE
#define FREELIST_TYPE FREELIST_DOUBLE
#endif
#endif
@ -45,7 +45,7 @@ struct nn_freelist {
ddsrt_atomic_lifo_t x;
ddsrt_atomic_uint32_t count;
uint32_t max;
off_t linkoff;
size_t linkoff;
};
#elif FREELIST_TYPE == FREELIST_DOUBLE
@ -73,12 +73,12 @@ struct nn_freelist {
struct nn_freelistM *emlist;
uint32_t count;
uint32_t max;
off_t linkoff;
size_t linkoff;
};
#endif
void nn_freelist_init (struct nn_freelist *fl, uint32_t max, off_t linkoff);
void nn_freelist_init (struct nn_freelist *fl, uint32_t max, size_t linkoff);
void nn_freelist_fini (struct nn_freelist *fl, void (*free) (void *elem));
bool nn_freelist_push (struct nn_freelist *fl, void *elem);
void *nn_freelist_pushmany (struct nn_freelist *fl, void *first, void *last, uint32_t n);

6
src/core/ddsi/src/q_freelist.c
View file

@ -20,7 +20,7 @@
#if FREELIST_TYPE == FREELIST_NONE
void nn_freelist_init (struct nn_freelist *fl, uint32_t max, off_t linkoff)
void nn_freelist_init (struct nn_freelist *fl, uint32_t max, size_t linkoff)
{
(void) fl; (void) max; (void) linkoff;
}
@ -50,7 +50,7 @@ void *nn_freelist_pop (struct nn_freelist *fl)
#elif FREELIST_TYPE == FREELIST_ATOMIC_LIFO
void nn_freelist_init (struct nn_freelist *fl, uint32_t max, off_t linkoff)
void nn_freelist_init (struct nn_freelist *fl, uint32_t max, size_t linkoff)
{
ddsrt_atomic_lifo_init (&fl->x);
ddsrt_atomic_st32(&fl->count, 0);
@ -104,7 +104,7 @@ void *nn_freelist_pop (struct nn_freelist *fl)
static ddsrt_thread_local int freelist_inner_idx = -1;
void nn_freelist_init (struct nn_freelist *fl, uint32_t max, off_t linkoff)
void nn_freelist_init (struct nn_freelist *fl, uint32_t max, size_t linkoff)
{
int i;
ddsrt_mutex_init (&fl->lock);