[instance] single OpenThread instance optimizations (#1926)

This commit new configuration option `enable-multiple-instances` and
its corresponding option `OPENTHREAD_ENABLE_MULTIPLE_INSTANCES`. When
enabled OpenThread supports handling of multiple instances. By default
this is disabled.

This commit also adds two optimizations for single instance case to
simplify the code and also help reduce memory/RAM usage:

(1) OpenThread objects/classes typically keep a reference to a higher
level object (e.g., many classes keep track of owning `ThreadNetif`)
to be able to access other objects/methods within OpenThread class
hierarchy. In single instance mode, the reference member variables are
removed and instead global functions are used to access the singleton
objects from one class to the other. To implement this, a group of
`<Object>Locator` classes are defined (e.g., `ThreadNetifLocator`,
etc.) which are then used as base class of other OpenThread classes.

(2) OpenThread objects which provide a callback/handler (e.g.,
`Timer`, `Tasklet`, etc.) have `void *mContext` member variable which
is used to keep track of the owner of the object. In single instance
mode the `mConext` member variables are removed since the owner is
expected to be a singleton and can be uniquely determined from the
callback function.

To implement this, two changes are made: First the handler methods are
modified to provide a reference to the object (e.g., `Timer` handler
will provide a `Timer &aTimer` as a parameter of its handler
callback). Second, a new base class `Context` is introduced which
hides the implementation providing an arbitrary context information. A
new static method `GetOwner(aContext)` is added to classes which own a
callback providing objects. This method help convert a `Context` to
the reference of the owner class object.
This commit is contained in:
Abtin Keshavarzian
2017-06-30 11:48:26 -07:00
committed by Jonathan Hui
parent 5128602b49
commit bbab3074ed
143 changed files with 2932 additions and 1831 deletions
+20 -30
View File
@@ -27,18 +27,24 @@
*/
#include <stdarg.h>
#include "utils/wrap_string.h"
#include "test_platform.h"
#include <openthread/config.h>
#include <openthread/openthread.h>
#include "openthread-instance.h"
#include "common/debug.hpp"
#include "common/message.hpp"
#include "utils/wrap_string.h"
#include "test_util.h"
#define kNumTestMessages 5
static otInstance *sInstance;
static ot::MessagePool *sMessagePool;
// This function verifies the content of the message queue to match the passed in messages
void VerifyMessageQueueContent(ot::MessageQueue &aMessageQueue, int aExpectedLength, ...)
{
@@ -73,16 +79,19 @@ void VerifyMessageQueueContent(ot::MessageQueue &aMessageQueue, int aExpectedLen
void TestMessageQueue(void)
{
otInstance instance;
ot::MessagePool messagePool(&instance);
ot::MessageQueue messageQueue;
ot::Message *msg[kNumTestMessages];
otError error;
uint16_t msgCount, bufferCount;
sInstance = testInitInstance();
VerifyOrQuit(sInstance != NULL, "Null instance");
sMessagePool = &sInstance->mIp6.mMessagePool;
for (int i = 0; i < kNumTestMessages; i++)
{
msg[i] = messagePool.New(ot::Message::kTypeIp6, 0);
msg[i] = sMessagePool->New(ot::Message::kTypeIp6, 0);
VerifyOrQuit(msg[i] != NULL, "Message::New failed\n");
}
@@ -146,6 +155,8 @@ void TestMessageQueue(void)
error = messageQueue.Dequeue(*msg[1]);
VerifyOrQuit(error == OT_ERROR_NOT_FOUND,
"Dequeuing a message not in the queue did not fail as expected.\n");
testFreeInstance(sInstance);
}
// This function verifies the content of the message queue to match the passed in messages
@@ -186,35 +197,17 @@ void VerifyMessageQueueContentUsingOtApi(otMessageQueue *aQueue, int aExpectedLe
// This test checks all the OpenThread C APIs for `otMessageQueue`
void TestMessageQueueOtApis(void)
{
otInstance *instance;
otMessageQueue queue, queue2;
otMessage *msg[kNumTestMessages];
otError error;
otMessage *message;
otMessageQueue queue, queue2;
#ifdef OPENTHREAD_MULTIPLE_INSTANCE
size_t otInstanceBufferLength = 0;
uint8_t *otInstanceBuffer = NULL;
// Call to query the buffer size
(void)otInstanceInit(NULL, &otInstanceBufferLength);
// Call to allocate the buffer
otInstanceBuffer = (uint8_t *)malloc(otInstanceBufferLength);
assert(otInstanceBuffer);
// Initialize OpenThread with the buffer
instance = otInstanceInit(otInstanceBuffer, &otInstanceBufferLength);
#else
instance = otInstanceInit();
#endif
VerifyOrQuit(instance != NULL, "Failed to get and init an otInstance.\n");
sInstance = testInitInstance();
VerifyOrQuit(sInstance != NULL, "Null instance");
for (int i = 0; i < kNumTestMessages; i++)
{
msg[i] = otIp6NewMessage(instance, true);
msg[i] = otIp6NewMessage(sInstance, true);
VerifyOrQuit(msg[i] != NULL, "otIp6NewMessage() failed.\n");
}
@@ -270,10 +263,7 @@ void TestMessageQueueOtApis(void)
SuccessOrQuit(otMessageQueueDequeue(&queue, msg[2]), "Failed to dequeue a message from otMessageQueue.\n");
VerifyMessageQueueContentUsingOtApi(&queue, 0);
otInstanceFinalize(instance);
#ifdef OPENTHREAD_MULTIPLE_INSTANCE
free(otInstanceBuffer);
#endif
testFreeInstance(sInstance);
}
#ifdef ENABLE_TEST_MAIN