feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

ringbuf: Fix ordering of StaticRingbuffer_t

Browse Source 
When building on linux/host compilers (e.g., GCC), the compiler may add padding
depending on the size and order of the member types.

This commit fixes the ordering or the StaticRingbuffer_t such that it matches
the internal Ringbuffer_t. The "_Static_assert" is always enabled for all
compilers.

Closes https://github.com/espressif/esp-idf/issues/11726
This commit is contained in:
Darian Leung
2023-06-22 19:56:29 +08:00
parent c221ce331a
commit b104b52b0e
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/esp_ringbuf/include/freertos/ringbuf.h
View File

@@ -57,8 +57,8 @@ typedef struct xSTATIC_RINGBUFFER {
/** @cond */ //Doxygen command to hide this structure from API Reference /** @cond */ //Doxygen command to hide this structure from API Reference
size_t xDummy1[2]; size_t xDummy1[2];
UBaseType_t uxDummy2; UBaseType_t uxDummy2;
BaseType_t xDummy3; void *pvDummy3[11];
void *pvDummy4[11]; BaseType_t xDummy4;
StaticList_t xDummy5[2]; StaticList_t xDummy5[2];
void * pvDummy6; void * pvDummy6;
portMUX_TYPE muxDummy; portMUX_TYPE muxDummy;

2
components/esp_ringbuf/ringbuf.c
View File

@@ -73,9 +73,7 @@ typedef struct RingbufferDefinition {
portMUX_TYPE mux; //Spinlock required for SMP portMUX_TYPE mux; //Spinlock required for SMP
} Ringbuffer_t; } Ringbuffer_t;
#if __GNUC_PREREQ(4, 6)
_Static_assert(sizeof(StaticRingbuffer_t) == sizeof(Ringbuffer_t), "StaticRingbuffer_t != Ringbuffer_t"); _Static_assert(sizeof(StaticRingbuffer_t) == sizeof(Ringbuffer_t), "StaticRingbuffer_t != Ringbuffer_t");
#endif
// ------------------------------------------------ Forward Declares --------------------------------------------------- // ------------------------------------------------ Forward Declares ---------------------------------------------------