| Message ID | 1398413259-10207-1-git-send-email-petri.savolainen@linaro.org |
|---|---|
| State | New |
| Headers | show |
On 04/25/2014 12:07 PM, Petri Savolainen wrote: > New buffer types: timeout and any. Timeout is used for timeout nofications. > A pool initilized with buffer type 'any' can allocate buffers for different > usage (raw, packet, timeout, ...). > > Signed-off-by: Petri Savolainen <petri.savolainen@linaro.org> > Hello Petri, can you please split this patch on two small patches. One for timeout buffer type and one for test change? It will be useful to keep history change for tests if we will move tests to other directory. Thanks, Maxim.
> -----Original Message----- > From: lng-odp-bounces@lists.linaro.org [mailto:lng-odp- > bounces@lists.linaro.org] On Behalf Of ext Maxim Uvarov > Sent: Friday, April 25, 2014 3:29 PM > To: lng-odp@lists.linaro.org > Subject: Re: [lng-odp] [PATCH] Added timeout buffer type > > On 04/25/2014 12:07 PM, Petri Savolainen wrote: > > New buffer types: timeout and any. Timeout is used for timeout > nofications. > > A pool initilized with buffer type 'any' can allocate buffers for > different > > usage (raw, packet, timeout, ...). > > > > Signed-off-by: Petri Savolainen <petri.savolainen@linaro.org> > > > Hello Petri, > > can you please split this patch on two small patches. One for timeout > buffer type and one for test change? > It will be useful to keep history change for tests if we will move > tests > to other directory. This test is going to be close to API (it's an example), not to be moved into different repo. Is the split needed? -Petri
On 04/25/2014 05:36 PM, Savolainen, Petri (NSN - FI/Espoo) wrote: > This test is going to be close to API (it's an example), not to be moved into different repo. Is the split needed? > > -Petri Anders suggested if test will be in separate patch git history will be 'git blame' safe. I.e. we can move test to separate directory in future and still have plain history for changes. Please split patch on 2. Thanks, Maxim.
Hi Petri, Since we have defined a new buffer type ODP_BUFFER_TYPE_TIMEOUT, Timeout notifications can be handled as a simple buffer itself. we can always use odp_buffer_t handle to read timeout notifications using *void *odp_buffer_addr(odp_buffer_t buf);* Timeout notifications can be considered as a buffer itself instead of defining a void* odp_timeout_t;. Regards, Bala On 5 May 2014 14:56, Maxim Uvarov <maxim.uvarov@linaro.org> wrote: > On 04/25/2014 05:36 PM, Savolainen, Petri (NSN - FI/Espoo) wrote: > >> This test is going to be close to API (it's an example), not to be moved >> into different repo. Is the split needed? >> >> -Petri >> > Anders suggested if test will be in separate patch git history will be > 'git blame' safe. I.e. we can move test to separate directory in future and > still have plain history for changes. Please split patch on 2. > > Thanks, > Maxim. > > > > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org > http://lists.linaro.org/mailman/listinfo/lng-odp >
Hi,
This is how buffers of TIMEOUT type are turned into timeout buffer handles (odp_timeout_t).
odp_timeout_t odp_timeout_from_buffer(odp_buffer_t buf);
odp_timeout_t is needed for access functions...
uint64_t odp_timeout_tick(odp_timeout_t tmo);
.. just like odp_packet_t for packet access functions
size_t odp_packet_l2_offset(odp_packet_t pkt);
void* is part of linux-generic implementation.
-Petri
From: ext Bala Manoharan [mailto:bala.manoharan@linaro.org]
Sent: Wednesday, May 07, 2014 9:53 AM
To: Maxim Uvarov
Cc: Savolainen, Petri (NSN - FI/Espoo); lng-odp@lists.linaro.org
Subject: Re: [lng-odp] [PATCH] Added timeout buffer type
Hi Petri,
Since we have defined a new buffer type ODP_BUFFER_TYPE_TIMEOUT, Timeout notifications can be handled as a simple buffer itself.
we can always use odp_buffer_t handle to read timeout notifications using void *odp_buffer_addr(odp_buffer_t buf);
Timeout notifications can be considered as a buffer itself instead of defining a void* odp_timeout_t;.
Regards,
Bala
On 5 May 2014 14:56, Maxim Uvarov <maxim.uvarov@linaro.org<mailto:maxim.uvarov@linaro.org>> wrote:
On 04/25/2014 05:36 PM, Savolainen, Petri (NSN - FI/Espoo) wrote:
This test is going to be close to API (it's an example), not to be moved into different repo. Is the split needed?
-Petri
Anders suggested if test will be in separate patch git history will be 'git blame' safe. I.e. we can move test to separate directory in future and still have plain history for changes. Please split patch on 2.
Thanks,
Maxim.
_______________________________________________
lng-odp mailing list
lng-odp@lists.linaro.org<mailto:lng-odp@lists.linaro.org>
http://lists.linaro.org/mailman/listinfo/lng-odp
are there any objections to apply this patch? Perti, also scheduler patch needed splitting up to be included. Thank you, Maxim. On 05/07/2014 11:21 AM, Savolainen, Petri (NSN - FI/Espoo) wrote: > > Hi, > > This is how buffers of TIMEOUT type are turned into timeout buffer > handles (odp_timeout_t). > > odp_timeout_t odp_timeout_from_buffer(odp_buffer_t buf); > > odp_timeout_t is needed for access functions... > > uint64_t odp_timeout_tick(odp_timeout_t tmo); > > .. just like odp_packet_t for packet access functions > > size_t odp_packet_l2_offset(odp_packet_t pkt); > > void* is part of linux-generic implementation. > > -Petri > > *From:*ext Bala Manoharan [mailto:bala.manoharan@linaro.org] > *Sent:* Wednesday, May 07, 2014 9:53 AM > *To:* Maxim Uvarov > *Cc:* Savolainen, Petri (NSN - FI/Espoo); lng-odp@lists.linaro.org > *Subject:* Re: [lng-odp] [PATCH] Added timeout buffer type > > Hi Petri, > > Since we have defined a new buffer type ODP_BUFFER_TYPE_TIMEOUT, > Timeout notifications can be handled as a simple buffer itself. > > we can always use odp_buffer_t handle to read timeout notifications > using *void *odp_buffer_addr(odp_buffer_t buf);* > > Timeout notifications can be considered as a buffer itself instead of > defining a void* odp_timeout_t;. > > Regards, > > Bala > > On 5 May 2014 14:56, Maxim Uvarov <maxim.uvarov@linaro.org > <mailto:maxim.uvarov@linaro.org>> wrote: > > On 04/25/2014 05:36 PM, Savolainen, Petri (NSN - FI/Espoo) wrote: > > This test is going to be close to API (it's an example), not to be > moved into different repo. Is the split needed? > > -Petri > > Anders suggested if test will be in separate patch git history will be > 'git blame' safe. I.e. we can move test to separate directory in > future and still have plain history for changes. Please split patch on 2. > > Thanks, > Maxim. > > > > > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org <mailto:lng-odp@lists.linaro.org> > http://lists.linaro.org/mailman/listinfo/lng-odp >
On 7 May 2014 09:21, Savolainen, Petri (NSN - FI/Espoo) < petri.savolainen@nsn.com> wrote: > Hi, > > > > This is how buffers of TIMEOUT type are turned into timeout buffer handles > (odp_timeout_t). > > > > odp_timeout_t odp_timeout_from_buffer(odp_buffer_t buf); > Is this function here to handle the case with user-defined timeout buffers? Only the implementation knows how to perform this translation. > > odp_timeout_t is needed for access functions... > > > > uint64_t odp_timeout_tick(odp_timeout_t tmo); > Is this supposed to be the expiration (timeout) value of the timer? Must this be available in the timeout? Or was this just a hypothetical example? > > .. just like odp_packet_t for packet access functions > > > > size_t odp_packet_l2_offset(odp_packet_t pkt); > > > > > > void* is part of linux-generic implementation. > > > > > > > > -Petri > > > > > > *From:* ext Bala Manoharan [mailto:bala.manoharan@linaro.org] > *Sent:* Wednesday, May 07, 2014 9:53 AM > *To:* Maxim Uvarov > *Cc:* Savolainen, Petri (NSN - FI/Espoo); lng-odp@lists.linaro.org > *Subject:* Re: [lng-odp] [PATCH] Added timeout buffer type > > > > Hi Petri, > > > > Since we have defined a new buffer type ODP_BUFFER_TYPE_TIMEOUT, Timeout > notifications can be handled as a simple buffer itself. > > we can always use odp_buffer_t handle to read timeout notifications using *void > *odp_buffer_addr(odp_buffer_t buf);* > > > > Timeout notifications can be considered as a buffer itself instead of > defining a void* odp_timeout_t;. > > > > Regards, > > Bala > > > > On 5 May 2014 14:56, Maxim Uvarov <maxim.uvarov@linaro.org> wrote: > > On 04/25/2014 05:36 PM, Savolainen, Petri (NSN - FI/Espoo) wrote: > > This test is going to be close to API (it's an example), not to be moved > into different repo. Is the split needed? > > -Petri > > Anders suggested if test will be in separate patch git history will be > 'git blame' safe. I.e. we can move test to separate directory in future and > still have plain history for changes. Please split patch on 2. > > Thanks, > Maxim. > > > > > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org > http://lists.linaro.org/mailman/listinfo/lng-odp > > > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org > http://lists.linaro.org/mailman/listinfo/lng-odp > >
On 25 April 2014 10:07, Petri Savolainen <petri.savolainen@linaro.org>wrote: > New buffer types: timeout and any. Timeout is used for timeout nofications. > A pool initilized with buffer type 'any' can allocate buffers for different > usage (raw, packet, timeout, ...). > > Signed-off-by: Petri Savolainen <petri.savolainen@linaro.org> > --- > include/odp_buffer.h | 8 ++-- > include/odp_timer.h | 31 +++++++++++-- > .../linux-generic/include/odp_buffer_internal.h | 5 ++- > .../linux-generic/include/odp_timer_internal.h | 52 > ++++++++++++++++++++++ > platform/linux-generic/source/odp_buffer.c | 4 +- > platform/linux-generic/source/odp_buffer_pool.c | 33 +++++++++++--- > platform/linux-generic/source/odp_timer.c | 13 ++++++ > test/timer/odp_timer_test.c | 11 ++++- > 8 files changed, 140 insertions(+), 17 deletions(-) > create mode 100644 platform/linux-generic/include/odp_timer_internal.h > > diff --git a/include/odp_buffer.h b/include/odp_buffer.h > index 2d2c25a..3156a20 100644 > --- a/include/odp_buffer.h > +++ b/include/odp_buffer.h > @@ -62,9 +62,11 @@ size_t odp_buffer_size(odp_buffer_t buf); > int odp_buffer_type(odp_buffer_t buf); > > #define ODP_BUFFER_TYPE_INVALID (-1) /**< Buffer type invalid */ > -#define ODP_BUFFER_TYPE_RAW 0 /**< Raw buffer */ > -#define ODP_BUFFER_TYPE_PACKET 1 /**< Packet buffer */ > -#define ODP_BUFFER_TYPE_TIMER 2 /**< Timer buffer */ > +#define ODP_BUFFER_TYPE_ANY 0 /**< Buffer that can hold any other > + buffer types */ > +#define ODP_BUFFER_TYPE_RAW 1 /**< Raw buffer, no metadata */ > +#define ODP_BUFFER_TYPE_PACKET 2 /**< Packet buffer */ > +#define ODP_BUFFER_TYPE_TIMEOUT 3 /**< Timeout buffer */ > > /** > * Tests if buffer is part of a scatter/gather list > diff --git a/include/odp_timer.h b/include/odp_timer.h > index 80babd1..e7a6200 100644 > --- a/include/odp_timer.h > +++ b/include/odp_timer.h > @@ -25,8 +25,8 @@ extern "C" { > > > /** > -* ODP timer handle > -*/ > + * ODP timer handle > + */ > typedef uint32_t odp_timer_t; > > /** Invalid timer */ > @@ -34,8 +34,8 @@ typedef uint32_t odp_timer_t; > > > /** > -* ODP timeout handle > -*/ > + * ODP timeout handle > + */ > typedef odp_buffer_t odp_timer_tmo_t; > > /** Invalid timeout */ > @@ -43,6 +43,12 @@ typedef odp_buffer_t odp_timer_tmo_t; > > > /** > + * Timeout notification > + */ > +typedef void *odp_timeout_t; > + > + > +/** > * Create a timer > * > * Creates a new timer with requested properties. > @@ -133,6 +139,23 @@ odp_timer_tmo_t odp_timer_absolute_tmo(odp_timer_t > timer, uint64_t tmo_tick, > */ > int odp_timer_cancel_tmo(odp_timer_t timer, odp_timer_tmo_t tmo); > > +/** > + * Convert buffer handle to timeout handle > + * > + * @param buf Buffer handle > + * > + * @return Timeout buffer handle > + */ > +odp_timeout_t odp_timeout_from_buffer(odp_buffer_t buf); > + > +/** > + * Return absolute timeout tick > + * > + * @param tmo Timeout buffer handle > + * > + * @return Absolute timeout tick > + */ > +uint64_t odp_timeout_tick(odp_timeout_t tmo); > > #ifdef __cplusplus > } > diff --git a/platform/linux-generic/include/odp_buffer_internal.h > b/platform/linux-generic/include/odp_buffer_internal.h > index f8ebc7c..d24c748 100644 > --- a/platform/linux-generic/include/odp_buffer_internal.h > +++ b/platform/linux-generic/include/odp_buffer_internal.h > @@ -89,8 +89,11 @@ typedef struct odp_buffer_hdr_t { > size_t cur_offset; /* current offset */ > odp_atomic_int_t ref_count; /* reference count */ > odp_buffer_scatter_t scatter; /* Scatter/gather list */ > - int type; /* type of next header */ > odp_buffer_pool_t pool; /* buffer pool */ > + int org_type; /* original buffer type */ > + int cur_type; /* type of next header */ > The variable doesn't match the comment, cur_type appear to imply the current type. > + > + int pad; /* padding for payload align > */ > > uint8_t payload[]; /* next header or data */ > } odp_buffer_hdr_t; > diff --git a/platform/linux-generic/include/odp_timer_internal.h > b/platform/linux-generic/include/odp_timer_internal.h > new file mode 100644 > index 0000000..97851a2 > --- /dev/null > +++ b/platform/linux-generic/include/odp_timer_internal.h > @@ -0,0 +1,52 @@ > +/* Copyright (c) 2013, Linaro Limited > + * All rights reserved. > + * > + * SPDX-License-Identifier: BSD-3-Clause > + */ > + > + > +/** > + * @file > + * > + * ODP timer timeout descriptor - implementation internal > + */ > + > +#ifndef ODP_TIMER_INTERNAL_H_ > +#define ODP_TIMER_INTERNAL_H_ > + > +#ifdef __cplusplus > +extern "C" { > +#endif > + > +#include <odp_std_types.h> > +#include <odp_queue.h> > +#include <odp_buffer.h> > +#include <odp_buffer_internal.h> > + > +struct odp_timeout_hdr_t; > + > +/** > + * Timeout notification header > + */ > +typedef struct odp_timeout_hdr_t { > + odp_buffer_hdr_t buf_hdr; > + > + uint64_t tick; > + > + uint8_t payload[]; > +} odp_timeout_hdr_t; > + > + > + > +ODP_ASSERT(sizeof(odp_timeout_hdr_t) == > + ODP_OFFSETOF(odp_timeout_hdr_t, payload), > + ODP_TIMEOUT_HDR_T__SIZE_ERR); > + > +ODP_ASSERT(sizeof(odp_timeout_hdr_t) % sizeof(uint64_t) == 0, > + ODP_TIMEOUT_HDR_T__SIZE_ERR2); > Can't we change ODP_ASSERT to ODP_STRUCT_SIZE_ASSERT? Maybe this can be a bug if we agree to change this? =) Cheers, Anders > + > +#ifdef __cplusplus > +} > +#endif > + > +#endif > diff --git a/platform/linux-generic/source/odp_buffer.c > b/platform/linux-generic/source/odp_buffer.c > index afbe96a..ff7a892 100644 > --- a/platform/linux-generic/source/odp_buffer.c > +++ b/platform/linux-generic/source/odp_buffer.c > @@ -32,7 +32,7 @@ int odp_buffer_type(odp_buffer_t buf) > { > odp_buffer_hdr_t *hdr = odp_buf_to_hdr(buf); > > - return hdr->type; > + return hdr->cur_type; > } > > > @@ -86,7 +86,7 @@ int odp_buffer_snprint(char *str, size_t n, odp_buffer_t > buf) > len += snprintf(&str[len], n-len, > " ref_count %i\n", hdr->ref_count); > len += snprintf(&str[len], n-len, > - " type %i\n", hdr->type); > + " type %i\n", hdr->cur_type); > len += snprintf(&str[len], n-len, > " Scatter list\n"); > len += snprintf(&str[len], n-len, > diff --git a/platform/linux-generic/source/odp_buffer_pool.c > b/platform/linux-generic/source/odp_buffer_pool.c > index 90214ba..3a5cb94 100644 > --- a/platform/linux-generic/source/odp_buffer_pool.c > +++ b/platform/linux-generic/source/odp_buffer_pool.c > @@ -9,6 +9,7 @@ > #include <odp_buffer_pool_internal.h> > #include <odp_buffer_internal.h> > #include <odp_packet_internal.h> > +#include <odp_timer_internal.h> > #include <odp_shared_memory.h> > #include <odp_align.h> > #include <odp_internal.h> > @@ -39,6 +40,15 @@ > > #define NULL_INDEX ((uint32_t)-1) > > +union buffer_type_any_u { > + odp_buffer_hdr_t buf; > + odp_packet_hdr_t pkt; > + odp_timeout_hdr_t tmo; > +}; > + > +ODP_ASSERT(sizeof(union buffer_type_any_u) % sizeof(uint64_t) == 0, > + BUFFER_TYPE_ANY_U__SIZE_ERR); > + > > typedef union pool_entry_u { > struct pool_entry_s s; > @@ -177,8 +187,9 @@ static void add_chunk(pool_entry_t *pool, > odp_buffer_chunk_hdr_t *chunk_hdr) > if (pool->s.head) { > /* link pool head to the chunk */ > add_buf_index(chunk_hdr, pool->s.head->buf_hdr.index); > - } else > + } else { > add_buf_index(chunk_hdr, NULL_INDEX); > + } > > pool->s.head = chunk_hdr; > pool->s.free_bufs += ODP_BUFS_PER_CHUNK; > @@ -214,6 +225,11 @@ static void fill_hdr(void *ptr, pool_entry_t *pool, > uint32_t index, > if (pool->s.buf_type == ODP_BUFFER_TYPE_PACKET) { > odp_packet_hdr_t *packet_hdr = ptr; > payload = packet_hdr->payload; > + } else if (pool->s.buf_type == ODP_BUFFER_TYPE_TIMEOUT) { > + odp_timeout_hdr_t *tmo_hdr = ptr; > + payload = tmo_hdr->payload; > + } else if (pool->s.buf_type == ODP_BUFFER_TYPE_ANY) { > + payload = ((uint8_t *)ptr) + sizeof(union > buffer_type_any_u); > } > > memset(hdr, 0, size); > @@ -224,7 +240,8 @@ static void fill_hdr(void *ptr, pool_entry_t *pool, > uint32_t index, > hdr->index = index; > hdr->size = pool->s.payload_size; > hdr->pool = pool->s.pool; > - hdr->type = buf_type; > + hdr->org_type = pool->s.buf_type; > + hdr->cur_type = buf_type; > > check_align(pool, hdr); > } > @@ -251,11 +268,15 @@ static void link_bufs(pool_entry_t *pool) > pool_size = pool->s.pool_size; > pool_base = (uintptr_t) pool->s.pool_base_addr; > > - if (buf_type == ODP_BUFFER_TYPE_RAW) > + if (buf_type == ODP_BUFFER_TYPE_RAW) { > hdr_size = sizeof(odp_buffer_hdr_t); > - else if (buf_type == ODP_BUFFER_TYPE_PACKET) > + } else if (buf_type == ODP_BUFFER_TYPE_PACKET) { > hdr_size = sizeof(odp_packet_hdr_t); > - else { > + } else if (buf_type == ODP_BUFFER_TYPE_TIMEOUT) { > + hdr_size = sizeof(odp_timeout_hdr_t); > + } else if (buf_type == ODP_BUFFER_TYPE_ANY) { > + hdr_size = sizeof(union buffer_type_any_u); > + } else { > ODP_ERR("odp_buffer_pool_create: Bad type %i\n", > buf_type); > exit(0); > @@ -404,7 +425,7 @@ odp_buffer_t odp_buffer_alloc(odp_buffer_pool_t > pool_id) > if (chunk->chunk.num_bufs == 0) { > /* give the chunk buffer */ > local_chunk[pool_id] = NULL; > - chunk->buf_hdr.type = pool->s.buf_type; > + chunk->buf_hdr.cur_type = pool->s.buf_type; > > handle = chunk->buf_hdr.handle; > } else { > diff --git a/platform/linux-generic/source/odp_timer.c > b/platform/linux-generic/source/odp_timer.c > index 6fb5025..7c6c4f4 100644 > --- a/platform/linux-generic/source/odp_timer.c > +++ b/platform/linux-generic/source/odp_timer.c > @@ -5,6 +5,8 @@ > */ > > #include <odp_timer.h> > +#include <odp_timer_internal.h> > +#include <odp_buffer_pool_internal.h> > #include <odp_internal.h> > #include <odp_atomic.h> > #include <odp_spinlock.h> > @@ -330,3 +332,14 @@ uint64_t odp_timer_current_tick(odp_timer_t timer) > id = timer - 1; > return odp_timer.timer[id].cur_tick; > } > + > +odp_timeout_t odp_timeout_from_buffer(odp_buffer_t buf) > +{ > + return (odp_timeout_t) odp_buf_to_hdr(buf); > +} > + > +uint64_t odp_timeout_tick(odp_timeout_t tmo) > +{ > + odp_timeout_hdr_t *tmo_hdr = tmo; > + return tmo_hdr->tick; > +} > diff --git a/test/timer/odp_timer_test.c b/test/timer/odp_timer_test.c > index 341265d..0af87b2 100644 > --- a/test/timer/odp_timer_test.c > +++ b/test/timer/odp_timer_test.c > @@ -70,8 +70,17 @@ static void test_timeouts(int thr) > ODP_DBG(" [%i] current tick %"PRIu64"\n", thr, tick); > > while (1) { > + int type; > + > buf = odp_schedule_one(&queue, ODP_SCHED_WAIT); > > + type = odp_buffer_type(buf); > + > + if (type == ODP_BUFFER_TYPE_TIMEOUT) > + ODP_DBG(" [%i] timeout\n", thr); > + else > + ODP_DBG(" [%i] message, type %i\n", thr, type); > + > /* TODO: read tick from tmo metadata */ > tick = odp_timer_current_tick(test_timer); > > @@ -271,7 +280,7 @@ int main(int argc, char *argv[]) > > pool = odp_buffer_pool_create("msg_pool", pool_base, MSG_POOL_SIZE, > sizeof(test_message_t), > - ODP_CACHE_LINE_SIZE, > ODP_BUFFER_TYPE_RAW); > + ODP_CACHE_LINE_SIZE, > ODP_BUFFER_TYPE_ANY); > > if (pool == ODP_BUFFER_POOL_INVALID) { > ODP_ERR("Pool create failed.\n"); > -- > 1.9.1 > > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org > http://lists.linaro.org/mailman/listinfo/lng-odp >
From: ext Ola Liljedahl [mailto:ola.liljedahl@linaro.org] Sent: Monday, May 12, 2014 5:48 PM To: Savolainen, Petri (NSN - FI/Espoo) Cc: ext Bala Manoharan; Maxim Uvarov; lng-odp@lists.linaro.org Subject: Re: [lng-odp] [PATCH] Added timeout buffer type On 7 May 2014 09:21, Savolainen, Petri (NSN - FI/Espoo) <petri.savolainen@nsn.com<mailto:petri.savolainen@nsn.com>> wrote: Hi, This is how buffers of TIMEOUT type are turned into timeout buffer handles (odp_timeout_t). odp_timeout_t odp_timeout_from_buffer(odp_buffer_t buf); Is this function here to handle the case with user-defined timeout buffers? Only the implementation knows how to perform this translation. No, it’s only for the TIMEOUT buffer type. odp_timeout_t is needed for access functions... uint64_t odp_timeout_tick(odp_timeout_t tmo); Is this supposed to be the expiration (timeout) value of the timer? Must this be available in the timeout? Or was this just a hypothetical example? Yes. It’s pretty obvious metadata for timeouts. Other could include the tmo ID and an user defined value. All these would help the user to determine which timeout (from potentially many) was received. -Petri .. just like odp_packet_t for packet access functions size_t odp_packet_l2_offset(odp_packet_t pkt); void* is part of linux-generic implementation. -Petri From: ext Bala Manoharan [mailto:bala.manoharan@linaro.org<mailto:bala.manoharan@linaro.org>] Sent: Wednesday, May 07, 2014 9:53 AM To: Maxim Uvarov Cc: Savolainen, Petri (NSN - FI/Espoo); lng-odp@lists.linaro.org<mailto:lng-odp@lists.linaro.org> Subject: Re: [lng-odp] [PATCH] Added timeout buffer type Hi Petri, Since we have defined a new buffer type ODP_BUFFER_TYPE_TIMEOUT, Timeout notifications can be handled as a simple buffer itself. we can always use odp_buffer_t handle to read timeout notifications using void *odp_buffer_addr(odp_buffer_t buf); Timeout notifications can be considered as a buffer itself instead of defining a void* odp_timeout_t;. Regards, Bala On 5 May 2014 14:56, Maxim Uvarov <maxim.uvarov@linaro.org<mailto:maxim.uvarov@linaro.org>> wrote: On 04/25/2014 05:36 PM, Savolainen, Petri (NSN - FI/Espoo) wrote: This test is going to be close to API (it's an example), not to be moved into different repo. Is the split needed? -Petri Anders suggested if test will be in separate patch git history will be 'git blame' safe. I.e. we can move test to separate directory in future and still have plain history for changes. Please split patch on 2. Thanks, Maxim. _______________________________________________ lng-odp mailing list lng-odp@lists.linaro.org<mailto:lng-odp@lists.linaro.org> http://lists.linaro.org/mailman/listinfo/lng-odp _______________________________________________ lng-odp mailing list lng-odp@lists.linaro.org<mailto:lng-odp@lists.linaro.org> http://lists.linaro.org/mailman/listinfo/lng-odp
diff --git a/include/odp_buffer.h b/include/odp_buffer.h index 2d2c25a..3156a20 100644 --- a/include/odp_buffer.h +++ b/include/odp_buffer.h @@ -62,9 +62,11 @@ size_t odp_buffer_size(odp_buffer_t buf); int odp_buffer_type(odp_buffer_t buf); #define ODP_BUFFER_TYPE_INVALID (-1) /**< Buffer type invalid */ -#define ODP_BUFFER_TYPE_RAW 0 /**< Raw buffer */ -#define ODP_BUFFER_TYPE_PACKET 1 /**< Packet buffer */ -#define ODP_BUFFER_TYPE_TIMER 2 /**< Timer buffer */ +#define ODP_BUFFER_TYPE_ANY 0 /**< Buffer that can hold any other + buffer types */ +#define ODP_BUFFER_TYPE_RAW 1 /**< Raw buffer, no metadata */ +#define ODP_BUFFER_TYPE_PACKET 2 /**< Packet buffer */ +#define ODP_BUFFER_TYPE_TIMEOUT 3 /**< Timeout buffer */ /** * Tests if buffer is part of a scatter/gather list diff --git a/include/odp_timer.h b/include/odp_timer.h index 80babd1..e7a6200 100644 --- a/include/odp_timer.h +++ b/include/odp_timer.h @@ -25,8 +25,8 @@ extern "C" { /** -* ODP timer handle -*/ + * ODP timer handle + */ typedef uint32_t odp_timer_t; /** Invalid timer */ @@ -34,8 +34,8 @@ typedef uint32_t odp_timer_t; /** -* ODP timeout handle -*/ + * ODP timeout handle + */ typedef odp_buffer_t odp_timer_tmo_t; /** Invalid timeout */ @@ -43,6 +43,12 @@ typedef odp_buffer_t odp_timer_tmo_t; /** + * Timeout notification + */ +typedef void *odp_timeout_t; + + +/** * Create a timer * * Creates a new timer with requested properties. @@ -133,6 +139,23 @@ odp_timer_tmo_t odp_timer_absolute_tmo(odp_timer_t timer, uint64_t tmo_tick, */ int odp_timer_cancel_tmo(odp_timer_t timer, odp_timer_tmo_t tmo); +/** + * Convert buffer handle to timeout handle + * + * @param buf Buffer handle + * + * @return Timeout buffer handle + */ +odp_timeout_t odp_timeout_from_buffer(odp_buffer_t buf); + +/** + * Return absolute timeout tick + * + * @param tmo Timeout buffer handle + * + * @return Absolute timeout tick + */ +uint64_t odp_timeout_tick(odp_timeout_t tmo); #ifdef __cplusplus } diff --git a/platform/linux-generic/include/odp_buffer_internal.h b/platform/linux-generic/include/odp_buffer_internal.h index f8ebc7c..d24c748 100644 --- a/platform/linux-generic/include/odp_buffer_internal.h +++ b/platform/linux-generic/include/odp_buffer_internal.h @@ -89,8 +89,11 @@ typedef struct odp_buffer_hdr_t { size_t cur_offset; /* current offset */ odp_atomic_int_t ref_count; /* reference count */ odp_buffer_scatter_t scatter; /* Scatter/gather list */ - int type; /* type of next header */ odp_buffer_pool_t pool; /* buffer pool */ + int org_type; /* original buffer type */ + int cur_type; /* type of next header */ + + int pad; /* padding for payload align */ uint8_t payload[]; /* next header or data */ } odp_buffer_hdr_t; diff --git a/platform/linux-generic/include/odp_timer_internal.h b/platform/linux-generic/include/odp_timer_internal.h new file mode 100644 index 0000000..97851a2 --- /dev/null +++ b/platform/linux-generic/include/odp_timer_internal.h @@ -0,0 +1,52 @@ +/* Copyright (c) 2013, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + + +/** + * @file + * + * ODP timer timeout descriptor - implementation internal + */ + +#ifndef ODP_TIMER_INTERNAL_H_ +#define ODP_TIMER_INTERNAL_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <odp_std_types.h> +#include <odp_queue.h> +#include <odp_buffer.h> +#include <odp_buffer_internal.h> + +struct odp_timeout_hdr_t; + +/** + * Timeout notification header + */ +typedef struct odp_timeout_hdr_t { + odp_buffer_hdr_t buf_hdr; + + uint64_t tick; + + uint8_t payload[]; +} odp_timeout_hdr_t; + + + +ODP_ASSERT(sizeof(odp_timeout_hdr_t) == + ODP_OFFSETOF(odp_timeout_hdr_t, payload), + ODP_TIMEOUT_HDR_T__SIZE_ERR); + +ODP_ASSERT(sizeof(odp_timeout_hdr_t) % sizeof(uint64_t) == 0, + ODP_TIMEOUT_HDR_T__SIZE_ERR2); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/source/odp_buffer.c b/platform/linux-generic/source/odp_buffer.c index afbe96a..ff7a892 100644 --- a/platform/linux-generic/source/odp_buffer.c +++ b/platform/linux-generic/source/odp_buffer.c @@ -32,7 +32,7 @@ int odp_buffer_type(odp_buffer_t buf) { odp_buffer_hdr_t *hdr = odp_buf_to_hdr(buf); - return hdr->type; + return hdr->cur_type; } @@ -86,7 +86,7 @@ int odp_buffer_snprint(char *str, size_t n, odp_buffer_t buf) len += snprintf(&str[len], n-len, " ref_count %i\n", hdr->ref_count); len += snprintf(&str[len], n-len, - " type %i\n", hdr->type); + " type %i\n", hdr->cur_type); len += snprintf(&str[len], n-len, " Scatter list\n"); len += snprintf(&str[len], n-len, diff --git a/platform/linux-generic/source/odp_buffer_pool.c b/platform/linux-generic/source/odp_buffer_pool.c index 90214ba..3a5cb94 100644 --- a/platform/linux-generic/source/odp_buffer_pool.c +++ b/platform/linux-generic/source/odp_buffer_pool.c @@ -9,6 +9,7 @@ #include <odp_buffer_pool_internal.h> #include <odp_buffer_internal.h> #include <odp_packet_internal.h> +#include <odp_timer_internal.h> #include <odp_shared_memory.h> #include <odp_align.h> #include <odp_internal.h> @@ -39,6 +40,15 @@ #define NULL_INDEX ((uint32_t)-1) +union buffer_type_any_u { + odp_buffer_hdr_t buf; + odp_packet_hdr_t pkt; + odp_timeout_hdr_t tmo; +}; + +ODP_ASSERT(sizeof(union buffer_type_any_u) % sizeof(uint64_t) == 0, + BUFFER_TYPE_ANY_U__SIZE_ERR); + typedef union pool_entry_u { struct pool_entry_s s; @@ -177,8 +187,9 @@ static void add_chunk(pool_entry_t *pool, odp_buffer_chunk_hdr_t *chunk_hdr) if (pool->s.head) { /* link pool head to the chunk */ add_buf_index(chunk_hdr, pool->s.head->buf_hdr.index); - } else + } else { add_buf_index(chunk_hdr, NULL_INDEX); + } pool->s.head = chunk_hdr; pool->s.free_bufs += ODP_BUFS_PER_CHUNK; @@ -214,6 +225,11 @@ static void fill_hdr(void *ptr, pool_entry_t *pool, uint32_t index, if (pool->s.buf_type == ODP_BUFFER_TYPE_PACKET) { odp_packet_hdr_t *packet_hdr = ptr; payload = packet_hdr->payload; + } else if (pool->s.buf_type == ODP_BUFFER_TYPE_TIMEOUT) { + odp_timeout_hdr_t *tmo_hdr = ptr; + payload = tmo_hdr->payload; + } else if (pool->s.buf_type == ODP_BUFFER_TYPE_ANY) { + payload = ((uint8_t *)ptr) + sizeof(union buffer_type_any_u); } memset(hdr, 0, size); @@ -224,7 +240,8 @@ static void fill_hdr(void *ptr, pool_entry_t *pool, uint32_t index, hdr->index = index; hdr->size = pool->s.payload_size; hdr->pool = pool->s.pool; - hdr->type = buf_type; + hdr->org_type = pool->s.buf_type; + hdr->cur_type = buf_type; check_align(pool, hdr); } @@ -251,11 +268,15 @@ static void link_bufs(pool_entry_t *pool) pool_size = pool->s.pool_size; pool_base = (uintptr_t) pool->s.pool_base_addr; - if (buf_type == ODP_BUFFER_TYPE_RAW) + if (buf_type == ODP_BUFFER_TYPE_RAW) { hdr_size = sizeof(odp_buffer_hdr_t); - else if (buf_type == ODP_BUFFER_TYPE_PACKET) + } else if (buf_type == ODP_BUFFER_TYPE_PACKET) { hdr_size = sizeof(odp_packet_hdr_t); - else { + } else if (buf_type == ODP_BUFFER_TYPE_TIMEOUT) { + hdr_size = sizeof(odp_timeout_hdr_t); + } else if (buf_type == ODP_BUFFER_TYPE_ANY) { + hdr_size = sizeof(union buffer_type_any_u); + } else { ODP_ERR("odp_buffer_pool_create: Bad type %i\n", buf_type); exit(0); @@ -404,7 +425,7 @@ odp_buffer_t odp_buffer_alloc(odp_buffer_pool_t pool_id) if (chunk->chunk.num_bufs == 0) { /* give the chunk buffer */ local_chunk[pool_id] = NULL; - chunk->buf_hdr.type = pool->s.buf_type; + chunk->buf_hdr.cur_type = pool->s.buf_type; handle = chunk->buf_hdr.handle; } else { diff --git a/platform/linux-generic/source/odp_timer.c b/platform/linux-generic/source/odp_timer.c index 6fb5025..7c6c4f4 100644 --- a/platform/linux-generic/source/odp_timer.c +++ b/platform/linux-generic/source/odp_timer.c @@ -5,6 +5,8 @@ */ #include <odp_timer.h> +#include <odp_timer_internal.h> +#include <odp_buffer_pool_internal.h> #include <odp_internal.h> #include <odp_atomic.h> #include <odp_spinlock.h> @@ -330,3 +332,14 @@ uint64_t odp_timer_current_tick(odp_timer_t timer) id = timer - 1; return odp_timer.timer[id].cur_tick; } + +odp_timeout_t odp_timeout_from_buffer(odp_buffer_t buf) +{ + return (odp_timeout_t) odp_buf_to_hdr(buf); +} + +uint64_t odp_timeout_tick(odp_timeout_t tmo) +{ + odp_timeout_hdr_t *tmo_hdr = tmo; + return tmo_hdr->tick; +} diff --git a/test/timer/odp_timer_test.c b/test/timer/odp_timer_test.c index 341265d..0af87b2 100644 --- a/test/timer/odp_timer_test.c +++ b/test/timer/odp_timer_test.c @@ -70,8 +70,17 @@ static void test_timeouts(int thr) ODP_DBG(" [%i] current tick %"PRIu64"\n", thr, tick); while (1) { + int type; + buf = odp_schedule_one(&queue, ODP_SCHED_WAIT); + type = odp_buffer_type(buf); + + if (type == ODP_BUFFER_TYPE_TIMEOUT) + ODP_DBG(" [%i] timeout\n", thr); + else + ODP_DBG(" [%i] message, type %i\n", thr, type); + /* TODO: read tick from tmo metadata */ tick = odp_timer_current_tick(test_timer); @@ -271,7 +280,7 @@ int main(int argc, char *argv[]) pool = odp_buffer_pool_create("msg_pool", pool_base, MSG_POOL_SIZE, sizeof(test_message_t), - ODP_CACHE_LINE_SIZE, ODP_BUFFER_TYPE_RAW); + ODP_CACHE_LINE_SIZE, ODP_BUFFER_TYPE_ANY); if (pool == ODP_BUFFER_POOL_INVALID) { ODP_ERR("Pool create failed.\n");
New buffer types: timeout and any. Timeout is used for timeout nofications. A pool initilized with buffer type 'any' can allocate buffers for different usage (raw, packet, timeout, ...). Signed-off-by: Petri Savolainen <petri.savolainen@linaro.org> --- include/odp_buffer.h | 8 ++-- include/odp_timer.h | 31 +++++++++++-- .../linux-generic/include/odp_buffer_internal.h | 5 ++- .../linux-generic/include/odp_timer_internal.h | 52 ++++++++++++++++++++++ platform/linux-generic/source/odp_buffer.c | 4 +- platform/linux-generic/source/odp_buffer_pool.c | 33 +++++++++++--- platform/linux-generic/source/odp_timer.c | 13 ++++++ test/timer/odp_timer_test.c | 11 ++++- 8 files changed, 140 insertions(+), 17 deletions(-) create mode 100644 platform/linux-generic/include/odp_timer_internal.h