This MR removes the common dependency from every IDF components to the SOC component. Currently, in the ``idf_functions.cmake`` script, we include the header path of SOC component by default for all components. But for better code organization (or maybe also benifits to the compiling speed), we may remove the dependency to SOC components for most components except the driver and kernel related components. In CMAKE, we have two kinds of header visibilities (set by include path visibility): (Assume component A --(depends on)--> B, B is the current component) 1. public (``COMPONENT_ADD_INCLUDEDIRS``): means this path is visible to other depending components (A) (visible to A and B) 2. private (``COMPONENT_PRIV_INCLUDEDIRS``): means this path is only visible to source files inside the component (visible to B only) and we have two kinds of depending ways: (Assume component A --(depends on)--> B --(depends on)--> C, B is the current component) 1. public (```COMPONENT_REQUIRES```): means B can access to public include path of C. All other components rely on you (A) will also be available for the public headers. (visible to A, B) 2. private (``COMPONENT_PRIV_REQUIRES``): means B can access to public include path of C, but don't propagate this relation to other components (A). (visible to B) 1. remove the common requirement in ``idf_functions.cmake``, this makes the SOC components invisible to all other components by default. 2. if a component (for example, DRIVER) really needs the dependency to SOC, add a private dependency to SOC for it. 3. some other components that don't really depends on the SOC may still meet some errors saying "can't find header soc/...", this is because it's depended component (DRIVER) incorrectly include the header of SOC in its public headers. Moving all this kind of #include into source files, or private headers 4. Fix the include requirements for some file which miss sufficient #include directives. (Previously they include some headers by the long long long header include link) This is a breaking change. Previous code may depends on the long include chain. You may need to include the following headers for some files after this commit: - soc/soc.h - soc/soc_memory_layout.h - driver/gpio.h - esp_sleep.h The major broken include chain includes: 1. esp_system.h no longer includes esp_sleep.h. The latter includes driver/gpio.h and driver/touch_pad.h. 2. ets_sys.h no longer includes soc/soc.h 3. freertos/portmacro.h no longer includes soc/soc_memory_layout.h some peripheral headers no longer includes their hw related headers, e.g. rom/gpio.h no longer includes soc/gpio_pins.h and soc/gpio_reg.h BREAKING CHANGE
321 lines
8.4 KiB
C++
321 lines
8.4 KiB
C++
#include <vector>
|
|
#include <numeric>
|
|
#include <stdexcept>
|
|
#include <string>
|
|
#include "unity.h"
|
|
#include "esp_log.h"
|
|
#include "freertos/FreeRTOS.h"
|
|
#include "freertos/task.h"
|
|
#include "freertos/semphr.h"
|
|
#include "soc/soc.h"
|
|
|
|
static const char* TAG = "cxx";
|
|
|
|
TEST_CASE("can use new and delete", "[cxx]")
|
|
{
|
|
int* int_p = new int(10);
|
|
delete int_p;
|
|
int* int_array = new int[10];
|
|
delete[] int_array;
|
|
}
|
|
|
|
class Base
|
|
{
|
|
public:
|
|
virtual ~Base() {}
|
|
virtual void foo() = 0;
|
|
};
|
|
|
|
class Derived : public Base
|
|
{
|
|
public:
|
|
virtual void foo() { }
|
|
};
|
|
|
|
TEST_CASE("can call virtual functions", "[cxx]")
|
|
{
|
|
Derived d;
|
|
Base& b = static_cast<Base&>(d);
|
|
b.foo();
|
|
}
|
|
|
|
class NonPOD
|
|
{
|
|
public:
|
|
NonPOD(int a_) : a(a_) { }
|
|
int a;
|
|
};
|
|
|
|
static int non_pod_test_helper(int new_val)
|
|
{
|
|
static NonPOD non_pod(42);
|
|
int ret = non_pod.a;
|
|
non_pod.a = new_val;
|
|
return ret;
|
|
}
|
|
|
|
TEST_CASE("can use static initializers for non-POD types", "[cxx]")
|
|
{
|
|
TEST_ASSERT_EQUAL(42, non_pod_test_helper(1));
|
|
TEST_ASSERT_EQUAL(1, non_pod_test_helper(0));
|
|
}
|
|
|
|
TEST_CASE("can use std::vector", "[cxx]")
|
|
{
|
|
std::vector<int> v(10, 1);
|
|
v[0] = 42;
|
|
TEST_ASSERT_EQUAL(51, std::accumulate(std::begin(v), std::end(v), 0));
|
|
}
|
|
|
|
/*
|
|
* This test exercises static initialization guards for two objects.
|
|
* For each object, 4 tasks are created which attempt to perform static initialization.
|
|
* We check that constructor runs only once for each object.
|
|
*/
|
|
|
|
static SemaphoreHandle_t s_slow_init_sem = NULL;
|
|
|
|
template<int obj>
|
|
class SlowInit
|
|
{
|
|
public:
|
|
SlowInit(int arg) {
|
|
ESP_LOGD(TAG, "init obj=%d start, arg=%d\n", obj, arg);
|
|
vTaskDelay(300/portTICK_PERIOD_MS);
|
|
TEST_ASSERT_EQUAL(-1, mInitBy);
|
|
TEST_ASSERT_EQUAL(0, mInitCount);
|
|
mInitBy = arg;
|
|
++mInitCount;
|
|
ESP_LOGD(TAG, "init obj=%d done\n", obj);
|
|
}
|
|
|
|
static void task(void* arg) {
|
|
int taskId = reinterpret_cast<int>(arg);
|
|
ESP_LOGD(TAG, "obj=%d before static init, task=%d\n", obj, taskId);
|
|
static SlowInit slowinit(taskId);
|
|
ESP_LOGD(TAG, "obj=%d after static init, task=%d\n", obj, taskId);
|
|
xSemaphoreGive(s_slow_init_sem);
|
|
vTaskDelete(NULL);
|
|
}
|
|
private:
|
|
static int mInitBy;
|
|
static int mInitCount;
|
|
};
|
|
|
|
template<> int SlowInit<1>::mInitBy = -1;
|
|
template<> int SlowInit<1>::mInitCount = 0;
|
|
template<> int SlowInit<2>::mInitBy = -1;
|
|
template<> int SlowInit<2>::mInitCount = 0;
|
|
|
|
template<int obj>
|
|
static int start_slow_init_task(int id, int affinity)
|
|
{
|
|
return xTaskCreatePinnedToCore(&SlowInit<obj>::task, "slow_init", 2048,
|
|
reinterpret_cast<void*>(id), 3, NULL, affinity) ? 1 : 0;
|
|
}
|
|
|
|
TEST_CASE("static initialization guards work as expected", "[cxx]")
|
|
{
|
|
s_slow_init_sem = xSemaphoreCreateCounting(10, 0);
|
|
TEST_ASSERT_NOT_NULL(s_slow_init_sem);
|
|
int task_count = 0;
|
|
// four tasks competing for static initialization of one object
|
|
task_count += start_slow_init_task<1>(0, PRO_CPU_NUM);
|
|
#if portNUM_PROCESSORS == 2
|
|
task_count += start_slow_init_task<1>(1, APP_CPU_NUM);
|
|
#endif
|
|
task_count += start_slow_init_task<1>(2, PRO_CPU_NUM);
|
|
task_count += start_slow_init_task<1>(3, tskNO_AFFINITY);
|
|
|
|
// four tasks competing for static initialization of another object
|
|
task_count += start_slow_init_task<2>(0, PRO_CPU_NUM);
|
|
#if portNUM_PROCESSORS == 2
|
|
task_count += start_slow_init_task<2>(1, APP_CPU_NUM);
|
|
#endif
|
|
task_count += start_slow_init_task<2>(2, PRO_CPU_NUM);
|
|
task_count += start_slow_init_task<2>(3, tskNO_AFFINITY);
|
|
|
|
// All tasks should
|
|
for (int i = 0; i < task_count; ++i) {
|
|
TEST_ASSERT_TRUE(xSemaphoreTake(s_slow_init_sem, 500/portTICK_PERIOD_MS));
|
|
}
|
|
vSemaphoreDelete(s_slow_init_sem);
|
|
|
|
vTaskDelay(10); // Allow tasks to clean up, avoids race with leak detector
|
|
}
|
|
|
|
struct GlobalInitTest
|
|
{
|
|
GlobalInitTest() : index(order++) {
|
|
}
|
|
int index;
|
|
static int order;
|
|
};
|
|
|
|
int GlobalInitTest::order = 0;
|
|
|
|
GlobalInitTest g_init_test1;
|
|
GlobalInitTest g_init_test2;
|
|
GlobalInitTest g_init_test3;
|
|
|
|
TEST_CASE("global initializers run in the correct order", "[cxx]")
|
|
{
|
|
TEST_ASSERT_EQUAL(0, g_init_test1.index);
|
|
TEST_ASSERT_EQUAL(1, g_init_test2.index);
|
|
TEST_ASSERT_EQUAL(2, g_init_test3.index);
|
|
}
|
|
|
|
struct StaticInitTestBeforeScheduler
|
|
{
|
|
StaticInitTestBeforeScheduler()
|
|
{
|
|
static int first_init_order = getOrder();
|
|
index = first_init_order;
|
|
}
|
|
|
|
int getOrder()
|
|
{
|
|
return order++;
|
|
}
|
|
|
|
int index;
|
|
static int order;
|
|
};
|
|
|
|
int StaticInitTestBeforeScheduler::order = 1;
|
|
|
|
StaticInitTestBeforeScheduler g_static_init_test1;
|
|
StaticInitTestBeforeScheduler g_static_init_test2;
|
|
StaticInitTestBeforeScheduler g_static_init_test3;
|
|
|
|
TEST_CASE("before scheduler has started, static initializers work correctly", "[cxx]")
|
|
{
|
|
TEST_ASSERT_EQUAL(1, g_static_init_test1.index);
|
|
TEST_ASSERT_EQUAL(1, g_static_init_test2.index);
|
|
TEST_ASSERT_EQUAL(1, g_static_init_test3.index);
|
|
TEST_ASSERT_EQUAL(2, StaticInitTestBeforeScheduler::order);
|
|
}
|
|
|
|
#ifdef CONFIG_CXX_EXCEPTIONS
|
|
|
|
TEST_CASE("c++ exceptions work", "[cxx]")
|
|
{
|
|
/* Note: When first exception (in system) is thrown this test produces memory leaks report (~500 bytes):
|
|
- 392 bytes (can vary) as libunwind allocates memory to keep stack frames info to handle exceptions.
|
|
This info is kept until global destructors are called by __do_global_dtors_aux()
|
|
- 8 bytes are allocated by __cxa_get_globals() to keep __cxa_eh_globals
|
|
- 16 bytes are allocated by pthread_setspecific() which is called by __cxa_get_globals() to init TLS var for __cxa_eh_globals
|
|
- 88 bytes are allocated by pthread_setspecific() to init internal lock
|
|
*/
|
|
int thrown_value;
|
|
try
|
|
{
|
|
throw 20;
|
|
}
|
|
catch (int e)
|
|
{
|
|
thrown_value = e;
|
|
}
|
|
TEST_ASSERT_EQUAL(20, thrown_value);
|
|
printf("OK?\n");
|
|
}
|
|
|
|
TEST_CASE("c++ exceptions emergency pool", "[cxx] [ignore]")
|
|
{
|
|
/* Note: When first exception (in system) is thrown this test produces memory leaks report (~500 bytes):
|
|
- 392 bytes (can vary) as libunwind allocates memory to keep stack frames info to handle exceptions.
|
|
This info is kept until global destructors are called by __do_global_dtors_aux()
|
|
- 8 bytes are allocated by __cxa_get_globals() to keep __cxa_eh_globals
|
|
- 16 bytes are allocated by pthread_setspecific() which is called by __cxa_get_globals() to init TLS var for __cxa_eh_globals
|
|
- 88 bytes are allocated by pthread_setspecific() to init internal lock
|
|
*/
|
|
void **p, **pprev = NULL;
|
|
int thrown_value = 0;
|
|
// throw first exception to ensure that all initial allocations are made
|
|
try
|
|
{
|
|
throw 33;
|
|
}
|
|
catch (int e)
|
|
{
|
|
thrown_value = e;
|
|
}
|
|
TEST_ASSERT_EQUAL(33, thrown_value);
|
|
// consume all dynamic memory
|
|
while ((p = (void **)malloc(sizeof(void *)))) {
|
|
if (pprev) {
|
|
*p = pprev;
|
|
} else {
|
|
*p = NULL;
|
|
}
|
|
pprev = p;
|
|
}
|
|
try
|
|
{
|
|
throw 20;
|
|
}
|
|
catch (int e)
|
|
{
|
|
thrown_value = e;
|
|
printf("Got exception %d\n", thrown_value);
|
|
}
|
|
#if CONFIG_CXX_EXCEPTIONS_EMG_POOL_SIZE > 0
|
|
// free all memory
|
|
while (pprev) {
|
|
p = (void **)(*pprev);
|
|
free(pprev);
|
|
pprev = p;
|
|
}
|
|
TEST_ASSERT_EQUAL(20, thrown_value);
|
|
#else
|
|
// if emergency pool is disabled we should never get here,
|
|
// expect abort() due to lack of memory for new exception
|
|
TEST_ASSERT_TRUE(0 == 1);
|
|
#endif
|
|
}
|
|
|
|
#else // !CONFIG_CXX_EXCEPTIONS
|
|
|
|
TEST_CASE("std::out_of_range exception when -fno-exceptions", "[cxx][reset=abort,SW_CPU_RESET]")
|
|
{
|
|
std::vector<int> v(10);
|
|
v.at(20) = 42;
|
|
TEST_FAIL_MESSAGE("Unreachable because we are aborted on the line above");
|
|
}
|
|
|
|
TEST_CASE("std::bad_alloc exception when -fno-exceptions", "[cxx][reset=abort,SW_CPU_RESET]")
|
|
{
|
|
std::string s = std::string(2000000000, 'a');
|
|
(void)s;
|
|
TEST_FAIL_MESSAGE("Unreachable because we are aborted on the line above");
|
|
}
|
|
|
|
#endif
|
|
|
|
/* These test cases pull a lot of code from libstdc++ and are disabled for now
|
|
*/
|
|
#if 0
|
|
#include <iostream>
|
|
#include <functional>
|
|
|
|
TEST_CASE("can use iostreams", "[cxx]")
|
|
{
|
|
std::cout << "hello world";
|
|
}
|
|
|
|
TEST_CASE("can call std::function and bind", "[cxx]")
|
|
{
|
|
int outer = 1;
|
|
std::function<int(int)> fn = [&outer](int x) -> int {
|
|
return x + outer;
|
|
};
|
|
outer = 5;
|
|
TEST_ASSERT_EQUAL(6, fn(1));
|
|
|
|
auto bound = std::bind(fn, outer);
|
|
outer = 10;
|
|
TEST_ASSERT_EQUAL(15, bound());
|
|
}
|
|
|
|
#endif
|
|
|