From d4acb08bad259e7882a215a7b6c416616dd24823 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Wed, 9 Mar 2022 14:16:23 -0800 Subject: [PATCH 01/59] README.md: Fix incorrect link --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index ff335e4..da92359 100644 --- a/README.md +++ b/README.md @@ -297,7 +297,7 @@ a single library needs to be installed since v1.1: * Search for "AceRoutine". Click Install. -The direct dependency to the [AceRoutine](https://github.com/bxparks/AceRoutine) +The direct dependency to the [AceCommon](https://github.com/bxparks/AceCommon) library was removed in v1.4.2, but some of the programs under `tests/` and `examples/` may still require the `AceCommon` library to be installed. @@ -479,12 +479,12 @@ sizeof(CoroutineScheduler): 4 sizeof(Channel): 12 ``` -The `CoroutineScheduler` consumes only 2 bytes of memory no matter how many -coroutines are created. That's because it depends on a singly-linked list whose -pointers live on the `Coroutine` object, not in the `CoroutineScheduler`. But -using the `CoroutineScheduler::loop()` instead of calling -`Coroutine::runCoroutine()` directly increases flash memory usage by 70-100 -bytes. +The `CoroutineScheduler` consumes only 2 bytes (8-bit processors) or 4 bytes +(32-bit processors) of static memory no matter how many coroutines are created. +That's because it depends on a singly-linked list whose pointers live on the +`Coroutine` object, not in the `CoroutineScheduler`. But using the +`CoroutineScheduler::loop()` instead of calling `Coroutine::runCoroutine()` +directly increases flash memory usage by 70-100 bytes. The `Channel` object requires 2 copies of the parameterized `` type so its size is equal to `1 + 2 * sizeof(T)`, rounded to the nearest memory alignment From c0e8bf7b2f87aa5d59cd1d39b2ddea9624d4dc5c Mon Sep 17 00:00:00 2001 From: Brian Park Date: Wed, 9 Mar 2022 14:18:02 -0800 Subject: [PATCH 02/59] README.md: Fix grammar --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index da92359..b6ed267 100644 --- a/README.md +++ b/README.md @@ -305,7 +305,7 @@ The development version can be installed by cloning the following git repo: * AceRoutine (https://github.com/bxparks/AceRoutine) -You can copy these directories to the `./libraries` directory used by the +You can copy this directory to the `./libraries` directory used by the Arduino IDE. (The result is a directory named `./libraries/AceRoutine`). Or you can create symlinks from `/.libraries` to this directory. From eeced2dab194366d975258d787e31561861ff184 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Mon, 14 Mar 2022 09:17:05 -0700 Subject: [PATCH 03/59] Coroutine.h: Add setCName(), getCName(), setFName(), getFName(), printNameTo() --- src/ace_routine/Coroutine.h | 57 ++++++++++++++++++++++++- tests/AceRoutineTest/AceRoutineTest.ino | 40 ++++++++++++++++- tests/AceRoutineTest/Makefile | 2 +- 3 files changed, 95 insertions(+), 4 deletions(-) diff --git a/src/ace_routine/Coroutine.h b/src/ace_routine/Coroutine.h index ead0fba..288f5a4 100644 --- a/src/ace_routine/Coroutine.h +++ b/src/ace_routine/Coroutine.h @@ -29,6 +29,7 @@ SOFTWARE. #include // Print #include "ClockInterface.h" +class __FlashStringHelper; class AceRoutineTest_statusStrings; class SuspendTest_suspendAndResume; @@ -279,6 +280,13 @@ class CoroutineTemplate { friend class ::AceRoutineTest_statusStrings; friend class ::SuspendTest_suspendAndResume; + public: + /** Coroutine name is a `const char*` c-string. */ + static const uint8_t kNameTypeCString = 0; + + /** Coroutine name is a `const __FlashStringHelper*` f-string. */ + static const uint8_t kNameTypeFString = 1; + public: /** * The body of the coroutine. The COROUTINE macro creates a subclass of @@ -308,12 +316,53 @@ class CoroutineTemplate { */ virtual void setupCoroutine() {} + /** + * Return the type of the name string, either kNameTypeCString or + * kNameTypeFString. + */ + uint8_t getNameType() const { return mNameType; } + + /** Set the name of the coroutine to the given c-string. */ + void setCName(const char* name) { + mNameType = kNameTypeCString; + mName = name; + } + + /** Set the name of the coroutine to the given f-string. */ + void setFName(const __FlashStringHelper* name) { + mNameType = kNameTypeFString; + mName = (const char*) name; + } + + /** Get name of the coroutine assuming it's a c-string. Nullable. */ + const char* getCName() const { return mName; } + + /** Get name of the coroutine assuming it's an f-string. Nullable. */ + const __FlashStringHelper* getFName() const { + return (const __FlashStringHelper*) mName; + } + + /** + * Print name to the given Printer. If the name is null, then print the + * hexadecimal representation of the pointer to the coroutine. + */ + void printNameTo(Print& printer) const { + if (mName == nullptr) { + printer.print("0x"); + printer.print((uintptr_t) this, 16); + } else if (mNameType == kNameTypeCString) { + printer.print(mName); + } else { + printer.print((const __FlashStringHelper*) mName); + } + } + /** * Suspend the coroutine at the next scheduler iteration. If the coroutine * is already in the process of ending or is already terminated, then this * method does nothing. A coroutine cannot use this method to suspend * itself, it can only suspend some other coroutine. Currently, there is no - * ability for a coroutine to suspend itself, that would require the + * ability for a coroutine to suspend itself. I think that would require the * addition of a COROUTINE_SUSPEND() macro. Also, this method works only if * the CoroutineScheduler::loop() is used because the suspend functionality * is implemented by the CoroutineScheduler. @@ -668,6 +717,12 @@ class CoroutineTemplate { /** Address of the label used by the computed-goto. */ void* mJumpPoint = nullptr; + /** Name of the coroutine. (Optional) */ + const char* mName = nullptr; + + /** String type of the coroutine mName. */ + uint8_t mNameType = kNameTypeCString; + /** Run-state of the coroutine. */ Status mStatus = kStatusYielding; diff --git a/tests/AceRoutineTest/AceRoutineTest.ino b/tests/AceRoutineTest/AceRoutineTest.ino index 0e3d172..67e5b50 100644 --- a/tests/AceRoutineTest/AceRoutineTest.ino +++ b/tests/AceRoutineTest/AceRoutineTest.ino @@ -1,13 +1,16 @@ #line 2 "AceRoutineTest.ino" +#include +#include // PrintStr<> #include -#include +#include // TestRunner #include "ace_routine/testing/TestableCoroutine.h" #include "ace_routine/testing/TestableClockInterface.h" using namespace ace_routine; using namespace ace_routine::testing; -using namespace aunit; +using aunit::TestRunner; +using ace_common::PrintStr; // --------------------------------------------------------------------------- @@ -157,6 +160,39 @@ test(AceRoutineTest, macroCoroutine) { // --------------------------------------------------------------------------- +test(AceRoutineTest, name_cstring) { + simpleCoroutine.setCName("simple"); + assertEqual(simpleCoroutine.getNameType(), Coroutine::kNameTypeCString); + assertEqual(simpleCoroutine.getCName(), "simple"); + + PrintStr<16> str; + simpleCoroutine.printNameTo(str); + assertEqual(str.cstr(), "simple"); +} + +test(AceRoutineTest, name_fstring) { + simpleCoroutine.setFName(F("simple")); + assertEqual(simpleCoroutine.getNameType(), Coroutine::kNameTypeFString); + assertEqual(simpleCoroutine.getFName(), F("simple")); + + PrintStr<16> str; + simpleCoroutine.printNameTo(str); + assertEqual(str.cstr(), "simple"); +} + +test(AceRoutineTest, name_nullptr) { + simpleCoroutine.setCName(nullptr); + assertEqual(simpleCoroutine.getNameType(), Coroutine::kNameTypeCString); + assertEqual(simpleCoroutine.getCName(), (const char*) nullptr); + + // Name is printed as a pointer, so begins with "0x". + PrintStr<16> str; + simpleCoroutine.printNameTo(str); + assertEqual(strncmp(str.cstr(), "0x", 2), 0); +} + +// --------------------------------------------------------------------------- + void setup() { #if defined(ARDUINO) delay(1000); // some boards reboot twice diff --git a/tests/AceRoutineTest/Makefile b/tests/AceRoutineTest/Makefile index 01662f3..e99684d 100644 --- a/tests/AceRoutineTest/Makefile +++ b/tests/AceRoutineTest/Makefile @@ -2,5 +2,5 @@ # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := AceRoutineTest -ARDUINO_LIBS := AUnit AceRoutine +ARDUINO_LIBS := AUnit AceRoutine AceCommon include ../../../EpoxyDuino/EpoxyDuino.mk From a1f4c6078e901b3ec07cd3f02cb5104384dae447 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Mon, 14 Mar 2022 09:43:41 -0700 Subject: [PATCH 04/59] MemoryBenchmark: Regenerate after adding support for coroutine names --- examples/MemoryBenchmark/README.md | 247 ++++++++++---------- examples/MemoryBenchmark/attiny.txt | 34 +-- examples/MemoryBenchmark/esp32.txt | 40 ++-- examples/MemoryBenchmark/esp8266.txt | 28 +-- examples/MemoryBenchmark/generate_readme.py | 9 +- examples/MemoryBenchmark/micro.txt | 34 +-- examples/MemoryBenchmark/nano.txt | 34 +-- examples/MemoryBenchmark/stm32.txt | 34 +-- examples/MemoryBenchmark/teensy32.txt | 34 +-- 9 files changed, 254 insertions(+), 240 deletions(-) diff --git a/examples/MemoryBenchmark/README.md b/examples/MemoryBenchmark/README.md index e7f60ee..d0005a5 100644 --- a/examples/MemoryBenchmark/README.md +++ b/examples/MemoryBenchmark/README.md @@ -14,7 +14,7 @@ calculated flash size can jump around in unexpected ways. **NOTE**: This file was auto-generated using `make README.md`. DO NOT EDIT. -**Version**: AceRoutine v1.4.2 +**Version**: AceRoutine v1.5 **Changes**: @@ -102,6 +102,13 @@ calculated flash size can jump around in unexpected ways. * ESP32 Core from 1.0.6 to 2.0.2 * Teensyduino from 1.54 to 1.56 +* v1.5 + * Add support for human-readable names to coroutine. + * Increases flash usage by 6-10 bytes per coroutine, even if name isn't + used. + * Increases static ram by 3 bytes (AVR) and 4 bytes (32-bits) per + coroutine. + ## How to Generate This requires the [AUniter](https://github.com/bxparks/AUniter) script @@ -172,32 +179,32 @@ $ make README.md | One Delay Function | 450/ 13 | 50/ 2 | | Two Delay Functions | 508/ 15 | 108/ 4 | |---------------------------------------+--------------+-------------| -| One Coroutine | 632/ 32 | 232/ 21 | -| Two Coroutines | 802/ 51 | 402/ 40 | +| One Coroutine | 638/ 35 | 238/ 24 | +| Two Coroutines | 822/ 57 | 422/ 46 | |---------------------------------------+--------------+-------------| -| One Coroutine (micros) | 600/ 32 | 200/ 21 | -| Two Coroutines (micros) | 738/ 51 | 338/ 40 | +| One Coroutine (micros) | 606/ 35 | 206/ 24 | +| Two Coroutines (micros) | 758/ 57 | 358/ 46 | |---------------------------------------+--------------+-------------| -| One Coroutine (seconds) | 728/ 32 | 328/ 21 | -| Two Coroutines (seconds) | 926/ 51 | 526/ 40 | +| One Coroutine (seconds) | 734/ 35 | 334/ 24 | +| Two Coroutines (seconds) | 946/ 57 | 546/ 46 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine | 760/ 34 | 360/ 23 | -| Scheduler, Two Coroutines | 924/ 53 | 524/ 42 | +| Scheduler, One Coroutine | 766/ 37 | 366/ 26 | +| Scheduler, Two Coroutines | 944/ 59 | 544/ 48 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (micros) | 728/ 34 | 328/ 23 | -| Scheduler, Two Coroutines (micros) | 860/ 53 | 460/ 42 | +| Scheduler, One Coroutine (micros) | 734/ 37 | 334/ 26 | +| Scheduler, Two Coroutines (micros) | 880/ 59 | 480/ 48 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (seconds) | 856/ 34 | 456/ 23 | -| Scheduler, Two Coroutines (seconds) | 1048/ 53 | 648/ 42 | +| Scheduler, One Coroutine (seconds) | 862/ 37 | 462/ 26 | +| Scheduler, Two Coroutines (seconds) | 1068/ 59 | 668/ 48 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (setup) | 812/ 34 | 412/ 23 | -| Scheduler, Two Coroutines (setup) | 1072/ 53 | 672/ 42 | +| Scheduler, One Coroutine (setup) | 818/ 37 | 418/ 26 | +| Scheduler, Two Coroutines (setup) | 1092/ 59 | 692/ 48 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (man setup) | 790/ 34 | 390/ 23 | -| Scheduler, Two Coroutines (man setup) | 1058/ 53 | 658/ 42 | +| Scheduler, One Coroutine (man setup) | 796/ 37 | 396/ 26 | +| Scheduler, Two Coroutines (man setup) | 1078/ 59 | 678/ 48 | |---------------------------------------+--------------+-------------| | Blink Function | 546/ 14 | 146/ 3 | -| Blink Coroutine | 756/ 32 | 356/ 21 | +| Blink Coroutine | 762/ 35 | 362/ 24 | +--------------------------------------------------------------------+ ``` @@ -217,32 +224,32 @@ $ make README.md | One Delay Function | 654/ 13 | 48/ 2 | | Two Delay Functions | 714/ 15 | 108/ 4 | |---------------------------------------+--------------+-------------| -| One Coroutine | 844/ 32 | 238/ 21 | -| Two Coroutines | 1016/ 51 | 410/ 40 | +| One Coroutine | 850/ 35 | 244/ 24 | +| Two Coroutines | 1036/ 57 | 430/ 46 | |---------------------------------------+--------------+-------------| -| One Coroutine (micros) | 816/ 32 | 210/ 21 | -| Two Coroutines (micros) | 960/ 51 | 354/ 40 | +| One Coroutine (micros) | 822/ 35 | 216/ 24 | +| Two Coroutines (micros) | 980/ 57 | 374/ 46 | |---------------------------------------+--------------+-------------| -| One Coroutine (seconds) | 944/ 32 | 338/ 21 | -| Two Coroutines (seconds) | 1148/ 51 | 542/ 40 | +| One Coroutine (seconds) | 950/ 35 | 344/ 24 | +| Two Coroutines (seconds) | 1168/ 57 | 562/ 46 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine | 968/ 34 | 362/ 23 | -| Scheduler, Two Coroutines | 1132/ 53 | 526/ 42 | +| Scheduler, One Coroutine | 974/ 37 | 368/ 26 | +| Scheduler, Two Coroutines | 1152/ 59 | 546/ 48 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (micros) | 940/ 34 | 334/ 23 | -| Scheduler, Two Coroutines (micros) | 1076/ 53 | 470/ 42 | +| Scheduler, One Coroutine (micros) | 946/ 37 | 340/ 26 | +| Scheduler, Two Coroutines (micros) | 1096/ 59 | 490/ 48 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (seconds) | 1068/ 34 | 462/ 23 | -| Scheduler, Two Coroutines (seconds) | 1264/ 53 | 658/ 42 | +| Scheduler, One Coroutine (seconds) | 1074/ 37 | 468/ 26 | +| Scheduler, Two Coroutines (seconds) | 1284/ 59 | 678/ 48 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (setup) | 1018/ 34 | 412/ 23 | -| Scheduler, Two Coroutines (setup) | 1282/ 53 | 676/ 42 | +| Scheduler, One Coroutine (setup) | 1024/ 37 | 418/ 26 | +| Scheduler, Two Coroutines (setup) | 1302/ 59 | 696/ 48 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (man setup) | 996/ 34 | 390/ 23 | -| Scheduler, Two Coroutines (man setup) | 1268/ 53 | 662/ 42 | +| Scheduler, One Coroutine (man setup) | 1002/ 37 | 396/ 26 | +| Scheduler, Two Coroutines (man setup) | 1288/ 59 | 682/ 48 | |---------------------------------------+--------------+-------------| | Blink Function | 938/ 14 | 332/ 3 | -| Blink Coroutine | 1158/ 32 | 552/ 21 | +| Blink Coroutine | 1164/ 35 | 558/ 24 | +--------------------------------------------------------------------+ ``` @@ -262,32 +269,32 @@ $ make README.md | One Delay Function | 3602/ 153 | 48/ 2 | | Two Delay Functions | 3662/ 155 | 108/ 4 | |---------------------------------------+--------------+-------------| -| One Coroutine | 3732/ 172 | 178/ 21 | -| Two Coroutines | 3904/ 191 | 350/ 40 | +| One Coroutine | 3738/ 175 | 184/ 24 | +| Two Coroutines | 3924/ 197 | 370/ 46 | |---------------------------------------+--------------+-------------| -| One Coroutine (micros) | 3704/ 172 | 150/ 21 | -| Two Coroutines (micros) | 3848/ 191 | 294/ 40 | +| One Coroutine (micros) | 3710/ 175 | 156/ 24 | +| Two Coroutines (micros) | 3868/ 197 | 314/ 46 | |---------------------------------------+--------------+-------------| -| One Coroutine (seconds) | 3832/ 172 | 278/ 21 | -| Two Coroutines (seconds) | 4036/ 191 | 482/ 40 | +| One Coroutine (seconds) | 3838/ 175 | 284/ 24 | +| Two Coroutines (seconds) | 4056/ 197 | 502/ 46 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine | 3856/ 174 | 302/ 23 | -| Scheduler, Two Coroutines | 4020/ 193 | 466/ 42 | +| Scheduler, One Coroutine | 3862/ 177 | 308/ 26 | +| Scheduler, Two Coroutines | 4040/ 199 | 486/ 48 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (micros) | 3828/ 174 | 274/ 23 | -| Scheduler, Two Coroutines (micros) | 3964/ 193 | 410/ 42 | +| Scheduler, One Coroutine (micros) | 3834/ 177 | 280/ 26 | +| Scheduler, Two Coroutines (micros) | 3984/ 199 | 430/ 48 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (seconds) | 3956/ 174 | 402/ 23 | -| Scheduler, Two Coroutines (seconds) | 4152/ 193 | 598/ 42 | +| Scheduler, One Coroutine (seconds) | 3962/ 177 | 408/ 26 | +| Scheduler, Two Coroutines (seconds) | 4172/ 199 | 618/ 48 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (setup) | 3906/ 174 | 352/ 23 | -| Scheduler, Two Coroutines (setup) | 4170/ 193 | 616/ 42 | +| Scheduler, One Coroutine (setup) | 3912/ 177 | 358/ 26 | +| Scheduler, Two Coroutines (setup) | 4190/ 199 | 636/ 48 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (man setup) | 3884/ 174 | 330/ 23 | -| Scheduler, Two Coroutines (man setup) | 4156/ 193 | 602/ 42 | +| Scheduler, One Coroutine (man setup) | 3890/ 177 | 336/ 26 | +| Scheduler, Two Coroutines (man setup) | 4176/ 199 | 622/ 48 | |---------------------------------------+--------------+-------------| | Blink Function | 3994/ 154 | 440/ 3 | -| Blink Coroutine | 4154/ 172 | 600/ 21 | +| Blink Coroutine | 4160/ 175 | 606/ 24 | +--------------------------------------------------------------------+ ``` @@ -307,32 +314,32 @@ $ make README.md | One Delay Function | 21912/ 3544 | 28/ 4 | | Two Delay Functions | 21960/ 3544 | 76/ 4 | |---------------------------------------+--------------+-------------| -| One Coroutine | 22012/ 3564 | 128/ 24 | -| Two Coroutines | 22156/ 3584 | 272/ 44 | +| One Coroutine | 22016/ 3568 | 132/ 28 | +| Two Coroutines | 22164/ 3592 | 280/ 52 | |---------------------------------------+--------------+-------------| -| One Coroutine (micros) | 22076/ 3564 | 192/ 24 | -| Two Coroutines (micros) | 22220/ 3584 | 336/ 44 | +| One Coroutine (micros) | 22080/ 3568 | 196/ 28 | +| Two Coroutines (micros) | 22228/ 3592 | 344/ 52 | |---------------------------------------+--------------+-------------| -| One Coroutine (seconds) | 22028/ 3564 | 144/ 24 | -| Two Coroutines (seconds) | 22188/ 3584 | 304/ 44 | +| One Coroutine (seconds) | 22032/ 3568 | 148/ 28 | +| Two Coroutines (seconds) | 22196/ 3592 | 312/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine | 22084/ 3568 | 200/ 28 | -| Scheduler, Two Coroutines | 22188/ 3588 | 304/ 48 | +| Scheduler, One Coroutine | 22088/ 3572 | 204/ 32 | +| Scheduler, Two Coroutines | 22192/ 3596 | 308/ 56 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (micros) | 22148/ 3568 | 264/ 28 | -| Scheduler, Two Coroutines (micros) | 22252/ 3588 | 368/ 48 | +| Scheduler, One Coroutine (micros) | 22152/ 3572 | 268/ 32 | +| Scheduler, Two Coroutines (micros) | 22256/ 3596 | 372/ 56 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (seconds) | 22100/ 3568 | 216/ 28 | -| Scheduler, Two Coroutines (seconds) | 22220/ 3588 | 336/ 48 | +| Scheduler, One Coroutine (seconds) | 22104/ 3572 | 220/ 32 | +| Scheduler, Two Coroutines (seconds) | 22224/ 3596 | 340/ 56 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (setup) | 22108/ 3568 | 224/ 28 | -| Scheduler, Two Coroutines (setup) | 22240/ 3588 | 356/ 48 | +| Scheduler, One Coroutine (setup) | 22112/ 3572 | 228/ 32 | +| Scheduler, Two Coroutines (setup) | 22244/ 3596 | 360/ 56 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (man setup) | 22100/ 3568 | 216/ 28 | -| Scheduler, Two Coroutines (man setup) | 22236/ 3588 | 352/ 48 | +| Scheduler, One Coroutine (man setup) | 22104/ 3572 | 220/ 32 | +| Scheduler, Two Coroutines (man setup) | 22240/ 3596 | 356/ 56 | |---------------------------------------+--------------+-------------| | Blink Function | 22120/ 3540 | 236/ 0 | -| Blink Coroutine | 22228/ 3560 | 344/ 20 | +| Blink Coroutine | 22232/ 3564 | 348/ 24 | +--------------------------------------------------------------------+ ``` @@ -353,31 +360,31 @@ $ make README.md | Two Delay Functions | 260441/27916 | 112/ 0 | |---------------------------------------+--------------+-------------| | One Coroutine | 260525/27944 | 196/ 28 | -| Two Coroutines | 260669/27960 | 340/ 44 | +| Two Coroutines | 260669/27968 | 340/ 52 | |---------------------------------------+--------------+-------------| | One Coroutine (micros) | 260541/27944 | 212/ 28 | -| Two Coroutines (micros) | 260701/27960 | 372/ 44 | +| Two Coroutines (micros) | 260701/27968 | 372/ 52 | |---------------------------------------+--------------+-------------| | One Coroutine (seconds) | 260541/27944 | 212/ 28 | -| Two Coroutines (seconds) | 260717/27960 | 388/ 44 | +| Two Coroutines (seconds) | 260717/27968 | 388/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine | 260573/27944 | 244/ 28 | -| Scheduler, Two Coroutines | 260701/27968 | 372/ 52 | +| Scheduler, One Coroutine | 260573/27952 | 244/ 36 | +| Scheduler, Two Coroutines | 260717/27976 | 388/ 60 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (micros) | 260589/27944 | 260/ 28 | -| Scheduler, Two Coroutines (micros) | 260733/27968 | 404/ 52 | +| Scheduler, One Coroutine (micros) | 260589/27952 | 260/ 36 | +| Scheduler, Two Coroutines (micros) | 260733/27976 | 404/ 60 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (seconds) | 260589/27944 | 260/ 28 | -| Scheduler, Two Coroutines (seconds) | 260749/27968 | 420/ 52 | +| Scheduler, One Coroutine (seconds) | 260589/27952 | 260/ 36 | +| Scheduler, Two Coroutines (seconds) | 260749/27976 | 420/ 60 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (setup) | 260605/27944 | 276/ 28 | -| Scheduler, Two Coroutines (setup) | 260765/27968 | 436/ 52 | +| Scheduler, One Coroutine (setup) | 260605/27952 | 276/ 36 | +| Scheduler, Two Coroutines (setup) | 260781/27976 | 452/ 60 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (man setup) | 260589/27944 | 260/ 28 | -| Scheduler, Two Coroutines (man setup) | 260749/27968 | 420/ 52 | +| Scheduler, One Coroutine (man setup) | 260589/27952 | 260/ 36 | +| Scheduler, Two Coroutines (man setup) | 260765/27976 | 436/ 60 | |---------------------------------------+--------------+-------------| | Blink Function | 261001/27988 | 672/ 72 | -| Blink Coroutine | 261133/28008 | 804/ 92 | +| Blink Coroutine | 261133/28016 | 804/ 100 | +--------------------------------------------------------------------+ ``` @@ -394,35 +401,35 @@ $ make README.md |---------------------------------------+--------------+-------------| | Baseline | 204573/16060 | 0/ 0 | |---------------------------------------+--------------+-------------| -| One Delay Function | 204921/16084 | 348/ 24 | -| Two Delay Functions | 204993/16084 | 420/ 24 | +| One Delay Function | 204713/16068 | 140/ 8 | +| Two Delay Functions | 204785/16068 | 212/ 8 | |---------------------------------------+--------------+-------------| -| One Coroutine | 205025/16108 | 452/ 48 | -| Two Coroutines | 205189/16124 | 616/ 64 | +| One Coroutine | 204821/16092 | 248/ 32 | +| Two Coroutines | 204989/16116 | 416/ 56 | |---------------------------------------+--------------+-------------| -| One Coroutine (micros) | 205013/16108 | 440/ 48 | -| Two Coroutines (micros) | 205177/16124 | 604/ 64 | +| One Coroutine (micros) | 204809/16092 | 236/ 32 | +| Two Coroutines (micros) | 204977/16116 | 404/ 56 | |---------------------------------------+--------------+-------------| -| One Coroutine (seconds) | 205041/16108 | 468/ 48 | -| Two Coroutines (seconds) | 205221/16124 | 648/ 64 | +| One Coroutine (seconds) | 204837/16092 | 264/ 32 | +| Two Coroutines (seconds) | 205021/16116 | 448/ 56 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine | 205089/16108 | 516/ 48 | -| Scheduler, Two Coroutines | 205229/16132 | 656/ 72 | +| Scheduler, One Coroutine | 204885/16100 | 312/ 40 | +| Scheduler, Two Coroutines | 205025/16124 | 452/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (micros) | 205077/16108 | 504/ 48 | -| Scheduler, Two Coroutines (micros) | 205217/16132 | 644/ 72 | +| Scheduler, One Coroutine (micros) | 204873/16100 | 300/ 40 | +| Scheduler, Two Coroutines (micros) | 205013/16124 | 440/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (seconds) | 205105/16108 | 532/ 48 | -| Scheduler, Two Coroutines (seconds) | 205261/16132 | 688/ 72 | +| Scheduler, One Coroutine (seconds) | 204901/16100 | 328/ 40 | +| Scheduler, Two Coroutines (seconds) | 205057/16124 | 484/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (setup) | 205117/16108 | 544/ 48 | -| Scheduler, Two Coroutines (setup) | 205289/16132 | 716/ 72 | +| Scheduler, One Coroutine (setup) | 204913/16100 | 340/ 40 | +| Scheduler, Two Coroutines (setup) | 205085/16124 | 512/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (man setup) | 205109/16108 | 536/ 48 | -| Scheduler, Two Coroutines (man setup) | 205289/16132 | 716/ 72 | +| Scheduler, One Coroutine (man setup) | 204905/16100 | 332/ 40 | +| Scheduler, Two Coroutines (man setup) | 205085/16124 | 512/ 64 | |---------------------------------------+--------------+-------------| -| Blink Function | 205273/16092 | 700/ 32 | -| Blink Coroutine | 205377/16108 | 804/ 48 | +| Blink Function | 205065/16076 | 492/ 16 | +| Blink Coroutine | 205173/16100 | 600/ 40 | +--------------------------------------------------------------------+ ``` @@ -443,32 +450,32 @@ $ make README.md | One Delay Function | 10264/ 4156 | 32/ 4 | | Two Delay Functions | 10292/ 4156 | 60/ 4 | |---------------------------------------+--------------+-------------| -| One Coroutine | 10380/ 4176 | 148/ 24 | -| Two Coroutines | 10496/ 4196 | 264/ 44 | +| One Coroutine | 10384/ 4180 | 152/ 28 | +| Two Coroutines | 10504/ 4204 | 272/ 52 | |---------------------------------------+--------------+-------------| -| One Coroutine (micros) | 10436/ 4176 | 204/ 24 | -| Two Coroutines (micros) | 10540/ 4196 | 308/ 44 | +| One Coroutine (micros) | 10440/ 4180 | 208/ 28 | +| Two Coroutines (micros) | 10548/ 4204 | 316/ 52 | |---------------------------------------+--------------+-------------| -| One Coroutine (seconds) | 10400/ 4176 | 168/ 24 | -| Two Coroutines (seconds) | 10536/ 4196 | 304/ 44 | +| One Coroutine (seconds) | 10404/ 4180 | 172/ 28 | +| Two Coroutines (seconds) | 10544/ 4204 | 312/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine | 10444/ 4180 | 212/ 28 | -| Scheduler, Two Coroutines | 10556/ 4200 | 324/ 48 | +| Scheduler, One Coroutine | 10448/ 4184 | 216/ 32 | +| Scheduler, Two Coroutines | 10564/ 4208 | 332/ 56 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (micros) | 10500/ 4180 | 268/ 28 | -| Scheduler, Two Coroutines (micros) | 10600/ 4200 | 368/ 48 | +| Scheduler, One Coroutine (micros) | 10504/ 4184 | 272/ 32 | +| Scheduler, Two Coroutines (micros) | 10608/ 4208 | 376/ 56 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (seconds) | 10464/ 4180 | 232/ 28 | -| Scheduler, Two Coroutines (seconds) | 10596/ 4200 | 364/ 48 | +| Scheduler, One Coroutine (seconds) | 10468/ 4184 | 236/ 32 | +| Scheduler, Two Coroutines (seconds) | 10604/ 4208 | 372/ 56 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (setup) | 10476/ 4180 | 244/ 28 | -| Scheduler, Two Coroutines (setup) | 10620/ 4200 | 388/ 48 | +| Scheduler, One Coroutine (setup) | 10480/ 4184 | 248/ 32 | +| Scheduler, Two Coroutines (setup) | 10628/ 4208 | 396/ 56 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (man setup) | 10464/ 4180 | 232/ 28 | -| Scheduler, Two Coroutines (man setup) | 10608/ 4200 | 376/ 48 | +| Scheduler, One Coroutine (man setup) | 10468/ 4184 | 236/ 32 | +| Scheduler, Two Coroutines (man setup) | 10616/ 4208 | 384/ 56 | |---------------------------------------+--------------+-------------| | Blink Function | 10688/ 4160 | 456/ 8 | -| Blink Coroutine | 10812/ 4176 | 580/ 24 | +| Blink Coroutine | 10816/ 4180 | 584/ 28 | +--------------------------------------------------------------------+ ``` diff --git a/examples/MemoryBenchmark/attiny.txt b/examples/MemoryBenchmark/attiny.txt index 7bc5d2f..7055626 100644 --- a/examples/MemoryBenchmark/attiny.txt +++ b/examples/MemoryBenchmark/attiny.txt @@ -1,21 +1,21 @@ 0 400 8192 11 512 1 450 8192 13 512 2 508 8192 15 512 -3 632 8192 32 512 -4 802 8192 51 512 -5 600 8192 32 512 -6 738 8192 51 512 -7 728 8192 32 512 -8 926 8192 51 512 -9 760 8192 34 512 -10 924 8192 53 512 -11 728 8192 34 512 -12 860 8192 53 512 -13 856 8192 34 512 -14 1048 8192 53 512 -15 812 8192 34 512 -16 1072 8192 53 512 -17 790 8192 34 512 -18 1058 8192 53 512 +3 638 8192 35 512 +4 822 8192 57 512 +5 606 8192 35 512 +6 758 8192 57 512 +7 734 8192 35 512 +8 946 8192 57 512 +9 766 8192 37 512 +10 944 8192 59 512 +11 734 8192 37 512 +12 880 8192 59 512 +13 862 8192 37 512 +14 1068 8192 59 512 +15 818 8192 37 512 +16 1092 8192 59 512 +17 796 8192 37 512 +18 1078 8192 59 512 19 546 8192 14 512 -20 756 8192 32 512 +20 762 8192 35 512 diff --git a/examples/MemoryBenchmark/esp32.txt b/examples/MemoryBenchmark/esp32.txt index 128bb41..49e7d7e 100644 --- a/examples/MemoryBenchmark/esp32.txt +++ b/examples/MemoryBenchmark/esp32.txt @@ -1,21 +1,21 @@ 0 204573 1310720 16060 327680 -1 204921 1310720 16084 327680 -2 204993 1310720 16084 327680 -3 205025 1310720 16108 327680 -4 205189 1310720 16124 327680 -5 205013 1310720 16108 327680 -6 205177 1310720 16124 327680 -7 205041 1310720 16108 327680 -8 205221 1310720 16124 327680 -9 205089 1310720 16108 327680 -10 205229 1310720 16132 327680 -11 205077 1310720 16108 327680 -12 205217 1310720 16132 327680 -13 205105 1310720 16108 327680 -14 205261 1310720 16132 327680 -15 205117 1310720 16108 327680 -16 205289 1310720 16132 327680 -17 205109 1310720 16108 327680 -18 205289 1310720 16132 327680 -19 205273 1310720 16092 327680 -20 205377 1310720 16108 327680 +1 204713 1310720 16068 327680 +2 204785 1310720 16068 327680 +3 204821 1310720 16092 327680 +4 204989 1310720 16116 327680 +5 204809 1310720 16092 327680 +6 204977 1310720 16116 327680 +7 204837 1310720 16092 327680 +8 205021 1310720 16116 327680 +9 204885 1310720 16100 327680 +10 205025 1310720 16124 327680 +11 204873 1310720 16100 327680 +12 205013 1310720 16124 327680 +13 204901 1310720 16100 327680 +14 205057 1310720 16124 327680 +15 204913 1310720 16100 327680 +16 205085 1310720 16124 327680 +17 204905 1310720 16100 327680 +18 205085 1310720 16124 327680 +19 205065 1310720 16076 327680 +20 205173 1310720 16100 327680 diff --git a/examples/MemoryBenchmark/esp8266.txt b/examples/MemoryBenchmark/esp8266.txt index 471a11b..7d62d3b 100644 --- a/examples/MemoryBenchmark/esp8266.txt +++ b/examples/MemoryBenchmark/esp8266.txt @@ -2,20 +2,20 @@ 1 260377 1044464 27916 81920 2 260441 1044464 27916 81920 3 260525 1044464 27944 81920 -4 260669 1044464 27960 81920 +4 260669 1044464 27968 81920 5 260541 1044464 27944 81920 -6 260701 1044464 27960 81920 +6 260701 1044464 27968 81920 7 260541 1044464 27944 81920 -8 260717 1044464 27960 81920 -9 260573 1044464 27944 81920 -10 260701 1044464 27968 81920 -11 260589 1044464 27944 81920 -12 260733 1044464 27968 81920 -13 260589 1044464 27944 81920 -14 260749 1044464 27968 81920 -15 260605 1044464 27944 81920 -16 260765 1044464 27968 81920 -17 260589 1044464 27944 81920 -18 260749 1044464 27968 81920 +8 260717 1044464 27968 81920 +9 260573 1044464 27952 81920 +10 260717 1044464 27976 81920 +11 260589 1044464 27952 81920 +12 260733 1044464 27976 81920 +13 260589 1044464 27952 81920 +14 260749 1044464 27976 81920 +15 260605 1044464 27952 81920 +16 260781 1044464 27976 81920 +17 260589 1044464 27952 81920 +18 260765 1044464 27976 81920 19 261001 1044464 27988 81920 -20 261133 1044464 28008 81920 +20 261133 1044464 28016 81920 diff --git a/examples/MemoryBenchmark/generate_readme.py b/examples/MemoryBenchmark/generate_readme.py index fcdc69f..27da327 100755 --- a/examples/MemoryBenchmark/generate_readme.py +++ b/examples/MemoryBenchmark/generate_readme.py @@ -38,7 +38,7 @@ **NOTE**: This file was auto-generated using `make README.md`. DO NOT EDIT. -**Version**: AceRoutine v1.4.2 +**Version**: AceRoutine v1.5 **Changes**: @@ -126,6 +126,13 @@ * ESP32 Core from 1.0.6 to 2.0.2 * Teensyduino from 1.54 to 1.56 +* v1.5 + * Add support for human-readable names to coroutine. + * Increases flash usage by 6-10 bytes per coroutine, even if name isn't + used. + * Increases static ram by 3 bytes (AVR) and 4 bytes (32-bits) per + coroutine. + ## How to Generate This requires the [AUniter](https://github.com/bxparks/AUniter) script diff --git a/examples/MemoryBenchmark/micro.txt b/examples/MemoryBenchmark/micro.txt index ad43f16..71da112 100644 --- a/examples/MemoryBenchmark/micro.txt +++ b/examples/MemoryBenchmark/micro.txt @@ -1,21 +1,21 @@ 0 3554 28672 151 2560 1 3602 28672 153 2560 2 3662 28672 155 2560 -3 3732 28672 172 2560 -4 3904 28672 191 2560 -5 3704 28672 172 2560 -6 3848 28672 191 2560 -7 3832 28672 172 2560 -8 4036 28672 191 2560 -9 3856 28672 174 2560 -10 4020 28672 193 2560 -11 3828 28672 174 2560 -12 3964 28672 193 2560 -13 3956 28672 174 2560 -14 4152 28672 193 2560 -15 3906 28672 174 2560 -16 4170 28672 193 2560 -17 3884 28672 174 2560 -18 4156 28672 193 2560 +3 3738 28672 175 2560 +4 3924 28672 197 2560 +5 3710 28672 175 2560 +6 3868 28672 197 2560 +7 3838 28672 175 2560 +8 4056 28672 197 2560 +9 3862 28672 177 2560 +10 4040 28672 199 2560 +11 3834 28672 177 2560 +12 3984 28672 199 2560 +13 3962 28672 177 2560 +14 4172 28672 199 2560 +15 3912 28672 177 2560 +16 4190 28672 199 2560 +17 3890 28672 177 2560 +18 4176 28672 199 2560 19 3994 28672 154 2560 -20 4154 28672 172 2560 +20 4160 28672 175 2560 diff --git a/examples/MemoryBenchmark/nano.txt b/examples/MemoryBenchmark/nano.txt index 2e6cb05..f639e58 100644 --- a/examples/MemoryBenchmark/nano.txt +++ b/examples/MemoryBenchmark/nano.txt @@ -1,21 +1,21 @@ 0 606 30720 11 2048 1 654 30720 13 2048 2 714 30720 15 2048 -3 844 30720 32 2048 -4 1016 30720 51 2048 -5 816 30720 32 2048 -6 960 30720 51 2048 -7 944 30720 32 2048 -8 1148 30720 51 2048 -9 968 30720 34 2048 -10 1132 30720 53 2048 -11 940 30720 34 2048 -12 1076 30720 53 2048 -13 1068 30720 34 2048 -14 1264 30720 53 2048 -15 1018 30720 34 2048 -16 1282 30720 53 2048 -17 996 30720 34 2048 -18 1268 30720 53 2048 +3 850 30720 35 2048 +4 1036 30720 57 2048 +5 822 30720 35 2048 +6 980 30720 57 2048 +7 950 30720 35 2048 +8 1168 30720 57 2048 +9 974 30720 37 2048 +10 1152 30720 59 2048 +11 946 30720 37 2048 +12 1096 30720 59 2048 +13 1074 30720 37 2048 +14 1284 30720 59 2048 +15 1024 30720 37 2048 +16 1302 30720 59 2048 +17 1002 30720 37 2048 +18 1288 30720 59 2048 19 938 30720 14 2048 -20 1158 30720 32 2048 +20 1164 30720 35 2048 diff --git a/examples/MemoryBenchmark/stm32.txt b/examples/MemoryBenchmark/stm32.txt index 6135e2f..ad12082 100644 --- a/examples/MemoryBenchmark/stm32.txt +++ b/examples/MemoryBenchmark/stm32.txt @@ -1,21 +1,21 @@ 0 21884 131072 3540 20480 1 21912 131072 3544 20480 2 21960 131072 3544 20480 -3 22012 131072 3564 20480 -4 22156 131072 3584 20480 -5 22076 131072 3564 20480 -6 22220 131072 3584 20480 -7 22028 131072 3564 20480 -8 22188 131072 3584 20480 -9 22084 131072 3568 20480 -10 22188 131072 3588 20480 -11 22148 131072 3568 20480 -12 22252 131072 3588 20480 -13 22100 131072 3568 20480 -14 22220 131072 3588 20480 -15 22108 131072 3568 20480 -16 22240 131072 3588 20480 -17 22100 131072 3568 20480 -18 22236 131072 3588 20480 +3 22016 131072 3568 20480 +4 22164 131072 3592 20480 +5 22080 131072 3568 20480 +6 22228 131072 3592 20480 +7 22032 131072 3568 20480 +8 22196 131072 3592 20480 +9 22088 131072 3572 20480 +10 22192 131072 3596 20480 +11 22152 131072 3572 20480 +12 22256 131072 3596 20480 +13 22104 131072 3572 20480 +14 22224 131072 3596 20480 +15 22112 131072 3572 20480 +16 22244 131072 3596 20480 +17 22104 131072 3572 20480 +18 22240 131072 3596 20480 19 22120 131072 3540 20480 -20 22228 131072 3560 20480 +20 22232 131072 3564 20480 diff --git a/examples/MemoryBenchmark/teensy32.txt b/examples/MemoryBenchmark/teensy32.txt index 564b555..26bad97 100644 --- a/examples/MemoryBenchmark/teensy32.txt +++ b/examples/MemoryBenchmark/teensy32.txt @@ -1,21 +1,21 @@ 0 10232 262144 4152 65536 1 10264 262144 4156 65536 2 10292 262144 4156 65536 -3 10380 262144 4176 65536 -4 10496 262144 4196 65536 -5 10436 262144 4176 65536 -6 10540 262144 4196 65536 -7 10400 262144 4176 65536 -8 10536 262144 4196 65536 -9 10444 262144 4180 65536 -10 10556 262144 4200 65536 -11 10500 262144 4180 65536 -12 10600 262144 4200 65536 -13 10464 262144 4180 65536 -14 10596 262144 4200 65536 -15 10476 262144 4180 65536 -16 10620 262144 4200 65536 -17 10464 262144 4180 65536 -18 10608 262144 4200 65536 +3 10384 262144 4180 65536 +4 10504 262144 4204 65536 +5 10440 262144 4180 65536 +6 10548 262144 4204 65536 +7 10404 262144 4180 65536 +8 10544 262144 4204 65536 +9 10448 262144 4184 65536 +10 10564 262144 4208 65536 +11 10504 262144 4184 65536 +12 10608 262144 4208 65536 +13 10468 262144 4184 65536 +14 10604 262144 4208 65536 +15 10480 262144 4184 65536 +16 10628 262144 4208 65536 +17 10468 262144 4184 65536 +18 10616 262144 4208 65536 19 10688 262144 4160 65536 -20 10812 262144 4176 65536 +20 10816 262144 4180 65536 From ba0d19d420d2f50bb49a9d1769eaabcdf31c6439 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Mon, 14 Mar 2022 09:44:40 -0700 Subject: [PATCH 05/59] CoroutineScheduler.h: Change listCoroutine() to use Coroutine::printNameTo() --- src/ace_routine/CoroutineScheduler.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ace_routine/CoroutineScheduler.h b/src/ace_routine/CoroutineScheduler.h index 0a0244c..bcdcb33 100644 --- a/src/ace_routine/CoroutineScheduler.h +++ b/src/ace_routine/CoroutineScheduler.h @@ -195,7 +195,7 @@ class CoroutineSchedulerTemplate { for (T_COROUTINE** p = T_COROUTINE::getRoot(); (*p) != nullptr; p = (*p)->getNext()) { printer.print(F("Coroutine ")); - printer.print((uintptr_t) *p); + (*p)->printNameTo(printer); printer.print(F("; status: ")); (*p)->statusPrintTo(printer); printer.println(); From bbb9aa30d3a26b86512e81e19d500ccf1b427e9b Mon Sep 17 00:00:00 2001 From: Brian Park Date: Mon, 14 Mar 2022 09:45:10 -0700 Subject: [PATCH 06/59] examples/SoundManager: Add coroutine names for demo purposes --- examples/SoundManager/SoundManager.ino | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/examples/SoundManager/SoundManager.ino b/examples/SoundManager/SoundManager.ino index b96daf9..67c43ee 100644 --- a/examples/SoundManager/SoundManager.ino +++ b/examples/SoundManager/SoundManager.ino @@ -51,12 +51,17 @@ using ace_routine::CoroutineScheduler; SoundRoutine soundRoutine; +EXTERN_COROUTINE(soundManager); void setup() { delay(1000); Serial.begin(115200); while (!Serial); // needed for Leonardo/Micro + // Set names using both c-string and f-string for testing purposes. + soundRoutine.setCName("soundRoutine"); + soundManager.setFName(F("soundManager")); + CoroutineScheduler::setup(); } From d89ed1df519dcac5fa9a2d8ef23db11b2b8fc55c Mon Sep 17 00:00:00 2001 From: Brian Park Date: Mon, 14 Mar 2022 10:09:23 -0700 Subject: [PATCH 07/59] USER_GUIDE.md: Add docs for coroutine names --- CHANGELOG.md | 8 ++++++++ USER_GUIDE.md | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd9ee71..2a630f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,14 @@ # Changelog * Unreleased + * (Re)add support for human-readable coroutine names by adding the following + methods to the `Coroutine` class: `setCName()`, `setFName()`, + `getCName()`, `getFName()`, `getNameType()`, and `printNameTo()`. + * This is an optional feature which helps debugging. Coroutines do not + need to have human readable names. + * Increases flash usage by 6-10 bytes per coroutine. + * Increases static ram usage by 3 bytes (AVR) or 4 bytes (32-bit) per + coroutine. * 1.4.2 (2022-02-04) * Remove dependency to AceCommon library in `libraries.properties`. * AceRoutine core no longer depends on AceCommon. diff --git a/USER_GUIDE.md b/USER_GUIDE.md index cd41375..bfc4c52 100644 --- a/USER_GUIDE.md +++ b/USER_GUIDE.md @@ -14,6 +14,7 @@ is installed. * [Overall Structure](#OverallStructure) * [Coroutine Class](#CoroutineClass) * [Coroutine Instance](#CoroutineInstance) + * [Coroutine Names](#CoroutineNames) * [Coroutine Body](#CoroutineBody) * [Begin and End Markers](#BeginAndEnd) * [Yield](#Yield) @@ -244,6 +245,50 @@ MyCoroutine routine2; For more details on manual Coroutine instances, see the [Manual Coroutines](#ManualCoroutines) section below. + +### Coroutine Names + +(Added in v1.5. Prior to v1.3, the name was automatically assigned to the +coroutine using the `COROUTINE()` macro. It was removed in v1.3 to save flash +memory. In v1.5, the feature is added back as an optional feature so that the +end-user can decide whether they want to spend the extra flash storage for this +feature.) + +A coroutine can be assigned a human-readable name through the following methods: + +```C++ +class Coroutine { + public: + static const uint8_t kNameTypeCString = 0; + static const uint8_t kNameTypeFString = 1; + + public: + void Coroutine::setCName(const char* name); + void Coroutine::setFName(const __FlashStringHelper* name); + + const char* Coroutine::getCName() const; + const __FlashStringHelper* Coroutine::getFName() const; + + uint8_t getNameType() const; + void printNameTo(Print& printer) const; +}; +`` + +It is expected that the `setCName()` or `setFName()` will be called in the +global `setup()` function. + +On most 32-bit processors, it makes little difference whether a C-string or an +F-string is used. (The exception is the ESP8266.) On AVR processors, using the +F-string will prevent those strings from consuming precious static RAM. + +The `printNameTo()` method prints the coroutine name to the given `Print` +object, which will usually be the `Serial` object. If the name is not set (hence +is the `nullptr`), `printNameTo()` will print the hexadecimal representation of +the pointer to the Coroutine (e.g. "0xe38a"). + +The `CoroutineScheduler::list()` method will now print the coroutine name if it +is defined. + ## Coroutine Body From 16324c44d7e1bcb1253c32c669b309bbf9f0e46d Mon Sep 17 00:00:00 2001 From: Brian Park Date: Mon, 14 Mar 2022 13:36:20 -0700 Subject: [PATCH 08/59] src/CoroutineProfiler,CoroutineLogBinProfiler: Add support for generating log-log frequency distribution of runCoroutine() execution time --- src/AceRoutine.h | 2 + src/ace_routine/Coroutine.h | 49 +++--- src/ace_routine/CoroutineLogBinProfiler.cpp | 161 ++++++++++++++++++++ src/ace_routine/CoroutineLogBinProfiler.h | 107 +++++++++++++ src/ace_routine/CoroutineProfiler.h | 43 ++++++ src/ace_routine/CoroutineScheduler.h | 11 +- 6 files changed, 352 insertions(+), 21 deletions(-) create mode 100644 src/ace_routine/CoroutineLogBinProfiler.cpp create mode 100644 src/ace_routine/CoroutineLogBinProfiler.h create mode 100644 src/ace_routine/CoroutineProfiler.h diff --git a/src/AceRoutine.h b/src/AceRoutine.h index 7534639..2318da0 100644 --- a/src/AceRoutine.h +++ b/src/AceRoutine.h @@ -48,6 +48,8 @@ SOFTWARE. #include "ace_routine/Coroutine.h" #include "ace_routine/CoroutineScheduler.h" +#include "ace_routine/CoroutineProfiler.h" +#include "ace_routine/CoroutineLogBinProfiler.h" #include "ace_routine/Channel.h" #endif diff --git a/src/ace_routine/Coroutine.h b/src/ace_routine/Coroutine.h index 288f5a4..a1633d7 100644 --- a/src/ace_routine/Coroutine.h +++ b/src/ace_routine/Coroutine.h @@ -264,6 +264,8 @@ extern className##_##name name namespace ace_routine { +class CoroutineProfiler; + /** A lookup table from Status integer to human-readable strings. */ extern const __FlashStringHelper* const sStatusStrings[]; @@ -481,6 +483,31 @@ class CoroutineTemplate { void setupCoroutine(const __FlashStringHelper* /*name*/) ACE_ROUTINE_DEPRECATED {} + /** Set the profiler. */ + void setProfiler(CoroutineProfiler* profiler) { mProfiler = profiler; } + + CoroutineProfiler* getProfiler() const { return mProfiler; } + + /** + * Get the pointer to the root pointer. Implemented as a function static to + * fix the C++ static initialization problem, making it safe to use this in + * other static contexts. + */ + static CoroutineTemplate** getRoot() { + // Use a static variable inside a function to solve the static + // initialization ordering problem. + static CoroutineTemplate* root; + return &root; + } + + /** + * Return the next pointer as a pointer to the pointer, similar to + * getRoot(). This makes it much easier to manipulate a singly-linked list. + * Also makes setNext() method unnecessary. Should be used only by + * CoroutineScheduler. + */ + CoroutineTemplate** getNext() { return &mNext; } + protected: /** * The execution status of the coroutine, corresponding to the @@ -678,26 +705,6 @@ class CoroutineTemplate { CoroutineTemplate(const CoroutineTemplate&) = delete; CoroutineTemplate& operator=(const CoroutineTemplate&) = delete; - /** - * Get the pointer to the root pointer. Implemented as a function static to - * fix the C++ static initialization problem, making it safe to use this in - * other static contexts. - */ - static CoroutineTemplate** getRoot() { - // Use a static variable inside a function to solve the static - // initialization ordering problem. - static CoroutineTemplate* root; - return &root; - } - - /** - * Return the next pointer as a pointer to the pointer, similar to - * getRoot(). This makes it much easier to manipulate a singly-linked list. - * Also makes setNext() method unnecessary. Should be used only by - * CoroutineScheduler. - */ - CoroutineTemplate** getNext() { return &mNext; } - /** * Insert the current coroutine at the root of the singly linked list. This * is the most efficient and becomes the default with v1.2 because the @@ -739,6 +746,8 @@ class CoroutineTemplate { * milliseconds, microseconds, or seconds. */ uint16_t mDelayDuration; + + CoroutineProfiler* mProfiler = nullptr; }; /** diff --git a/src/ace_routine/CoroutineLogBinProfiler.cpp b/src/ace_routine/CoroutineLogBinProfiler.cpp new file mode 100644 index 0000000..b3ade41 --- /dev/null +++ b/src/ace_routine/CoroutineLogBinProfiler.cpp @@ -0,0 +1,161 @@ +/* +MIT License + +Copyright (c) 2022 Brian T. Park + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ + +#include +#include // memset() +#include // printfTo() +#include "Coroutine.h" +#include "CoroutineLogBinProfiler.h" + +using ace_common::printfTo; + +namespace ace_routine { + +CoroutineLogBinProfiler::CoroutineLogBinProfiler() { + init(); +} + +void CoroutineLogBinProfiler::init() { + memset(mBins, 0, sizeof(mBins)); +} + +void CoroutineLogBinProfiler::updateElapsedMicros(uint32_t micros) { + uint8_t index = 0; // [0, 31] + + // The index is the bit number (0-31) of the most significant bit. So each bin + // contains the number of samples whose elapsed micros is between 2^i and + // 2^(i+1). Example, for Bin 3, and this bin contains the number of samples + // which satsify (8us <= elapsed < 16us). The exception is Bin 0 because it + // includes samples where elapsed = 0 as well, so the sample interval for Bin + // 0 is (0 <= elapsed < 2), instead of (1 <= elapsed < 2). + while (true) { + micros >>= 1; + if (micros == 0) break; + index++; + } + uint16_t count = mBins[index]; + if (count < UINT16_MAX) { + mBins[index]++; + } +} + +// Labels for each bin in mBins. +static const char* kBinLabels[CoroutineLogBinProfiler::kNumBins] = { + "<2us", + "<4us", + "<8us", + "<16us", + "<32us", + "<64us", + "<128us", + "<256us", + "<512us", + "<1ms", + "<2ms", + "<4ms", + "<8ms", + "<16ms", + "<32ms", + "<64ms", + "<128ms", + "<256ms", + "<512ms", + "<1s", + "<2s", + "<4s", + "<8s", + "<16s", + "<32s", + "<64s", + "<128s", + "<256s", + "<512s", + "<1024s", + "<2048s", + "<4096s", +}; + +void CoroutineLogBinProfiler::printHeaderTo( + Print& printer, uint8_t binStart, uint8_t binEnd) const { + if (binEnd <= binStart) return; + + binEnd = (binEnd > kNumBins) ? kNumBins : binEnd; + for (uint8_t i = binStart; i < binEnd; i++) { + ace_common::printfTo(printer, "%6s", kBinLabels[i]); + } +} + +void CoroutineLogBinProfiler::printTo( + Print& printer, uint8_t binStart, uint8_t binEnd) const { + if (binEnd <= binStart) return; + + binEnd = (binEnd > kNumBins) ? kNumBins : binEnd; + for (uint8_t i = binStart; i < binEnd; i++) { + uint16_t count = mBins[i]; + ace_common::printfTo(printer, "%6d", count); + } + + uint32_t remaining = 0; + for (uint8_t i = binEnd; i < kNumBins; i++) { + remaining += mBins[i]; + } + if (remaining > 0) { + ace_common::printfTo(printer, "%6ld", (unsigned long) remaining); + } +} + +void CoroutineLogBinProfiler::printBinsTo( + Print& printer, Coroutine** root, uint8_t binStart, uint8_t binEnd) { + if (binEnd <= binStart) return; + + bool isHeaderPrinted = false; + for (Coroutine** p = root; (*p) != nullptr; p = (*p)->getNext()) { + CoroutineLogBinProfiler* profiler = + (CoroutineLogBinProfiler*) (*p)->getProfiler(); + if (! profiler) continue; + + // Print header if needed. + if (! isHeaderPrinted) { + printfTo(printer, "%12.12s", ""); + profiler->printHeaderTo(printer, binStart, binEnd); + printer.println(); + isHeaderPrinted = true; + } + + // Print the bins. The number of digits is automatically a log10() of the + // counts, so we should be able to visually scan the table and see which + // coroutine is taking too long. + printfTo(printer, "%12.12s", (*p)->getCName()); + profiler->printTo(printer, binStart, binEnd); + printer.println(); + + // TODO: It'd be useful to sum up the remaining buckets after binEnd, and + // print the number of samples that weren't printed in the loop above. + + // Maybe control this using a boolean flag. + profiler->init(); + } +} + +} diff --git a/src/ace_routine/CoroutineLogBinProfiler.h b/src/ace_routine/CoroutineLogBinProfiler.h new file mode 100644 index 0000000..068d843 --- /dev/null +++ b/src/ace_routine/CoroutineLogBinProfiler.h @@ -0,0 +1,107 @@ +/* +MIT License + +Copyright (c) 2022 Brian T. Park + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ + +#ifndef ACE_ROUTINE_COROUTINE_LOG_BIN_PROFILER_H +#define ACE_ROUTINE_COROUTINE_LOG_BIN_PROFILER_H + +#include // uint8_t, uint32_t +#include "Coroutine.h" +#include "CoroutineProfiler.h" + +class Print; + +namespace ace_routine { + +/** + * Class that maintains the frequency count of the elapsed time of + * runCoroutine() in an array of bins where each bin is a log2() logarithm of + * the elapsed time in microseconds. An instance of this class can be attached + * to a given coroutine through the `Coroutine::setProfiler()` method. + * + * After sufficient number of samples are collected, the frequency distribution + * of all profilers for all coroutines can be printed as a table using the + * `printBinsTo()` static helper function. Each bin is printed as a 5-digit + * number (since the bins use a `uint16_t` integer for the count). The number of + * digits in the printed number is equivalent to the log10() of the frequency + * count. (To see why that's true, imagine if each digit of the bin count was + * replaced by a '*' character.) Therefore the table is a rough ASCII version of + * a log-log graph of the frequency count. + * + * For example, here is the output of `printBinsTo()` for the sample program in + * `examples/SoundManager`: + * + * @verbatim + * <2us <4us <8us <16us <32us <64us<128us<256us<512us <1ms <2ms + * soundManag 621 2091 0 0 5 3 0 0 0 0 1 + * soundRouti 2162 553 1 0 1 2 2 1 0 0 0 + * + * The `init()` method resets the frequency count of the bins. + * + * @endverbatim + */ +class CoroutineLogBinProfiler : public CoroutineProfiler { + public: + static const uint8_t kNumBins = 32; + + public: + /** Constructor. */ + CoroutineLogBinProfiler(); + + /** Clear the bins. */ + void init(); + + void updateElapsedMicros(uint32_t micros) override; + + /** + * Print the header related to this profiler. + * + * @param binStart start index of the bins (0-31) + * @param binEnd end index (exclusive) of the bins (0-32) + */ + void printHeaderTo(Print& printer, uint8_t binStart, uint8_t binEnd) const; + + /** + * Print the bins of this profiler. + * + * @param binStart start index of the bins (0-31) + * @param binEnd end index (exclusive) of the bins (0-32) + */ + void printTo(Print& printer, uint8_t binStart, uint8_t binEnd) const; + + /** + * Loop over all coroutines and print the ASCII version of a histogram. + * + * @param binStart start index of the bins (0-31) + * @param binEnd end inex (exclusive) of the bins (0-32) + */ + static void printBinsTo( + Print& printer, Coroutine** root, uint8_t binStart, uint8_t binEnd); + + public: + uint16_t mBins[kNumBins]; +}; + +} + +#endif diff --git a/src/ace_routine/CoroutineProfiler.h b/src/ace_routine/CoroutineProfiler.h new file mode 100644 index 0000000..da09c71 --- /dev/null +++ b/src/ace_routine/CoroutineProfiler.h @@ -0,0 +1,43 @@ +/* +MIT License + +Copyright (c) 2022 Brian T. Park + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ + +#ifndef ACE_ROUTINE_COROUTINE_PROFILER_H +#define ACE_ROUTINE_COROUTINE_PROFILER_H + +#include // uint32_t + +namespace ace_routine { + +class CoroutineProfiler { + public: + /** + * Process the completion of the runCoroutine() method which took + * `micros` microseconds. + */ + virtual void updateElapsedMicros(uint32_t micros) = 0; +}; + +} + +#endif diff --git a/src/ace_routine/CoroutineScheduler.h b/src/ace_routine/CoroutineScheduler.h index bcdcb33..59a5c3f 100644 --- a/src/ace_routine/CoroutineScheduler.h +++ b/src/ace_routine/CoroutineScheduler.h @@ -29,6 +29,7 @@ SOFTWARE. #include // Serial, Print #endif #include "Coroutine.h" +#include "CoroutineProfiler.h" class Print; @@ -172,7 +173,15 @@ class CoroutineSchedulerTemplate { // its continuation context determines whether to call // Coroutine::isDelayExpired(), Coroutine::isDelayMicrosExpired(), or // Coroutine::isDelaySecondsExpired(). - (*mCurrent)->runCoroutine(); + if ((*mCurrent)->mProfiler) { + uint32_t startMicros = T_COROUTINE::coroutineMicros(); + (*mCurrent)->runCoroutine(); + uint32_t elapsedMicros = T_COROUTINE::coroutineMicros() + - startMicros; + (*mCurrent)->mProfiler->updateElapsedMicros(elapsedMicros); + } else { + (*mCurrent)->runCoroutine(); + } break; case T_COROUTINE::kStatusEnding: From 1120cf673177b2c72e809ebf75dcb8220d4c6ebf Mon Sep 17 00:00:00 2001 From: Brian Park Date: Mon, 14 Mar 2022 13:36:47 -0700 Subject: [PATCH 09/59] examples/SoundManager: Add CoroutineProfiler as a demo --- examples/SoundManager/Makefile | 3 ++- examples/SoundManager/SoundManager.ino | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/examples/SoundManager/Makefile b/examples/SoundManager/Makefile index 41e999f..6660500 100644 --- a/examples/SoundManager/Makefile +++ b/examples/SoundManager/Makefile @@ -2,5 +2,6 @@ # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := SoundManager -ARDUINO_LIBS := AceRoutine +ARDUINO_LIBS := AceRoutine AceCommon +EXTRA_CXXFLAGS := -g include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/examples/SoundManager/SoundManager.ino b/examples/SoundManager/SoundManager.ino index 67c43ee..e11d296 100644 --- a/examples/SoundManager/SoundManager.ino +++ b/examples/SoundManager/SoundManager.ino @@ -45,14 +45,29 @@ */ #include +#include #include #include "SoundRoutine.h" +using ace_routine::Coroutine;; using ace_routine::CoroutineScheduler; +using ace_routine::CoroutineLogBinProfiler; +using ace_common::printfTo; SoundRoutine soundRoutine; EXTERN_COROUTINE(soundManager); +COROUTINE(printProfile) { + COROUTINE_LOOP() { + CoroutineLogBinProfiler::printBinsTo(Serial, getRoot(), 0, 16); + COROUTINE_DELAY_SECONDS(10); + } +} + + +CoroutineLogBinProfiler soundRoutineProfiler; +CoroutineLogBinProfiler soundManagerProfiler; + void setup() { delay(1000); Serial.begin(115200); @@ -62,6 +77,9 @@ void setup() { soundRoutine.setCName("soundRoutine"); soundManager.setFName(F("soundManager")); + soundRoutine.setProfiler(&soundRoutineProfiler); + soundManager.setProfiler(&soundManagerProfiler); + CoroutineScheduler::setup(); } From 4a00a5942a8d99fbed92ff88c4b5fae250939712 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Mon, 14 Mar 2022 14:38:27 -0700 Subject: [PATCH 10/59] MemoryBenchmark: Regenerate after adding CoroutineProfiler --- examples/MemoryBenchmark/README.md | 253 ++++++++++---------- examples/MemoryBenchmark/attiny.txt | 34 +-- examples/MemoryBenchmark/esp32.txt | 40 ++-- examples/MemoryBenchmark/esp8266.txt | 34 +-- examples/MemoryBenchmark/generate_readme.py | 9 + examples/MemoryBenchmark/micro.txt | 34 +-- examples/MemoryBenchmark/nano.txt | 34 +-- examples/MemoryBenchmark/stm32.txt | 34 +-- examples/MemoryBenchmark/teensy32.txt | 34 +-- 9 files changed, 262 insertions(+), 244 deletions(-) diff --git a/examples/MemoryBenchmark/README.md b/examples/MemoryBenchmark/README.md index d0005a5..37e38f6 100644 --- a/examples/MemoryBenchmark/README.md +++ b/examples/MemoryBenchmark/README.md @@ -108,6 +108,15 @@ calculated flash size can jump around in unexpected ways. used. * Increases static ram by 3 bytes (AVR) and 4 bytes (32-bits) per coroutine. + * Add a `CoroutineLogBinProfiler` to 2 coroutines. + * Use a 3rd coroutine to print the frequency count to the `Serial` + output every 10 seconds. + * Provide `CoroutineLogBinProfiler::printBinsTo()` which prints + a table of the frequency count over all coroutines. This represents a + poor-man's version of the log-log graph of the frequency count. + * Increases the flash size of the `CoroutineScheduler` by 100-140 bytes + for both 8-bit and 32-bit processors, even if `CoroutineProfiler` is + not used. This is a one-time hit. ## How to Generate @@ -179,32 +188,32 @@ $ make README.md | One Delay Function | 450/ 13 | 50/ 2 | | Two Delay Functions | 508/ 15 | 108/ 4 | |---------------------------------------+--------------+-------------| -| One Coroutine | 638/ 35 | 238/ 24 | -| Two Coroutines | 822/ 57 | 422/ 46 | +| One Coroutine | 642/ 37 | 242/ 26 | +| Two Coroutines | 834/ 61 | 434/ 50 | |---------------------------------------+--------------+-------------| -| One Coroutine (micros) | 606/ 35 | 206/ 24 | -| Two Coroutines (micros) | 758/ 57 | 358/ 46 | +| One Coroutine (micros) | 610/ 37 | 210/ 26 | +| Two Coroutines (micros) | 770/ 61 | 370/ 50 | |---------------------------------------+--------------+-------------| -| One Coroutine (seconds) | 734/ 35 | 334/ 24 | -| Two Coroutines (seconds) | 946/ 57 | 546/ 46 | +| One Coroutine (seconds) | 738/ 37 | 338/ 26 | +| Two Coroutines (seconds) | 958/ 61 | 558/ 50 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine | 766/ 37 | 366/ 26 | -| Scheduler, Two Coroutines | 944/ 59 | 544/ 48 | +| Scheduler, One Coroutine | 866/ 39 | 466/ 28 | +| Scheduler, Two Coroutines | 1052/ 63 | 652/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (micros) | 734/ 37 | 334/ 26 | -| Scheduler, Two Coroutines (micros) | 880/ 59 | 480/ 48 | +| Scheduler, One Coroutine (micros) | 834/ 39 | 434/ 28 | +| Scheduler, Two Coroutines (micros) | 988/ 63 | 588/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (seconds) | 862/ 37 | 462/ 26 | -| Scheduler, Two Coroutines (seconds) | 1068/ 59 | 668/ 48 | +| Scheduler, One Coroutine (seconds) | 962/ 39 | 562/ 28 | +| Scheduler, Two Coroutines (seconds) | 1176/ 63 | 776/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (setup) | 818/ 37 | 418/ 26 | -| Scheduler, Two Coroutines (setup) | 1092/ 59 | 692/ 48 | +| Scheduler, One Coroutine (setup) | 920/ 39 | 520/ 28 | +| Scheduler, Two Coroutines (setup) | 1202/ 63 | 802/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (man setup) | 796/ 37 | 396/ 26 | -| Scheduler, Two Coroutines (man setup) | 1078/ 59 | 678/ 48 | +| Scheduler, One Coroutine (man setup) | 896/ 39 | 496/ 28 | +| Scheduler, Two Coroutines (man setup) | 1186/ 63 | 786/ 52 | |---------------------------------------+--------------+-------------| | Blink Function | 546/ 14 | 146/ 3 | -| Blink Coroutine | 762/ 35 | 362/ 24 | +| Blink Coroutine | 766/ 37 | 366/ 26 | +--------------------------------------------------------------------+ ``` @@ -224,32 +233,32 @@ $ make README.md | One Delay Function | 654/ 13 | 48/ 2 | | Two Delay Functions | 714/ 15 | 108/ 4 | |---------------------------------------+--------------+-------------| -| One Coroutine | 850/ 35 | 244/ 24 | -| Two Coroutines | 1036/ 57 | 430/ 46 | +| One Coroutine | 854/ 37 | 248/ 26 | +| Two Coroutines | 1048/ 61 | 442/ 50 | |---------------------------------------+--------------+-------------| -| One Coroutine (micros) | 822/ 35 | 216/ 24 | -| Two Coroutines (micros) | 980/ 57 | 374/ 46 | +| One Coroutine (micros) | 826/ 37 | 220/ 26 | +| Two Coroutines (micros) | 992/ 61 | 386/ 50 | |---------------------------------------+--------------+-------------| -| One Coroutine (seconds) | 950/ 35 | 344/ 24 | -| Two Coroutines (seconds) | 1168/ 57 | 562/ 46 | +| One Coroutine (seconds) | 954/ 37 | 348/ 26 | +| Two Coroutines (seconds) | 1180/ 61 | 574/ 50 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine | 974/ 37 | 368/ 26 | -| Scheduler, Two Coroutines | 1152/ 59 | 546/ 48 | +| Scheduler, One Coroutine | 1078/ 39 | 472/ 28 | +| Scheduler, Two Coroutines | 1264/ 63 | 658/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (micros) | 946/ 37 | 340/ 26 | -| Scheduler, Two Coroutines (micros) | 1096/ 59 | 490/ 48 | +| Scheduler, One Coroutine (micros) | 1050/ 39 | 444/ 28 | +| Scheduler, Two Coroutines (micros) | 1208/ 63 | 602/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (seconds) | 1074/ 37 | 468/ 26 | -| Scheduler, Two Coroutines (seconds) | 1284/ 59 | 678/ 48 | +| Scheduler, One Coroutine (seconds) | 1178/ 39 | 572/ 28 | +| Scheduler, Two Coroutines (seconds) | 1396/ 63 | 790/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (setup) | 1024/ 37 | 418/ 26 | -| Scheduler, Two Coroutines (setup) | 1302/ 59 | 696/ 48 | +| Scheduler, One Coroutine (setup) | 1128/ 39 | 522/ 28 | +| Scheduler, Two Coroutines (setup) | 1414/ 63 | 808/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (man setup) | 1002/ 37 | 396/ 26 | -| Scheduler, Two Coroutines (man setup) | 1288/ 59 | 682/ 48 | +| Scheduler, One Coroutine (man setup) | 1106/ 39 | 500/ 28 | +| Scheduler, Two Coroutines (man setup) | 1400/ 63 | 794/ 52 | |---------------------------------------+--------------+-------------| | Blink Function | 938/ 14 | 332/ 3 | -| Blink Coroutine | 1164/ 35 | 558/ 24 | +| Blink Coroutine | 1168/ 37 | 562/ 26 | +--------------------------------------------------------------------+ ``` @@ -269,32 +278,32 @@ $ make README.md | One Delay Function | 3602/ 153 | 48/ 2 | | Two Delay Functions | 3662/ 155 | 108/ 4 | |---------------------------------------+--------------+-------------| -| One Coroutine | 3738/ 175 | 184/ 24 | -| Two Coroutines | 3924/ 197 | 370/ 46 | +| One Coroutine | 3742/ 177 | 188/ 26 | +| Two Coroutines | 3936/ 201 | 382/ 50 | |---------------------------------------+--------------+-------------| -| One Coroutine (micros) | 3710/ 175 | 156/ 24 | -| Two Coroutines (micros) | 3868/ 197 | 314/ 46 | +| One Coroutine (micros) | 3714/ 177 | 160/ 26 | +| Two Coroutines (micros) | 3880/ 201 | 326/ 50 | |---------------------------------------+--------------+-------------| -| One Coroutine (seconds) | 3838/ 175 | 284/ 24 | -| Two Coroutines (seconds) | 4056/ 197 | 502/ 46 | +| One Coroutine (seconds) | 3842/ 177 | 288/ 26 | +| Two Coroutines (seconds) | 4068/ 201 | 514/ 50 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine | 3862/ 177 | 308/ 26 | -| Scheduler, Two Coroutines | 4040/ 199 | 486/ 48 | +| Scheduler, One Coroutine | 3966/ 179 | 412/ 28 | +| Scheduler, Two Coroutines | 4152/ 203 | 598/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (micros) | 3834/ 177 | 280/ 26 | -| Scheduler, Two Coroutines (micros) | 3984/ 199 | 430/ 48 | +| Scheduler, One Coroutine (micros) | 3938/ 179 | 384/ 28 | +| Scheduler, Two Coroutines (micros) | 4096/ 203 | 542/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (seconds) | 3962/ 177 | 408/ 26 | -| Scheduler, Two Coroutines (seconds) | 4172/ 199 | 618/ 48 | +| Scheduler, One Coroutine (seconds) | 4066/ 179 | 512/ 28 | +| Scheduler, Two Coroutines (seconds) | 4284/ 203 | 730/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (setup) | 3912/ 177 | 358/ 26 | -| Scheduler, Two Coroutines (setup) | 4190/ 199 | 636/ 48 | +| Scheduler, One Coroutine (setup) | 4016/ 179 | 462/ 28 | +| Scheduler, Two Coroutines (setup) | 4302/ 203 | 748/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (man setup) | 3890/ 177 | 336/ 26 | -| Scheduler, Two Coroutines (man setup) | 4176/ 199 | 622/ 48 | +| Scheduler, One Coroutine (man setup) | 3994/ 179 | 440/ 28 | +| Scheduler, Two Coroutines (man setup) | 4288/ 203 | 734/ 52 | |---------------------------------------+--------------+-------------| | Blink Function | 3994/ 154 | 440/ 3 | -| Blink Coroutine | 4160/ 175 | 606/ 24 | +| Blink Coroutine | 4164/ 177 | 610/ 26 | +--------------------------------------------------------------------+ ``` @@ -314,32 +323,32 @@ $ make README.md | One Delay Function | 21912/ 3544 | 28/ 4 | | Two Delay Functions | 21960/ 3544 | 76/ 4 | |---------------------------------------+--------------+-------------| -| One Coroutine | 22016/ 3568 | 132/ 28 | -| Two Coroutines | 22164/ 3592 | 280/ 52 | +| One Coroutine | 22016/ 3572 | 132/ 32 | +| Two Coroutines | 22164/ 3600 | 280/ 60 | |---------------------------------------+--------------+-------------| -| One Coroutine (micros) | 22080/ 3568 | 196/ 28 | -| Two Coroutines (micros) | 22228/ 3592 | 344/ 52 | +| One Coroutine (micros) | 22080/ 3572 | 196/ 32 | +| Two Coroutines (micros) | 22228/ 3600 | 344/ 60 | |---------------------------------------+--------------+-------------| -| One Coroutine (seconds) | 22032/ 3568 | 148/ 28 | -| Two Coroutines (seconds) | 22196/ 3592 | 312/ 52 | +| One Coroutine (seconds) | 22032/ 3572 | 148/ 32 | +| Two Coroutines (seconds) | 22196/ 3600 | 312/ 60 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine | 22088/ 3572 | 204/ 32 | -| Scheduler, Two Coroutines | 22192/ 3596 | 308/ 56 | +| Scheduler, One Coroutine | 22208/ 3576 | 324/ 36 | +| Scheduler, Two Coroutines | 22312/ 3604 | 428/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (micros) | 22152/ 3572 | 268/ 32 | -| Scheduler, Two Coroutines (micros) | 22256/ 3596 | 372/ 56 | +| Scheduler, One Coroutine (micros) | 22208/ 3576 | 324/ 36 | +| Scheduler, Two Coroutines (micros) | 22312/ 3604 | 428/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (seconds) | 22104/ 3572 | 220/ 32 | -| Scheduler, Two Coroutines (seconds) | 22224/ 3596 | 340/ 56 | +| Scheduler, One Coroutine (seconds) | 22224/ 3576 | 340/ 36 | +| Scheduler, Two Coroutines (seconds) | 22344/ 3604 | 460/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (setup) | 22112/ 3572 | 228/ 32 | -| Scheduler, Two Coroutines (setup) | 22244/ 3596 | 360/ 56 | +| Scheduler, One Coroutine (setup) | 22232/ 3576 | 348/ 36 | +| Scheduler, Two Coroutines (setup) | 22364/ 3604 | 480/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (man setup) | 22104/ 3572 | 220/ 32 | -| Scheduler, Two Coroutines (man setup) | 22240/ 3596 | 356/ 56 | +| Scheduler, One Coroutine (man setup) | 22224/ 3576 | 340/ 36 | +| Scheduler, Two Coroutines (man setup) | 22360/ 3604 | 476/ 64 | |---------------------------------------+--------------+-------------| | Blink Function | 22120/ 3540 | 236/ 0 | -| Blink Coroutine | 22232/ 3564 | 348/ 24 | +| Blink Coroutine | 22232/ 3568 | 348/ 28 | +--------------------------------------------------------------------+ ``` @@ -359,32 +368,32 @@ $ make README.md | One Delay Function | 260377/27916 | 48/ 0 | | Two Delay Functions | 260441/27916 | 112/ 0 | |---------------------------------------+--------------+-------------| -| One Coroutine | 260525/27944 | 196/ 28 | -| Two Coroutines | 260669/27968 | 340/ 52 | +| One Coroutine | 260525/27952 | 196/ 36 | +| Two Coroutines | 260685/27976 | 356/ 60 | |---------------------------------------+--------------+-------------| -| One Coroutine (micros) | 260541/27944 | 212/ 28 | -| Two Coroutines (micros) | 260701/27968 | 372/ 52 | +| One Coroutine (micros) | 260541/27952 | 212/ 36 | +| Two Coroutines (micros) | 260701/27976 | 372/ 60 | |---------------------------------------+--------------+-------------| -| One Coroutine (seconds) | 260541/27944 | 212/ 28 | -| Two Coroutines (seconds) | 260717/27968 | 388/ 52 | +| One Coroutine (seconds) | 260541/27952 | 212/ 36 | +| Two Coroutines (seconds) | 260717/27976 | 388/ 60 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine | 260573/27952 | 244/ 36 | -| Scheduler, Two Coroutines | 260717/27976 | 388/ 60 | +| Scheduler, One Coroutine | 260669/27952 | 340/ 36 | +| Scheduler, Two Coroutines | 260813/27984 | 484/ 68 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (micros) | 260589/27952 | 260/ 36 | -| Scheduler, Two Coroutines (micros) | 260733/27976 | 404/ 60 | +| Scheduler, One Coroutine (micros) | 260669/27952 | 340/ 36 | +| Scheduler, Two Coroutines (micros) | 260813/27984 | 484/ 68 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (seconds) | 260589/27952 | 260/ 36 | -| Scheduler, Two Coroutines (seconds) | 260749/27976 | 420/ 60 | +| Scheduler, One Coroutine (seconds) | 260701/27952 | 372/ 36 | +| Scheduler, Two Coroutines (seconds) | 260861/27984 | 532/ 68 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (setup) | 260605/27952 | 276/ 36 | -| Scheduler, Two Coroutines (setup) | 260781/27976 | 452/ 60 | +| Scheduler, One Coroutine (setup) | 260701/27952 | 372/ 36 | +| Scheduler, Two Coroutines (setup) | 260877/27984 | 548/ 68 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (man setup) | 260589/27952 | 260/ 36 | -| Scheduler, Two Coroutines (man setup) | 260765/27976 | 436/ 60 | +| Scheduler, One Coroutine (man setup) | 260685/27952 | 356/ 36 | +| Scheduler, Two Coroutines (man setup) | 260861/27984 | 532/ 68 | |---------------------------------------+--------------+-------------| | Blink Function | 261001/27988 | 672/ 72 | -| Blink Coroutine | 261133/28016 | 804/ 100 | +| Blink Coroutine | 261149/28016 | 820/ 100 | +--------------------------------------------------------------------+ ``` @@ -401,35 +410,35 @@ $ make README.md |---------------------------------------+--------------+-------------| | Baseline | 204573/16060 | 0/ 0 | |---------------------------------------+--------------+-------------| -| One Delay Function | 204713/16068 | 140/ 8 | -| Two Delay Functions | 204785/16068 | 212/ 8 | +| One Delay Function | 205129/16092 | 556/ 32 | +| Two Delay Functions | 205201/16092 | 628/ 32 | |---------------------------------------+--------------+-------------| -| One Coroutine | 204821/16092 | 248/ 32 | -| Two Coroutines | 204989/16116 | 416/ 56 | +| One Coroutine | 205241/16124 | 668/ 64 | +| Two Coroutines | 205413/16148 | 840/ 88 | |---------------------------------------+--------------+-------------| -| One Coroutine (micros) | 204809/16092 | 236/ 32 | -| Two Coroutines (micros) | 204977/16116 | 404/ 56 | +| One Coroutine (micros) | 205229/16124 | 656/ 64 | +| Two Coroutines (micros) | 205401/16148 | 828/ 88 | |---------------------------------------+--------------+-------------| -| One Coroutine (seconds) | 204837/16092 | 264/ 32 | -| Two Coroutines (seconds) | 205021/16116 | 448/ 56 | +| One Coroutine (seconds) | 205257/16124 | 684/ 64 | +| Two Coroutines (seconds) | 205445/16148 | 872/ 88 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine | 204885/16100 | 312/ 40 | -| Scheduler, Two Coroutines | 205025/16124 | 452/ 64 | +| Scheduler, One Coroutine | 205397/16124 | 824/ 64 | +| Scheduler, Two Coroutines | 205537/16156 | 964/ 96 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (micros) | 204873/16100 | 300/ 40 | -| Scheduler, Two Coroutines (micros) | 205013/16124 | 440/ 64 | +| Scheduler, One Coroutine (micros) | 205373/16124 | 800/ 64 | +| Scheduler, Two Coroutines (micros) | 205513/16156 | 940/ 96 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (seconds) | 204901/16100 | 328/ 40 | -| Scheduler, Two Coroutines (seconds) | 205057/16124 | 484/ 64 | +| Scheduler, One Coroutine (seconds) | 205413/16124 | 840/ 64 | +| Scheduler, Two Coroutines (seconds) | 205569/16156 | 996/ 96 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (setup) | 204913/16100 | 340/ 40 | -| Scheduler, Two Coroutines (setup) | 205085/16124 | 512/ 64 | +| Scheduler, One Coroutine (setup) | 205425/16124 | 852/ 64 | +| Scheduler, Two Coroutines (setup) | 205597/16156 | 1024/ 96 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (man setup) | 204905/16100 | 332/ 40 | -| Scheduler, Two Coroutines (man setup) | 205085/16124 | 512/ 64 | +| Scheduler, One Coroutine (man setup) | 205417/16124 | 844/ 64 | +| Scheduler, Two Coroutines (man setup) | 205597/16156 | 1024/ 96 | |---------------------------------------+--------------+-------------| -| Blink Function | 205065/16076 | 492/ 16 | -| Blink Coroutine | 205173/16100 | 600/ 40 | +| Blink Function | 205481/16100 | 908/ 40 | +| Blink Coroutine | 205593/16124 | 1020/ 64 | +--------------------------------------------------------------------+ ``` @@ -450,32 +459,32 @@ $ make README.md | One Delay Function | 10264/ 4156 | 32/ 4 | | Two Delay Functions | 10292/ 4156 | 60/ 4 | |---------------------------------------+--------------+-------------| -| One Coroutine | 10384/ 4180 | 152/ 28 | -| Two Coroutines | 10504/ 4204 | 272/ 52 | +| One Coroutine | 10388/ 4184 | 156/ 32 | +| Two Coroutines | 10508/ 4212 | 276/ 60 | |---------------------------------------+--------------+-------------| -| One Coroutine (micros) | 10440/ 4180 | 208/ 28 | -| Two Coroutines (micros) | 10548/ 4204 | 316/ 52 | +| One Coroutine (micros) | 10444/ 4184 | 212/ 32 | +| Two Coroutines (micros) | 10552/ 4212 | 320/ 60 | |---------------------------------------+--------------+-------------| -| One Coroutine (seconds) | 10404/ 4180 | 172/ 28 | -| Two Coroutines (seconds) | 10544/ 4204 | 312/ 52 | +| One Coroutine (seconds) | 10408/ 4184 | 176/ 32 | +| Two Coroutines (seconds) | 10548/ 4212 | 316/ 60 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine | 10448/ 4184 | 216/ 32 | -| Scheduler, Two Coroutines | 10564/ 4208 | 332/ 56 | +| Scheduler, One Coroutine | 10568/ 4188 | 336/ 36 | +| Scheduler, Two Coroutines | 10684/ 4216 | 452/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (micros) | 10504/ 4184 | 272/ 32 | -| Scheduler, Two Coroutines (micros) | 10608/ 4208 | 376/ 56 | +| Scheduler, One Coroutine (micros) | 10556/ 4188 | 324/ 36 | +| Scheduler, Two Coroutines (micros) | 10660/ 4216 | 428/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (seconds) | 10468/ 4184 | 236/ 32 | -| Scheduler, Two Coroutines (seconds) | 10604/ 4208 | 372/ 56 | +| Scheduler, One Coroutine (seconds) | 10588/ 4188 | 356/ 36 | +| Scheduler, Two Coroutines (seconds) | 10724/ 4216 | 492/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (setup) | 10480/ 4184 | 248/ 32 | -| Scheduler, Two Coroutines (setup) | 10628/ 4208 | 396/ 56 | +| Scheduler, One Coroutine (setup) | 10600/ 4188 | 368/ 36 | +| Scheduler, Two Coroutines (setup) | 10748/ 4216 | 516/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (man setup) | 10468/ 4184 | 236/ 32 | -| Scheduler, Two Coroutines (man setup) | 10616/ 4208 | 384/ 56 | +| Scheduler, One Coroutine (man setup) | 10588/ 4188 | 356/ 36 | +| Scheduler, Two Coroutines (man setup) | 10736/ 4216 | 504/ 64 | |---------------------------------------+--------------+-------------| | Blink Function | 10688/ 4160 | 456/ 8 | -| Blink Coroutine | 10816/ 4180 | 584/ 28 | +| Blink Coroutine | 10820/ 4184 | 588/ 32 | +--------------------------------------------------------------------+ ``` diff --git a/examples/MemoryBenchmark/attiny.txt b/examples/MemoryBenchmark/attiny.txt index 7055626..970946b 100644 --- a/examples/MemoryBenchmark/attiny.txt +++ b/examples/MemoryBenchmark/attiny.txt @@ -1,21 +1,21 @@ 0 400 8192 11 512 1 450 8192 13 512 2 508 8192 15 512 -3 638 8192 35 512 -4 822 8192 57 512 -5 606 8192 35 512 -6 758 8192 57 512 -7 734 8192 35 512 -8 946 8192 57 512 -9 766 8192 37 512 -10 944 8192 59 512 -11 734 8192 37 512 -12 880 8192 59 512 -13 862 8192 37 512 -14 1068 8192 59 512 -15 818 8192 37 512 -16 1092 8192 59 512 -17 796 8192 37 512 -18 1078 8192 59 512 +3 642 8192 37 512 +4 834 8192 61 512 +5 610 8192 37 512 +6 770 8192 61 512 +7 738 8192 37 512 +8 958 8192 61 512 +9 866 8192 39 512 +10 1052 8192 63 512 +11 834 8192 39 512 +12 988 8192 63 512 +13 962 8192 39 512 +14 1176 8192 63 512 +15 920 8192 39 512 +16 1202 8192 63 512 +17 896 8192 39 512 +18 1186 8192 63 512 19 546 8192 14 512 -20 762 8192 35 512 +20 766 8192 37 512 diff --git a/examples/MemoryBenchmark/esp32.txt b/examples/MemoryBenchmark/esp32.txt index 49e7d7e..9efefbc 100644 --- a/examples/MemoryBenchmark/esp32.txt +++ b/examples/MemoryBenchmark/esp32.txt @@ -1,21 +1,21 @@ 0 204573 1310720 16060 327680 -1 204713 1310720 16068 327680 -2 204785 1310720 16068 327680 -3 204821 1310720 16092 327680 -4 204989 1310720 16116 327680 -5 204809 1310720 16092 327680 -6 204977 1310720 16116 327680 -7 204837 1310720 16092 327680 -8 205021 1310720 16116 327680 -9 204885 1310720 16100 327680 -10 205025 1310720 16124 327680 -11 204873 1310720 16100 327680 -12 205013 1310720 16124 327680 -13 204901 1310720 16100 327680 -14 205057 1310720 16124 327680 -15 204913 1310720 16100 327680 -16 205085 1310720 16124 327680 -17 204905 1310720 16100 327680 -18 205085 1310720 16124 327680 -19 205065 1310720 16076 327680 -20 205173 1310720 16100 327680 +1 205129 1310720 16092 327680 +2 205201 1310720 16092 327680 +3 205241 1310720 16124 327680 +4 205413 1310720 16148 327680 +5 205229 1310720 16124 327680 +6 205401 1310720 16148 327680 +7 205257 1310720 16124 327680 +8 205445 1310720 16148 327680 +9 205397 1310720 16124 327680 +10 205537 1310720 16156 327680 +11 205373 1310720 16124 327680 +12 205513 1310720 16156 327680 +13 205413 1310720 16124 327680 +14 205569 1310720 16156 327680 +15 205425 1310720 16124 327680 +16 205597 1310720 16156 327680 +17 205417 1310720 16124 327680 +18 205597 1310720 16156 327680 +19 205481 1310720 16100 327680 +20 205593 1310720 16124 327680 diff --git a/examples/MemoryBenchmark/esp8266.txt b/examples/MemoryBenchmark/esp8266.txt index 7d62d3b..5add629 100644 --- a/examples/MemoryBenchmark/esp8266.txt +++ b/examples/MemoryBenchmark/esp8266.txt @@ -1,21 +1,21 @@ 0 260329 1044464 27916 81920 1 260377 1044464 27916 81920 2 260441 1044464 27916 81920 -3 260525 1044464 27944 81920 -4 260669 1044464 27968 81920 -5 260541 1044464 27944 81920 -6 260701 1044464 27968 81920 -7 260541 1044464 27944 81920 -8 260717 1044464 27968 81920 -9 260573 1044464 27952 81920 -10 260717 1044464 27976 81920 -11 260589 1044464 27952 81920 -12 260733 1044464 27976 81920 -13 260589 1044464 27952 81920 -14 260749 1044464 27976 81920 -15 260605 1044464 27952 81920 -16 260781 1044464 27976 81920 -17 260589 1044464 27952 81920 -18 260765 1044464 27976 81920 +3 260525 1044464 27952 81920 +4 260685 1044464 27976 81920 +5 260541 1044464 27952 81920 +6 260701 1044464 27976 81920 +7 260541 1044464 27952 81920 +8 260717 1044464 27976 81920 +9 260669 1044464 27952 81920 +10 260813 1044464 27984 81920 +11 260669 1044464 27952 81920 +12 260813 1044464 27984 81920 +13 260701 1044464 27952 81920 +14 260861 1044464 27984 81920 +15 260701 1044464 27952 81920 +16 260877 1044464 27984 81920 +17 260685 1044464 27952 81920 +18 260861 1044464 27984 81920 19 261001 1044464 27988 81920 -20 261133 1044464 28016 81920 +20 261149 1044464 28016 81920 diff --git a/examples/MemoryBenchmark/generate_readme.py b/examples/MemoryBenchmark/generate_readme.py index 27da327..755251c 100755 --- a/examples/MemoryBenchmark/generate_readme.py +++ b/examples/MemoryBenchmark/generate_readme.py @@ -132,6 +132,15 @@ used. * Increases static ram by 3 bytes (AVR) and 4 bytes (32-bits) per coroutine. + * Add a `CoroutineLogBinProfiler` to 2 coroutines. + * Use a 3rd coroutine to print the frequency count to the `Serial` + output every 10 seconds. + * Provide `CoroutineLogBinProfiler::printBinsTo()` which prints + a table of the frequency count over all coroutines. This represents a + poor-man's version of the log-log graph of the frequency count. + * Increases the flash size of the `CoroutineScheduler` by 100-140 bytes + for both 8-bit and 32-bit processors, even if `CoroutineProfiler` is + not used. This is a one-time hit. ## How to Generate diff --git a/examples/MemoryBenchmark/micro.txt b/examples/MemoryBenchmark/micro.txt index 71da112..e99f5b5 100644 --- a/examples/MemoryBenchmark/micro.txt +++ b/examples/MemoryBenchmark/micro.txt @@ -1,21 +1,21 @@ 0 3554 28672 151 2560 1 3602 28672 153 2560 2 3662 28672 155 2560 -3 3738 28672 175 2560 -4 3924 28672 197 2560 -5 3710 28672 175 2560 -6 3868 28672 197 2560 -7 3838 28672 175 2560 -8 4056 28672 197 2560 -9 3862 28672 177 2560 -10 4040 28672 199 2560 -11 3834 28672 177 2560 -12 3984 28672 199 2560 -13 3962 28672 177 2560 -14 4172 28672 199 2560 -15 3912 28672 177 2560 -16 4190 28672 199 2560 -17 3890 28672 177 2560 -18 4176 28672 199 2560 +3 3742 28672 177 2560 +4 3936 28672 201 2560 +5 3714 28672 177 2560 +6 3880 28672 201 2560 +7 3842 28672 177 2560 +8 4068 28672 201 2560 +9 3966 28672 179 2560 +10 4152 28672 203 2560 +11 3938 28672 179 2560 +12 4096 28672 203 2560 +13 4066 28672 179 2560 +14 4284 28672 203 2560 +15 4016 28672 179 2560 +16 4302 28672 203 2560 +17 3994 28672 179 2560 +18 4288 28672 203 2560 19 3994 28672 154 2560 -20 4160 28672 175 2560 +20 4164 28672 177 2560 diff --git a/examples/MemoryBenchmark/nano.txt b/examples/MemoryBenchmark/nano.txt index f639e58..209e4a1 100644 --- a/examples/MemoryBenchmark/nano.txt +++ b/examples/MemoryBenchmark/nano.txt @@ -1,21 +1,21 @@ 0 606 30720 11 2048 1 654 30720 13 2048 2 714 30720 15 2048 -3 850 30720 35 2048 -4 1036 30720 57 2048 -5 822 30720 35 2048 -6 980 30720 57 2048 -7 950 30720 35 2048 -8 1168 30720 57 2048 -9 974 30720 37 2048 -10 1152 30720 59 2048 -11 946 30720 37 2048 -12 1096 30720 59 2048 -13 1074 30720 37 2048 -14 1284 30720 59 2048 -15 1024 30720 37 2048 -16 1302 30720 59 2048 -17 1002 30720 37 2048 -18 1288 30720 59 2048 +3 854 30720 37 2048 +4 1048 30720 61 2048 +5 826 30720 37 2048 +6 992 30720 61 2048 +7 954 30720 37 2048 +8 1180 30720 61 2048 +9 1078 30720 39 2048 +10 1264 30720 63 2048 +11 1050 30720 39 2048 +12 1208 30720 63 2048 +13 1178 30720 39 2048 +14 1396 30720 63 2048 +15 1128 30720 39 2048 +16 1414 30720 63 2048 +17 1106 30720 39 2048 +18 1400 30720 63 2048 19 938 30720 14 2048 -20 1164 30720 35 2048 +20 1168 30720 37 2048 diff --git a/examples/MemoryBenchmark/stm32.txt b/examples/MemoryBenchmark/stm32.txt index ad12082..2fdf69c 100644 --- a/examples/MemoryBenchmark/stm32.txt +++ b/examples/MemoryBenchmark/stm32.txt @@ -1,21 +1,21 @@ 0 21884 131072 3540 20480 1 21912 131072 3544 20480 2 21960 131072 3544 20480 -3 22016 131072 3568 20480 -4 22164 131072 3592 20480 -5 22080 131072 3568 20480 -6 22228 131072 3592 20480 -7 22032 131072 3568 20480 -8 22196 131072 3592 20480 -9 22088 131072 3572 20480 -10 22192 131072 3596 20480 -11 22152 131072 3572 20480 -12 22256 131072 3596 20480 -13 22104 131072 3572 20480 -14 22224 131072 3596 20480 -15 22112 131072 3572 20480 -16 22244 131072 3596 20480 -17 22104 131072 3572 20480 -18 22240 131072 3596 20480 +3 22016 131072 3572 20480 +4 22164 131072 3600 20480 +5 22080 131072 3572 20480 +6 22228 131072 3600 20480 +7 22032 131072 3572 20480 +8 22196 131072 3600 20480 +9 22208 131072 3576 20480 +10 22312 131072 3604 20480 +11 22208 131072 3576 20480 +12 22312 131072 3604 20480 +13 22224 131072 3576 20480 +14 22344 131072 3604 20480 +15 22232 131072 3576 20480 +16 22364 131072 3604 20480 +17 22224 131072 3576 20480 +18 22360 131072 3604 20480 19 22120 131072 3540 20480 -20 22232 131072 3564 20480 +20 22232 131072 3568 20480 diff --git a/examples/MemoryBenchmark/teensy32.txt b/examples/MemoryBenchmark/teensy32.txt index 26bad97..8b02774 100644 --- a/examples/MemoryBenchmark/teensy32.txt +++ b/examples/MemoryBenchmark/teensy32.txt @@ -1,21 +1,21 @@ 0 10232 262144 4152 65536 1 10264 262144 4156 65536 2 10292 262144 4156 65536 -3 10384 262144 4180 65536 -4 10504 262144 4204 65536 -5 10440 262144 4180 65536 -6 10548 262144 4204 65536 -7 10404 262144 4180 65536 -8 10544 262144 4204 65536 -9 10448 262144 4184 65536 -10 10564 262144 4208 65536 -11 10504 262144 4184 65536 -12 10608 262144 4208 65536 -13 10468 262144 4184 65536 -14 10604 262144 4208 65536 -15 10480 262144 4184 65536 -16 10628 262144 4208 65536 -17 10468 262144 4184 65536 -18 10616 262144 4208 65536 +3 10388 262144 4184 65536 +4 10508 262144 4212 65536 +5 10444 262144 4184 65536 +6 10552 262144 4212 65536 +7 10408 262144 4184 65536 +8 10548 262144 4212 65536 +9 10568 262144 4188 65536 +10 10684 262144 4216 65536 +11 10556 262144 4188 65536 +12 10660 262144 4216 65536 +13 10588 262144 4188 65536 +14 10724 262144 4216 65536 +15 10600 262144 4188 65536 +16 10748 262144 4216 65536 +17 10588 262144 4188 65536 +18 10736 262144 4216 65536 19 10688 262144 4160 65536 -20 10816 262144 4180 65536 +20 10820 262144 4184 65536 From 8dba23b0732d1ed2e136c599b669efee0518b4d3 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Mon, 14 Mar 2022 15:10:47 -0700 Subject: [PATCH 11/59] AutoBenchmark: Regenerate after adding CoroutineProfiler; runCoroutine() is slower < 0.7 microseconds --- examples/AutoBenchmark/README.md | 45 ++++++++++++++--------- examples/AutoBenchmark/esp32.txt | 6 +-- examples/AutoBenchmark/esp8266.txt | 6 +-- examples/AutoBenchmark/generate_readme.py | 11 +++++- examples/AutoBenchmark/micro.txt | 6 +-- examples/AutoBenchmark/nano.txt | 4 +- examples/AutoBenchmark/stm32.txt | 4 +- examples/AutoBenchmark/teensy32.txt | 4 +- 8 files changed, 52 insertions(+), 34 deletions(-) diff --git a/examples/AutoBenchmark/README.md b/examples/AutoBenchmark/README.md index 7cdeb5c..1dda3d9 100644 --- a/examples/AutoBenchmark/README.md +++ b/examples/AutoBenchmark/README.md @@ -14,7 +14,7 @@ is the overhead caused by the `Coroutine` context switch. All times in below are in microseconds. -**Version**: AceRoutine v1.4.2 +**Version**: AceRoutine v1.5.0 **DO NOT EDIT**: This file was auto-generated using `make README.md`. @@ -121,6 +121,15 @@ $ make README.md * ESP32 Core from 1.0.6 to 2.0.2 * Teensyduino from 1.54 to 1.56 +* v1.5.0 + * Add `CoroutineProfiler` to `CoroutineScheduler`. + * `CoroutineScheduler::runCoroutine()` becomes slightly slower: + * 0.7 microseconds (AVR) + * 0.5 microseconds (STM32) + * 0.2 microseconds (ESP8266) + * 0.07 microseconds (ESP32) + * 0.15 microseconds (Teensy 3.2) + ## Arduino Nano * 16MHz ATmega328P @@ -130,7 +139,7 @@ $ make README.md ``` Sizes of Objects: -sizeof(Coroutine): 11 +sizeof(Coroutine): 16 sizeof(CoroutineScheduler): 2 sizeof(Channel): 5 @@ -140,7 +149,7 @@ CPU: |---------------------+--------+-------------+--------| | EmptyLoop | 10000 | 1.700 | 0.000 | | DirectScheduling | 10000 | 2.900 | 1.200 | -| CoroutineScheduling | 10000 | 7.200 | 5.500 | +| CoroutineScheduling | 10000 | 7.900 | 6.200 | +---------------------+--------+-------------+--------+ ``` @@ -154,7 +163,7 @@ CPU: ``` Sizes of Objects: -sizeof(Coroutine): 11 +sizeof(Coroutine): 16 sizeof(CoroutineScheduler): 2 sizeof(Channel): 5 @@ -162,9 +171,9 @@ CPU: +---------------------+--------+-------------+--------+ | Functionality | iters | micros/iter | diff | |---------------------+--------+-------------+--------| -| EmptyLoop | 10000 | 1.800 | 0.000 | -| DirectScheduling | 10000 | 2.900 | 1.100 | -| CoroutineScheduling | 10000 | 7.300 | 5.500 | +| EmptyLoop | 10000 | 1.700 | 0.000 | +| DirectScheduling | 10000 | 2.900 | 1.200 | +| CoroutineScheduling | 10000 | 7.900 | 6.200 | +---------------------+--------+-------------+--------+ ``` @@ -177,7 +186,7 @@ CPU: ``` Sizes of Objects: -sizeof(Coroutine): 20 +sizeof(Coroutine): 28 sizeof(CoroutineScheduler): 4 sizeof(Channel): 12 @@ -187,7 +196,7 @@ CPU: |---------------------+--------+-------------+--------| | EmptyLoop | 30000 | 0.133 | 0.000 | | DirectScheduling | 30000 | 0.533 | 0.400 | -| CoroutineScheduling | 30000 | 1.133 | 1.000 | +| CoroutineScheduling | 30000 | 1.600 | 1.467 | +---------------------+--------+-------------+--------+ ``` @@ -200,7 +209,7 @@ CPU: ``` Sizes of Objects: -sizeof(Coroutine): 20 +sizeof(Coroutine): 28 sizeof(CoroutineScheduler): 4 sizeof(Channel): 12 @@ -208,9 +217,9 @@ CPU: +---------------------+--------+-------------+--------+ | Functionality | iters | micros/iter | diff | |---------------------+--------+-------------+--------| -| EmptyLoop | 10000 | 0.100 | 0.000 | -| DirectScheduling | 10000 | 0.500 | 0.400 | -| CoroutineScheduling | 10000 | 0.900 | 0.800 | +| EmptyLoop | 10000 | 0.200 | 0.000 | +| DirectScheduling | 10000 | 0.500 | 0.300 | +| CoroutineScheduling | 10000 | 1.200 | 1.000 | +---------------------+--------+-------------+--------+ ``` @@ -223,7 +232,7 @@ CPU: ``` Sizes of Objects: -sizeof(Coroutine): 20 +sizeof(Coroutine): 28 sizeof(CoroutineScheduler): 4 sizeof(Channel): 12 @@ -232,8 +241,8 @@ CPU: | Functionality | iters | micros/iter | diff | |---------------------+--------+-------------+--------| | EmptyLoop | 30000 | 0.066 | 0.000 | -| DirectScheduling | 30000 | 0.133 | 0.067 | -| CoroutineScheduling | 30000 | 0.333 | 0.267 | +| DirectScheduling | 30000 | 0.100 | 0.034 | +| CoroutineScheduling | 30000 | 0.400 | 0.334 | +---------------------+--------+-------------+--------+ ``` @@ -247,7 +256,7 @@ CPU: ``` Sizes of Objects: -sizeof(Coroutine): 20 +sizeof(Coroutine): 28 sizeof(CoroutineScheduler): 4 sizeof(Channel): 12 @@ -257,7 +266,7 @@ CPU: |---------------------+--------+-------------+--------| | EmptyLoop | 30000 | 0.066 | 0.000 | | DirectScheduling | 30000 | 0.233 | 0.167 | -| CoroutineScheduling | 30000 | 0.533 | 0.467 | +| CoroutineScheduling | 30000 | 0.666 | 0.600 | +---------------------+--------+-------------+--------+ ``` diff --git a/examples/AutoBenchmark/esp32.txt b/examples/AutoBenchmark/esp32.txt index 54bbc70..489da42 100644 --- a/examples/AutoBenchmark/esp32.txt +++ b/examples/AutoBenchmark/esp32.txt @@ -1,9 +1,9 @@ SIZEOF -sizeof(Coroutine): 20 +sizeof(Coroutine): 28 sizeof(CoroutineScheduler): 4 sizeof(Channel): 12 BENCHMARKS EmptyLoop 0.066 30000 -DirectScheduling 0.133 30000 -CoroutineScheduling 0.333 30000 +DirectScheduling 0.100 30000 +CoroutineScheduling 0.400 30000 END diff --git a/examples/AutoBenchmark/esp8266.txt b/examples/AutoBenchmark/esp8266.txt index ec53d60..f6ee050 100644 --- a/examples/AutoBenchmark/esp8266.txt +++ b/examples/AutoBenchmark/esp8266.txt @@ -1,9 +1,9 @@ SIZEOF -sizeof(Coroutine): 20 +sizeof(Coroutine): 28 sizeof(CoroutineScheduler): 4 sizeof(Channel): 12 BENCHMARKS -EmptyLoop 0.100 10000 +EmptyLoop 0.200 10000 DirectScheduling 0.500 10000 -CoroutineScheduling 0.900 10000 +CoroutineScheduling 1.200 10000 END diff --git a/examples/AutoBenchmark/generate_readme.py b/examples/AutoBenchmark/generate_readme.py index dcf3b49..15e394c 100755 --- a/examples/AutoBenchmark/generate_readme.py +++ b/examples/AutoBenchmark/generate_readme.py @@ -38,7 +38,7 @@ All times in below are in microseconds. -**Version**: AceRoutine v1.4.2 +**Version**: AceRoutine v1.5.0 **DO NOT EDIT**: This file was auto-generated using `make README.md`. @@ -145,6 +145,15 @@ * ESP32 Core from 1.0.6 to 2.0.2 * Teensyduino from 1.54 to 1.56 +* v1.5.0 + * Add `CoroutineProfiler` to `CoroutineScheduler`. + * `CoroutineScheduler::runCoroutine()` becomes slightly slower: + * 0.7 microseconds (AVR) + * 0.5 microseconds (STM32) + * 0.2 microseconds (ESP8266) + * 0.07 microseconds (ESP32) + * 0.15 microseconds (Teensy 3.2) + ## Arduino Nano * 16MHz ATmega328P diff --git a/examples/AutoBenchmark/micro.txt b/examples/AutoBenchmark/micro.txt index d422fc0..12320ef 100644 --- a/examples/AutoBenchmark/micro.txt +++ b/examples/AutoBenchmark/micro.txt @@ -1,9 +1,9 @@ SIZEOF -sizeof(Coroutine): 11 +sizeof(Coroutine): 16 sizeof(CoroutineScheduler): 2 sizeof(Channel): 5 BENCHMARKS -EmptyLoop 1.800 10000 +EmptyLoop 1.700 10000 DirectScheduling 2.900 10000 -CoroutineScheduling 7.300 10000 +CoroutineScheduling 7.900 10000 END diff --git a/examples/AutoBenchmark/nano.txt b/examples/AutoBenchmark/nano.txt index 6c7eaa4..12320ef 100644 --- a/examples/AutoBenchmark/nano.txt +++ b/examples/AutoBenchmark/nano.txt @@ -1,9 +1,9 @@ SIZEOF -sizeof(Coroutine): 11 +sizeof(Coroutine): 16 sizeof(CoroutineScheduler): 2 sizeof(Channel): 5 BENCHMARKS EmptyLoop 1.700 10000 DirectScheduling 2.900 10000 -CoroutineScheduling 7.200 10000 +CoroutineScheduling 7.900 10000 END diff --git a/examples/AutoBenchmark/stm32.txt b/examples/AutoBenchmark/stm32.txt index cf9fc95..d3caab3 100644 --- a/examples/AutoBenchmark/stm32.txt +++ b/examples/AutoBenchmark/stm32.txt @@ -1,9 +1,9 @@ SIZEOF -sizeof(Coroutine): 20 +sizeof(Coroutine): 28 sizeof(CoroutineScheduler): 4 sizeof(Channel): 12 BENCHMARKS EmptyLoop 0.133 30000 DirectScheduling 0.533 30000 -CoroutineScheduling 1.133 30000 +CoroutineScheduling 1.600 30000 END diff --git a/examples/AutoBenchmark/teensy32.txt b/examples/AutoBenchmark/teensy32.txt index e8b7ca2..358df17 100644 --- a/examples/AutoBenchmark/teensy32.txt +++ b/examples/AutoBenchmark/teensy32.txt @@ -1,9 +1,9 @@ SIZEOF -sizeof(Coroutine): 20 +sizeof(Coroutine): 28 sizeof(CoroutineScheduler): 4 sizeof(Channel): 12 BENCHMARKS EmptyLoop 0.066 30000 DirectScheduling 0.233 30000 -CoroutineScheduling 0.533 30000 +CoroutineScheduling 0.666 30000 END From a233bbc1987c634f1c500b2b360317f5ab8207ed Mon Sep 17 00:00:00 2001 From: Brian Park Date: Mon, 14 Mar 2022 16:18:14 -0700 Subject: [PATCH 12/59] CoroutineLogBinProfiler.h: Change to template class parameterized on T_COROUTINE --- src/ace_routine/Coroutine.h | 23 ++- src/ace_routine/CoroutineLogBinProfiler.cpp | 161 ------------------- src/ace_routine/CoroutineLogBinProfiler.h | 169 ++++++++++++++++++-- 3 files changed, 172 insertions(+), 181 deletions(-) delete mode 100644 src/ace_routine/CoroutineLogBinProfiler.cpp diff --git a/src/ace_routine/Coroutine.h b/src/ace_routine/Coroutine.h index a1633d7..93d35b2 100644 --- a/src/ace_routine/Coroutine.h +++ b/src/ace_routine/Coroutine.h @@ -27,6 +27,7 @@ SOFTWARE. #include // UINT16_MAX #include // Print +#include // PrintStr<> #include "ClockInterface.h" class __FlashStringHelper; @@ -347,16 +348,28 @@ class CoroutineTemplate { /** * Print name to the given Printer. If the name is null, then print the * hexadecimal representation of the pointer to the coroutine. + * + * @param printer destination of output, usually `Serial` + * @param maxLen truncate to maxLen if given */ - void printNameTo(Print& printer) const { + void printNameTo(Print& printer, uint8_t maxLen = 0) const { + // Need to go through this contortion because vsnprintf() does not support + // flash string parameters, so I can't use something like "%12.12s" with + // a flash string. + ace_common::PrintStr<128> pname; + if (mName == nullptr) { - printer.print("0x"); - printer.print((uintptr_t) this, 16); + pname.print("0x"); + pname.print((uintptr_t) this, 16); } else if (mNameType == kNameTypeCString) { - printer.print(mName); + pname.print(mName); } else { - printer.print((const __FlashStringHelper*) mName); + pname.print((const __FlashStringHelper*) mName); } + + // Print up to maxLen characters. + maxLen = (maxLen == 0) ? pname.length() : maxLen; + printer.write(pname.cstr(), maxLen); } /** diff --git a/src/ace_routine/CoroutineLogBinProfiler.cpp b/src/ace_routine/CoroutineLogBinProfiler.cpp deleted file mode 100644 index b3ade41..0000000 --- a/src/ace_routine/CoroutineLogBinProfiler.cpp +++ /dev/null @@ -1,161 +0,0 @@ -/* -MIT License - -Copyright (c) 2022 Brian T. Park - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - -#include -#include // memset() -#include // printfTo() -#include "Coroutine.h" -#include "CoroutineLogBinProfiler.h" - -using ace_common::printfTo; - -namespace ace_routine { - -CoroutineLogBinProfiler::CoroutineLogBinProfiler() { - init(); -} - -void CoroutineLogBinProfiler::init() { - memset(mBins, 0, sizeof(mBins)); -} - -void CoroutineLogBinProfiler::updateElapsedMicros(uint32_t micros) { - uint8_t index = 0; // [0, 31] - - // The index is the bit number (0-31) of the most significant bit. So each bin - // contains the number of samples whose elapsed micros is between 2^i and - // 2^(i+1). Example, for Bin 3, and this bin contains the number of samples - // which satsify (8us <= elapsed < 16us). The exception is Bin 0 because it - // includes samples where elapsed = 0 as well, so the sample interval for Bin - // 0 is (0 <= elapsed < 2), instead of (1 <= elapsed < 2). - while (true) { - micros >>= 1; - if (micros == 0) break; - index++; - } - uint16_t count = mBins[index]; - if (count < UINT16_MAX) { - mBins[index]++; - } -} - -// Labels for each bin in mBins. -static const char* kBinLabels[CoroutineLogBinProfiler::kNumBins] = { - "<2us", - "<4us", - "<8us", - "<16us", - "<32us", - "<64us", - "<128us", - "<256us", - "<512us", - "<1ms", - "<2ms", - "<4ms", - "<8ms", - "<16ms", - "<32ms", - "<64ms", - "<128ms", - "<256ms", - "<512ms", - "<1s", - "<2s", - "<4s", - "<8s", - "<16s", - "<32s", - "<64s", - "<128s", - "<256s", - "<512s", - "<1024s", - "<2048s", - "<4096s", -}; - -void CoroutineLogBinProfiler::printHeaderTo( - Print& printer, uint8_t binStart, uint8_t binEnd) const { - if (binEnd <= binStart) return; - - binEnd = (binEnd > kNumBins) ? kNumBins : binEnd; - for (uint8_t i = binStart; i < binEnd; i++) { - ace_common::printfTo(printer, "%6s", kBinLabels[i]); - } -} - -void CoroutineLogBinProfiler::printTo( - Print& printer, uint8_t binStart, uint8_t binEnd) const { - if (binEnd <= binStart) return; - - binEnd = (binEnd > kNumBins) ? kNumBins : binEnd; - for (uint8_t i = binStart; i < binEnd; i++) { - uint16_t count = mBins[i]; - ace_common::printfTo(printer, "%6d", count); - } - - uint32_t remaining = 0; - for (uint8_t i = binEnd; i < kNumBins; i++) { - remaining += mBins[i]; - } - if (remaining > 0) { - ace_common::printfTo(printer, "%6ld", (unsigned long) remaining); - } -} - -void CoroutineLogBinProfiler::printBinsTo( - Print& printer, Coroutine** root, uint8_t binStart, uint8_t binEnd) { - if (binEnd <= binStart) return; - - bool isHeaderPrinted = false; - for (Coroutine** p = root; (*p) != nullptr; p = (*p)->getNext()) { - CoroutineLogBinProfiler* profiler = - (CoroutineLogBinProfiler*) (*p)->getProfiler(); - if (! profiler) continue; - - // Print header if needed. - if (! isHeaderPrinted) { - printfTo(printer, "%12.12s", ""); - profiler->printHeaderTo(printer, binStart, binEnd); - printer.println(); - isHeaderPrinted = true; - } - - // Print the bins. The number of digits is automatically a log10() of the - // counts, so we should be able to visually scan the table and see which - // coroutine is taking too long. - printfTo(printer, "%12.12s", (*p)->getCName()); - profiler->printTo(printer, binStart, binEnd); - printer.println(); - - // TODO: It'd be useful to sum up the remaining buckets after binEnd, and - // print the number of samples that weren't printed in the loop above. - - // Maybe control this using a boolean flag. - profiler->init(); - } -} - -} diff --git a/src/ace_routine/CoroutineLogBinProfiler.h b/src/ace_routine/CoroutineLogBinProfiler.h index 068d843..7e1a51c 100644 --- a/src/ace_routine/CoroutineLogBinProfiler.h +++ b/src/ace_routine/CoroutineLogBinProfiler.h @@ -26,10 +26,12 @@ SOFTWARE. #define ACE_ROUTINE_COROUTINE_LOG_BIN_PROFILER_H #include // uint8_t, uint32_t +#include // memset() +#include // Print +#include // printfTo() #include "Coroutine.h" #include "CoroutineProfiler.h" -class Print; namespace ace_routine { @@ -48,30 +50,56 @@ namespace ace_routine { * replaced by a '*' character.) Therefore the table is a rough ASCII version of * a log-log graph of the frequency count. * - * For example, here is the output of `printBinsTo()` for the sample program in - * `examples/SoundManager`: + * For example, here is the output of `printBinsTo(Serial, 0, 9)` for the sample + * program in `examples/SoundManager`: * * @verbatim - * <2us <4us <8us <16us <32us <64us<128us<256us<512us <1ms <2ms - * soundManag 621 2091 0 0 5 3 0 0 0 0 1 - * soundRouti 2162 553 1 0 1 2 2 1 0 0 0 + * <2us <4us <8us <16us <32us <64us<128us<256us<512us + * soundManager 621 2091 0 0 5 3 0 0 0 1 + * soundRoutine 2162 553 1 0 1 2 2 1 0 * * The `init()` method resets the frequency count of the bins. * * @endverbatim */ -class CoroutineLogBinProfiler : public CoroutineProfiler { +template +class CoroutineLogBinProfilerTemplate : public CoroutineProfiler { public: static const uint8_t kNumBins = 32; public: /** Constructor. */ - CoroutineLogBinProfiler(); + CoroutineLogBinProfilerTemplate() { + init(); + } /** Clear the bins. */ - void init(); + void init() { + memset(mBins, 0, sizeof(mBins)); + } - void updateElapsedMicros(uint32_t micros) override; + /** + * Update the count for the calculated elapsed time bin. The bin index is + * the bit number (0-31) of the most significant bit. So each bin contains + * the number of samples whose elapsed micros is between 2^i and 2^(i+1). + * Example, for Bin 3, and this bin contains the number of samples which + * satsify (8us <= elapsed < 16us). The exception is Bin 0 because it + * includes samples where elapsed = 0 as well, so the sample interval for + * Bin 0 is (0 <= elapsed < 2), instead of (1 <= elapsed < 2). + */ + void updateElapsedMicros(uint32_t micros) override { + uint8_t index = 0; // [0, 31] + + while (true) { + micros >>= 1; + if (micros == 0) break; + index++; + } + uint16_t count = mBins[index]; + if (count < UINT16_MAX) { + mBins[index]++; + } + } /** * Print the header related to this profiler. @@ -79,29 +107,140 @@ class CoroutineLogBinProfiler : public CoroutineProfiler { * @param binStart start index of the bins (0-31) * @param binEnd end index (exclusive) of the bins (0-32) */ - void printHeaderTo(Print& printer, uint8_t binStart, uint8_t binEnd) const; + void printHeaderTo(Print& printer, uint8_t binStart, uint8_t binEnd) const { + if (binEnd <= binStart) return; + + binEnd = (binEnd > kNumBins) ? kNumBins : binEnd; + for (uint8_t i = binStart; i < binEnd; i++) { + ace_common::printfTo(printer, "%6.6s", kBinLabels[i]); + } + } /** - * Print the bins of this profiler. + * Print the bins of this profiler as a single line of text with each bin + * printed as a 5-digit number in a 6-character box. If there are any + * remaining counts after the `binEnd`, the cummulative sum of the remaining + * bins are printed in another 6-character box. * * @param binStart start index of the bins (0-31) * @param binEnd end index (exclusive) of the bins (0-32) */ - void printTo(Print& printer, uint8_t binStart, uint8_t binEnd) const; + void printTo(Print& printer, uint8_t binStart, uint8_t binEnd) const { + if (binEnd <= binStart) return; + + binEnd = (binEnd > kNumBins) ? kNumBins : binEnd; + for (uint8_t i = binStart; i < binEnd; i++) { + uint16_t count = mBins[i]; + ace_common::printfTo(printer, "%6u", count); + } + + uint32_t remaining = 0; + for (uint8_t i = binEnd; i < kNumBins; i++) { + remaining += mBins[i]; + } + if (remaining > 0) { + ace_common::printfTo(printer, "%6lu", (unsigned long) remaining); + } + } /** - * Loop over all coroutines and print the ASCII version of a histogram. + * Loop over all coroutines and print the ASCII version of a histogram. This + * assumes that all the coroutines are using the same CoroutineProfiler + * class, so we can use any of the profilers to print the header, and the + * numbers will be lined up properly. * + * @param printer destination of output, usually `Serial` + * @param root pointer to the singly-linked list of Coroutines * @param binStart start index of the bins (0-31) * @param binEnd end inex (exclusive) of the bins (0-32) + * @param clear call init() after printing (default true) */ static void printBinsTo( - Print& printer, Coroutine** root, uint8_t binStart, uint8_t binEnd); + Print& printer, + T_COROUTINE** root, + uint8_t binStart, + uint8_t binEnd, + bool clear = true + ) { + if (binEnd <= binStart) return; + + bool isHeaderPrinted = false; + for (Coroutine** p = root; (*p) != nullptr; p = (*p)->getNext()) { + CoroutineLogBinProfilerTemplate* profiler = + (CoroutineLogBinProfilerTemplate*) (*p)->getProfiler(); + if (! profiler) continue; + + // Print header if needed. + if (! isHeaderPrinted) { + ace_common::printfTo(printer, "%12.12s", ""); + profiler->printHeaderTo(printer, binStart, binEnd); + printer.println(); + isHeaderPrinted = true; + } + + // Print the coroutine name, truncated to 12 characters. The next column + // is a 5-digit number formatted into a 6-character block, so there will + // always be a space between the coroutine name and the next number. + (*p)->printNameTo(printer, 12); + + // Print the bins. The number of digits is automatically a log10() of + // the counts, so we should be able to visually scan the table and see + // which coroutine is taking too long. + profiler->printTo(printer, binStart, binEnd); + printer.println(); + + if (clear) { + profiler->init(); + } + } + } public: + static const char* const kBinLabels[kNumBins]; + uint16_t mBins[kNumBins]; }; +// Labels for each bin in mBins. +template +const char* const CoroutineLogBinProfilerTemplate::kBinLabels[ + CoroutineLogBinProfilerTemplate::kNumBins] = { + "<2us", + "<4us", + "<8us", + "<16us", + "<32us", + "<64us", + "<128us", + "<256us", + "<512us", + "<1ms", + "<2ms", + "<4ms", + "<8ms", + "<16ms", + "<32ms", + "<64ms", + "<128ms", + "<256ms", + "<512ms", + "<1s", + "<2s", + "<4s", + "<8s", + "<16s", + "<32s", + "<64s", + "<128s", + "<256s", + "<512s", + "<1024s", + "<2048s", + "<4096s", +}; + +using CoroutineLogBinProfiler = CoroutineLogBinProfilerTemplate; + } #endif From 01930c5f2363d64b1e95ffbddd300f34063fba59 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Mon, 14 Mar 2022 16:23:26 -0700 Subject: [PATCH 13/59] SoundManager.ino: Print fewer bins to fit output into 80 columns --- examples/SoundManager/SoundManager.ino | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/SoundManager/SoundManager.ino b/examples/SoundManager/SoundManager.ino index e11d296..4513e70 100644 --- a/examples/SoundManager/SoundManager.ino +++ b/examples/SoundManager/SoundManager.ino @@ -59,8 +59,8 @@ EXTERN_COROUTINE(soundManager); COROUTINE(printProfile) { COROUTINE_LOOP() { - CoroutineLogBinProfiler::printBinsTo(Serial, getRoot(), 0, 16); - COROUTINE_DELAY_SECONDS(10); + CoroutineLogBinProfiler::printBinsTo(Serial, getRoot(), 0, 8); + COROUTINE_DELAY_SECONDS(5); } } From ce2539b9f4f96918e7fb3660ff75aeec36c7ada4 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Mon, 14 Mar 2022 18:23:16 -0700 Subject: [PATCH 14/59] src/CoroutineLogBinRenderer.h: Extract rendering logic from CoroutineLogBinProfiler --- examples/SoundManager/SoundManager.ino | 5 +- src/AceRoutine.h | 1 + src/ace_routine/CoroutineLogBinProfiler.h | 147 --------------- src/ace_routine/CoroutineLogBinRenderer.h | 207 ++++++++++++++++++++++ 4 files changed, 211 insertions(+), 149 deletions(-) create mode 100644 src/ace_routine/CoroutineLogBinRenderer.h diff --git a/examples/SoundManager/SoundManager.ino b/examples/SoundManager/SoundManager.ino index 4513e70..da5c344 100644 --- a/examples/SoundManager/SoundManager.ino +++ b/examples/SoundManager/SoundManager.ino @@ -52,14 +52,15 @@ using ace_routine::Coroutine;; using ace_routine::CoroutineScheduler; using ace_routine::CoroutineLogBinProfiler; -using ace_common::printfTo; +using ace_routine::CoroutineLogBinRenderer; SoundRoutine soundRoutine; EXTERN_COROUTINE(soundManager); COROUTINE(printProfile) { COROUTINE_LOOP() { - CoroutineLogBinProfiler::printBinsTo(Serial, getRoot(), 0, 8); + CoroutineLogBinRenderer renderer(getRoot()); + renderer.printTableTo(Serial, 0, 8); COROUTINE_DELAY_SECONDS(5); } } diff --git a/src/AceRoutine.h b/src/AceRoutine.h index 2318da0..2ca390d 100644 --- a/src/AceRoutine.h +++ b/src/AceRoutine.h @@ -50,6 +50,7 @@ SOFTWARE. #include "ace_routine/CoroutineScheduler.h" #include "ace_routine/CoroutineProfiler.h" #include "ace_routine/CoroutineLogBinProfiler.h" +#include "ace_routine/CoroutineLogBinRenderer.h" #include "ace_routine/Channel.h" #endif diff --git a/src/ace_routine/CoroutineLogBinProfiler.h b/src/ace_routine/CoroutineLogBinProfiler.h index 7e1a51c..dc61994 100644 --- a/src/ace_routine/CoroutineLogBinProfiler.h +++ b/src/ace_routine/CoroutineLogBinProfiler.h @@ -27,8 +27,6 @@ SOFTWARE. #include // uint8_t, uint32_t #include // memset() -#include // Print -#include // printfTo() #include "Coroutine.h" #include "CoroutineProfiler.h" @@ -50,17 +48,6 @@ namespace ace_routine { * replaced by a '*' character.) Therefore the table is a rough ASCII version of * a log-log graph of the frequency count. * - * For example, here is the output of `printBinsTo(Serial, 0, 9)` for the sample - * program in `examples/SoundManager`: - * - * @verbatim - * <2us <4us <8us <16us <32us <64us<128us<256us<512us - * soundManager 621 2091 0 0 5 3 0 0 0 1 - * soundRoutine 2162 553 1 0 1 2 2 1 0 - * - * The `init()` method resets the frequency count of the bins. - * - * @endverbatim */ template class CoroutineLogBinProfilerTemplate : public CoroutineProfiler { @@ -101,144 +88,10 @@ class CoroutineLogBinProfilerTemplate : public CoroutineProfiler { } } - /** - * Print the header related to this profiler. - * - * @param binStart start index of the bins (0-31) - * @param binEnd end index (exclusive) of the bins (0-32) - */ - void printHeaderTo(Print& printer, uint8_t binStart, uint8_t binEnd) const { - if (binEnd <= binStart) return; - - binEnd = (binEnd > kNumBins) ? kNumBins : binEnd; - for (uint8_t i = binStart; i < binEnd; i++) { - ace_common::printfTo(printer, "%6.6s", kBinLabels[i]); - } - } - - /** - * Print the bins of this profiler as a single line of text with each bin - * printed as a 5-digit number in a 6-character box. If there are any - * remaining counts after the `binEnd`, the cummulative sum of the remaining - * bins are printed in another 6-character box. - * - * @param binStart start index of the bins (0-31) - * @param binEnd end index (exclusive) of the bins (0-32) - */ - void printTo(Print& printer, uint8_t binStart, uint8_t binEnd) const { - if (binEnd <= binStart) return; - - binEnd = (binEnd > kNumBins) ? kNumBins : binEnd; - for (uint8_t i = binStart; i < binEnd; i++) { - uint16_t count = mBins[i]; - ace_common::printfTo(printer, "%6u", count); - } - - uint32_t remaining = 0; - for (uint8_t i = binEnd; i < kNumBins; i++) { - remaining += mBins[i]; - } - if (remaining > 0) { - ace_common::printfTo(printer, "%6lu", (unsigned long) remaining); - } - } - - /** - * Loop over all coroutines and print the ASCII version of a histogram. This - * assumes that all the coroutines are using the same CoroutineProfiler - * class, so we can use any of the profilers to print the header, and the - * numbers will be lined up properly. - * - * @param printer destination of output, usually `Serial` - * @param root pointer to the singly-linked list of Coroutines - * @param binStart start index of the bins (0-31) - * @param binEnd end inex (exclusive) of the bins (0-32) - * @param clear call init() after printing (default true) - */ - static void printBinsTo( - Print& printer, - T_COROUTINE** root, - uint8_t binStart, - uint8_t binEnd, - bool clear = true - ) { - if (binEnd <= binStart) return; - - bool isHeaderPrinted = false; - for (Coroutine** p = root; (*p) != nullptr; p = (*p)->getNext()) { - CoroutineLogBinProfilerTemplate* profiler = - (CoroutineLogBinProfilerTemplate*) (*p)->getProfiler(); - if (! profiler) continue; - - // Print header if needed. - if (! isHeaderPrinted) { - ace_common::printfTo(printer, "%12.12s", ""); - profiler->printHeaderTo(printer, binStart, binEnd); - printer.println(); - isHeaderPrinted = true; - } - - // Print the coroutine name, truncated to 12 characters. The next column - // is a 5-digit number formatted into a 6-character block, so there will - // always be a space between the coroutine name and the next number. - (*p)->printNameTo(printer, 12); - - // Print the bins. The number of digits is automatically a log10() of - // the counts, so we should be able to visually scan the table and see - // which coroutine is taking too long. - profiler->printTo(printer, binStart, binEnd); - printer.println(); - - if (clear) { - profiler->init(); - } - } - } - public: - static const char* const kBinLabels[kNumBins]; - uint16_t mBins[kNumBins]; }; -// Labels for each bin in mBins. -template -const char* const CoroutineLogBinProfilerTemplate::kBinLabels[ - CoroutineLogBinProfilerTemplate::kNumBins] = { - "<2us", - "<4us", - "<8us", - "<16us", - "<32us", - "<64us", - "<128us", - "<256us", - "<512us", - "<1ms", - "<2ms", - "<4ms", - "<8ms", - "<16ms", - "<32ms", - "<64ms", - "<128ms", - "<256ms", - "<512ms", - "<1s", - "<2s", - "<4s", - "<8s", - "<16s", - "<32s", - "<64s", - "<128s", - "<256s", - "<512s", - "<1024s", - "<2048s", - "<4096s", -}; - using CoroutineLogBinProfiler = CoroutineLogBinProfilerTemplate; } diff --git a/src/ace_routine/CoroutineLogBinRenderer.h b/src/ace_routine/CoroutineLogBinRenderer.h new file mode 100644 index 0000000..07ad082 --- /dev/null +++ b/src/ace_routine/CoroutineLogBinRenderer.h @@ -0,0 +1,207 @@ +/* +MIT License + +Copyright (c) 2022 Brian T. Park + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ + +#ifndef ACE_ROUTINE_COROUTINE_LOG_BIN_RENDERER_H +#define ACE_ROUTINE_COROUTINE_LOG_BIN_RENDERER_H + +#include // uint8_t, uint32_t +#include // Print +#include // printfTo() +#include "Coroutine.h" // Coroutine +#include "CoroutineProfiler.h" + +namespace ace_routine { + +/** + * Print the information in the CoroutineLogBinProfiler for each Coroutine + * in a human-readable table. For example, the output of `printTableTo(Serial, + * 0, 9)` for `examples/SoundManager` looks like this: + * + * @verbatim + * <2us <4us <8us <16us <32us <64us<128us<256us<512us + * soundManager 621 2091 0 0 5 3 0 0 0 1 + * soundRoutine 2162 553 1 0 1 2 2 1 0 + * + * The `init()` method resets the frequency count of the bins. + * + * @endverbatim + + */ +template +class CoroutineLogBinRendererTemplate { + public: + /** Typedef of the CoroutineLogBinProfiler supported by this class. */ + using Profiler = CoroutineLogBinProfilerTemplate; + + /** Constructor. */ + CoroutineLogBinRendererTemplate(T_COROUTINE** root) + : mRoot(root) + {} + + /** + * Loop over all coroutines and print the ASCII version of a histogram. This + * assumes that all the coroutines are using the same CoroutineProfiler + * class, so we can use any of the profilers to print the header, and the + * numbers will be lined up properly. + * + * @param printer destination of output, usually `Serial` + * @param binStart start index of the bins (0-31) + * @param binEnd end inex (exclusive) of the bins (0-32) + * @param clear call init() after printing (default true) + */ + void printTableTo( + Print& printer, + uint8_t binStart, + uint8_t binEnd, + bool clear = true + ) { + if (binEnd <= binStart) return; + + bool isHeaderPrinted = false; + for (Coroutine** p = mRoot; (*p) != nullptr; p = (*p)->getNext()) { + auto* profiler = (Profiler*) (*p)->getProfiler(); + if (! profiler) continue; + + // Print header if needed. + if (! isHeaderPrinted) { + ace_common::printfTo(printer, "%12.12s", ""); + printHeaderTo(printer, binStart, binEnd); + printer.println(); + isHeaderPrinted = true; + } + + // Print the coroutine name, truncated to 12 characters. The next column + // is a 5-digit number formatted into a 6-character block, so there will + // always be a space between the coroutine name and the next number. + (*p)->printNameTo(printer, 12); + + // Print the bins. The number of digits is automatically a log10() of + // the counts, so we should be able to visually scan the table and see + // which coroutine is taking too long. + printBinsTo(printer, profiler, binStart, binEnd); + printer.println(); + + if (clear) { + profiler->init(); + } + } + } + + private: + /** + * Print the header related to this profiler. + * + * @param printer destination of output + * @param binStart start index of the bins (0-31) + * @param binEnd end index (exclusive) of the bins (0-32) + */ + void printHeaderTo(Print& printer, uint8_t binStart, uint8_t binEnd) const { + if (binEnd <= binStart) return; + + binEnd = (binEnd > Profiler::kNumBins) ? Profiler::kNumBins : binEnd; + for (uint8_t i = binStart; i < binEnd; i++) { + ace_common::printfTo(printer, "%6.6s", kBinLabels[i]); + } + } + + /** + * Print the bins of this profiler as a single line of text with each bin + * printed as a 5-digit number in a 6-character box. If there are any + * remaining counts after the `binEnd`, the cummulative sum of the remaining + * bins are printed in another 6-character box. + * + * @param binStart start index of the bins (0-31) + * @param binEnd end index (exclusive) of the bins (0-32) + */ + void printBinsTo( + Print& printer, + Profiler* profiler, + uint8_t binStart, + uint8_t binEnd) const { + if (binEnd <= binStart) return; + + binEnd = (binEnd > Profiler::kNumBins) ? Profiler::kNumBins : binEnd; + for (uint8_t i = binStart; i < binEnd; i++) { + uint16_t count = profiler->mBins[i]; + ace_common::printfTo(printer, "%6u", count); + } + + uint32_t remaining = 0; + for (uint8_t i = binEnd; i < Profiler::kNumBins; i++) { + remaining += profiler->mBins[i]; + } + if (remaining > 0) { + ace_common::printfTo(printer, "%6lu", (unsigned long) remaining); + } + } + + private: + static const char* const kBinLabels[Profiler::kNumBins]; + + T_COROUTINE** mRoot; +}; + +// Labels for each bin in mBins. +template +const char* const CoroutineLogBinRendererTemplate::kBinLabels[ + CoroutineLogBinProfilerTemplate::kNumBins] = { + "<2us", + "<4us", + "<8us", + "<16us", + "<32us", + "<64us", + "<128us", + "<256us", + "<512us", + "<1ms", + "<2ms", + "<4ms", + "<8ms", + "<16ms", + "<32ms", + "<64ms", + "<128ms", + "<256ms", + "<512ms", + "<1s", + "<2s", + "<4s", + "<8s", + "<16s", + "<32s", + "<64s", + "<128s", + "<256s", + "<512s", + "<1024s", + "<2048s", + "<4096s", +}; + +using CoroutineLogBinRenderer = CoroutineLogBinRendererTemplate; + +} + +#endif From 5dcb848c95e5accec32d2df0c843b15eb4df6cc5 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Mon, 14 Mar 2022 18:24:14 -0700 Subject: [PATCH 15/59] {examples,tests}/Makefile: Add AceCommon dependency --- examples/BlinkSlowFastManualRoutine/Makefile | 2 +- examples/BlinkSlowFastRoutine/Makefile | 2 +- examples/CountAndBlink/Makefile | 2 +- examples/Delay/Makefile | 2 +- examples/HelloCoroutine/Makefile | 2 +- examples/HelloManualCoroutine/Makefile | 2 +- examples/HelloScheduler/Makefile | 2 +- examples/MemoryBenchmark/Makefile | 2 +- examples/Pipe/Makefile | 2 +- examples/SoundManager/Makefile | 2 +- examples/Tasks/Makefile | 2 +- tests/ChannelTest/Makefile | 2 +- tests/ResetTest/Makefile | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/examples/BlinkSlowFastManualRoutine/Makefile b/examples/BlinkSlowFastManualRoutine/Makefile index 4d56967..6ae2f9a 100644 --- a/examples/BlinkSlowFastManualRoutine/Makefile +++ b/examples/BlinkSlowFastManualRoutine/Makefile @@ -2,5 +2,5 @@ # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := BlinkSlowFastManualRoutine -ARDUINO_LIBS := AceRoutine +ARDUINO_LIBS := AceCommon AceRoutine include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/examples/BlinkSlowFastRoutine/Makefile b/examples/BlinkSlowFastRoutine/Makefile index 00f684c..56ab28b 100644 --- a/examples/BlinkSlowFastRoutine/Makefile +++ b/examples/BlinkSlowFastRoutine/Makefile @@ -2,5 +2,5 @@ # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := BlinkSlowFastRoutine -ARDUINO_LIBS := AceRoutine +ARDUINO_LIBS := AceCommon AceRoutine include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/examples/CountAndBlink/Makefile b/examples/CountAndBlink/Makefile index ade004f..68b0b14 100644 --- a/examples/CountAndBlink/Makefile +++ b/examples/CountAndBlink/Makefile @@ -2,5 +2,5 @@ # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := CountAndBlink -ARDUINO_LIBS := AceRoutine +ARDUINO_LIBS := AceCommon AceRoutine include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/examples/Delay/Makefile b/examples/Delay/Makefile index 882873c..edd859d 100644 --- a/examples/Delay/Makefile +++ b/examples/Delay/Makefile @@ -2,5 +2,5 @@ # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := Delay -ARDUINO_LIBS := AceRoutine +ARDUINO_LIBS := AceCommon AceRoutine include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/examples/HelloCoroutine/Makefile b/examples/HelloCoroutine/Makefile index 66e94e5..72ef17f 100644 --- a/examples/HelloCoroutine/Makefile +++ b/examples/HelloCoroutine/Makefile @@ -2,5 +2,5 @@ # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := HelloCoroutine -ARDUINO_LIBS := AceRoutine +ARDUINO_LIBS := AceCommon AceRoutine include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/examples/HelloManualCoroutine/Makefile b/examples/HelloManualCoroutine/Makefile index e8fd352..bfaaf07 100644 --- a/examples/HelloManualCoroutine/Makefile +++ b/examples/HelloManualCoroutine/Makefile @@ -2,5 +2,5 @@ # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := HelloManualCoroutine -ARDUINO_LIBS := AceRoutine +ARDUINO_LIBS := AceCommon AceRoutine include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/examples/HelloScheduler/Makefile b/examples/HelloScheduler/Makefile index 2901d3f..b26b516 100644 --- a/examples/HelloScheduler/Makefile +++ b/examples/HelloScheduler/Makefile @@ -2,5 +2,5 @@ # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := HelloScheduler -ARDUINO_LIBS := AceRoutine +ARDUINO_LIBS := AceCommon AceRoutine include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/examples/MemoryBenchmark/Makefile b/examples/MemoryBenchmark/Makefile index bf4f415..8ddb22e 100644 --- a/examples/MemoryBenchmark/Makefile +++ b/examples/MemoryBenchmark/Makefile @@ -2,7 +2,7 @@ # EpoxyDuino to compile and run AUnit tests natively on Linux or MacOS. APP_NAME := MemoryBenchmark -ARDUINO_LIBS := AceRoutine +ARDUINO_LIBS := AceCommon AceRoutine MORE_CLEAN := more_clean include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/examples/Pipe/Makefile b/examples/Pipe/Makefile index 1349596..252d9a5 100644 --- a/examples/Pipe/Makefile +++ b/examples/Pipe/Makefile @@ -2,5 +2,5 @@ # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := Pipe -ARDUINO_LIBS := AceRoutine +ARDUINO_LIBS := AceCommon AceRoutine include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/examples/SoundManager/Makefile b/examples/SoundManager/Makefile index 6660500..24e1f30 100644 --- a/examples/SoundManager/Makefile +++ b/examples/SoundManager/Makefile @@ -2,6 +2,6 @@ # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := SoundManager -ARDUINO_LIBS := AceRoutine AceCommon +ARDUINO_LIBS := AceCommon AceRoutine EXTRA_CXXFLAGS := -g include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/examples/Tasks/Makefile b/examples/Tasks/Makefile index aa3bedc..01ce7b2 100644 --- a/examples/Tasks/Makefile +++ b/examples/Tasks/Makefile @@ -2,5 +2,5 @@ # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := Tasks -ARDUINO_LIBS := AceRoutine +ARDUINO_LIBS := AceCommon AceRoutine include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/tests/ChannelTest/Makefile b/tests/ChannelTest/Makefile index 942e3d1..f7bf2d6 100644 --- a/tests/ChannelTest/Makefile +++ b/tests/ChannelTest/Makefile @@ -2,5 +2,5 @@ # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := ChannelTest -ARDUINO_LIBS := AUnit AceRoutine +ARDUINO_LIBS := AUnit AceCommon AceRoutine include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/tests/ResetTest/Makefile b/tests/ResetTest/Makefile index 2564b1d..518ebe0 100644 --- a/tests/ResetTest/Makefile +++ b/tests/ResetTest/Makefile @@ -2,5 +2,5 @@ # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := ResetTest -ARDUINO_LIBS := AUnit AceRoutine +ARDUINO_LIBS := AUnit AceCommon AceRoutine include ../../../EpoxyDuino/EpoxyDuino.mk From 35b8bec7182375d828a118f91a5206772f3042c2 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Mon, 14 Mar 2022 18:40:09 -0700 Subject: [PATCH 16/59] CoroutineLogBinRenderer.h: Rollup bins below startBin and bins above endBin into the first and last bins --- examples/SoundManager/SoundManager.ino | 2 +- src/ace_routine/CoroutineLogBinProfiler.h | 2 + src/ace_routine/CoroutineLogBinRenderer.h | 84 ++++++++++++++--------- 3 files changed, 53 insertions(+), 35 deletions(-) diff --git a/examples/SoundManager/SoundManager.ino b/examples/SoundManager/SoundManager.ino index da5c344..e20c81b 100644 --- a/examples/SoundManager/SoundManager.ino +++ b/examples/SoundManager/SoundManager.ino @@ -60,7 +60,7 @@ EXTERN_COROUTINE(soundManager); COROUTINE(printProfile) { COROUTINE_LOOP() { CoroutineLogBinRenderer renderer(getRoot()); - renderer.printTableTo(Serial, 0, 8); + renderer.printTableTo(Serial, 2, 12); COROUTINE_DELAY_SECONDS(5); } } diff --git a/src/ace_routine/CoroutineLogBinProfiler.h b/src/ace_routine/CoroutineLogBinProfiler.h index dc61994..ebc6926 100644 --- a/src/ace_routine/CoroutineLogBinProfiler.h +++ b/src/ace_routine/CoroutineLogBinProfiler.h @@ -48,6 +48,8 @@ namespace ace_routine { * replaced by a '*' character.) Therefore the table is a rough ASCII version of * a log-log graph of the frequency count. * + * @tparam T_COROUTINE class of the specific CoroutineTemplate instantiation, + * usually `Coroutine` */ template class CoroutineLogBinProfilerTemplate : public CoroutineProfiler { diff --git a/src/ace_routine/CoroutineLogBinRenderer.h b/src/ace_routine/CoroutineLogBinRenderer.h index 07ad082..e34cc96 100644 --- a/src/ace_routine/CoroutineLogBinRenderer.h +++ b/src/ace_routine/CoroutineLogBinRenderer.h @@ -36,17 +36,22 @@ namespace ace_routine { /** * Print the information in the CoroutineLogBinProfiler for each Coroutine * in a human-readable table. For example, the output of `printTableTo(Serial, - * 0, 9)` for `examples/SoundManager` looks like this: + * 2, 10)` for `examples/SoundManager` looks like this: * * @verbatim - * <2us <4us <8us <16us <32us <64us<128us<256us<512us - * soundManager 621 2091 0 0 5 3 0 0 0 1 - * soundRoutine 2162 553 1 0 1 2 2 1 0 + * <8us <16us <32us <64us<128us<256us<512us <1ms <2ms >> + * soundManager 1418 0 0 1 0 0 0 0 1 0 + * soundRoutine 1417 0 0 1 1 1 0 0 0 0 + * @endverbatim + * + * The bins below the startBin are rolled into the first bin. The bins above the + * (endBin-1) are rolled into the last bin with the label `>>`. There must be at + * least 2 rendering bins (endBin >= startBin + 2) otherwise nothing is printed. * * The `init()` method resets the frequency count of the bins. * - * @endverbatim - + * @tparam T_COROUTINE class of the specific CoroutineTemplate instantiation, + * usually `Coroutine` */ template class CoroutineLogBinRendererTemplate { @@ -66,17 +71,17 @@ class CoroutineLogBinRendererTemplate { * numbers will be lined up properly. * * @param printer destination of output, usually `Serial` - * @param binStart start index of the bins (0-31) - * @param binEnd end inex (exclusive) of the bins (0-32) + * @param startBin start index of the bins (0-31) + * @param endBin end inex (exclusive) of the bins (0-32) * @param clear call init() after printing (default true) */ void printTableTo( Print& printer, - uint8_t binStart, - uint8_t binEnd, + uint8_t startBin, + uint8_t endBin, bool clear = true ) { - if (binEnd <= binStart) return; + if (endBin <= startBin) return; bool isHeaderPrinted = false; for (Coroutine** p = mRoot; (*p) != nullptr; p = (*p)->getNext()) { @@ -86,7 +91,7 @@ class CoroutineLogBinRendererTemplate { // Print header if needed. if (! isHeaderPrinted) { ace_common::printfTo(printer, "%12.12s", ""); - printHeaderTo(printer, binStart, binEnd); + printHeaderTo(printer, startBin, endBin); printer.println(); isHeaderPrinted = true; } @@ -99,7 +104,7 @@ class CoroutineLogBinRendererTemplate { // Print the bins. The number of digits is automatically a log10() of // the counts, so we should be able to visually scan the table and see // which coroutine is taking too long. - printBinsTo(printer, profiler, binStart, binEnd); + printBinsTo(printer, profiler, startBin, endBin); printer.println(); if (clear) { @@ -113,56 +118,67 @@ class CoroutineLogBinRendererTemplate { * Print the header related to this profiler. * * @param printer destination of output - * @param binStart start index of the bins (0-31) - * @param binEnd end index (exclusive) of the bins (0-32) + * @param startBin start index of the bins (0-31) + * @param endBin end index (exclusive) of the bins (0-32) */ - void printHeaderTo(Print& printer, uint8_t binStart, uint8_t binEnd) const { - if (binEnd <= binStart) return; + void printHeaderTo(Print& printer, uint8_t startBin, uint8_t endBin) const { + endBin = (endBin > Profiler::kNumBins) ? Profiler::kNumBins : endBin; + if (endBin < startBin + 2) return; - binEnd = (binEnd > Profiler::kNumBins) ? Profiler::kNumBins : binEnd; - for (uint8_t i = binStart; i < binEnd; i++) { + for (uint8_t i = startBin; i < endBin - 1; i++) { ace_common::printfTo(printer, "%6.6s", kBinLabels[i]); } + ace_common::printfTo(printer, "%6.6s", ">>"); } /** * Print the bins of this profiler as a single line of text with each bin * printed as a 5-digit number in a 6-character box. If there are any - * remaining counts after the `binEnd`, the cummulative sum of the remaining + * remaining counts after the `endBin`, the cummulative sum of the remaining * bins are printed in another 6-character box. * - * @param binStart start index of the bins (0-31) - * @param binEnd end index (exclusive) of the bins (0-32) + * @param startBin start index of the bins (0-31) + * @param endBin end index (exclusive) of the bins (0-32) */ void printBinsTo( Print& printer, Profiler* profiler, - uint8_t binStart, - uint8_t binEnd) const { - if (binEnd <= binStart) return; + uint8_t startBin, + uint8_t endBin) const { - binEnd = (binEnd > Profiler::kNumBins) ? Profiler::kNumBins : binEnd; - for (uint8_t i = binStart; i < binEnd; i++) { + endBin = (endBin > Profiler::kNumBins) ? Profiler::kNumBins : endBin; + if (endBin < startBin + 2) return; + + // Rollup all bins below startBin into the first bin. + uint32_t underCount = 0; + for (uint8_t i = 0; i <= startBin; i++) { + underCount += profiler->mBins[i]; + } + if (underCount > UINT16_MAX) underCount = UINT16_MAX; + ace_common::printfTo(printer, "%6u", underCount); + + // Print interior bins. + for (uint8_t i = startBin + 1; i < endBin - 1; i++) { uint16_t count = profiler->mBins[i]; ace_common::printfTo(printer, "%6u", count); } - uint32_t remaining = 0; - for (uint8_t i = binEnd; i < Profiler::kNumBins; i++) { - remaining += profiler->mBins[i]; - } - if (remaining > 0) { - ace_common::printfTo(printer, "%6lu", (unsigned long) remaining); + // Rollup all bins at or above endBin into the last bin. + uint32_t overCount = 0; + for (uint8_t i = endBin - 1; i < Profiler::kNumBins; i++) { + overCount += profiler->mBins[i]; } + if (overCount > UINT16_MAX) overCount = UINT16_MAX; + ace_common::printfTo(printer, "%6u", overCount); } private: + /** Labels for each bin in CoroutineLogBinProfiler::mBins. */ static const char* const kBinLabels[Profiler::kNumBins]; T_COROUTINE** mRoot; }; -// Labels for each bin in mBins. template const char* const CoroutineLogBinRendererTemplate::kBinLabels[ CoroutineLogBinProfilerTemplate::kNumBins] = { From de3a91458fd782bb59b555d4a40ed8c7d925354f Mon Sep 17 00:00:00 2001 From: Brian Park Date: Mon, 14 Mar 2022 19:00:32 -0700 Subject: [PATCH 17/59] CHANGELOG.md: Add CoroutineProfiler and CoroutineLogBinProfiler --- CHANGELOG.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a630f6..85e300a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,22 @@ * Increases flash usage by 6-10 bytes per coroutine. * Increases static ram usage by 3 bytes (AVR) or 4 bytes (32-bit) per coroutine. + * Support `CoroutineProfiler` in `CoroutineScheduler`. + * If a coroutine contains a valid pointer to a `CoroutineProfiler`, then + `CoroutineScheduler::runCoroutine()` will measure the elapsed + microseconds for the `Coroutine::runCoroutine()` to run. + * It then calls `CoroutineProfiler::updateElapsedMicros()` to allow the + profiler to update its internal tracking. + * Provide `CoroutineLogBinProfiler`, and specific subclass that collects + the frequency count of the elapsed microseconds using 32 bins + representing the `log2()` function of the microseconds. + * Provide `CoroutineLogBinProfiler::printBinsTo()` which prints + a table of the frequency count over all coroutines. This represents a + poor-man's version of the log-log graph of the frequency count. + * Increases the flash size of the `CoroutineScheduler` by 100-140 bytes + for both 8-bit and 32-bit processors, even if `CoroutineProfiler` is + not used. This is a one-time hit. + * See [examples/SoundManager](examples/SoundManager) for an example. * 1.4.2 (2022-02-04) * Remove dependency to AceCommon library in `libraries.properties`. * AceRoutine core no longer depends on AceCommon. From ddba0600903d9b760f2def56c551b200b9272b8e Mon Sep 17 00:00:00 2001 From: Brian Park Date: Mon, 14 Mar 2022 19:08:03 -0700 Subject: [PATCH 18/59] CoroutineLogBinRenderer.h: Update labels to account for 2^10 being slightly larger than 1000 --- src/ace_routine/CoroutineLogBinRenderer.h | 28 +++++++++++------------ 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/ace_routine/CoroutineLogBinRenderer.h b/src/ace_routine/CoroutineLogBinRenderer.h index e34cc96..dc4dd40 100644 --- a/src/ace_routine/CoroutineLogBinRenderer.h +++ b/src/ace_routine/CoroutineLogBinRenderer.h @@ -196,24 +196,24 @@ const char* const CoroutineLogBinRendererTemplate::kBinLabels[ "<4ms", "<8ms", "<16ms", - "<32ms", - "<64ms", - "<128ms", - "<256ms", - "<512ms", + "<33ms", + "<66ms", + "<131ms", + "<262ms", + "<524ms", "<1s", "<2s", "<4s", "<8s", - "<16s", - "<32s", - "<64s", - "<128s", - "<256s", - "<512s", - "<1024s", - "<2048s", - "<4096s", + "<17s", + "<34s", + "<67s", + "<134s", + "<268s", + "<537s", + "<1074s", + "<2147s", + "<4295s", }; using CoroutineLogBinRenderer = CoroutineLogBinRendererTemplate; From 44f9a5439fdb645df5f1e6c2d623896a3ca27a36 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Tue, 15 Mar 2022 09:40:15 -0700 Subject: [PATCH 19/59] CoroutineLogBinProfiler.h: Add createProfilers(), deleteProfilers(), initProfilers() --- src/ace_routine/Coroutine.h | 20 +++++++++---- src/ace_routine/CoroutineLogBinProfiler.h | 34 ++++++++++++++++++++++- src/ace_routine/CoroutineLogBinRenderer.h | 8 ++++-- 3 files changed, 53 insertions(+), 9 deletions(-) diff --git a/src/ace_routine/Coroutine.h b/src/ace_routine/Coroutine.h index 93d35b2..02e46d9 100644 --- a/src/ace_routine/Coroutine.h +++ b/src/ace_routine/Coroutine.h @@ -350,13 +350,13 @@ class CoroutineTemplate { * hexadecimal representation of the pointer to the coroutine. * * @param printer destination of output, usually `Serial` - * @param maxLen truncate to maxLen if given + * @param maxLen truncate or pad to maxLen if given */ void printNameTo(Print& printer, uint8_t maxLen = 0) const { // Need to go through this contortion because vsnprintf() does not support // flash string parameters, so I can't use something like "%12.12s" with // a flash string. - ace_common::PrintStr<128> pname; + ace_common::PrintStr<64> pname; if (mName == nullptr) { pname.print("0x"); @@ -367,9 +367,19 @@ class CoroutineTemplate { pname.print((const __FlashStringHelper*) mName); } - // Print up to maxLen characters. - maxLen = (maxLen == 0) ? pname.length() : maxLen; - printer.write(pname.cstr(), maxLen); + // Print name, truncated to maxLen or padded to maxLen. + if (maxLen) { + if (pname.length() < maxLen) { + printer.write(pname.cstr()); + for (uint8_t i = pname.length(); i < maxLen; i++) { + printer.write(' '); + } + } else { + printer.write(pname.cstr(), maxLen); + } + } else { + printer.write(pname.cstr()); + } } /** diff --git a/src/ace_routine/CoroutineLogBinProfiler.h b/src/ace_routine/CoroutineLogBinProfiler.h index ebc6926..7f4b9c7 100644 --- a/src/ace_routine/CoroutineLogBinProfiler.h +++ b/src/ace_routine/CoroutineLogBinProfiler.h @@ -73,7 +73,7 @@ class CoroutineLogBinProfilerTemplate : public CoroutineProfiler { * the number of samples whose elapsed micros is between 2^i and 2^(i+1). * Example, for Bin 3, and this bin contains the number of samples which * satsify (8us <= elapsed < 16us). The exception is Bin 0 because it - * includes samples where elapsed = 0 as well, so the sample interval for + * includes samples where elapsed is 0 as well, so the sample interval for * Bin 0 is (0 <= elapsed < 2), instead of (1 <= elapsed < 2). */ void updateElapsedMicros(uint32_t micros) override { @@ -90,6 +90,38 @@ class CoroutineLogBinProfilerTemplate : public CoroutineProfiler { } } + /** + * Create a profiler on the heap for each coroutine in the singly-linked + * list of coroutines defined by `root`. + */ + static void createProfilers(T_COROUTINE** root) { + for (Coroutine** p = root; (*p) != nullptr; p = (*p)->getNext()) { + auto* profiler = new CoroutineLogBinProfilerTemplate(); + (*p)->setProfiler(profiler); + } + } + + /** Delete the profilers created by createProfilers(). */ + static void deleteProfilers(T_COROUTINE** root) { + for (Coroutine** p = root; (*p) != nullptr; p = (*p)->getNext()) { + auto* profiler = (CoroutineLogBinProfilerTemplate*) (*p)->getProfiler(); + if (profiler) { + delete profiler; + (*p)->setProfiler(nullptr); + } + } + } + + /** Init all profilers for all coroutines defined by `root`. */ + static void initProfilers(T_COROUTINE** root) { + for (Coroutine** p = root; (*p) != nullptr; p = (*p)->getNext()) { + auto* profiler = (CoroutineLogBinProfilerTemplate*) (*p)->getProfiler(); + if (profiler) { + profiler->init(); + } + } + } + public: uint16_t mBins[kNumBins]; }; diff --git a/src/ace_routine/CoroutineLogBinRenderer.h b/src/ace_routine/CoroutineLogBinRenderer.h index dc4dd40..c958f73 100644 --- a/src/ace_routine/CoroutineLogBinRenderer.h +++ b/src/ace_routine/CoroutineLogBinRenderer.h @@ -121,7 +121,9 @@ class CoroutineLogBinRendererTemplate { * @param startBin start index of the bins (0-31) * @param endBin end index (exclusive) of the bins (0-32) */ - void printHeaderTo(Print& printer, uint8_t startBin, uint8_t endBin) const { + static void printHeaderTo( + Print& printer, uint8_t startBin, uint8_t endBin) { + endBin = (endBin > Profiler::kNumBins) ? Profiler::kNumBins : endBin; if (endBin < startBin + 2) return; @@ -140,11 +142,11 @@ class CoroutineLogBinRendererTemplate { * @param startBin start index of the bins (0-31) * @param endBin end index (exclusive) of the bins (0-32) */ - void printBinsTo( + static void printBinsTo( Print& printer, Profiler* profiler, uint8_t startBin, - uint8_t endBin) const { + uint8_t endBin) { endBin = (endBin > Profiler::kNumBins) ? Profiler::kNumBins : endBin; if (endBin < startBin + 2) return; From 1f13ac071e26303f0661493f3ac0b8c16404d517 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Tue, 15 Mar 2022 17:00:12 -0700 Subject: [PATCH 20/59] tests/SchedulerTest: Add coroutine names; fix broken test, pointer value now printed in hex instead of decimal --- tests/SchedulerTest/SchedulerTest.ino | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/SchedulerTest/SchedulerTest.ino b/tests/SchedulerTest/SchedulerTest.ino index 4dd813f..4b9fb57 100644 --- a/tests/SchedulerTest/SchedulerTest.ino +++ b/tests/SchedulerTest/SchedulerTest.ino @@ -77,10 +77,11 @@ test(AceRoutineTest, scheduler) { TestableCoroutineScheduler::list(output); PrintStr<200> expected; - printfTo(expected, "Coroutine %ld; status: Yielding\r\n", (uintptr_t) &a); - printfTo(expected, "Coroutine %ld; status: Yielding\r\n", (uintptr_t) &b); - printfTo(expected, "Coroutine %ld; status: Yielding\r\n", (uintptr_t) &c); - printfTo(expected, "Coroutine %ld; status: Suspended\r\n", + printfTo(expected, "Coroutine coA; status: Yielding\r\n"); + printfTo(expected, "Coroutine coB; status: Yielding\r\n"); + printfTo(expected, "Coroutine 0x%lX; status: Yielding\r\n", + (unsigned long) &c); + printfTo(expected, "Coroutine 0x%lX; status: Suspended\r\n", (uintptr_t) &extra); assertEqual(expected.cstr(), output.cstr()); @@ -410,6 +411,9 @@ void setup() { // suspended coroutine will be retained in the linked list of coroutines. extra.suspend(); + // Set human-readable names to some coroutines. + a.setCName("coA"); + b.setFName(F("coB")); TestableCoroutineScheduler::setup(); } From e1397028968470cd379a7278cc6b0edbe39f3be7 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Tue, 15 Mar 2022 17:07:29 -0700 Subject: [PATCH 21/59] tests/SuspendTest: Fix test, unnamed coroutines now printed in hexadecimal instead of decimal --- tests/SuspendTest/SuspendTest.ino | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/SuspendTest/SuspendTest.ino b/tests/SuspendTest/SuspendTest.ino index 8d9a89c..a436288 100644 --- a/tests/SuspendTest/SuspendTest.ino +++ b/tests/SuspendTest/SuspendTest.ino @@ -33,30 +33,30 @@ test(suspendAndResume) { CoroutineScheduler::list(output); PrintStr<100> expected; - printfTo(expected, "Coroutine %ld; status: Yielding\r\n", - (uintptr_t) &routine1); - printfTo(expected, "Coroutine %ld; status: Yielding\r\n", - (uintptr_t) &routine2); + printfTo(expected, "Coroutine 0x%lX; status: Yielding\r\n", + (unsigned long) &routine1); + printfTo(expected, "Coroutine 0x%lX; status: Yielding\r\n", + (unsigned long) &routine2); assertEqual(expected.cstr(), output.cstr()); output.flush(); expected.flush(); routine2.suspend(); CoroutineScheduler::list(output); - printfTo(expected, "Coroutine %ld; status: Yielding\r\n", - (uintptr_t) &routine1); - printfTo(expected, "Coroutine %ld; status: Suspended\r\n", - (uintptr_t) &routine2); + printfTo(expected, "Coroutine 0x%lX; status: Yielding\r\n", + (unsigned long) &routine1); + printfTo(expected, "Coroutine 0x%lX; status: Suspended\r\n", + (unsigned long) &routine2); assertEqual(expected.cstr(), output.cstr()); output.flush(); expected.flush(); routine2.resume(); CoroutineScheduler::list(output); - printfTo(expected, "Coroutine %ld; status: Yielding\r\n", - (uintptr_t) &routine1); - printfTo(expected, "Coroutine %ld; status: Yielding\r\n", - (uintptr_t) &routine2); + printfTo(expected, "Coroutine 0x%lX; status: Yielding\r\n", + (unsigned long) &routine1); + printfTo(expected, "Coroutine 0x%lX; status: Yielding\r\n", + (unsigned long) &routine2); assertEqual(expected.cstr(), output.cstr()); } From 9882df10b677b7e606e027005e10b004d7713dda Mon Sep 17 00:00:00 2001 From: Brian Park Date: Wed, 16 Mar 2022 10:57:47 -0700 Subject: [PATCH 22/59] CoroutineLogBinProfiler.h: Rename init() to clear(); initProfilers() to clearProfilers() --- src/ace_routine/CoroutineLogBinProfiler.h | 33 +++++++++++++---------- src/ace_routine/CoroutineLogBinRenderer.h | 24 ++++++++++------- 2 files changed, 34 insertions(+), 23 deletions(-) diff --git a/src/ace_routine/CoroutineLogBinProfiler.h b/src/ace_routine/CoroutineLogBinProfiler.h index 7f4b9c7..4d307f6 100644 --- a/src/ace_routine/CoroutineLogBinProfiler.h +++ b/src/ace_routine/CoroutineLogBinProfiler.h @@ -40,13 +40,9 @@ namespace ace_routine { * to a given coroutine through the `Coroutine::setProfiler()` method. * * After sufficient number of samples are collected, the frequency distribution - * of all profilers for all coroutines can be printed as a table using the - * `printBinsTo()` static helper function. Each bin is printed as a 5-digit - * number (since the bins use a `uint16_t` integer for the count). The number of - * digits in the printed number is equivalent to the log10() of the frequency - * count. (To see why that's true, imagine if each digit of the bin count was - * replaced by a '*' character.) Therefore the table is a rough ASCII version of - * a log-log graph of the frequency count. + * of all profilers for all coroutines can be printed by a renderer. An + * implementation of such a render is `CoroutineLogBinRendererTemplate` + * which prints the frequency distribution as a formatted table. * * @tparam T_COROUTINE class of the specific CoroutineTemplate instantiation, * usually `Coroutine` @@ -59,11 +55,11 @@ class CoroutineLogBinProfilerTemplate : public CoroutineProfiler { public: /** Constructor. */ CoroutineLogBinProfilerTemplate() { - init(); + clear(); } /** Clear the bins. */ - void init() { + void clear() { memset(mBins, 0, sizeof(mBins)); } @@ -91,11 +87,20 @@ class CoroutineLogBinProfilerTemplate : public CoroutineProfiler { } /** - * Create a profiler on the heap for each coroutine in the singly-linked - * list of coroutines defined by `root`. + * Create a new profiler on the heap and attach it to each coroutine in the + * singly-linked list of coroutines defined by `root`. */ static void createProfilers(T_COROUTINE** root) { for (Coroutine** p = root; (*p) != nullptr; p = (*p)->getNext()) { + + // Delete any existing profiler. + auto* currentProfiler = + (CoroutineLogBinProfilerTemplate*) (*p)->getProfiler(); + if (currentProfiler) { + delete currentProfiler; + } + + // Attach new profiler. auto* profiler = new CoroutineLogBinProfilerTemplate(); (*p)->setProfiler(profiler); } @@ -112,12 +117,12 @@ class CoroutineLogBinProfilerTemplate : public CoroutineProfiler { } } - /** Init all profilers for all coroutines defined by `root`. */ - static void initProfilers(T_COROUTINE** root) { + /** Clear counters for all profilers in the coroutines defined by `root`. */ + static void clearProfilers(T_COROUTINE** root) { for (Coroutine** p = root; (*p) != nullptr; p = (*p)->getNext()) { auto* profiler = (CoroutineLogBinProfilerTemplate*) (*p)->getProfiler(); if (profiler) { - profiler->init(); + profiler->clear(); } } } diff --git a/src/ace_routine/CoroutineLogBinRenderer.h b/src/ace_routine/CoroutineLogBinRenderer.h index c958f73..8899a6f 100644 --- a/src/ace_routine/CoroutineLogBinRenderer.h +++ b/src/ace_routine/CoroutineLogBinRenderer.h @@ -35,11 +35,18 @@ namespace ace_routine { /** * Print the information in the CoroutineLogBinProfiler for each Coroutine - * in a human-readable table. For example, the output of `printTableTo(Serial, - * 2, 10)` for `examples/SoundManager` looks like this: + * in a human-readable table. Each bin is printed as a 5-digit number, since the + * bins use a `uint16_t` integer for the count. The number of digits in the + * printed number is equivalent to the log10() of the frequency count. To see + * why that's true, imagine if each digit of the bin count was replaced by a '*' + * character. Therefore the table is a rough ASCII version of a log-log graph of + * the frequency count. + * + * For example, the output of `printTableTo(Serial, 2, 10)` for + * `examples/SoundManager` looks like this: * * @verbatim - * <8us <16us <32us <64us<128us<256us<512us <1ms <2ms >> + * name <8us <16us <32us <64us<128us<256us<512us <1ms <2ms >> * soundManager 1418 0 0 1 0 0 0 0 1 0 * soundRoutine 1417 0 0 1 1 1 0 0 0 0 * @endverbatim @@ -48,8 +55,6 @@ namespace ace_routine { * (endBin-1) are rolled into the last bin with the label `>>`. There must be at * least 2 rendering bins (endBin >= startBin + 2) otherwise nothing is printed. * - * The `init()` method resets the frequency count of the bins. - * * @tparam T_COROUTINE class of the specific CoroutineTemplate instantiation, * usually `Coroutine` */ @@ -72,8 +77,9 @@ class CoroutineLogBinRendererTemplate { * * @param printer destination of output, usually `Serial` * @param startBin start index of the bins (0-31) - * @param endBin end inex (exclusive) of the bins (0-32) - * @param clear call init() after printing (default true) + * @param endBin end index (exclusive) of the bins (0-32) + * @param clear call CoroutineLogBinProfiler::clear() after printing + * (default true) */ void printTableTo( Print& printer, @@ -90,7 +96,7 @@ class CoroutineLogBinRendererTemplate { // Print header if needed. if (! isHeaderPrinted) { - ace_common::printfTo(printer, "%12.12s", ""); + ace_common::printfTo(printer, "%-12.12s", "name"); printHeaderTo(printer, startBin, endBin); printer.println(); isHeaderPrinted = true; @@ -108,7 +114,7 @@ class CoroutineLogBinRendererTemplate { printer.println(); if (clear) { - profiler->init(); + profiler->clear(); } } } From ec1712bb1654137691efbc66658749fa4ce07213 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Wed, 16 Mar 2022 13:25:11 -0700 Subject: [PATCH 23/59] CoroutineLogBinProfiler.h,LogBinProfilerTest: Extract rollupExteriorBins() into a separate function, for reuse by other renderers --- src/AceRoutine.h | 1 + src/ace_routine/CoroutineLogBinProfiler.h | 41 ++++++++ src/ace_routine/CoroutineLogBinRenderer.h | 51 +++++----- .../LogBinProfilerTest/LogBinProfilerTest.ino | 95 +++++++++++++++++++ tests/LogBinProfilerTest/Makefile | 6 ++ 5 files changed, 168 insertions(+), 26 deletions(-) create mode 100644 tests/LogBinProfilerTest/LogBinProfilerTest.ino create mode 100644 tests/LogBinProfilerTest/Makefile diff --git a/src/AceRoutine.h b/src/AceRoutine.h index 2ca390d..c6ed99f 100644 --- a/src/AceRoutine.h +++ b/src/AceRoutine.h @@ -51,6 +51,7 @@ SOFTWARE. #include "ace_routine/CoroutineProfiler.h" #include "ace_routine/CoroutineLogBinProfiler.h" #include "ace_routine/CoroutineLogBinRenderer.h" +#include "ace_routine/CoroutineLogBinJsonRenderer.h" #include "ace_routine/Channel.h" #endif diff --git a/src/ace_routine/CoroutineLogBinProfiler.h b/src/ace_routine/CoroutineLogBinProfiler.h index 4d307f6..efe1567 100644 --- a/src/ace_routine/CoroutineLogBinProfiler.h +++ b/src/ace_routine/CoroutineLogBinProfiler.h @@ -133,6 +133,47 @@ class CoroutineLogBinProfilerTemplate : public CoroutineProfiler { using CoroutineLogBinProfiler = CoroutineLogBinProfilerTemplate; +/** + * Rollup bins before `startBin` into `startBin` and bins at or after + * `endBin` into the last bin (at `endBin - 1`). This is useful to preserve + * count information when printing only a subset of the `mBins[]` array. If + * `endBin <= startBin`, this function does nothing. If `endBin < startBin - + * 1`, there is only single interior bin, so everything gets rolled up into + * the single bin. This is probably not useful, but at least it's + * mathematically correct. + */ +inline void rollupExteriorBins( + uint16_t dst[], + const uint16_t src[], + uint8_t numBins, + uint8_t startBin, + uint8_t endBin +) { + endBin = (endBin > numBins) ? numBins : endBin; + if (endBin <= startBin) return; + + // Rollup all bins at or below startBin into the startBin. + uint32_t leftRollup = 0; + for (uint8_t i = 0; i <= startBin; i++) { + leftRollup += src[i]; + } + if (leftRollup > UINT16_MAX) leftRollup = UINT16_MAX; + dst[startBin] = leftRollup; + + // Copy the interior bins. + for (uint8_t i = startBin + 1; i < endBin - 1; i++) { + dst[i] = src[i]; + } + + // Rollup all bins at or above the last bin into the last bin. + uint32_t rightRollup = (endBin - 1 == startBin) ? leftRollup : 0; + for (uint8_t i = endBin - 1; i < numBins; i++) { + rightRollup += src[i]; + } + if (rightRollup > UINT16_MAX) rightRollup = UINT16_MAX; + dst[endBin - 1] = rightRollup; +} + } #endif diff --git a/src/ace_routine/CoroutineLogBinRenderer.h b/src/ace_routine/CoroutineLogBinRenderer.h index 8899a6f..b4e10cc 100644 --- a/src/ace_routine/CoroutineLogBinRenderer.h +++ b/src/ace_routine/CoroutineLogBinRenderer.h @@ -80,15 +80,20 @@ class CoroutineLogBinRendererTemplate { * @param endBin end index (exclusive) of the bins (0-32) * @param clear call CoroutineLogBinProfiler::clear() after printing * (default true) + * @param rollup roll-up exterior bins into the startBin and (endBin-1) bin + * (default true) */ void printTableTo( Print& printer, uint8_t startBin, uint8_t endBin, - bool clear = true + bool clear = true, + bool rollup = true ) { if (endBin <= startBin) return; + uint16_t bufBins[Profiler::kNumBins]; + bool isHeaderPrinted = false; for (Coroutine** p = mRoot; (*p) != nullptr; p = (*p)->getNext()) { auto* profiler = (Profiler*) (*p)->getProfiler(); @@ -107,10 +112,20 @@ class CoroutineLogBinRendererTemplate { // always be a space between the coroutine name and the next number. (*p)->printNameTo(printer, 12); + // Roll up the exterior bins in to the first and last bins if requested. + const uint16_t* bins; + if (rollup) { + rollupExteriorBins(bufBins, profiler->mBins, Profiler::kNumBins, + startBin, endBin); + bins = bufBins; + } else { + bins = profiler->mBins; + } + // Print the bins. The number of digits is automatically a log10() of // the counts, so we should be able to visually scan the table and see // which coroutine is taking too long. - printBinsTo(printer, profiler, startBin, endBin); + printBinsTo(printer, bins, Profiler::kNumBins, startBin, endBin); printer.println(); if (clear) { @@ -131,7 +146,7 @@ class CoroutineLogBinRendererTemplate { Print& printer, uint8_t startBin, uint8_t endBin) { endBin = (endBin > Profiler::kNumBins) ? Profiler::kNumBins : endBin; - if (endBin < startBin + 2) return; + if (endBin <= startBin) return; // needed if startBin = endBin = 0 for (uint8_t i = startBin; i < endBin - 1; i++) { ace_common::printfTo(printer, "%6.6s", kBinLabels[i]); @@ -145,39 +160,23 @@ class CoroutineLogBinRendererTemplate { * remaining counts after the `endBin`, the cummulative sum of the remaining * bins are printed in another 6-character box. * + * @param printer usual `Serial` + * @param bins pointer to array of bins * @param startBin start index of the bins (0-31) * @param endBin end index (exclusive) of the bins (0-32) */ static void printBinsTo( Print& printer, - Profiler* profiler, + const uint16_t bins[], + uint8_t numBins, uint8_t startBin, uint8_t endBin) { - endBin = (endBin > Profiler::kNumBins) ? Profiler::kNumBins : endBin; - if (endBin < startBin + 2) return; - - // Rollup all bins below startBin into the first bin. - uint32_t underCount = 0; - for (uint8_t i = 0; i <= startBin; i++) { - underCount += profiler->mBins[i]; - } - if (underCount > UINT16_MAX) underCount = UINT16_MAX; - ace_common::printfTo(printer, "%6u", underCount); - - // Print interior bins. - for (uint8_t i = startBin + 1; i < endBin - 1; i++) { - uint16_t count = profiler->mBins[i]; + endBin = (endBin > numBins) ? numBins : endBin; + for (uint8_t i = startBin; i < endBin; i++) { + uint16_t count = bins[i]; ace_common::printfTo(printer, "%6u", count); } - - // Rollup all bins at or above endBin into the last bin. - uint32_t overCount = 0; - for (uint8_t i = endBin - 1; i < Profiler::kNumBins; i++) { - overCount += profiler->mBins[i]; - } - if (overCount > UINT16_MAX) overCount = UINT16_MAX; - ace_common::printfTo(printer, "%6u", overCount); } private: diff --git a/tests/LogBinProfilerTest/LogBinProfilerTest.ino b/tests/LogBinProfilerTest/LogBinProfilerTest.ino new file mode 100644 index 0000000..c02bda0 --- /dev/null +++ b/tests/LogBinProfilerTest/LogBinProfilerTest.ino @@ -0,0 +1,95 @@ +#line 2 "LogBinProfilerTest.ino" + +#include +#include + +using ace_routine::CoroutineLogBinProfiler; +using ace_routine::rollupExteriorBins; +using aunit::TestRunner; + +// --------------------------------------------------------------------------- +// Test CorooutineLogBinProfiler functions. +// --------------------------------------------------------------------------- + +test(updateElapsedMicros) { + CoroutineLogBinProfiler profiler; + + profiler.updateElapsedMicros(0); + assertEqual(profiler.mBins[0], 1); + + profiler.updateElapsedMicros(1); + assertEqual(profiler.mBins[0], 2); + + profiler.updateElapsedMicros(2); + assertEqual(profiler.mBins[1], 1); + + profiler.updateElapsedMicros(1024); + assertEqual(profiler.mBins[10], 1); + + profiler.updateElapsedMicros(1025); + assertEqual(profiler.mBins[10], 2); + + profiler.updateElapsedMicros(UINT32_MAX); + assertEqual(profiler.mBins[31], 1); +} + +test(rollupExteriorBins) { + CoroutineLogBinProfiler profiler; + profiler.mBins[0] = 1; + profiler.mBins[1] = 2; + profiler.mBins[2] = 3; + profiler.mBins[30] = 11; + profiler.mBins[31] = 12; + + uint16_t bufBins[32]; + + rollupExteriorBins(bufBins, profiler.mBins, profiler.kNumBins, 0, 32); + assertEqual(bufBins[0], 1); + assertEqual(bufBins[1], 2); + assertEqual(bufBins[2], 3); + assertEqual(bufBins[3], 0); + assertEqual(bufBins[30], 11); + assertEqual(bufBins[31], 12); + + rollupExteriorBins(bufBins, profiler.mBins, profiler.kNumBins, 1, 31); + assertEqual(bufBins[1], 3); + assertEqual(bufBins[2], 3); + assertEqual(bufBins[3], 0); + assertEqual(bufBins[29], 0); + assertEqual(bufBins[30], 23); + + rollupExteriorBins(bufBins, profiler.mBins, profiler.kNumBins, 2, 30); + assertEqual(bufBins[2], 6); + assertEqual(bufBins[3], 0); + assertEqual(bufBins[29], 23); + + rollupExteriorBins(bufBins, profiler.mBins, profiler.kNumBins, 10, 12); + assertEqual(bufBins[10], 6); + assertEqual(bufBins[11], 23); + + rollupExteriorBins(bufBins, profiler.mBins, profiler.kNumBins, 10, 11); + assertEqual(bufBins[10], 29); + + // If startBin == endBin, no rollup should be performed, so bufBins[] should + // be untouched. + bufBins[0] = 9999; + bufBins[1] = 9999; + rollupExteriorBins(bufBins, profiler.mBins, profiler.kNumBins, 0, 0); + assertEqual(bufBins[0], 9999); + assertEqual(bufBins[1], 9999); +} + +// --------------------------------------------------------------------------- + +void setup() { +#if ! defined(EPOXY_DUINO) + delay(1000); // some boards reboot twice +#endif + + Serial.begin(115200); + while (!Serial); // Leonardo/Micro +} + +void loop() { + TestRunner::run(); +} diff --git a/tests/LogBinProfilerTest/Makefile b/tests/LogBinProfilerTest/Makefile new file mode 100644 index 0000000..af5037f --- /dev/null +++ b/tests/LogBinProfilerTest/Makefile @@ -0,0 +1,6 @@ +# See https://github.com/bxparks/EpoxyDuino for documentation about this +# Makefile to compile and run Arduino programs natively on Linux or MacOS. + +APP_NAME := LogBinProfilerTest +ARDUINO_LIBS := AUnit AceCommon AceRoutine +include ../../../EpoxyDuino/EpoxyDuino.mk From 82930c3dcbe8409f1f6cc26364d9dc1f230adaa5 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Wed, 16 Mar 2022 13:30:54 -0700 Subject: [PATCH 24/59] CoroutineLogBinJsonRenderer.h: Add a renderer that prints JSON version of profiler frequency distributions --- examples/SoundManager/SoundManager.ino | 9 +- src/ace_routine/CoroutineLogBinJsonRenderer.h | 126 ++++++++++++++++++ src/ace_routine/CoroutineLogBinRenderer.h | 2 +- 3 files changed, 134 insertions(+), 3 deletions(-) create mode 100644 src/ace_routine/CoroutineLogBinJsonRenderer.h diff --git a/examples/SoundManager/SoundManager.ino b/examples/SoundManager/SoundManager.ino index e20c81b..54b3a5c 100644 --- a/examples/SoundManager/SoundManager.ino +++ b/examples/SoundManager/SoundManager.ino @@ -53,14 +53,19 @@ using ace_routine::Coroutine;; using ace_routine::CoroutineScheduler; using ace_routine::CoroutineLogBinProfiler; using ace_routine::CoroutineLogBinRenderer; +using ace_routine::CoroutineLogBinJsonRenderer; SoundRoutine soundRoutine; EXTERN_COROUTINE(soundManager); COROUTINE(printProfile) { COROUTINE_LOOP() { - CoroutineLogBinRenderer renderer(getRoot()); - renderer.printTableTo(Serial, 2, 12); + CoroutineLogBinRenderer tableRenderer(getRoot()); + tableRenderer.printTableTo(Serial, 2, 12, false /*clear*/); + + CoroutineLogBinJsonRenderer jsonRenderer(getRoot()); + jsonRenderer.printJsonTo(Serial, 2, 12); + COROUTINE_DELAY_SECONDS(5); } } diff --git a/src/ace_routine/CoroutineLogBinJsonRenderer.h b/src/ace_routine/CoroutineLogBinJsonRenderer.h new file mode 100644 index 0000000..7f1996d --- /dev/null +++ b/src/ace_routine/CoroutineLogBinJsonRenderer.h @@ -0,0 +1,126 @@ +/* +MIT License + +Copyright (c) 2022 Brian T. Park + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ + +#ifndef ACE_ROUTINE_COROUTINE_LOG_BIN_JSON_RENDERER_H +#define ACE_ROUTINE_COROUTINE_LOG_BIN_JSON_RENDERER_H + +#include // uint8_t, uint32_t +#include // Print +#include // printfTo() +#include "Coroutine.h" // Coroutine +#include "CoroutineProfiler.h" + +namespace ace_routine { + +/** + * Print the `CoroutineLogBinProfiler bins as a JSON array. For example, here + * is the output from `examples/SoundManager`: + * + * @verbatim + * { + * "soundManager":[1411,0,2,0,0,0,0,0,0,0], + * "soundRoutine":[1411,0,1,1,0,0,0,0,0,0] + * } + * @endverbatim + */ +template +class CoroutineLogBinJsonRendererTemplate { + public: + /** Typedef of the CoroutineLogBinProfiler supported by this class. */ + using Profiler = CoroutineLogBinProfilerTemplate; + + /** Constructor. */ + CoroutineLogBinJsonRendererTemplate(T_COROUTINE** root) + : mRoot(root) + {} + + /** + * Loop over all coroutines and print the bin counts as JSON. + * + * @param printer destination of output, usually `Serial` + * @param startBin start index of the bins (0-31) + * @param endBin end index (exclusive) of the bins (0-32) + * @param clear call CoroutineLogBinProfiler::clear() after printing + * (default true) + * @param rollup roll-up exterior bins into the first and last bins + * (default true) + */ + void printJsonTo( + Print& printer, + uint8_t startBin, + uint8_t endBin, + bool clear = true, + bool rollup = true + ) { + uint16_t bufBins[Profiler::kNumBins]; + + printer.println('{'); + bool lineNeedsTrailingComma = false; + for (Coroutine** p = mRoot; (*p) != nullptr; p = (*p)->getNext()) { + auto* profiler = (Profiler*) (*p)->getProfiler(); + if (! profiler) continue; + + // Roll up the exterior bins in to the first and last bins if requested. + const uint16_t* bins; + if (rollup) { + rollupExteriorBins(bufBins, profiler->mBins, Profiler::kNumBins, + startBin, endBin); + bins = bufBins; + } else { + bins = profiler->mBins; + } + + if (lineNeedsTrailingComma) printer.println(','); + lineNeedsTrailingComma = true; + + printer.print('"'); + (*p)->printNameTo(printer); + printer.print("\":["); + + bool elementNeedsTrailingComma = false; + for (uint8_t i = startBin; i < endBin; i++) { + if (elementNeedsTrailingComma) printer.print(','); + elementNeedsTrailingComma = true; + printer.print(bins[i]); + } + printer.print(']'); + + if (clear) { + profiler->clear(); + } + } + printer.println(); + printer.println('}'); + } + + public: + T_COROUTINE** mRoot; +}; + +using CoroutineLogBinJsonRenderer = + CoroutineLogBinJsonRendererTemplate; + +} + +#endif diff --git a/src/ace_routine/CoroutineLogBinRenderer.h b/src/ace_routine/CoroutineLogBinRenderer.h index b4e10cc..fcc19f5 100644 --- a/src/ace_routine/CoroutineLogBinRenderer.h +++ b/src/ace_routine/CoroutineLogBinRenderer.h @@ -80,7 +80,7 @@ class CoroutineLogBinRendererTemplate { * @param endBin end index (exclusive) of the bins (0-32) * @param clear call CoroutineLogBinProfiler::clear() after printing * (default true) - * @param rollup roll-up exterior bins into the startBin and (endBin-1) bin + * @param rollup roll-up exterior bins into the first and last bins * (default true) */ void printTableTo( From ebedea8a191fbc5a701d7d44a5783ccde0ae0f63 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Wed, 16 Mar 2022 13:45:50 -0700 Subject: [PATCH 25/59] src/*LogBin*.h: Rename CoroutineLogBinXxx classes to LogBinXxx for simplicity --- CHANGELOG.md | 11 +++--- examples/MemoryBenchmark/README.md | 7 +--- examples/MemoryBenchmark/generate_readme.py | 7 +--- examples/SoundManager/SoundManager.ino | 19 +++++----- src/AceRoutine.h | 8 ++--- ...BinJsonRenderer.h => LogBinJsonRenderer.h} | 21 ++++++----- ...utineLogBinProfiler.h => LogBinProfiler.h} | 20 +++++------ ...LogBinRenderer.h => LogBinTableRenderer.h} | 36 +++++++++---------- .../LogBinProfilerTest/LogBinProfilerTest.ino | 6 ++-- 9 files changed, 63 insertions(+), 72 deletions(-) rename src/ace_routine/{CoroutineLogBinJsonRenderer.h => LogBinJsonRenderer.h} (84%) rename src/ace_routine/{CoroutineLogBinProfiler.h => LogBinProfiler.h} (89%) rename src/ace_routine/{CoroutineLogBinRenderer.h => LogBinTableRenderer.h} (85%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 85e300a..e32fd7e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,12 +15,15 @@ microseconds for the `Coroutine::runCoroutine()` to run. * It then calls `CoroutineProfiler::updateElapsedMicros()` to allow the profiler to update its internal tracking. - * Provide `CoroutineLogBinProfiler`, and specific subclass that collects + * Provide `LogBinProfiler`, and specific subclass that collects the frequency count of the elapsed microseconds using 32 bins representing the `log2()` function of the microseconds. - * Provide `CoroutineLogBinProfiler::printBinsTo()` which prints - a table of the frequency count over all coroutines. This represents a - poor-man's version of the log-log graph of the frequency count. + * Provide 2 renderers: + * `LogBinTableRenderer::printTo()` prints a formatted table of the + frequency count over all coroutines. This represents a poor-man's + version of the log-log graph of the frequency count. + * `LogBinJsonRenderer::printTo()` prints the frequency count + in JSON format. * Increases the flash size of the `CoroutineScheduler` by 100-140 bytes for both 8-bit and 32-bit processors, even if `CoroutineProfiler` is not used. This is a one-time hit. diff --git a/examples/MemoryBenchmark/README.md b/examples/MemoryBenchmark/README.md index 37e38f6..fd2c782 100644 --- a/examples/MemoryBenchmark/README.md +++ b/examples/MemoryBenchmark/README.md @@ -108,12 +108,7 @@ calculated flash size can jump around in unexpected ways. used. * Increases static ram by 3 bytes (AVR) and 4 bytes (32-bits) per coroutine. - * Add a `CoroutineLogBinProfiler` to 2 coroutines. - * Use a 3rd coroutine to print the frequency count to the `Serial` - output every 10 seconds. - * Provide `CoroutineLogBinProfiler::printBinsTo()` which prints - a table of the frequency count over all coroutines. This represents a - poor-man's version of the log-log graph of the frequency count. + * Support `CoroutineProfiler` in the `CoroutineScheduler`. * Increases the flash size of the `CoroutineScheduler` by 100-140 bytes for both 8-bit and 32-bit processors, even if `CoroutineProfiler` is not used. This is a one-time hit. diff --git a/examples/MemoryBenchmark/generate_readme.py b/examples/MemoryBenchmark/generate_readme.py index 755251c..f4176fd 100755 --- a/examples/MemoryBenchmark/generate_readme.py +++ b/examples/MemoryBenchmark/generate_readme.py @@ -132,12 +132,7 @@ used. * Increases static ram by 3 bytes (AVR) and 4 bytes (32-bits) per coroutine. - * Add a `CoroutineLogBinProfiler` to 2 coroutines. - * Use a 3rd coroutine to print the frequency count to the `Serial` - output every 10 seconds. - * Provide `CoroutineLogBinProfiler::printBinsTo()` which prints - a table of the frequency count over all coroutines. This represents a - poor-man's version of the log-log graph of the frequency count. + * Support `CoroutineProfiler` in the `CoroutineScheduler`. * Increases the flash size of the `CoroutineScheduler` by 100-140 bytes for both 8-bit and 32-bit processors, even if `CoroutineProfiler` is not used. This is a one-time hit. diff --git a/examples/SoundManager/SoundManager.ino b/examples/SoundManager/SoundManager.ino index 54b3a5c..c7cd505 100644 --- a/examples/SoundManager/SoundManager.ino +++ b/examples/SoundManager/SoundManager.ino @@ -51,28 +51,27 @@ using ace_routine::Coroutine;; using ace_routine::CoroutineScheduler; -using ace_routine::CoroutineLogBinProfiler; -using ace_routine::CoroutineLogBinRenderer; -using ace_routine::CoroutineLogBinJsonRenderer; +using ace_routine::LogBinProfiler; +using ace_routine::LogBinTableRenderer; +using ace_routine::LogBinJsonRenderer; SoundRoutine soundRoutine; EXTERN_COROUTINE(soundManager); COROUTINE(printProfile) { COROUTINE_LOOP() { - CoroutineLogBinRenderer tableRenderer(getRoot()); - tableRenderer.printTableTo(Serial, 2, 12, false /*clear*/); + LogBinTableRenderer tableRenderer(getRoot()); + tableRenderer.printTo(Serial, 2, 12, false /*clear*/); - CoroutineLogBinJsonRenderer jsonRenderer(getRoot()); - jsonRenderer.printJsonTo(Serial, 2, 12); + LogBinJsonRenderer jsonRenderer(getRoot()); + jsonRenderer.printTo(Serial, 2, 12); COROUTINE_DELAY_SECONDS(5); } } - -CoroutineLogBinProfiler soundRoutineProfiler; -CoroutineLogBinProfiler soundManagerProfiler; +LogBinProfiler soundRoutineProfiler; +LogBinProfiler soundManagerProfiler; void setup() { delay(1000); diff --git a/src/AceRoutine.h b/src/AceRoutine.h index c6ed99f..9947f94 100644 --- a/src/AceRoutine.h +++ b/src/AceRoutine.h @@ -48,10 +48,10 @@ SOFTWARE. #include "ace_routine/Coroutine.h" #include "ace_routine/CoroutineScheduler.h" -#include "ace_routine/CoroutineProfiler.h" -#include "ace_routine/CoroutineLogBinProfiler.h" -#include "ace_routine/CoroutineLogBinRenderer.h" -#include "ace_routine/CoroutineLogBinJsonRenderer.h" #include "ace_routine/Channel.h" +#include "ace_routine/CoroutineProfiler.h" +#include "ace_routine/LogBinProfiler.h" +#include "ace_routine/LogBinTableRenderer.h" +#include "ace_routine/LogBinJsonRenderer.h" #endif diff --git a/src/ace_routine/CoroutineLogBinJsonRenderer.h b/src/ace_routine/LogBinJsonRenderer.h similarity index 84% rename from src/ace_routine/CoroutineLogBinJsonRenderer.h rename to src/ace_routine/LogBinJsonRenderer.h index 7f1996d..716ce5e 100644 --- a/src/ace_routine/CoroutineLogBinJsonRenderer.h +++ b/src/ace_routine/LogBinJsonRenderer.h @@ -22,8 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef ACE_ROUTINE_COROUTINE_LOG_BIN_JSON_RENDERER_H -#define ACE_ROUTINE_COROUTINE_LOG_BIN_JSON_RENDERER_H +#ifndef ACE_ROUTINE_LOG_BIN_JSON_RENDERER_H +#define ACE_ROUTINE_LOG_BIN_JSON_RENDERER_H #include // uint8_t, uint32_t #include // Print @@ -34,7 +34,7 @@ SOFTWARE. namespace ace_routine { /** - * Print the `CoroutineLogBinProfiler bins as a JSON array. For example, here + * Print the `LogBinProfiler bins as a JSON array. For example, here * is the output from `examples/SoundManager`: * * @verbatim @@ -45,13 +45,13 @@ namespace ace_routine { * @endverbatim */ template -class CoroutineLogBinJsonRendererTemplate { +class LogBinJsonRendererTemplate { public: - /** Typedef of the CoroutineLogBinProfiler supported by this class. */ - using Profiler = CoroutineLogBinProfilerTemplate; + /** Typedef of the LogBinProfiler supported by this class. */ + using Profiler = LogBinProfilerTemplate; /** Constructor. */ - CoroutineLogBinJsonRendererTemplate(T_COROUTINE** root) + LogBinJsonRendererTemplate(T_COROUTINE** root) : mRoot(root) {} @@ -61,12 +61,12 @@ class CoroutineLogBinJsonRendererTemplate { * @param printer destination of output, usually `Serial` * @param startBin start index of the bins (0-31) * @param endBin end index (exclusive) of the bins (0-32) - * @param clear call CoroutineLogBinProfiler::clear() after printing + * @param clear call LogBinProfiler::clear() after printing * (default true) * @param rollup roll-up exterior bins into the first and last bins * (default true) */ - void printJsonTo( + void printTo( Print& printer, uint8_t startBin, uint8_t endBin, @@ -118,8 +118,7 @@ class CoroutineLogBinJsonRendererTemplate { T_COROUTINE** mRoot; }; -using CoroutineLogBinJsonRenderer = - CoroutineLogBinJsonRendererTemplate; +using LogBinJsonRenderer = LogBinJsonRendererTemplate; } diff --git a/src/ace_routine/CoroutineLogBinProfiler.h b/src/ace_routine/LogBinProfiler.h similarity index 89% rename from src/ace_routine/CoroutineLogBinProfiler.h rename to src/ace_routine/LogBinProfiler.h index efe1567..e40f6ca 100644 --- a/src/ace_routine/CoroutineLogBinProfiler.h +++ b/src/ace_routine/LogBinProfiler.h @@ -22,8 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef ACE_ROUTINE_COROUTINE_LOG_BIN_PROFILER_H -#define ACE_ROUTINE_COROUTINE_LOG_BIN_PROFILER_H +#ifndef ACE_ROUTINE_LOG_BIN_PROFILER_H +#define ACE_ROUTINE_LOG_BIN_PROFILER_H #include // uint8_t, uint32_t #include // memset() @@ -41,20 +41,20 @@ namespace ace_routine { * * After sufficient number of samples are collected, the frequency distribution * of all profilers for all coroutines can be printed by a renderer. An - * implementation of such a render is `CoroutineLogBinRendererTemplate` + * implementation of such a render is `LogBinRendererTemplate` * which prints the frequency distribution as a formatted table. * * @tparam T_COROUTINE class of the specific CoroutineTemplate instantiation, * usually `Coroutine` */ template -class CoroutineLogBinProfilerTemplate : public CoroutineProfiler { +class LogBinProfilerTemplate : public CoroutineProfiler { public: static const uint8_t kNumBins = 32; public: /** Constructor. */ - CoroutineLogBinProfilerTemplate() { + LogBinProfilerTemplate() { clear(); } @@ -95,13 +95,13 @@ class CoroutineLogBinProfilerTemplate : public CoroutineProfiler { // Delete any existing profiler. auto* currentProfiler = - (CoroutineLogBinProfilerTemplate*) (*p)->getProfiler(); + (LogBinProfilerTemplate*) (*p)->getProfiler(); if (currentProfiler) { delete currentProfiler; } // Attach new profiler. - auto* profiler = new CoroutineLogBinProfilerTemplate(); + auto* profiler = new LogBinProfilerTemplate(); (*p)->setProfiler(profiler); } } @@ -109,7 +109,7 @@ class CoroutineLogBinProfilerTemplate : public CoroutineProfiler { /** Delete the profilers created by createProfilers(). */ static void deleteProfilers(T_COROUTINE** root) { for (Coroutine** p = root; (*p) != nullptr; p = (*p)->getNext()) { - auto* profiler = (CoroutineLogBinProfilerTemplate*) (*p)->getProfiler(); + auto* profiler = (LogBinProfilerTemplate*) (*p)->getProfiler(); if (profiler) { delete profiler; (*p)->setProfiler(nullptr); @@ -120,7 +120,7 @@ class CoroutineLogBinProfilerTemplate : public CoroutineProfiler { /** Clear counters for all profilers in the coroutines defined by `root`. */ static void clearProfilers(T_COROUTINE** root) { for (Coroutine** p = root; (*p) != nullptr; p = (*p)->getNext()) { - auto* profiler = (CoroutineLogBinProfilerTemplate*) (*p)->getProfiler(); + auto* profiler = (LogBinProfilerTemplate*) (*p)->getProfiler(); if (profiler) { profiler->clear(); } @@ -131,7 +131,7 @@ class CoroutineLogBinProfilerTemplate : public CoroutineProfiler { uint16_t mBins[kNumBins]; }; -using CoroutineLogBinProfiler = CoroutineLogBinProfilerTemplate; +using LogBinProfiler = LogBinProfilerTemplate; /** * Rollup bins before `startBin` into `startBin` and bins at or after diff --git a/src/ace_routine/CoroutineLogBinRenderer.h b/src/ace_routine/LogBinTableRenderer.h similarity index 85% rename from src/ace_routine/CoroutineLogBinRenderer.h rename to src/ace_routine/LogBinTableRenderer.h index fcc19f5..9183d5b 100644 --- a/src/ace_routine/CoroutineLogBinRenderer.h +++ b/src/ace_routine/LogBinTableRenderer.h @@ -22,8 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef ACE_ROUTINE_COROUTINE_LOG_BIN_RENDERER_H -#define ACE_ROUTINE_COROUTINE_LOG_BIN_RENDERER_H +#ifndef ACE_ROUTINE_LOG_BIN_TABLE_RENDERER_H +#define ACE_ROUTINE_LOG_BIN_TABLE_RENDERER_H #include // uint8_t, uint32_t #include // Print @@ -34,7 +34,7 @@ SOFTWARE. namespace ace_routine { /** - * Print the information in the CoroutineLogBinProfiler for each Coroutine + * Print the information in the LogBinProfiler for each Coroutine * in a human-readable table. Each bin is printed as a 5-digit number, since the * bins use a `uint16_t` integer for the count. The number of digits in the * printed number is equivalent to the log10() of the frequency count. To see @@ -42,7 +42,7 @@ namespace ace_routine { * character. Therefore the table is a rough ASCII version of a log-log graph of * the frequency count. * - * For example, the output of `printTableTo(Serial, 2, 10)` for + * For example, the output of `printTo(Serial, 2, 10)` for * `examples/SoundManager` looks like this: * * @verbatim @@ -59,31 +59,31 @@ namespace ace_routine { * usually `Coroutine` */ template -class CoroutineLogBinRendererTemplate { +class LogBinRendererTemplate { public: - /** Typedef of the CoroutineLogBinProfiler supported by this class. */ - using Profiler = CoroutineLogBinProfilerTemplate; + /** Typedef of the LogBinProfiler supported by this class. */ + using Profiler = LogBinProfilerTemplate; /** Constructor. */ - CoroutineLogBinRendererTemplate(T_COROUTINE** root) + LogBinRendererTemplate(T_COROUTINE** root) : mRoot(root) {} /** - * Loop over all coroutines and print the ASCII version of a histogram. This - * assumes that all the coroutines are using the same CoroutineProfiler - * class, so we can use any of the profilers to print the header, and the - * numbers will be lined up properly. + * Loop over all coroutines and print the ASCII version of the frequency + * distribution. This assumes that all the coroutines are using the same + * CoroutineProfiler class, so we can use any of the profilers to print the + * header, and the numbers will be lined up properly. * * @param printer destination of output, usually `Serial` * @param startBin start index of the bins (0-31) * @param endBin end index (exclusive) of the bins (0-32) - * @param clear call CoroutineLogBinProfiler::clear() after printing + * @param clear call LogBinProfiler::clear() after printing * (default true) * @param rollup roll-up exterior bins into the first and last bins * (default true) */ - void printTableTo( + void printTo( Print& printer, uint8_t startBin, uint8_t endBin, @@ -180,15 +180,15 @@ class CoroutineLogBinRendererTemplate { } private: - /** Labels for each bin in CoroutineLogBinProfiler::mBins. */ + /** Labels for each bin in LogBinProfiler::mBins. */ static const char* const kBinLabels[Profiler::kNumBins]; T_COROUTINE** mRoot; }; template -const char* const CoroutineLogBinRendererTemplate::kBinLabels[ - CoroutineLogBinProfilerTemplate::kNumBins] = { +const char* const LogBinRendererTemplate::kBinLabels[ + LogBinProfilerTemplate::kNumBins] = { "<2us", "<4us", "<8us", @@ -223,7 +223,7 @@ const char* const CoroutineLogBinRendererTemplate::kBinLabels[ "<4295s", }; -using CoroutineLogBinRenderer = CoroutineLogBinRendererTemplate; +using LogBinTableRenderer = LogBinRendererTemplate; } diff --git a/tests/LogBinProfilerTest/LogBinProfilerTest.ino b/tests/LogBinProfilerTest/LogBinProfilerTest.ino index c02bda0..a69120a 100644 --- a/tests/LogBinProfilerTest/LogBinProfilerTest.ino +++ b/tests/LogBinProfilerTest/LogBinProfilerTest.ino @@ -3,7 +3,7 @@ #include #include -using ace_routine::CoroutineLogBinProfiler; +using ace_routine::LogBinProfiler; using ace_routine::rollupExteriorBins; using aunit::TestRunner; @@ -12,7 +12,7 @@ using aunit::TestRunner; // --------------------------------------------------------------------------- test(updateElapsedMicros) { - CoroutineLogBinProfiler profiler; + LogBinProfiler profiler; profiler.updateElapsedMicros(0); assertEqual(profiler.mBins[0], 1); @@ -34,7 +34,7 @@ test(updateElapsedMicros) { } test(rollupExteriorBins) { - CoroutineLogBinProfiler profiler; + LogBinProfiler profiler; profiler.mBins[0] = 1; profiler.mBins[1] = 2; profiler.mBins[2] = 3; From eeefa39003a24d60b2fea33132b40833d40f84e0 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Wed, 16 Mar 2022 13:55:41 -0700 Subject: [PATCH 26/59] examples/SoundManager: Use LogBinProfiler::createProfilers() --- examples/SoundManager/SoundManager.ino | 40 +++++++++++++++++--------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/examples/SoundManager/SoundManager.ino b/examples/SoundManager/SoundManager.ino index c7cd505..52e1e36 100644 --- a/examples/SoundManager/SoundManager.ino +++ b/examples/SoundManager/SoundManager.ino @@ -21,25 +21,36 @@ * Coroutine soundManager; status: Running * First BEEP * Second BEEP + * name <8us <16us <32us <64us<128us<256us<512us <1ms <2ms >> + * soundManager 1440 0 1 0 0 0 0 0 1 0 + * 0x55C5AB3CE2 1438 1 2 0 0 0 0 0 0 1 + * soundRoutine 1440 0 0 0 2 0 0 0 0 0 + * { + * "soundManager":[1440,0,1,0,0,0,0,0,1,0], + * "0x55C5AB3CE240":[1438,1,2,0,0,0,0,0,0,1], + * "soundRoutine":[1440,0,0,0,2,0,0,0,0,0] + * } * * Request Boop and wait 5 seconds... * Coroutine soundRoutine; status: Yielding * Coroutine soundManager; status: Running * First BOOP * Second BOOP + * name <8us <16us <32us <64us<128us<256us<512us <1ms <2ms >> + * soundManager 1440 0 1 0 0 0 0 0 1 0 + * 0x55C5AB3CE2 1438 1 2 0 0 0 0 0 0 1 + * soundRoutine 1440 0 0 0 2 0 0 0 0 0 + * { + * "soundManager":[1440,0,1,0,0,0,0,0,1,0], + * "0x55C5AB3CE240":[1438,1,2,0,0,0,0,0,0,1], + * "soundRoutine":[1440,0,0,0,2,0,0,0,0,0] + * } * * Request Silence and wait 5 seconds... * Coroutine soundRoutine; status: Yielding * Coroutine soundManager; status: Running * Wait 5 seconds... * - * - * Request Beep and wait 5 seconds... - * Coroutine soundRoutine; status: Yielding - * Coroutine soundManager; status: Running - * First BEEP - * Second BEEP - * * ... * @endverbatim */ @@ -58,7 +69,9 @@ using ace_routine::LogBinJsonRenderer; SoundRoutine soundRoutine; EXTERN_COROUTINE(soundManager); -COROUTINE(printProfile) { +// Every 5 seconds, print out the elapsed time frequency distribution from the +// LogBinProfiler. +COROUTINE(printProfiler) { COROUTINE_LOOP() { LogBinTableRenderer tableRenderer(getRoot()); tableRenderer.printTo(Serial, 2, 12, false /*clear*/); @@ -70,9 +83,6 @@ COROUTINE(printProfile) { } } -LogBinProfiler soundRoutineProfiler; -LogBinProfiler soundManagerProfiler; - void setup() { delay(1000); Serial.begin(115200); @@ -82,8 +92,12 @@ void setup() { soundRoutine.setCName("soundRoutine"); soundManager.setFName(F("soundManager")); - soundRoutine.setProfiler(&soundRoutineProfiler); - soundManager.setProfiler(&soundManagerProfiler); + // Don't set the name of 'printProfiler' to verify that the name of the + // coroutine becomes the pointer address in hexadecimal. + // printProfiler.setFName(F("printProfiler")); + + // Attach profilers to all coroutines. + LogBinProfiler::createProfilers(Coroutine::getRoot()); CoroutineScheduler::setup(); } From a80f7eedfb2ff29bc7c8684a20242d02880b1326 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Wed, 16 Mar 2022 15:26:51 -0700 Subject: [PATCH 27/59] Coroutine.h: Add explicit cast to (const uint8_t*) due to missing overloaded write() in ATtiny85 Core --- src/ace_routine/Coroutine.h | 5 ++++- src/ace_routine/LogBinJsonRenderer.h | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ace_routine/Coroutine.h b/src/ace_routine/Coroutine.h index 02e46d9..e681853 100644 --- a/src/ace_routine/Coroutine.h +++ b/src/ace_routine/Coroutine.h @@ -375,7 +375,10 @@ class CoroutineTemplate { printer.write(' '); } } else { - printer.write(pname.cstr(), maxLen); + // NOTE: Must cast to (const uint8_t*) because the ATtiny85 core does + // not have a version of write() that accepts a (const char*), in + // contrast to every other Arduino Core. + printer.write((const uint8_t*) pname.cstr(), maxLen); } } else { printer.write(pname.cstr()); diff --git a/src/ace_routine/LogBinJsonRenderer.h b/src/ace_routine/LogBinJsonRenderer.h index 716ce5e..0d31356 100644 --- a/src/ace_routine/LogBinJsonRenderer.h +++ b/src/ace_routine/LogBinJsonRenderer.h @@ -27,7 +27,6 @@ SOFTWARE. #include // uint8_t, uint32_t #include // Print -#include // printfTo() #include "Coroutine.h" // Coroutine #include "CoroutineProfiler.h" From 6ce3a1dd054a9c146573382d108ba49dc22d9a82 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Wed, 16 Mar 2022 15:31:30 -0700 Subject: [PATCH 28/59] MemoryBenchmark: Add LogBinProfiler, LogBinTableRenderer, LogBinJsonRenderer --- examples/MemoryBenchmark/MemoryBenchmark.ino | 40 +++++++++- examples/MemoryBenchmark/README.md | 75 ++++++++++++++----- examples/MemoryBenchmark/attiny.txt | 7 +- examples/MemoryBenchmark/collect.sh | 2 +- examples/MemoryBenchmark/esp32.txt | 43 ++++++----- examples/MemoryBenchmark/esp8266.txt | 7 +- examples/MemoryBenchmark/generate_table.awk | 8 +- examples/MemoryBenchmark/micro.txt | 7 +- examples/MemoryBenchmark/nano.txt | 7 +- examples/MemoryBenchmark/stm32.txt | 7 +- examples/MemoryBenchmark/teensy32.txt | 7 +- .../validate_using_epoxy_duino.sh | 2 +- 12 files changed, 154 insertions(+), 58 deletions(-) diff --git a/examples/MemoryBenchmark/MemoryBenchmark.ino b/examples/MemoryBenchmark/MemoryBenchmark.ino index 404f988..1ac57e9 100644 --- a/examples/MemoryBenchmark/MemoryBenchmark.ino +++ b/examples/MemoryBenchmark/MemoryBenchmark.ino @@ -34,8 +34,11 @@ #define FEATURE_SCHEDULER_SETUP_TWO_COROUTINES 16 #define FEATURE_SCHEDULER_MANUAL_SETUP_ONE_COROUTINE 17 #define FEATURE_SCHEDULER_MANUAL_SETUP_TWO_COROUTINES 18 -#define FEATURE_BLINK_FUNCTION 19 -#define FEATURE_BLINK_COROUTINE 20 +#define FEATURE_LOG_BIN_PROFILER 19 +#define FEATURE_LOG_BIN_TABLE_RENDERER 20 +#define FEATURE_LOG_BIN_JSON_RENDERER 21 +#define FEATURE_BLINK_FUNCTION 22 +#define FEATURE_BLINK_COROUTINE 23 #if FEATURE != FEATURE_BASELINE #include @@ -413,6 +416,17 @@ volatile int disableCompilerOptimization = 0; } } +#elif FEATURE == FEATURE_LOG_BIN_PROFILER \ + || FEATURE == FEATURE_LOG_BIN_TABLE_RENDERER \ + || FEATURE == FEATURE_LOG_BIN_JSON_RENDERER + + COROUTINE(profiled) { + COROUTINE_LOOP() { + disableCompilerOptimization = 1; + COROUTINE_DELAY(10); + } + } + #elif FEATURE == FEATURE_BLINK_COROUTINE #ifndef LED_BUILTIN @@ -449,6 +463,12 @@ volatile int disableCompilerOptimization = 0; FooClass* foo; #endif +#if FEATURE == FEATURE_LOG_BIN_PROFILER \ + || FEATURE == FEATURE_LOG_BIN_TABLE_RENDERER \ + || FEATURE == FEATURE_LOG_BIN_JSON_RENDERER + LogBinProfiler profiler; +#endif + void setup() { delay(1000); @@ -473,6 +493,12 @@ void setup() { #endif #endif + +#if FEATURE == FEATURE_LOG_BIN_PROFILER \ + || FEATURE == FEATURE_LOG_BIN_TABLE_RENDERER \ + || FEATURE == FEATURE_LOG_BIN_JSON_RENDERER + profiled.setProfiler(&profiler); +#endif } void loop() { @@ -522,6 +548,16 @@ void loop() { CoroutineScheduler::loop(); #elif FEATURE == FEATURE_SCHEDULER_MANUAL_SETUP_TWO_COROUTINES CoroutineScheduler::loop(); +#elif FEATURE == FEATURE_LOG_BIN_PROFILER + CoroutineScheduler::loop(); +#elif FEATURE == FEATURE_LOG_BIN_TABLE_RENDERER + CoroutineScheduler::loop(); + LogBinTableRenderer renderer(Coroutine::getRoot()); + renderer.printTo(Serial, 0, 32); +#elif FEATURE == FEATURE_LOG_BIN_JSON_RENDERER + CoroutineScheduler::loop(); + LogBinJsonRenderer renderer(Coroutine::getRoot()); + renderer.printTo(Serial, 0, 32); #elif FEATURE == FEATURE_BLINK_COROUTINE blink.runCoroutine(); #elif FEATURE == FEATURE_BLINK_FUNCTION diff --git a/examples/MemoryBenchmark/README.md b/examples/MemoryBenchmark/README.md index fd2c782..65f70ca 100644 --- a/examples/MemoryBenchmark/README.md +++ b/examples/MemoryBenchmark/README.md @@ -112,6 +112,13 @@ calculated flash size can jump around in unexpected ways. * Increases the flash size of the `CoroutineScheduler` by 100-140 bytes for both 8-bit and 32-bit processors, even if `CoroutineProfiler` is not used. This is a one-time hit. + * Add `LogBinProfiler` + * Adds about 90 bytes of flash and 70 bytes of RAM on AVR. + * Add `LogBinTableRenderer` + * Adds about 3500 bytes of flash (probably due to `vsnprintf()`) and 450 + bytes of RAM on AVR. + * Add `LogBinJsonRenderer` + * Adds about 1800 bytes of flash and 200 bytes of RAM. ## How to Generate @@ -207,6 +214,10 @@ $ make README.md | Scheduler, One Coroutine (man setup) | 896/ 39 | 496/ 28 | | Scheduler, Two Coroutines (man setup) | 1186/ 63 | 786/ 52 | |---------------------------------------+--------------+-------------| +| Scheduler, LogBinProfiler | 954/ 111 | 554/ 100 | +| Scheduler, LogBinTableRenderer | 4092/ 467 | 3692/ 456 | +| Scheduler, LogBinJsonRenderer | 2356/ 197 | 1956/ 186 | +|---------------------------------------+--------------+-------------| | Blink Function | 546/ 14 | 146/ 3 | | Blink Coroutine | 766/ 37 | 366/ 26 | +--------------------------------------------------------------------+ @@ -252,6 +263,10 @@ $ make README.md | Scheduler, One Coroutine (man setup) | 1106/ 39 | 500/ 28 | | Scheduler, Two Coroutines (man setup) | 1400/ 63 | 794/ 52 | |---------------------------------------+--------------+-------------| +| Scheduler, LogBinProfiler | 1166/ 111 | 560/ 100 | +| Scheduler, LogBinTableRenderer | 4702/ 578 | 4096/ 567 | +| Scheduler, LogBinJsonRenderer | 2924/ 308 | 2318/ 297 | +|---------------------------------------+--------------+-------------| | Blink Function | 938/ 14 | 332/ 3 | | Blink Coroutine | 1168/ 37 | 562/ 26 | +--------------------------------------------------------------------+ @@ -297,6 +312,10 @@ $ make README.md | Scheduler, One Coroutine (man setup) | 3994/ 179 | 440/ 28 | | Scheduler, Two Coroutines (man setup) | 4288/ 203 | 734/ 52 | |---------------------------------------+--------------+-------------| +| Scheduler, LogBinProfiler | 4054/ 251 | 500/ 100 | +| Scheduler, LogBinTableRenderer | 6760/ 543 | 3206/ 392 | +| Scheduler, LogBinJsonRenderer | 4980/ 273 | 1426/ 122 | +|---------------------------------------+--------------+-------------| | Blink Function | 3994/ 154 | 440/ 3 | | Blink Coroutine | 4164/ 177 | 610/ 26 | +--------------------------------------------------------------------+ @@ -342,6 +361,10 @@ $ make README.md | Scheduler, One Coroutine (man setup) | 22224/ 3576 | 340/ 36 | | Scheduler, Two Coroutines (man setup) | 22360/ 3604 | 476/ 64 | |---------------------------------------+--------------+-------------| +| Scheduler, LogBinProfiler | 22284/ 3644 | 400/ 104 | +| Scheduler, LogBinTableRenderer | 25164/ 3644 | 3280/ 104 | +| Scheduler, LogBinJsonRenderer | 22956/ 3644 | 1072/ 104 | +|---------------------------------------+--------------+-------------| | Blink Function | 22120/ 3540 | 236/ 0 | | Blink Coroutine | 22232/ 3568 | 348/ 28 | +--------------------------------------------------------------------+ @@ -387,6 +410,10 @@ $ make README.md | Scheduler, One Coroutine (man setup) | 260685/27952 | 356/ 36 | | Scheduler, Two Coroutines (man setup) | 260861/27984 | 532/ 68 | |---------------------------------------+--------------+-------------| +| Scheduler, LogBinProfiler | 260765/28024 | 436/ 108 | +| Scheduler, LogBinTableRenderer | 265057/28440 | 4728/ 524 | +| Scheduler, LogBinJsonRenderer | 264785/28104 | 4456/ 188 | +|---------------------------------------+--------------+-------------| | Blink Function | 261001/27988 | 672/ 72 | | Blink Coroutine | 261149/28016 | 820/ 100 | +--------------------------------------------------------------------+ @@ -405,35 +432,39 @@ $ make README.md |---------------------------------------+--------------+-------------| | Baseline | 204573/16060 | 0/ 0 | |---------------------------------------+--------------+-------------| -| One Delay Function | 205129/16092 | 556/ 32 | -| Two Delay Functions | 205201/16092 | 628/ 32 | +| One Delay Function | 204985/16084 | 412/ 24 | +| Two Delay Functions | 205057/16084 | 484/ 24 | +|---------------------------------------+--------------+-------------| +| One Coroutine | 205097/16116 | 524/ 56 | +| Two Coroutines | 205269/16140 | 696/ 80 | |---------------------------------------+--------------+-------------| -| One Coroutine | 205241/16124 | 668/ 64 | -| Two Coroutines | 205413/16148 | 840/ 88 | +| One Coroutine (micros) | 205085/16116 | 512/ 56 | +| Two Coroutines (micros) | 205257/16140 | 684/ 80 | |---------------------------------------+--------------+-------------| -| One Coroutine (micros) | 205229/16124 | 656/ 64 | -| Two Coroutines (micros) | 205401/16148 | 828/ 88 | +| One Coroutine (seconds) | 205113/16116 | 540/ 56 | +| Two Coroutines (seconds) | 205301/16140 | 728/ 80 | |---------------------------------------+--------------+-------------| -| One Coroutine (seconds) | 205257/16124 | 684/ 64 | -| Two Coroutines (seconds) | 205445/16148 | 872/ 88 | +| Scheduler, One Coroutine | 205253/16116 | 680/ 56 | +| Scheduler, Two Coroutines | 205393/16148 | 820/ 88 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine | 205397/16124 | 824/ 64 | -| Scheduler, Two Coroutines | 205537/16156 | 964/ 96 | +| Scheduler, One Coroutine (micros) | 205229/16116 | 656/ 56 | +| Scheduler, Two Coroutines (micros) | 205369/16148 | 796/ 88 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (micros) | 205373/16124 | 800/ 64 | -| Scheduler, Two Coroutines (micros) | 205513/16156 | 940/ 96 | +| Scheduler, One Coroutine (seconds) | 205269/16116 | 696/ 56 | +| Scheduler, Two Coroutines (seconds) | 205425/16148 | 852/ 88 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (seconds) | 205413/16124 | 840/ 64 | -| Scheduler, Two Coroutines (seconds) | 205569/16156 | 996/ 96 | +| Scheduler, One Coroutine (setup) | 205281/16116 | 708/ 56 | +| Scheduler, Two Coroutines (setup) | 205453/16148 | 880/ 88 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (setup) | 205425/16124 | 852/ 64 | -| Scheduler, Two Coroutines (setup) | 205597/16156 | 1024/ 96 | +| Scheduler, One Coroutine (man setup) | 205273/16116 | 700/ 56 | +| Scheduler, Two Coroutines (man setup) | 205453/16148 | 880/ 88 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (man setup) | 205417/16124 | 844/ 64 | -| Scheduler, Two Coroutines (man setup) | 205597/16156 | 1024/ 96 | +| Scheduler, LogBinProfiler | 205333/16188 | 760/ 128 | +| Scheduler, LogBinTableRenderer | 210913/16268 | 6340/ 208 | +| Scheduler, LogBinJsonRenderer | 210477/16268 | 5904/ 208 | |---------------------------------------+--------------+-------------| -| Blink Function | 205481/16100 | 908/ 40 | -| Blink Coroutine | 205593/16124 | 1020/ 64 | +| Blink Function | 205337/16092 | 764/ 32 | +| Blink Coroutine | 205449/16116 | 876/ 56 | +--------------------------------------------------------------------+ ``` @@ -478,6 +509,10 @@ $ make README.md | Scheduler, One Coroutine (man setup) | 10588/ 4188 | 356/ 36 | | Scheduler, Two Coroutines (man setup) | 10736/ 4216 | 504/ 64 | |---------------------------------------+--------------+-------------| +| Scheduler, LogBinProfiler | 10852/ 4256 | 620/ 104 | +| Scheduler, LogBinTableRenderer | 31108/ 4640 | 20876/ 488 | +| Scheduler, LogBinJsonRenderer | 13140/ 4276 | 2908/ 124 | +|---------------------------------------+--------------+-------------| | Blink Function | 10688/ 4160 | 456/ 8 | | Blink Coroutine | 10820/ 4184 | 588/ 32 | +--------------------------------------------------------------------+ diff --git a/examples/MemoryBenchmark/attiny.txt b/examples/MemoryBenchmark/attiny.txt index 970946b..e307ca5 100644 --- a/examples/MemoryBenchmark/attiny.txt +++ b/examples/MemoryBenchmark/attiny.txt @@ -17,5 +17,8 @@ 16 1202 8192 63 512 17 896 8192 39 512 18 1186 8192 63 512 -19 546 8192 14 512 -20 766 8192 37 512 +19 954 8192 111 512 +20 4092 8192 467 512 +21 2356 8192 197 512 +22 546 8192 14 512 +23 766 8192 37 512 diff --git a/examples/MemoryBenchmark/collect.sh b/examples/MemoryBenchmark/collect.sh index 5b57758..9e84de6 100755 --- a/examples/MemoryBenchmark/collect.sh +++ b/examples/MemoryBenchmark/collect.sh @@ -16,7 +16,7 @@ set -eu PROGRAM_NAME='MemoryBenchmark.ino' -NUM_FEATURES=20 # excluding FEATURE_BASELINE +NUM_FEATURES=23 # excluding FEATURE_BASELINE # Assume that https://github.com/bxparks/AUniter is installed as a # sibling project to AceRoutine. diff --git a/examples/MemoryBenchmark/esp32.txt b/examples/MemoryBenchmark/esp32.txt index 9efefbc..a9a15bc 100644 --- a/examples/MemoryBenchmark/esp32.txt +++ b/examples/MemoryBenchmark/esp32.txt @@ -1,21 +1,24 @@ 0 204573 1310720 16060 327680 -1 205129 1310720 16092 327680 -2 205201 1310720 16092 327680 -3 205241 1310720 16124 327680 -4 205413 1310720 16148 327680 -5 205229 1310720 16124 327680 -6 205401 1310720 16148 327680 -7 205257 1310720 16124 327680 -8 205445 1310720 16148 327680 -9 205397 1310720 16124 327680 -10 205537 1310720 16156 327680 -11 205373 1310720 16124 327680 -12 205513 1310720 16156 327680 -13 205413 1310720 16124 327680 -14 205569 1310720 16156 327680 -15 205425 1310720 16124 327680 -16 205597 1310720 16156 327680 -17 205417 1310720 16124 327680 -18 205597 1310720 16156 327680 -19 205481 1310720 16100 327680 -20 205593 1310720 16124 327680 +1 204985 1310720 16084 327680 +2 205057 1310720 16084 327680 +3 205097 1310720 16116 327680 +4 205269 1310720 16140 327680 +5 205085 1310720 16116 327680 +6 205257 1310720 16140 327680 +7 205113 1310720 16116 327680 +8 205301 1310720 16140 327680 +9 205253 1310720 16116 327680 +10 205393 1310720 16148 327680 +11 205229 1310720 16116 327680 +12 205369 1310720 16148 327680 +13 205269 1310720 16116 327680 +14 205425 1310720 16148 327680 +15 205281 1310720 16116 327680 +16 205453 1310720 16148 327680 +17 205273 1310720 16116 327680 +18 205453 1310720 16148 327680 +19 205333 1310720 16188 327680 +20 210913 1310720 16268 327680 +21 210477 1310720 16268 327680 +22 205337 1310720 16092 327680 +23 205449 1310720 16116 327680 diff --git a/examples/MemoryBenchmark/esp8266.txt b/examples/MemoryBenchmark/esp8266.txt index 5add629..cc6530c 100644 --- a/examples/MemoryBenchmark/esp8266.txt +++ b/examples/MemoryBenchmark/esp8266.txt @@ -17,5 +17,8 @@ 16 260877 1044464 27984 81920 17 260685 1044464 27952 81920 18 260861 1044464 27984 81920 -19 261001 1044464 27988 81920 -20 261149 1044464 28016 81920 +19 260765 1044464 28024 81920 +20 265057 1044464 28440 81920 +21 264785 1044464 28104 81920 +22 261001 1044464 27988 81920 +23 261149 1044464 28016 81920 diff --git a/examples/MemoryBenchmark/generate_table.awk b/examples/MemoryBenchmark/generate_table.awk index 18cadbd..59c439f 100755 --- a/examples/MemoryBenchmark/generate_table.awk +++ b/examples/MemoryBenchmark/generate_table.awk @@ -25,8 +25,11 @@ BEGIN { labels[16] = "Scheduler, Two Coroutines (setup)" labels[17] = "Scheduler, One Coroutine (man setup)" labels[18] = "Scheduler, Two Coroutines (man setup)" - labels[19] = "Blink Function" - labels[20] = "Blink Coroutine" + labels[19] = "Scheduler, LogBinProfiler" + labels[20] = "Scheduler, LogBinTableRenderer" + labels[21] = "Scheduler, LogBinJsonRenderer" + labels[22] = "Blink Function" + labels[23] = "Blink Coroutine" record_index = 0 } { @@ -57,6 +60,7 @@ END { || labels[i] ~ /^Scheduler, One Coroutine \(seconds\)$/ \ || labels[i] ~ /^Scheduler, One Coroutine \(setup\)$/ \ || labels[i] ~ /^Scheduler, One Coroutine \(man setup\)$/ \ + || labels[i] ~ /^Scheduler, LogBinProfiler$/ \ || labels[i] ~ /^Blink Function$/ \ ) { printf("|---------------------------------------+--------------+-------------|\n") diff --git a/examples/MemoryBenchmark/micro.txt b/examples/MemoryBenchmark/micro.txt index e99f5b5..17cdec5 100644 --- a/examples/MemoryBenchmark/micro.txt +++ b/examples/MemoryBenchmark/micro.txt @@ -17,5 +17,8 @@ 16 4302 28672 203 2560 17 3994 28672 179 2560 18 4288 28672 203 2560 -19 3994 28672 154 2560 -20 4164 28672 177 2560 +19 4054 28672 251 2560 +20 6760 28672 543 2560 +21 4980 28672 273 2560 +22 3994 28672 154 2560 +23 4164 28672 177 2560 diff --git a/examples/MemoryBenchmark/nano.txt b/examples/MemoryBenchmark/nano.txt index 209e4a1..3801c53 100644 --- a/examples/MemoryBenchmark/nano.txt +++ b/examples/MemoryBenchmark/nano.txt @@ -17,5 +17,8 @@ 16 1414 30720 63 2048 17 1106 30720 39 2048 18 1400 30720 63 2048 -19 938 30720 14 2048 -20 1168 30720 37 2048 +19 1166 30720 111 2048 +20 4702 30720 578 2048 +21 2924 30720 308 2048 +22 938 30720 14 2048 +23 1168 30720 37 2048 diff --git a/examples/MemoryBenchmark/stm32.txt b/examples/MemoryBenchmark/stm32.txt index 2fdf69c..1a5d623 100644 --- a/examples/MemoryBenchmark/stm32.txt +++ b/examples/MemoryBenchmark/stm32.txt @@ -17,5 +17,8 @@ 16 22364 131072 3604 20480 17 22224 131072 3576 20480 18 22360 131072 3604 20480 -19 22120 131072 3540 20480 -20 22232 131072 3568 20480 +19 22284 131072 3644 20480 +20 25164 131072 3644 20480 +21 22956 131072 3644 20480 +22 22120 131072 3540 20480 +23 22232 131072 3568 20480 diff --git a/examples/MemoryBenchmark/teensy32.txt b/examples/MemoryBenchmark/teensy32.txt index 8b02774..325aa29 100644 --- a/examples/MemoryBenchmark/teensy32.txt +++ b/examples/MemoryBenchmark/teensy32.txt @@ -17,5 +17,8 @@ 16 10748 262144 4216 65536 17 10588 262144 4188 65536 18 10736 262144 4216 65536 -19 10688 262144 4160 65536 -20 10820 262144 4184 65536 +19 10852 262144 4256 65536 +20 31108 262144 4640 65536 +21 13140 262144 4276 65536 +22 10688 262144 4160 65536 +23 10820 262144 4184 65536 diff --git a/examples/MemoryBenchmark/validate_using_epoxy_duino.sh b/examples/MemoryBenchmark/validate_using_epoxy_duino.sh index 34b8899..1841ffd 100755 --- a/examples/MemoryBenchmark/validate_using_epoxy_duino.sh +++ b/examples/MemoryBenchmark/validate_using_epoxy_duino.sh @@ -8,7 +8,7 @@ set -eu PROGRAM_NAME='MemoryBenchmark.ino' -NUM_FEATURES=20 # excluding FEATURE_BASELINE +NUM_FEATURES=23 # excluding FEATURE_BASELINE temp_out_file= function cleanup() { From 826378e44703196a419998e8a3f133305c48422d Mon Sep 17 00:00:00 2001 From: Brian Park Date: Wed, 16 Mar 2022 15:54:18 -0700 Subject: [PATCH 29/59] LogBinTableRenderer.h: Replace vsnprintf() with ace_common::printPad5To(); reduces flash size ~0 byte (ESP32), ~400 bytes (ESP8266), ~1200 bytes (AVR), ~17kB! (Teensy 3.2) --- examples/MemoryBenchmark/README.md | 20 ++++++++++---------- examples/MemoryBenchmark/attiny.txt | 2 +- examples/MemoryBenchmark/esp32.txt | 2 +- examples/MemoryBenchmark/esp8266.txt | 2 +- examples/MemoryBenchmark/generate_readme.py | 7 +++++++ examples/MemoryBenchmark/micro.txt | 2 +- examples/MemoryBenchmark/nano.txt | 2 +- examples/MemoryBenchmark/stm32.txt | 2 +- examples/MemoryBenchmark/teensy32.txt | 2 +- src/ace_routine/LogBinTableRenderer.h | 15 ++++++++++----- 10 files changed, 34 insertions(+), 22 deletions(-) diff --git a/examples/MemoryBenchmark/README.md b/examples/MemoryBenchmark/README.md index 65f70ca..ce44f95 100644 --- a/examples/MemoryBenchmark/README.md +++ b/examples/MemoryBenchmark/README.md @@ -115,10 +115,10 @@ calculated flash size can jump around in unexpected ways. * Add `LogBinProfiler` * Adds about 90 bytes of flash and 70 bytes of RAM on AVR. * Add `LogBinTableRenderer` - * Adds about 3500 bytes of flash (probably due to `vsnprintf()`) and 450 - bytes of RAM on AVR. + * Adds about 2200 bytes of flash and 450 bytes of RAM on AVR. * Add `LogBinJsonRenderer` - * Adds about 1800 bytes of flash and 200 bytes of RAM. + * Adds about 1800 bytes of flash and 200 bytes of RAM on AVR. + ## How to Generate @@ -215,7 +215,7 @@ $ make README.md | Scheduler, Two Coroutines (man setup) | 1186/ 63 | 786/ 52 | |---------------------------------------+--------------+-------------| | Scheduler, LogBinProfiler | 954/ 111 | 554/ 100 | -| Scheduler, LogBinTableRenderer | 4092/ 467 | 3692/ 456 | +| Scheduler, LogBinTableRenderer | 2776/ 439 | 2376/ 428 | | Scheduler, LogBinJsonRenderer | 2356/ 197 | 1956/ 186 | |---------------------------------------+--------------+-------------| | Blink Function | 546/ 14 | 146/ 3 | @@ -264,7 +264,7 @@ $ make README.md | Scheduler, Two Coroutines (man setup) | 1400/ 63 | 794/ 52 | |---------------------------------------+--------------+-------------| | Scheduler, LogBinProfiler | 1166/ 111 | 560/ 100 | -| Scheduler, LogBinTableRenderer | 4702/ 578 | 4096/ 567 | +| Scheduler, LogBinTableRenderer | 3348/ 552 | 2742/ 541 | | Scheduler, LogBinJsonRenderer | 2924/ 308 | 2318/ 297 | |---------------------------------------+--------------+-------------| | Blink Function | 938/ 14 | 332/ 3 | @@ -313,7 +313,7 @@ $ make README.md | Scheduler, Two Coroutines (man setup) | 4288/ 203 | 734/ 52 | |---------------------------------------+--------------+-------------| | Scheduler, LogBinProfiler | 4054/ 251 | 500/ 100 | -| Scheduler, LogBinTableRenderer | 6760/ 543 | 3206/ 392 | +| Scheduler, LogBinTableRenderer | 5404/ 515 | 1850/ 364 | | Scheduler, LogBinJsonRenderer | 4980/ 273 | 1426/ 122 | |---------------------------------------+--------------+-------------| | Blink Function | 3994/ 154 | 440/ 3 | @@ -362,7 +362,7 @@ $ make README.md | Scheduler, Two Coroutines (man setup) | 22360/ 3604 | 476/ 64 | |---------------------------------------+--------------+-------------| | Scheduler, LogBinProfiler | 22284/ 3644 | 400/ 104 | -| Scheduler, LogBinTableRenderer | 25164/ 3644 | 3280/ 104 | +| Scheduler, LogBinTableRenderer | 23636/ 3644 | 1752/ 104 | | Scheduler, LogBinJsonRenderer | 22956/ 3644 | 1072/ 104 | |---------------------------------------+--------------+-------------| | Blink Function | 22120/ 3540 | 236/ 0 | @@ -411,7 +411,7 @@ $ make README.md | Scheduler, Two Coroutines (man setup) | 260861/27984 | 532/ 68 | |---------------------------------------+--------------+-------------| | Scheduler, LogBinProfiler | 260765/28024 | 436/ 108 | -| Scheduler, LogBinTableRenderer | 265057/28440 | 4728/ 524 | +| Scheduler, LogBinTableRenderer | 265465/28420 | 5136/ 504 | | Scheduler, LogBinJsonRenderer | 264785/28104 | 4456/ 188 | |---------------------------------------+--------------+-------------| | Blink Function | 261001/27988 | 672/ 72 | @@ -460,7 +460,7 @@ $ make README.md | Scheduler, Two Coroutines (man setup) | 205453/16148 | 880/ 88 | |---------------------------------------+--------------+-------------| | Scheduler, LogBinProfiler | 205333/16188 | 760/ 128 | -| Scheduler, LogBinTableRenderer | 210913/16268 | 6340/ 208 | +| Scheduler, LogBinTableRenderer | 210941/16268 | 6368/ 208 | | Scheduler, LogBinJsonRenderer | 210477/16268 | 5904/ 208 | |---------------------------------------+--------------+-------------| | Blink Function | 205337/16092 | 764/ 32 | @@ -510,7 +510,7 @@ $ make README.md | Scheduler, Two Coroutines (man setup) | 10736/ 4216 | 504/ 64 | |---------------------------------------+--------------+-------------| | Scheduler, LogBinProfiler | 10852/ 4256 | 620/ 104 | -| Scheduler, LogBinTableRenderer | 31108/ 4640 | 20876/ 488 | +| Scheduler, LogBinTableRenderer | 13720/ 4276 | 3488/ 124 | | Scheduler, LogBinJsonRenderer | 13140/ 4276 | 2908/ 124 | |---------------------------------------+--------------+-------------| | Blink Function | 10688/ 4160 | 456/ 8 | diff --git a/examples/MemoryBenchmark/attiny.txt b/examples/MemoryBenchmark/attiny.txt index e307ca5..f7e8e1d 100644 --- a/examples/MemoryBenchmark/attiny.txt +++ b/examples/MemoryBenchmark/attiny.txt @@ -18,7 +18,7 @@ 17 896 8192 39 512 18 1186 8192 63 512 19 954 8192 111 512 -20 4092 8192 467 512 +20 2776 8192 439 512 21 2356 8192 197 512 22 546 8192 14 512 23 766 8192 37 512 diff --git a/examples/MemoryBenchmark/esp32.txt b/examples/MemoryBenchmark/esp32.txt index a9a15bc..b5a4203 100644 --- a/examples/MemoryBenchmark/esp32.txt +++ b/examples/MemoryBenchmark/esp32.txt @@ -18,7 +18,7 @@ 17 205273 1310720 16116 327680 18 205453 1310720 16148 327680 19 205333 1310720 16188 327680 -20 210913 1310720 16268 327680 +20 210941 1310720 16268 327680 21 210477 1310720 16268 327680 22 205337 1310720 16092 327680 23 205449 1310720 16116 327680 diff --git a/examples/MemoryBenchmark/esp8266.txt b/examples/MemoryBenchmark/esp8266.txt index cc6530c..22fd3f2 100644 --- a/examples/MemoryBenchmark/esp8266.txt +++ b/examples/MemoryBenchmark/esp8266.txt @@ -18,7 +18,7 @@ 17 260685 1044464 27952 81920 18 260861 1044464 27984 81920 19 260765 1044464 28024 81920 -20 265057 1044464 28440 81920 +20 265465 1044464 28420 81920 21 264785 1044464 28104 81920 22 261001 1044464 27988 81920 23 261149 1044464 28016 81920 diff --git a/examples/MemoryBenchmark/generate_readme.py b/examples/MemoryBenchmark/generate_readme.py index f4176fd..8dd752f 100755 --- a/examples/MemoryBenchmark/generate_readme.py +++ b/examples/MemoryBenchmark/generate_readme.py @@ -136,6 +136,13 @@ * Increases the flash size of the `CoroutineScheduler` by 100-140 bytes for both 8-bit and 32-bit processors, even if `CoroutineProfiler` is not used. This is a one-time hit. + * Add `LogBinProfiler` + * Adds about 90 bytes of flash and 70 bytes of RAM on AVR. + * Add `LogBinTableRenderer` + * Adds about 2200 bytes of flash and 450 bytes of RAM on AVR. + * Add `LogBinJsonRenderer` + * Adds about 1800 bytes of flash and 200 bytes of RAM on AVR. + ## How to Generate diff --git a/examples/MemoryBenchmark/micro.txt b/examples/MemoryBenchmark/micro.txt index 17cdec5..141dd28 100644 --- a/examples/MemoryBenchmark/micro.txt +++ b/examples/MemoryBenchmark/micro.txt @@ -18,7 +18,7 @@ 17 3994 28672 179 2560 18 4288 28672 203 2560 19 4054 28672 251 2560 -20 6760 28672 543 2560 +20 5404 28672 515 2560 21 4980 28672 273 2560 22 3994 28672 154 2560 23 4164 28672 177 2560 diff --git a/examples/MemoryBenchmark/nano.txt b/examples/MemoryBenchmark/nano.txt index 3801c53..e42236c 100644 --- a/examples/MemoryBenchmark/nano.txt +++ b/examples/MemoryBenchmark/nano.txt @@ -18,7 +18,7 @@ 17 1106 30720 39 2048 18 1400 30720 63 2048 19 1166 30720 111 2048 -20 4702 30720 578 2048 +20 3348 30720 552 2048 21 2924 30720 308 2048 22 938 30720 14 2048 23 1168 30720 37 2048 diff --git a/examples/MemoryBenchmark/stm32.txt b/examples/MemoryBenchmark/stm32.txt index 1a5d623..a22c6b1 100644 --- a/examples/MemoryBenchmark/stm32.txt +++ b/examples/MemoryBenchmark/stm32.txt @@ -18,7 +18,7 @@ 17 22224 131072 3576 20480 18 22360 131072 3604 20480 19 22284 131072 3644 20480 -20 25164 131072 3644 20480 +20 23636 131072 3644 20480 21 22956 131072 3644 20480 22 22120 131072 3540 20480 23 22232 131072 3568 20480 diff --git a/examples/MemoryBenchmark/teensy32.txt b/examples/MemoryBenchmark/teensy32.txt index 325aa29..94cbfe7 100644 --- a/examples/MemoryBenchmark/teensy32.txt +++ b/examples/MemoryBenchmark/teensy32.txt @@ -18,7 +18,7 @@ 17 10588 262144 4188 65536 18 10736 262144 4216 65536 19 10852 262144 4256 65536 -20 31108 262144 4640 65536 +20 13720 262144 4276 65536 21 13140 262144 4276 65536 22 10688 262144 4160 65536 23 10820 262144 4184 65536 diff --git a/src/ace_routine/LogBinTableRenderer.h b/src/ace_routine/LogBinTableRenderer.h index 9183d5b..9b9d223 100644 --- a/src/ace_routine/LogBinTableRenderer.h +++ b/src/ace_routine/LogBinTableRenderer.h @@ -27,7 +27,7 @@ SOFTWARE. #include // uint8_t, uint32_t #include // Print -#include // printfTo() +#include // printPad5To() #include "Coroutine.h" // Coroutine #include "CoroutineProfiler.h" @@ -101,7 +101,7 @@ class LogBinRendererTemplate { // Print header if needed. if (! isHeaderPrinted) { - ace_common::printfTo(printer, "%-12.12s", "name"); + printer.print(F("name ")); printHeaderTo(printer, startBin, endBin); printer.println(); isHeaderPrinted = true; @@ -149,9 +149,13 @@ class LogBinRendererTemplate { if (endBin <= startBin) return; // needed if startBin = endBin = 0 for (uint8_t i = startBin; i < endBin - 1; i++) { - ace_common::printfTo(printer, "%6.6s", kBinLabels[i]); + uint8_t labelLength = strlen(kBinLabels[i]); + for (uint8_t i = 0; i < (6 - labelLength); i++) { + printer.print(' '); + } + printer.print(kBinLabels[i]); } - ace_common::printfTo(printer, "%6.6s", ">>"); + printer.print(F(" >>")); } /** @@ -175,7 +179,8 @@ class LogBinRendererTemplate { endBin = (endBin > numBins) ? numBins : endBin; for (uint8_t i = startBin; i < endBin; i++) { uint16_t count = bins[i]; - ace_common::printfTo(printer, "%6u", count); + printer.print(' '); + ace_common::printPad5To(printer, count); } } From 6cffcac98c9b0080736d564a5b83b0136e590a97 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Wed, 16 Mar 2022 16:49:06 -0700 Subject: [PATCH 30/59] LogBinTableRenderer.cpp: Move column labels into PROGMEM, saving ~250 bytes of RAM on AVR, ~350 bytes of RAM on ESP8266 --- examples/MemoryBenchmark/README.md | 66 ++++++------- examples/MemoryBenchmark/attiny.txt | 2 +- examples/MemoryBenchmark/esp32.txt | 46 ++++----- examples/MemoryBenchmark/esp8266.txt | 2 +- examples/MemoryBenchmark/generate_readme.py | 12 +-- examples/MemoryBenchmark/micro.txt | 2 +- examples/MemoryBenchmark/nano.txt | 2 +- src/ace_routine/LogBinTableRenderer.cpp | 102 ++++++++++++++++++++ src/ace_routine/LogBinTableRenderer.h | 59 +++-------- 9 files changed, 184 insertions(+), 109 deletions(-) create mode 100644 src/ace_routine/LogBinTableRenderer.cpp diff --git a/examples/MemoryBenchmark/README.md b/examples/MemoryBenchmark/README.md index ce44f95..79d6132 100644 --- a/examples/MemoryBenchmark/README.md +++ b/examples/MemoryBenchmark/README.md @@ -115,7 +115,7 @@ calculated flash size can jump around in unexpected ways. * Add `LogBinProfiler` * Adds about 90 bytes of flash and 70 bytes of RAM on AVR. * Add `LogBinTableRenderer` - * Adds about 2200 bytes of flash and 450 bytes of RAM on AVR. + * Adds about 2200 bytes of flash and 200 bytes of RAM on AVR. * Add `LogBinJsonRenderer` * Adds about 1800 bytes of flash and 200 bytes of RAM on AVR. @@ -215,7 +215,7 @@ $ make README.md | Scheduler, Two Coroutines (man setup) | 1186/ 63 | 786/ 52 | |---------------------------------------+--------------+-------------| | Scheduler, LogBinProfiler | 954/ 111 | 554/ 100 | -| Scheduler, LogBinTableRenderer | 2776/ 439 | 2376/ 428 | +| Scheduler, LogBinTableRenderer | 2798/ 193 | 2398/ 182 | | Scheduler, LogBinJsonRenderer | 2356/ 197 | 1956/ 186 | |---------------------------------------+--------------+-------------| | Blink Function | 546/ 14 | 146/ 3 | @@ -228,7 +228,7 @@ $ make README.md * 16MHz ATmega328P * Arduino IDE 1.8.19, Arduino CLI 0.19.2 -* Arduino AVR Boards 1.8.3 +* Arduino AVR Boards 1.8.4 ``` +--------------------------------------------------------------------+ @@ -264,7 +264,7 @@ $ make README.md | Scheduler, Two Coroutines (man setup) | 1400/ 63 | 794/ 52 | |---------------------------------------+--------------+-------------| | Scheduler, LogBinProfiler | 1166/ 111 | 560/ 100 | -| Scheduler, LogBinTableRenderer | 3348/ 552 | 2742/ 541 | +| Scheduler, LogBinTableRenderer | 3364/ 304 | 2758/ 293 | | Scheduler, LogBinJsonRenderer | 2924/ 308 | 2318/ 297 | |---------------------------------------+--------------+-------------| | Blink Function | 938/ 14 | 332/ 3 | @@ -313,7 +313,7 @@ $ make README.md | Scheduler, Two Coroutines (man setup) | 4288/ 203 | 734/ 52 | |---------------------------------------+--------------+-------------| | Scheduler, LogBinProfiler | 4054/ 251 | 500/ 100 | -| Scheduler, LogBinTableRenderer | 5404/ 515 | 1850/ 364 | +| Scheduler, LogBinTableRenderer | 5422/ 269 | 1868/ 118 | | Scheduler, LogBinJsonRenderer | 4980/ 273 | 1426/ 122 | |---------------------------------------+--------------+-------------| | Blink Function | 3994/ 154 | 440/ 3 | @@ -326,7 +326,7 @@ $ make README.md * STM32F103C8, 72 MHz ARM Cortex-M3 * Arduino IDE 1.8.19, Arduino CLI 0.19.2 -* STM32duino 2.0.0 +* STM32duino 2.2.0 ``` +--------------------------------------------------------------------+ @@ -375,7 +375,7 @@ $ make README.md * NodeMCU 1.0 clone, 80MHz ESP8266 * Arduino IDE 1.8.19, Arduino CLI 0.19.2 -* ESP8266 Boards 2.7.4 +* ESP8266 Boards 3.0.2 ``` +--------------------------------------------------------------------+ @@ -411,7 +411,7 @@ $ make README.md | Scheduler, Two Coroutines (man setup) | 260861/27984 | 532/ 68 | |---------------------------------------+--------------+-------------| | Scheduler, LogBinProfiler | 260765/28024 | 436/ 108 | -| Scheduler, LogBinTableRenderer | 265465/28420 | 5136/ 504 | +| Scheduler, LogBinTableRenderer | 265217/28100 | 4888/ 184 | | Scheduler, LogBinJsonRenderer | 264785/28104 | 4456/ 188 | |---------------------------------------+--------------+-------------| | Blink Function | 261001/27988 | 672/ 72 | @@ -424,7 +424,7 @@ $ make README.md * ESP32-01 Dev Board, 240 MHz Tensilica LX6 * Arduino IDE 1.8.19, Arduino CLI 0.19.2 -* ESP32 Boards 1.0.6 +* ESP32 Boards 2.0.2 ``` +--------------------------------------------------------------------+ @@ -432,39 +432,39 @@ $ make README.md |---------------------------------------+--------------+-------------| | Baseline | 204573/16060 | 0/ 0 | |---------------------------------------+--------------+-------------| -| One Delay Function | 204985/16084 | 412/ 24 | -| Two Delay Functions | 205057/16084 | 484/ 24 | +| One Delay Function | 205017/16092 | 444/ 32 | +| Two Delay Functions | 205089/16092 | 516/ 32 | |---------------------------------------+--------------+-------------| -| One Coroutine | 205097/16116 | 524/ 56 | -| Two Coroutines | 205269/16140 | 696/ 80 | +| One Coroutine | 205129/16124 | 556/ 64 | +| Two Coroutines | 205301/16148 | 728/ 88 | |---------------------------------------+--------------+-------------| -| One Coroutine (micros) | 205085/16116 | 512/ 56 | -| Two Coroutines (micros) | 205257/16140 | 684/ 80 | +| One Coroutine (micros) | 205117/16124 | 544/ 64 | +| Two Coroutines (micros) | 205289/16148 | 716/ 88 | |---------------------------------------+--------------+-------------| -| One Coroutine (seconds) | 205113/16116 | 540/ 56 | -| Two Coroutines (seconds) | 205301/16140 | 728/ 80 | +| One Coroutine (seconds) | 205145/16124 | 572/ 64 | +| Two Coroutines (seconds) | 205333/16148 | 760/ 88 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine | 205253/16116 | 680/ 56 | -| Scheduler, Two Coroutines | 205393/16148 | 820/ 88 | +| Scheduler, One Coroutine | 205285/16124 | 712/ 64 | +| Scheduler, Two Coroutines | 205425/16156 | 852/ 96 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (micros) | 205229/16116 | 656/ 56 | -| Scheduler, Two Coroutines (micros) | 205369/16148 | 796/ 88 | +| Scheduler, One Coroutine (micros) | 205261/16124 | 688/ 64 | +| Scheduler, Two Coroutines (micros) | 205401/16156 | 828/ 96 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (seconds) | 205269/16116 | 696/ 56 | -| Scheduler, Two Coroutines (seconds) | 205425/16148 | 852/ 88 | +| Scheduler, One Coroutine (seconds) | 205301/16124 | 728/ 64 | +| Scheduler, Two Coroutines (seconds) | 205457/16156 | 884/ 96 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (setup) | 205281/16116 | 708/ 56 | -| Scheduler, Two Coroutines (setup) | 205453/16148 | 880/ 88 | +| Scheduler, One Coroutine (setup) | 205313/16124 | 740/ 64 | +| Scheduler, Two Coroutines (setup) | 205485/16156 | 912/ 96 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (man setup) | 205273/16116 | 700/ 56 | -| Scheduler, Two Coroutines (man setup) | 205453/16148 | 880/ 88 | +| Scheduler, One Coroutine (man setup) | 205305/16124 | 732/ 64 | +| Scheduler, Two Coroutines (man setup) | 205485/16156 | 912/ 96 | |---------------------------------------+--------------+-------------| -| Scheduler, LogBinProfiler | 205333/16188 | 760/ 128 | -| Scheduler, LogBinTableRenderer | 210941/16268 | 6368/ 208 | -| Scheduler, LogBinJsonRenderer | 210477/16268 | 5904/ 208 | +| Scheduler, LogBinProfiler | 205365/16196 | 792/ 136 | +| Scheduler, LogBinTableRenderer | 210973/16276 | 6400/ 216 | +| Scheduler, LogBinJsonRenderer | 210509/16276 | 5936/ 216 | |---------------------------------------+--------------+-------------| -| Blink Function | 205337/16092 | 764/ 32 | -| Blink Coroutine | 205449/16116 | 876/ 56 | +| Blink Function | 205369/16100 | 796/ 40 | +| Blink Coroutine | 205481/16124 | 908/ 64 | +--------------------------------------------------------------------+ ``` @@ -473,7 +473,7 @@ $ make README.md * 96 MHz ARM Cortex-M4 * Arduino IDE 1.8.19, Arduino CLI 0.19.2 -* Teensyduino 1.53 +* Teensyduino 1.56 * Compiler options: "Faster" ``` diff --git a/examples/MemoryBenchmark/attiny.txt b/examples/MemoryBenchmark/attiny.txt index f7e8e1d..299b455 100644 --- a/examples/MemoryBenchmark/attiny.txt +++ b/examples/MemoryBenchmark/attiny.txt @@ -18,7 +18,7 @@ 17 896 8192 39 512 18 1186 8192 63 512 19 954 8192 111 512 -20 2776 8192 439 512 +20 2798 8192 193 512 21 2356 8192 197 512 22 546 8192 14 512 23 766 8192 37 512 diff --git a/examples/MemoryBenchmark/esp32.txt b/examples/MemoryBenchmark/esp32.txt index b5a4203..0460485 100644 --- a/examples/MemoryBenchmark/esp32.txt +++ b/examples/MemoryBenchmark/esp32.txt @@ -1,24 +1,24 @@ 0 204573 1310720 16060 327680 -1 204985 1310720 16084 327680 -2 205057 1310720 16084 327680 -3 205097 1310720 16116 327680 -4 205269 1310720 16140 327680 -5 205085 1310720 16116 327680 -6 205257 1310720 16140 327680 -7 205113 1310720 16116 327680 -8 205301 1310720 16140 327680 -9 205253 1310720 16116 327680 -10 205393 1310720 16148 327680 -11 205229 1310720 16116 327680 -12 205369 1310720 16148 327680 -13 205269 1310720 16116 327680 -14 205425 1310720 16148 327680 -15 205281 1310720 16116 327680 -16 205453 1310720 16148 327680 -17 205273 1310720 16116 327680 -18 205453 1310720 16148 327680 -19 205333 1310720 16188 327680 -20 210941 1310720 16268 327680 -21 210477 1310720 16268 327680 -22 205337 1310720 16092 327680 -23 205449 1310720 16116 327680 +1 205017 1310720 16092 327680 +2 205089 1310720 16092 327680 +3 205129 1310720 16124 327680 +4 205301 1310720 16148 327680 +5 205117 1310720 16124 327680 +6 205289 1310720 16148 327680 +7 205145 1310720 16124 327680 +8 205333 1310720 16148 327680 +9 205285 1310720 16124 327680 +10 205425 1310720 16156 327680 +11 205261 1310720 16124 327680 +12 205401 1310720 16156 327680 +13 205301 1310720 16124 327680 +14 205457 1310720 16156 327680 +15 205313 1310720 16124 327680 +16 205485 1310720 16156 327680 +17 205305 1310720 16124 327680 +18 205485 1310720 16156 327680 +19 205365 1310720 16196 327680 +20 210973 1310720 16276 327680 +21 210509 1310720 16276 327680 +22 205369 1310720 16100 327680 +23 205481 1310720 16124 327680 diff --git a/examples/MemoryBenchmark/esp8266.txt b/examples/MemoryBenchmark/esp8266.txt index 22fd3f2..b779234 100644 --- a/examples/MemoryBenchmark/esp8266.txt +++ b/examples/MemoryBenchmark/esp8266.txt @@ -18,7 +18,7 @@ 17 260685 1044464 27952 81920 18 260861 1044464 27984 81920 19 260765 1044464 28024 81920 -20 265465 1044464 28420 81920 +20 265217 1044464 28100 81920 21 264785 1044464 28104 81920 22 261001 1044464 27988 81920 23 261149 1044464 28016 81920 diff --git a/examples/MemoryBenchmark/generate_readme.py b/examples/MemoryBenchmark/generate_readme.py index 8dd752f..7d79a77 100755 --- a/examples/MemoryBenchmark/generate_readme.py +++ b/examples/MemoryBenchmark/generate_readme.py @@ -139,7 +139,7 @@ * Add `LogBinProfiler` * Adds about 90 bytes of flash and 70 bytes of RAM on AVR. * Add `LogBinTableRenderer` - * Adds about 2200 bytes of flash and 450 bytes of RAM on AVR. + * Adds about 2200 bytes of flash and 200 bytes of RAM on AVR. * Add `LogBinJsonRenderer` * Adds about 1800 bytes of flash and 200 bytes of RAM on AVR. @@ -213,7 +213,7 @@ * 16MHz ATmega328P * Arduino IDE 1.8.19, Arduino CLI 0.19.2 -* Arduino AVR Boards 1.8.3 +* Arduino AVR Boards 1.8.4 ``` {nano_results} @@ -233,7 +233,7 @@ * STM32F103C8, 72 MHz ARM Cortex-M3 * Arduino IDE 1.8.19, Arduino CLI 0.19.2 -* STM32duino 2.0.0 +* STM32duino 2.2.0 ``` {stm32_results} @@ -243,7 +243,7 @@ * NodeMCU 1.0 clone, 80MHz ESP8266 * Arduino IDE 1.8.19, Arduino CLI 0.19.2 -* ESP8266 Boards 2.7.4 +* ESP8266 Boards 3.0.2 ``` {esp8266_results} @@ -253,7 +253,7 @@ * ESP32-01 Dev Board, 240 MHz Tensilica LX6 * Arduino IDE 1.8.19, Arduino CLI 0.19.2 -* ESP32 Boards 1.0.6 +* ESP32 Boards 2.0.2 ``` {esp32_results} @@ -263,7 +263,7 @@ * 96 MHz ARM Cortex-M4 * Arduino IDE 1.8.19, Arduino CLI 0.19.2 -* Teensyduino 1.53 +* Teensyduino 1.56 * Compiler options: "Faster" ``` diff --git a/examples/MemoryBenchmark/micro.txt b/examples/MemoryBenchmark/micro.txt index 141dd28..dce71d8 100644 --- a/examples/MemoryBenchmark/micro.txt +++ b/examples/MemoryBenchmark/micro.txt @@ -18,7 +18,7 @@ 17 3994 28672 179 2560 18 4288 28672 203 2560 19 4054 28672 251 2560 -20 5404 28672 515 2560 +20 5422 28672 269 2560 21 4980 28672 273 2560 22 3994 28672 154 2560 23 4164 28672 177 2560 diff --git a/examples/MemoryBenchmark/nano.txt b/examples/MemoryBenchmark/nano.txt index e42236c..ca091af 100644 --- a/examples/MemoryBenchmark/nano.txt +++ b/examples/MemoryBenchmark/nano.txt @@ -18,7 +18,7 @@ 17 1106 30720 39 2048 18 1400 30720 63 2048 19 1166 30720 111 2048 -20 3348 30720 552 2048 +20 3364 30720 304 2048 21 2924 30720 308 2048 22 938 30720 14 2048 23 1168 30720 37 2048 diff --git a/src/ace_routine/LogBinTableRenderer.cpp b/src/ace_routine/LogBinTableRenderer.cpp new file mode 100644 index 0000000..22f813c --- /dev/null +++ b/src/ace_routine/LogBinTableRenderer.cpp @@ -0,0 +1,102 @@ +/* +MIT License + +Copyright (c) 2022 Brian T. Park + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ + +#include +#include "LogBinTableRenderer.h" + +namespace ace_routine { +namespace internal { + +// The numbers for higher duration values deviate from powers of 2 because 2^10 +// = 1024, which is not exactly 1000. +static const char kBinLabel00[] PROGMEM = "<2us"; +static const char kBinLabel01[] PROGMEM = "<4us"; +static const char kBinLabel02[] PROGMEM = "<8us"; +static const char kBinLabel03[] PROGMEM = "<16us"; +static const char kBinLabel04[] PROGMEM = "<32us"; +static const char kBinLabel05[] PROGMEM = "<64us"; +static const char kBinLabel06[] PROGMEM = "<128us"; +static const char kBinLabel07[] PROGMEM = "<256us"; +static const char kBinLabel08[] PROGMEM = "<512us"; +static const char kBinLabel09[] PROGMEM = "<1ms"; +static const char kBinLabel10[] PROGMEM = "<2ms"; +static const char kBinLabel11[] PROGMEM = "<4ms"; +static const char kBinLabel12[] PROGMEM = "<8ms"; +static const char kBinLabel13[] PROGMEM = "<16ms"; +static const char kBinLabel14[] PROGMEM = "<33ms"; +static const char kBinLabel15[] PROGMEM = "<66ms"; +static const char kBinLabel16[] PROGMEM = "<131ms"; +static const char kBinLabel17[] PROGMEM = "<262ms"; +static const char kBinLabel18[] PROGMEM = "<524ms"; +static const char kBinLabel19[] PROGMEM = "<1s"; +static const char kBinLabel20[] PROGMEM = "<2s"; +static const char kBinLabel21[] PROGMEM = "<4s"; +static const char kBinLabel22[] PROGMEM = "<8s"; +static const char kBinLabel23[] PROGMEM = "<17s"; +static const char kBinLabel24[] PROGMEM = "<34s"; +static const char kBinLabel25[] PROGMEM = "<67s"; +static const char kBinLabel26[] PROGMEM = "<134s"; +static const char kBinLabel27[] PROGMEM = "<268s"; +static const char kBinLabel28[] PROGMEM = "<537s"; +static const char kBinLabel29[] PROGMEM = "<1074s"; +static const char kBinLabel30[] PROGMEM = "<2147s"; +static const char kBinLabel31[] PROGMEM = "<4295s"; + +const char* const kBinLabels[kNumBinLabels] PROGMEM = { + kBinLabel00, + kBinLabel01, + kBinLabel02, + kBinLabel03, + kBinLabel04, + kBinLabel05, + kBinLabel06, + kBinLabel07, + kBinLabel08, + kBinLabel09, + kBinLabel10, + kBinLabel11, + kBinLabel12, + kBinLabel13, + kBinLabel14, + kBinLabel15, + kBinLabel16, + kBinLabel17, + kBinLabel18, + kBinLabel19, + kBinLabel20, + kBinLabel21, + kBinLabel22, + kBinLabel23, + kBinLabel24, + kBinLabel25, + kBinLabel26, + kBinLabel27, + kBinLabel28, + kBinLabel29, + kBinLabel30, + kBinLabel31, +}; + +} +} diff --git a/src/ace_routine/LogBinTableRenderer.h b/src/ace_routine/LogBinTableRenderer.h index 9b9d223..f0fef95 100644 --- a/src/ace_routine/LogBinTableRenderer.h +++ b/src/ace_routine/LogBinTableRenderer.h @@ -29,10 +29,18 @@ SOFTWARE. #include // Print #include // printPad5To() #include "Coroutine.h" // Coroutine -#include "CoroutineProfiler.h" +#include "LogBinProfiler.h" namespace ace_routine { +namespace internal { + /** Number of bins in LogBinProfiler. */ + const uint8_t kNumBinLabels = 32; + + /** Labels for each bin in LogBinProfiler::mBins. */ + extern const char* const kBinLabels[kNumBinLabels] PROGMEM; +} + /** * Print the information in the LogBinProfiler for each Coroutine * in a human-readable table. Each bin is printed as a 5-digit number, since the @@ -149,11 +157,16 @@ class LogBinRendererTemplate { if (endBin <= startBin) return; // needed if startBin = endBin = 0 for (uint8_t i = startBin; i < endBin - 1; i++) { - uint8_t labelLength = strlen(kBinLabels[i]); + // These contortions are needed because the labels are stored in PROGMEM + // flash memory. + auto* label = (const char*) pgm_read_ptr(&internal::kBinLabels[i]); + uint8_t labelLength = strlen_P(label); + + // Print label right justified in a box of 6 characters. for (uint8_t i = 0; i < (6 - labelLength); i++) { printer.print(' '); } - printer.print(kBinLabels[i]); + printer.print((const __FlashStringHelper*) label); } printer.print(F(" >>")); } @@ -185,49 +198,9 @@ class LogBinRendererTemplate { } private: - /** Labels for each bin in LogBinProfiler::mBins. */ - static const char* const kBinLabels[Profiler::kNumBins]; - T_COROUTINE** mRoot; }; -template -const char* const LogBinRendererTemplate::kBinLabels[ - LogBinProfilerTemplate::kNumBins] = { - "<2us", - "<4us", - "<8us", - "<16us", - "<32us", - "<64us", - "<128us", - "<256us", - "<512us", - "<1ms", - "<2ms", - "<4ms", - "<8ms", - "<16ms", - "<33ms", - "<66ms", - "<131ms", - "<262ms", - "<524ms", - "<1s", - "<2s", - "<4s", - "<8s", - "<17s", - "<34s", - "<67s", - "<134s", - "<268s", - "<537s", - "<1074s", - "<2147s", - "<4295s", -}; - using LogBinTableRenderer = LogBinRendererTemplate; } From 70ff9031f462e0556430cbd0104e3e448851d3f4 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Wed, 16 Mar 2022 17:32:57 -0700 Subject: [PATCH 31/59] CoroutineProfiler.h: Enable virtual destructor only on 32-bit processors, increasing flash usage by 50-150 bytes --- examples/MemoryBenchmark/README.md | 24 +++++++++---------- examples/MemoryBenchmark/esp32.txt | 6 ++--- examples/MemoryBenchmark/esp8266.txt | 6 ++--- examples/MemoryBenchmark/stm32.txt | 6 ++--- examples/MemoryBenchmark/teensy32.txt | 6 ++--- src/ace_routine/CoroutineProfiler.h | 32 +++++++++++++++++++++++++ src/ace_routine/LogBinTableRenderer.cpp | 3 ++- 7 files changed, 58 insertions(+), 25 deletions(-) diff --git a/examples/MemoryBenchmark/README.md b/examples/MemoryBenchmark/README.md index 79d6132..cde2d90 100644 --- a/examples/MemoryBenchmark/README.md +++ b/examples/MemoryBenchmark/README.md @@ -361,9 +361,9 @@ $ make README.md | Scheduler, One Coroutine (man setup) | 22224/ 3576 | 340/ 36 | | Scheduler, Two Coroutines (man setup) | 22360/ 3604 | 476/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, LogBinProfiler | 22284/ 3644 | 400/ 104 | -| Scheduler, LogBinTableRenderer | 23636/ 3644 | 1752/ 104 | -| Scheduler, LogBinJsonRenderer | 22956/ 3644 | 1072/ 104 | +| Scheduler, LogBinProfiler | 22316/ 3644 | 432/ 104 | +| Scheduler, LogBinTableRenderer | 23664/ 3644 | 1780/ 104 | +| Scheduler, LogBinJsonRenderer | 22984/ 3644 | 1100/ 104 | |---------------------------------------+--------------+-------------| | Blink Function | 22120/ 3540 | 236/ 0 | | Blink Coroutine | 22232/ 3568 | 348/ 28 | @@ -410,9 +410,9 @@ $ make README.md | Scheduler, One Coroutine (man setup) | 260685/27952 | 356/ 36 | | Scheduler, Two Coroutines (man setup) | 260861/27984 | 532/ 68 | |---------------------------------------+--------------+-------------| -| Scheduler, LogBinProfiler | 260765/28024 | 436/ 108 | -| Scheduler, LogBinTableRenderer | 265217/28100 | 4888/ 184 | -| Scheduler, LogBinJsonRenderer | 264785/28104 | 4456/ 188 | +| Scheduler, LogBinProfiler | 260797/28024 | 468/ 108 | +| Scheduler, LogBinTableRenderer | 265249/28100 | 4920/ 184 | +| Scheduler, LogBinJsonRenderer | 264817/28104 | 4488/ 188 | |---------------------------------------+--------------+-------------| | Blink Function | 261001/27988 | 672/ 72 | | Blink Coroutine | 261149/28016 | 820/ 100 | @@ -459,9 +459,9 @@ $ make README.md | Scheduler, One Coroutine (man setup) | 205305/16124 | 732/ 64 | | Scheduler, Two Coroutines (man setup) | 205485/16156 | 912/ 96 | |---------------------------------------+--------------+-------------| -| Scheduler, LogBinProfiler | 205365/16196 | 792/ 136 | -| Scheduler, LogBinTableRenderer | 210973/16276 | 6400/ 216 | -| Scheduler, LogBinJsonRenderer | 210509/16276 | 5936/ 216 | +| Scheduler, LogBinProfiler | 205401/16196 | 828/ 136 | +| Scheduler, LogBinTableRenderer | 211005/16276 | 6432/ 216 | +| Scheduler, LogBinJsonRenderer | 210525/16276 | 5952/ 216 | |---------------------------------------+--------------+-------------| | Blink Function | 205369/16100 | 796/ 40 | | Blink Coroutine | 205481/16124 | 908/ 64 | @@ -509,9 +509,9 @@ $ make README.md | Scheduler, One Coroutine (man setup) | 10588/ 4188 | 356/ 36 | | Scheduler, Two Coroutines (man setup) | 10736/ 4216 | 504/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, LogBinProfiler | 10852/ 4256 | 620/ 104 | -| Scheduler, LogBinTableRenderer | 13720/ 4276 | 3488/ 124 | -| Scheduler, LogBinJsonRenderer | 13140/ 4276 | 2908/ 124 | +| Scheduler, LogBinProfiler | 10956/ 4264 | 724/ 112 | +| Scheduler, LogBinTableRenderer | 13800/ 4284 | 3568/ 132 | +| Scheduler, LogBinJsonRenderer | 13284/ 4284 | 3052/ 132 | |---------------------------------------+--------------+-------------| | Blink Function | 10688/ 4160 | 456/ 8 | | Blink Coroutine | 10820/ 4184 | 588/ 32 | diff --git a/examples/MemoryBenchmark/esp32.txt b/examples/MemoryBenchmark/esp32.txt index 0460485..363f98c 100644 --- a/examples/MemoryBenchmark/esp32.txt +++ b/examples/MemoryBenchmark/esp32.txt @@ -17,8 +17,8 @@ 16 205485 1310720 16156 327680 17 205305 1310720 16124 327680 18 205485 1310720 16156 327680 -19 205365 1310720 16196 327680 -20 210973 1310720 16276 327680 -21 210509 1310720 16276 327680 +19 205401 1310720 16196 327680 +20 211005 1310720 16276 327680 +21 210525 1310720 16276 327680 22 205369 1310720 16100 327680 23 205481 1310720 16124 327680 diff --git a/examples/MemoryBenchmark/esp8266.txt b/examples/MemoryBenchmark/esp8266.txt index b779234..e801b07 100644 --- a/examples/MemoryBenchmark/esp8266.txt +++ b/examples/MemoryBenchmark/esp8266.txt @@ -17,8 +17,8 @@ 16 260877 1044464 27984 81920 17 260685 1044464 27952 81920 18 260861 1044464 27984 81920 -19 260765 1044464 28024 81920 -20 265217 1044464 28100 81920 -21 264785 1044464 28104 81920 +19 260797 1044464 28024 81920 +20 265249 1044464 28100 81920 +21 264817 1044464 28104 81920 22 261001 1044464 27988 81920 23 261149 1044464 28016 81920 diff --git a/examples/MemoryBenchmark/stm32.txt b/examples/MemoryBenchmark/stm32.txt index a22c6b1..5594ba6 100644 --- a/examples/MemoryBenchmark/stm32.txt +++ b/examples/MemoryBenchmark/stm32.txt @@ -17,8 +17,8 @@ 16 22364 131072 3604 20480 17 22224 131072 3576 20480 18 22360 131072 3604 20480 -19 22284 131072 3644 20480 -20 23636 131072 3644 20480 -21 22956 131072 3644 20480 +19 22316 131072 3644 20480 +20 23664 131072 3644 20480 +21 22984 131072 3644 20480 22 22120 131072 3540 20480 23 22232 131072 3568 20480 diff --git a/examples/MemoryBenchmark/teensy32.txt b/examples/MemoryBenchmark/teensy32.txt index 94cbfe7..bfe9041 100644 --- a/examples/MemoryBenchmark/teensy32.txt +++ b/examples/MemoryBenchmark/teensy32.txt @@ -17,8 +17,8 @@ 16 10748 262144 4216 65536 17 10588 262144 4188 65536 18 10736 262144 4216 65536 -19 10852 262144 4256 65536 -20 13720 262144 4276 65536 -21 13140 262144 4276 65536 +19 10956 262144 4264 65536 +20 13800 262144 4284 65536 +21 13284 262144 4284 65536 22 10688 262144 4160 65536 23 10820 262144 4184 65536 diff --git a/src/ace_routine/CoroutineProfiler.h b/src/ace_routine/CoroutineProfiler.h index da09c71..14bf99f 100644 --- a/src/ace_routine/CoroutineProfiler.h +++ b/src/ace_routine/CoroutineProfiler.h @@ -31,6 +31,38 @@ namespace ace_routine { class CoroutineProfiler { public: + /** Use default constructor. */ + CoroutineProfiler() = default; + + /** + * The destructor is NON-virtual on AVR processors because adding a virtual + * destructor causes flash consumption to increase by 600 bytes, even if the + * profiler is never used. If profiling is enabled on 8-bit processors, I + * expect the number of coroutines in the system to be relatively small, so + * it seems reasonable to create instances of the CoroutineProfiler + * statically at the global scope, and attach them to the Coroutines using + * the `Coroutine::setProfiler()` method. This means that this destructor + * will never be called polymorphically. + * + * On 32-bit processors, the destructor is virtual because I expect that the + * application will use a larger number of coroutines, so it will be much + * easier to use to the `LogBinProfiler::createProfilers()` and + * `LogBinProfiler::deleteProfilers()` helper methods to create the + * profilers on the heap. This means that the destructor may be called + * polymorphically and a virtual destructor is needed for correctness. + * It is expected that 32-bit processors will have far more flash memory and + * static RAM than 8-bit processors, so the additional resource consumption + * will hopefully not be too burdensome. If it is, then 32-bit processors + * have the option of using the same technique as 8-bit processors, and use + * the `Coroutine::setProfiler()` to attach statically created instances + * instead. + */ + #if defined(ARDUINO_ARCH_AVR) + ~CoroutineProfiler() = default; + #else + virtual ~CoroutineProfiler() = default; + #endif + /** * Process the completion of the runCoroutine() method which took * `micros` microseconds. diff --git a/src/ace_routine/LogBinTableRenderer.cpp b/src/ace_routine/LogBinTableRenderer.cpp index 22f813c..0f85b18 100644 --- a/src/ace_routine/LogBinTableRenderer.cpp +++ b/src/ace_routine/LogBinTableRenderer.cpp @@ -29,7 +29,8 @@ namespace ace_routine { namespace internal { // The numbers for higher duration values deviate from powers of 2 because 2^10 -// = 1024, which is not exactly 1000. +// = 1024, which is not exactly 1000. The length of each string *must* be 6 or +// smaller, otherwise a bit of code in LogBinTableRenderer.h must be updated. static const char kBinLabel00[] PROGMEM = "<2us"; static const char kBinLabel01[] PROGMEM = "<4us"; static const char kBinLabel02[] PROGMEM = "<8us"; From 9842d89e827998446cd1746a478610c13fa6a93f Mon Sep 17 00:00:00 2001 From: Brian Park Date: Wed, 16 Mar 2022 17:34:13 -0700 Subject: [PATCH 32/59] LogBinProfiler.h: Remove 'delete' of existing profiler pointer in createProfilers(), to prevent accidental delete of statically defined profiler --- src/ace_routine/LogBinProfiler.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/ace_routine/LogBinProfiler.h b/src/ace_routine/LogBinProfiler.h index e40f6ca..71cdc03 100644 --- a/src/ace_routine/LogBinProfiler.h +++ b/src/ace_routine/LogBinProfiler.h @@ -88,19 +88,19 @@ class LogBinProfilerTemplate : public CoroutineProfiler { /** * Create a new profiler on the heap and attach it to each coroutine in the - * singly-linked list of coroutines defined by `root`. + * singly-linked list of coroutines defined by `root`. If the coroutine has + * an existing profiler attached to it, the previous profiler is simply + * replaced, but *not* deleted. The reason is that the previous profiler + * could have been created statically, instead of on the heap, and we + * would crash the program if we tried to call `delete` on that pointer. + * + * If createProfilers() is called twice within the same application, (which + * should rarely happen), the program must ensure that deleteProfilers() is + * called before the second call to createProfilers(). Otherwise, heap + * memory will be leaked. */ static void createProfilers(T_COROUTINE** root) { for (Coroutine** p = root; (*p) != nullptr; p = (*p)->getNext()) { - - // Delete any existing profiler. - auto* currentProfiler = - (LogBinProfilerTemplate*) (*p)->getProfiler(); - if (currentProfiler) { - delete currentProfiler; - } - - // Attach new profiler. auto* profiler = new LogBinProfilerTemplate(); (*p)->setProfiler(profiler); } From 3078fc3ec030248cc143641599f026c11411d95e Mon Sep 17 00:00:00 2001 From: Brian Park Date: Wed, 16 Mar 2022 18:26:06 -0700 Subject: [PATCH 33/59] Coroutine.h: Extract 'run with profiler' code from CoroutineScheduler to Coroutine::runCoroutineWithProfiler(), saving 10-40 bytes of flash --- examples/MemoryBenchmark/README.md | 178 +++++++++++++------------- examples/MemoryBenchmark/attiny.txt | 26 ++-- examples/MemoryBenchmark/esp32.txt | 26 ++-- examples/MemoryBenchmark/esp8266.txt | 26 ++-- examples/MemoryBenchmark/micro.txt | 26 ++-- examples/MemoryBenchmark/nano.txt | 26 ++-- examples/MemoryBenchmark/stm32.txt | 26 ++-- examples/MemoryBenchmark/teensy32.txt | 22 ++-- src/ace_routine/Coroutine.h | 26 +++- src/ace_routine/CoroutineScheduler.h | 17 +-- 10 files changed, 209 insertions(+), 190 deletions(-) diff --git a/examples/MemoryBenchmark/README.md b/examples/MemoryBenchmark/README.md index cde2d90..df115b7 100644 --- a/examples/MemoryBenchmark/README.md +++ b/examples/MemoryBenchmark/README.md @@ -199,24 +199,24 @@ $ make README.md | One Coroutine (seconds) | 738/ 37 | 338/ 26 | | Two Coroutines (seconds) | 958/ 61 | 558/ 50 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine | 866/ 39 | 466/ 28 | -| Scheduler, Two Coroutines | 1052/ 63 | 652/ 52 | +| Scheduler, One Coroutine | 830/ 39 | 430/ 28 | +| Scheduler, Two Coroutines | 1016/ 63 | 616/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (micros) | 834/ 39 | 434/ 28 | -| Scheduler, Two Coroutines (micros) | 988/ 63 | 588/ 52 | +| Scheduler, One Coroutine (micros) | 798/ 39 | 398/ 28 | +| Scheduler, Two Coroutines (micros) | 952/ 63 | 552/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (seconds) | 962/ 39 | 562/ 28 | -| Scheduler, Two Coroutines (seconds) | 1176/ 63 | 776/ 52 | +| Scheduler, One Coroutine (seconds) | 926/ 39 | 526/ 28 | +| Scheduler, Two Coroutines (seconds) | 1140/ 63 | 740/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (setup) | 920/ 39 | 520/ 28 | -| Scheduler, Two Coroutines (setup) | 1202/ 63 | 802/ 52 | +| Scheduler, One Coroutine (setup) | 880/ 39 | 480/ 28 | +| Scheduler, Two Coroutines (setup) | 1162/ 63 | 762/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (man setup) | 896/ 39 | 496/ 28 | -| Scheduler, Two Coroutines (man setup) | 1186/ 63 | 786/ 52 | +| Scheduler, One Coroutine (man setup) | 860/ 39 | 460/ 28 | +| Scheduler, Two Coroutines (man setup) | 1150/ 63 | 750/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, LogBinProfiler | 954/ 111 | 554/ 100 | -| Scheduler, LogBinTableRenderer | 2798/ 193 | 2398/ 182 | -| Scheduler, LogBinJsonRenderer | 2356/ 197 | 1956/ 186 | +| Scheduler, LogBinProfiler | 918/ 111 | 518/ 100 | +| Scheduler, LogBinTableRenderer | 2766/ 193 | 2366/ 182 | +| Scheduler, LogBinJsonRenderer | 2326/ 197 | 1926/ 186 | |---------------------------------------+--------------+-------------| | Blink Function | 546/ 14 | 146/ 3 | | Blink Coroutine | 766/ 37 | 366/ 26 | @@ -248,24 +248,24 @@ $ make README.md | One Coroutine (seconds) | 954/ 37 | 348/ 26 | | Two Coroutines (seconds) | 1180/ 61 | 574/ 50 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine | 1078/ 39 | 472/ 28 | -| Scheduler, Two Coroutines | 1264/ 63 | 658/ 52 | +| Scheduler, One Coroutine | 1042/ 39 | 436/ 28 | +| Scheduler, Two Coroutines | 1228/ 63 | 622/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (micros) | 1050/ 39 | 444/ 28 | -| Scheduler, Two Coroutines (micros) | 1208/ 63 | 602/ 52 | +| Scheduler, One Coroutine (micros) | 1014/ 39 | 408/ 28 | +| Scheduler, Two Coroutines (micros) | 1172/ 63 | 566/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (seconds) | 1178/ 39 | 572/ 28 | -| Scheduler, Two Coroutines (seconds) | 1396/ 63 | 790/ 52 | +| Scheduler, One Coroutine (seconds) | 1142/ 39 | 536/ 28 | +| Scheduler, Two Coroutines (seconds) | 1360/ 63 | 754/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (setup) | 1128/ 39 | 522/ 28 | -| Scheduler, Two Coroutines (setup) | 1414/ 63 | 808/ 52 | +| Scheduler, One Coroutine (setup) | 1096/ 39 | 490/ 28 | +| Scheduler, Two Coroutines (setup) | 1382/ 63 | 776/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (man setup) | 1106/ 39 | 500/ 28 | -| Scheduler, Two Coroutines (man setup) | 1400/ 63 | 794/ 52 | +| Scheduler, One Coroutine (man setup) | 1074/ 39 | 468/ 28 | +| Scheduler, Two Coroutines (man setup) | 1368/ 63 | 762/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, LogBinProfiler | 1166/ 111 | 560/ 100 | -| Scheduler, LogBinTableRenderer | 3364/ 304 | 2758/ 293 | -| Scheduler, LogBinJsonRenderer | 2924/ 308 | 2318/ 297 | +| Scheduler, LogBinProfiler | 1134/ 111 | 528/ 100 | +| Scheduler, LogBinTableRenderer | 3340/ 304 | 2734/ 293 | +| Scheduler, LogBinJsonRenderer | 2900/ 308 | 2294/ 297 | |---------------------------------------+--------------+-------------| | Blink Function | 938/ 14 | 332/ 3 | | Blink Coroutine | 1168/ 37 | 562/ 26 | @@ -297,24 +297,24 @@ $ make README.md | One Coroutine (seconds) | 3842/ 177 | 288/ 26 | | Two Coroutines (seconds) | 4068/ 201 | 514/ 50 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine | 3966/ 179 | 412/ 28 | -| Scheduler, Two Coroutines | 4152/ 203 | 598/ 52 | +| Scheduler, One Coroutine | 3930/ 179 | 376/ 28 | +| Scheduler, Two Coroutines | 4116/ 203 | 562/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (micros) | 3938/ 179 | 384/ 28 | -| Scheduler, Two Coroutines (micros) | 4096/ 203 | 542/ 52 | +| Scheduler, One Coroutine (micros) | 3902/ 179 | 348/ 28 | +| Scheduler, Two Coroutines (micros) | 4060/ 203 | 506/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (seconds) | 4066/ 179 | 512/ 28 | -| Scheduler, Two Coroutines (seconds) | 4284/ 203 | 730/ 52 | +| Scheduler, One Coroutine (seconds) | 4030/ 179 | 476/ 28 | +| Scheduler, Two Coroutines (seconds) | 4248/ 203 | 694/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (setup) | 4016/ 179 | 462/ 28 | -| Scheduler, Two Coroutines (setup) | 4302/ 203 | 748/ 52 | +| Scheduler, One Coroutine (setup) | 3984/ 179 | 430/ 28 | +| Scheduler, Two Coroutines (setup) | 4270/ 203 | 716/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (man setup) | 3994/ 179 | 440/ 28 | -| Scheduler, Two Coroutines (man setup) | 4288/ 203 | 734/ 52 | +| Scheduler, One Coroutine (man setup) | 3962/ 179 | 408/ 28 | +| Scheduler, Two Coroutines (man setup) | 4256/ 203 | 702/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, LogBinProfiler | 4054/ 251 | 500/ 100 | -| Scheduler, LogBinTableRenderer | 5422/ 269 | 1868/ 118 | -| Scheduler, LogBinJsonRenderer | 4980/ 273 | 1426/ 122 | +| Scheduler, LogBinProfiler | 4022/ 251 | 468/ 100 | +| Scheduler, LogBinTableRenderer | 5398/ 269 | 1844/ 118 | +| Scheduler, LogBinJsonRenderer | 4958/ 273 | 1404/ 122 | |---------------------------------------+--------------+-------------| | Blink Function | 3994/ 154 | 440/ 3 | | Blink Coroutine | 4164/ 177 | 610/ 26 | @@ -346,24 +346,24 @@ $ make README.md | One Coroutine (seconds) | 22032/ 3572 | 148/ 32 | | Two Coroutines (seconds) | 22196/ 3600 | 312/ 60 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine | 22208/ 3576 | 324/ 36 | -| Scheduler, Two Coroutines | 22312/ 3604 | 428/ 64 | +| Scheduler, One Coroutine | 22192/ 3576 | 308/ 36 | +| Scheduler, Two Coroutines | 22296/ 3604 | 412/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (micros) | 22208/ 3576 | 324/ 36 | -| Scheduler, Two Coroutines (micros) | 22312/ 3604 | 428/ 64 | +| Scheduler, One Coroutine (micros) | 22192/ 3576 | 308/ 36 | +| Scheduler, Two Coroutines (micros) | 22296/ 3604 | 412/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (seconds) | 22224/ 3576 | 340/ 36 | -| Scheduler, Two Coroutines (seconds) | 22344/ 3604 | 460/ 64 | +| Scheduler, One Coroutine (seconds) | 22208/ 3576 | 324/ 36 | +| Scheduler, Two Coroutines (seconds) | 22328/ 3604 | 444/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (setup) | 22232/ 3576 | 348/ 36 | -| Scheduler, Two Coroutines (setup) | 22364/ 3604 | 480/ 64 | +| Scheduler, One Coroutine (setup) | 22216/ 3576 | 332/ 36 | +| Scheduler, Two Coroutines (setup) | 22348/ 3604 | 464/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (man setup) | 22224/ 3576 | 340/ 36 | -| Scheduler, Two Coroutines (man setup) | 22360/ 3604 | 476/ 64 | +| Scheduler, One Coroutine (man setup) | 22208/ 3576 | 324/ 36 | +| Scheduler, Two Coroutines (man setup) | 22344/ 3604 | 460/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, LogBinProfiler | 22316/ 3644 | 432/ 104 | -| Scheduler, LogBinTableRenderer | 23664/ 3644 | 1780/ 104 | -| Scheduler, LogBinJsonRenderer | 22984/ 3644 | 1100/ 104 | +| Scheduler, LogBinProfiler | 22300/ 3644 | 416/ 104 | +| Scheduler, LogBinTableRenderer | 23644/ 3644 | 1760/ 104 | +| Scheduler, LogBinJsonRenderer | 22968/ 3644 | 1084/ 104 | |---------------------------------------+--------------+-------------| | Blink Function | 22120/ 3540 | 236/ 0 | | Blink Coroutine | 22232/ 3568 | 348/ 28 | @@ -395,24 +395,24 @@ $ make README.md | One Coroutine (seconds) | 260541/27952 | 212/ 36 | | Two Coroutines (seconds) | 260717/27976 | 388/ 60 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine | 260669/27952 | 340/ 36 | -| Scheduler, Two Coroutines | 260813/27984 | 484/ 68 | +| Scheduler, One Coroutine | 260653/27952 | 324/ 36 | +| Scheduler, Two Coroutines | 260797/27984 | 468/ 68 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (micros) | 260669/27952 | 340/ 36 | -| Scheduler, Two Coroutines (micros) | 260813/27984 | 484/ 68 | +| Scheduler, One Coroutine (micros) | 260653/27952 | 324/ 36 | +| Scheduler, Two Coroutines (micros) | 260797/27984 | 468/ 68 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (seconds) | 260701/27952 | 372/ 36 | -| Scheduler, Two Coroutines (seconds) | 260861/27984 | 532/ 68 | +| Scheduler, One Coroutine (seconds) | 260669/27952 | 340/ 36 | +| Scheduler, Two Coroutines (seconds) | 260829/27984 | 500/ 68 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (setup) | 260701/27952 | 372/ 36 | -| Scheduler, Two Coroutines (setup) | 260877/27984 | 548/ 68 | +| Scheduler, One Coroutine (setup) | 260685/27952 | 356/ 36 | +| Scheduler, Two Coroutines (setup) | 260861/27984 | 532/ 68 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (man setup) | 260685/27952 | 356/ 36 | -| Scheduler, Two Coroutines (man setup) | 260861/27984 | 532/ 68 | +| Scheduler, One Coroutine (man setup) | 260669/27952 | 340/ 36 | +| Scheduler, Two Coroutines (man setup) | 260845/27984 | 516/ 68 | |---------------------------------------+--------------+-------------| -| Scheduler, LogBinProfiler | 260797/28024 | 468/ 108 | -| Scheduler, LogBinTableRenderer | 265249/28100 | 4920/ 184 | -| Scheduler, LogBinJsonRenderer | 264817/28104 | 4488/ 188 | +| Scheduler, LogBinProfiler | 260781/28024 | 452/ 108 | +| Scheduler, LogBinTableRenderer | 265489/28100 | 5160/ 184 | +| Scheduler, LogBinJsonRenderer | 265057/28104 | 4728/ 188 | |---------------------------------------+--------------+-------------| | Blink Function | 261001/27988 | 672/ 72 | | Blink Coroutine | 261149/28016 | 820/ 100 | @@ -444,24 +444,24 @@ $ make README.md | One Coroutine (seconds) | 205145/16124 | 572/ 64 | | Two Coroutines (seconds) | 205333/16148 | 760/ 88 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine | 205285/16124 | 712/ 64 | -| Scheduler, Two Coroutines | 205425/16156 | 852/ 96 | +| Scheduler, One Coroutine | 205245/16124 | 672/ 64 | +| Scheduler, Two Coroutines | 205385/16156 | 812/ 96 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (micros) | 205261/16124 | 688/ 64 | -| Scheduler, Two Coroutines (micros) | 205401/16156 | 828/ 96 | +| Scheduler, One Coroutine (micros) | 205221/16124 | 648/ 64 | +| Scheduler, Two Coroutines (micros) | 205361/16156 | 788/ 96 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (seconds) | 205301/16124 | 728/ 64 | -| Scheduler, Two Coroutines (seconds) | 205457/16156 | 884/ 96 | +| Scheduler, One Coroutine (seconds) | 205261/16124 | 688/ 64 | +| Scheduler, Two Coroutines (seconds) | 205417/16156 | 844/ 96 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (setup) | 205313/16124 | 740/ 64 | -| Scheduler, Two Coroutines (setup) | 205485/16156 | 912/ 96 | +| Scheduler, One Coroutine (setup) | 205273/16124 | 700/ 64 | +| Scheduler, Two Coroutines (setup) | 205445/16156 | 872/ 96 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (man setup) | 205305/16124 | 732/ 64 | -| Scheduler, Two Coroutines (man setup) | 205485/16156 | 912/ 96 | +| Scheduler, One Coroutine (man setup) | 205265/16124 | 692/ 64 | +| Scheduler, Two Coroutines (man setup) | 205445/16156 | 872/ 96 | |---------------------------------------+--------------+-------------| -| Scheduler, LogBinProfiler | 205401/16196 | 828/ 136 | -| Scheduler, LogBinTableRenderer | 211005/16276 | 6432/ 216 | -| Scheduler, LogBinJsonRenderer | 210525/16276 | 5952/ 216 | +| Scheduler, LogBinProfiler | 205361/16196 | 788/ 136 | +| Scheduler, LogBinTableRenderer | 210969/16276 | 6396/ 216 | +| Scheduler, LogBinJsonRenderer | 210489/16276 | 5916/ 216 | |---------------------------------------+--------------+-------------| | Blink Function | 205369/16100 | 796/ 40 | | Blink Coroutine | 205481/16124 | 908/ 64 | @@ -494,22 +494,22 @@ $ make README.md | One Coroutine (seconds) | 10408/ 4184 | 176/ 32 | | Two Coroutines (seconds) | 10548/ 4212 | 316/ 60 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine | 10568/ 4188 | 336/ 36 | -| Scheduler, Two Coroutines | 10684/ 4216 | 452/ 64 | +| Scheduler, One Coroutine | 10560/ 4188 | 328/ 36 | +| Scheduler, Two Coroutines | 10676/ 4216 | 444/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (micros) | 10556/ 4188 | 324/ 36 | -| Scheduler, Two Coroutines (micros) | 10660/ 4216 | 428/ 64 | +| Scheduler, One Coroutine (micros) | 10548/ 4188 | 316/ 36 | +| Scheduler, Two Coroutines (micros) | 10652/ 4216 | 420/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (seconds) | 10588/ 4188 | 356/ 36 | -| Scheduler, Two Coroutines (seconds) | 10724/ 4216 | 492/ 64 | +| Scheduler, One Coroutine (seconds) | 10580/ 4188 | 348/ 36 | +| Scheduler, Two Coroutines (seconds) | 10716/ 4216 | 484/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (setup) | 10600/ 4188 | 368/ 36 | -| Scheduler, Two Coroutines (setup) | 10748/ 4216 | 516/ 64 | +| Scheduler, One Coroutine (setup) | 10592/ 4188 | 360/ 36 | +| Scheduler, Two Coroutines (setup) | 10740/ 4216 | 508/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (man setup) | 10588/ 4188 | 356/ 36 | -| Scheduler, Two Coroutines (man setup) | 10736/ 4216 | 504/ 64 | +| Scheduler, One Coroutine (man setup) | 10580/ 4188 | 348/ 36 | +| Scheduler, Two Coroutines (man setup) | 10728/ 4216 | 496/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, LogBinProfiler | 10956/ 4264 | 724/ 112 | +| Scheduler, LogBinProfiler | 10952/ 4264 | 720/ 112 | | Scheduler, LogBinTableRenderer | 13800/ 4284 | 3568/ 132 | | Scheduler, LogBinJsonRenderer | 13284/ 4284 | 3052/ 132 | |---------------------------------------+--------------+-------------| diff --git a/examples/MemoryBenchmark/attiny.txt b/examples/MemoryBenchmark/attiny.txt index 299b455..cab6c18 100644 --- a/examples/MemoryBenchmark/attiny.txt +++ b/examples/MemoryBenchmark/attiny.txt @@ -7,18 +7,18 @@ 6 770 8192 61 512 7 738 8192 37 512 8 958 8192 61 512 -9 866 8192 39 512 -10 1052 8192 63 512 -11 834 8192 39 512 -12 988 8192 63 512 -13 962 8192 39 512 -14 1176 8192 63 512 -15 920 8192 39 512 -16 1202 8192 63 512 -17 896 8192 39 512 -18 1186 8192 63 512 -19 954 8192 111 512 -20 2798 8192 193 512 -21 2356 8192 197 512 +9 830 8192 39 512 +10 1016 8192 63 512 +11 798 8192 39 512 +12 952 8192 63 512 +13 926 8192 39 512 +14 1140 8192 63 512 +15 880 8192 39 512 +16 1162 8192 63 512 +17 860 8192 39 512 +18 1150 8192 63 512 +19 918 8192 111 512 +20 2766 8192 193 512 +21 2326 8192 197 512 22 546 8192 14 512 23 766 8192 37 512 diff --git a/examples/MemoryBenchmark/esp32.txt b/examples/MemoryBenchmark/esp32.txt index 363f98c..c4972f8 100644 --- a/examples/MemoryBenchmark/esp32.txt +++ b/examples/MemoryBenchmark/esp32.txt @@ -7,18 +7,18 @@ 6 205289 1310720 16148 327680 7 205145 1310720 16124 327680 8 205333 1310720 16148 327680 -9 205285 1310720 16124 327680 -10 205425 1310720 16156 327680 -11 205261 1310720 16124 327680 -12 205401 1310720 16156 327680 -13 205301 1310720 16124 327680 -14 205457 1310720 16156 327680 -15 205313 1310720 16124 327680 -16 205485 1310720 16156 327680 -17 205305 1310720 16124 327680 -18 205485 1310720 16156 327680 -19 205401 1310720 16196 327680 -20 211005 1310720 16276 327680 -21 210525 1310720 16276 327680 +9 205245 1310720 16124 327680 +10 205385 1310720 16156 327680 +11 205221 1310720 16124 327680 +12 205361 1310720 16156 327680 +13 205261 1310720 16124 327680 +14 205417 1310720 16156 327680 +15 205273 1310720 16124 327680 +16 205445 1310720 16156 327680 +17 205265 1310720 16124 327680 +18 205445 1310720 16156 327680 +19 205361 1310720 16196 327680 +20 210969 1310720 16276 327680 +21 210489 1310720 16276 327680 22 205369 1310720 16100 327680 23 205481 1310720 16124 327680 diff --git a/examples/MemoryBenchmark/esp8266.txt b/examples/MemoryBenchmark/esp8266.txt index e801b07..44e3525 100644 --- a/examples/MemoryBenchmark/esp8266.txt +++ b/examples/MemoryBenchmark/esp8266.txt @@ -7,18 +7,18 @@ 6 260701 1044464 27976 81920 7 260541 1044464 27952 81920 8 260717 1044464 27976 81920 -9 260669 1044464 27952 81920 -10 260813 1044464 27984 81920 -11 260669 1044464 27952 81920 -12 260813 1044464 27984 81920 -13 260701 1044464 27952 81920 -14 260861 1044464 27984 81920 -15 260701 1044464 27952 81920 -16 260877 1044464 27984 81920 -17 260685 1044464 27952 81920 -18 260861 1044464 27984 81920 -19 260797 1044464 28024 81920 -20 265249 1044464 28100 81920 -21 264817 1044464 28104 81920 +9 260653 1044464 27952 81920 +10 260797 1044464 27984 81920 +11 260653 1044464 27952 81920 +12 260797 1044464 27984 81920 +13 260669 1044464 27952 81920 +14 260829 1044464 27984 81920 +15 260685 1044464 27952 81920 +16 260861 1044464 27984 81920 +17 260669 1044464 27952 81920 +18 260845 1044464 27984 81920 +19 260781 1044464 28024 81920 +20 265489 1044464 28100 81920 +21 265057 1044464 28104 81920 22 261001 1044464 27988 81920 23 261149 1044464 28016 81920 diff --git a/examples/MemoryBenchmark/micro.txt b/examples/MemoryBenchmark/micro.txt index dce71d8..b745eb9 100644 --- a/examples/MemoryBenchmark/micro.txt +++ b/examples/MemoryBenchmark/micro.txt @@ -7,18 +7,18 @@ 6 3880 28672 201 2560 7 3842 28672 177 2560 8 4068 28672 201 2560 -9 3966 28672 179 2560 -10 4152 28672 203 2560 -11 3938 28672 179 2560 -12 4096 28672 203 2560 -13 4066 28672 179 2560 -14 4284 28672 203 2560 -15 4016 28672 179 2560 -16 4302 28672 203 2560 -17 3994 28672 179 2560 -18 4288 28672 203 2560 -19 4054 28672 251 2560 -20 5422 28672 269 2560 -21 4980 28672 273 2560 +9 3930 28672 179 2560 +10 4116 28672 203 2560 +11 3902 28672 179 2560 +12 4060 28672 203 2560 +13 4030 28672 179 2560 +14 4248 28672 203 2560 +15 3984 28672 179 2560 +16 4270 28672 203 2560 +17 3962 28672 179 2560 +18 4256 28672 203 2560 +19 4022 28672 251 2560 +20 5398 28672 269 2560 +21 4958 28672 273 2560 22 3994 28672 154 2560 23 4164 28672 177 2560 diff --git a/examples/MemoryBenchmark/nano.txt b/examples/MemoryBenchmark/nano.txt index ca091af..7e84a36 100644 --- a/examples/MemoryBenchmark/nano.txt +++ b/examples/MemoryBenchmark/nano.txt @@ -7,18 +7,18 @@ 6 992 30720 61 2048 7 954 30720 37 2048 8 1180 30720 61 2048 -9 1078 30720 39 2048 -10 1264 30720 63 2048 -11 1050 30720 39 2048 -12 1208 30720 63 2048 -13 1178 30720 39 2048 -14 1396 30720 63 2048 -15 1128 30720 39 2048 -16 1414 30720 63 2048 -17 1106 30720 39 2048 -18 1400 30720 63 2048 -19 1166 30720 111 2048 -20 3364 30720 304 2048 -21 2924 30720 308 2048 +9 1042 30720 39 2048 +10 1228 30720 63 2048 +11 1014 30720 39 2048 +12 1172 30720 63 2048 +13 1142 30720 39 2048 +14 1360 30720 63 2048 +15 1096 30720 39 2048 +16 1382 30720 63 2048 +17 1074 30720 39 2048 +18 1368 30720 63 2048 +19 1134 30720 111 2048 +20 3340 30720 304 2048 +21 2900 30720 308 2048 22 938 30720 14 2048 23 1168 30720 37 2048 diff --git a/examples/MemoryBenchmark/stm32.txt b/examples/MemoryBenchmark/stm32.txt index 5594ba6..fafbe4e 100644 --- a/examples/MemoryBenchmark/stm32.txt +++ b/examples/MemoryBenchmark/stm32.txt @@ -7,18 +7,18 @@ 6 22228 131072 3600 20480 7 22032 131072 3572 20480 8 22196 131072 3600 20480 -9 22208 131072 3576 20480 -10 22312 131072 3604 20480 -11 22208 131072 3576 20480 -12 22312 131072 3604 20480 -13 22224 131072 3576 20480 -14 22344 131072 3604 20480 -15 22232 131072 3576 20480 -16 22364 131072 3604 20480 -17 22224 131072 3576 20480 -18 22360 131072 3604 20480 -19 22316 131072 3644 20480 -20 23664 131072 3644 20480 -21 22984 131072 3644 20480 +9 22192 131072 3576 20480 +10 22296 131072 3604 20480 +11 22192 131072 3576 20480 +12 22296 131072 3604 20480 +13 22208 131072 3576 20480 +14 22328 131072 3604 20480 +15 22216 131072 3576 20480 +16 22348 131072 3604 20480 +17 22208 131072 3576 20480 +18 22344 131072 3604 20480 +19 22300 131072 3644 20480 +20 23644 131072 3644 20480 +21 22968 131072 3644 20480 22 22120 131072 3540 20480 23 22232 131072 3568 20480 diff --git a/examples/MemoryBenchmark/teensy32.txt b/examples/MemoryBenchmark/teensy32.txt index bfe9041..7e26fa4 100644 --- a/examples/MemoryBenchmark/teensy32.txt +++ b/examples/MemoryBenchmark/teensy32.txt @@ -7,17 +7,17 @@ 6 10552 262144 4212 65536 7 10408 262144 4184 65536 8 10548 262144 4212 65536 -9 10568 262144 4188 65536 -10 10684 262144 4216 65536 -11 10556 262144 4188 65536 -12 10660 262144 4216 65536 -13 10588 262144 4188 65536 -14 10724 262144 4216 65536 -15 10600 262144 4188 65536 -16 10748 262144 4216 65536 -17 10588 262144 4188 65536 -18 10736 262144 4216 65536 -19 10956 262144 4264 65536 +9 10560 262144 4188 65536 +10 10676 262144 4216 65536 +11 10548 262144 4188 65536 +12 10652 262144 4216 65536 +13 10580 262144 4188 65536 +14 10716 262144 4216 65536 +15 10592 262144 4188 65536 +16 10740 262144 4216 65536 +17 10580 262144 4188 65536 +18 10728 262144 4216 65536 +19 10952 262144 4264 65536 20 13800 262144 4284 65536 21 13284 262144 4284 65536 22 10688 262144 4160 65536 diff --git a/src/ace_routine/Coroutine.h b/src/ace_routine/Coroutine.h index e681853..3b0e0fd 100644 --- a/src/ace_routine/Coroutine.h +++ b/src/ace_routine/Coroutine.h @@ -28,6 +28,7 @@ SOFTWARE. #include // UINT16_MAX #include // Print #include // PrintStr<> +#include "CoroutineProfiler.h" #include "ClockInterface.h" class __FlashStringHelper; @@ -265,8 +266,6 @@ extern className##_##name name namespace ace_routine { -class CoroutineProfiler; - /** A lookup table from Status integer to human-readable strings. */ extern const __FlashStringHelper* const sStatusStrings[]; @@ -319,6 +318,29 @@ class CoroutineTemplate { */ virtual void setupCoroutine() {} + /** + * This is a variant of runCoroutine() which measures the execution time of + * runCoroutine() and updates the attached profiler if it exists. + * + * On 8-bit processors, memory consumption can be reduced by calling the + * `Coroutine::runCoroutine()` method directly in the global `loop()` + * function, instead of using the `CoroutineScheduler`. In such an + * environment, the end-user can enable profiling by manually changing the + * calls to `Coroutine::runCoroutine()` to + * `Coroutine::runCoroutineWithProfiler()`, and recompiling the program. + */ + int runCoroutineWithProfiler() { + if (mProfiler) { + uint32_t startMicros = coroutineMicros(); + runCoroutine(); + uint32_t elapsedMicros = coroutineMicros() - startMicros; + mProfiler->updateElapsedMicros(elapsedMicros); + return 0; + } else { + return runCoroutine(); + } + } + /** * Return the type of the name string, either kNameTypeCString or * kNameTypeFString. diff --git a/src/ace_routine/CoroutineScheduler.h b/src/ace_routine/CoroutineScheduler.h index 59a5c3f..71e7043 100644 --- a/src/ace_routine/CoroutineScheduler.h +++ b/src/ace_routine/CoroutineScheduler.h @@ -173,15 +173,13 @@ class CoroutineSchedulerTemplate { // its continuation context determines whether to call // Coroutine::isDelayExpired(), Coroutine::isDelayMicrosExpired(), or // Coroutine::isDelaySecondsExpired(). - if ((*mCurrent)->mProfiler) { - uint32_t startMicros = T_COROUTINE::coroutineMicros(); - (*mCurrent)->runCoroutine(); - uint32_t elapsedMicros = T_COROUTINE::coroutineMicros() - - startMicros; - (*mCurrent)->mProfiler->updateElapsedMicros(elapsedMicros); - } else { - (*mCurrent)->runCoroutine(); - } + // + // The `CoroutineScheduler` always enables the profiler by calling + // `Coroutine::runCoroutineWithProfiler()`. If memory usage is a + // problem, then consider calling the `Coroutine::runCoroutine()` + // directly in the global `loop()` function, instead of going through + // the `CoroutineScheduler`. + (*mCurrent)->runCoroutineWithProfiler(); break; case T_COROUTINE::kStatusEnding: @@ -198,7 +196,6 @@ class CoroutineSchedulerTemplate { mCurrent = (*mCurrent)->getNext(); } - /** List all the routines in the linked list to the printer. */ void listCoroutines(Print& printer) { for (T_COROUTINE** p = T_COROUTINE::getRoot(); (*p) != nullptr; From 7850d49b2259a719eea2cf4d2817493963048af2 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Thu, 17 Mar 2022 08:21:22 -0700 Subject: [PATCH 34/59] LogBinProfiler.h: Move rollupExteriorBins() into ace_common::internal namespace, and into LogBinProfiler.cpp file --- src/ace_routine/LogBinJsonRenderer.h | 5 +- src/ace_routine/LogBinProfiler.cpp | 63 +++++++++++++++++++ src/ace_routine/LogBinProfiler.h | 42 ++++--------- src/ace_routine/LogBinTableRenderer.h | 6 +- .../LogBinProfilerTest/LogBinProfilerTest.ino | 2 +- 5 files changed, 81 insertions(+), 37 deletions(-) create mode 100644 src/ace_routine/LogBinProfiler.cpp diff --git a/src/ace_routine/LogBinJsonRenderer.h b/src/ace_routine/LogBinJsonRenderer.h index 0d31356..3a81ff4 100644 --- a/src/ace_routine/LogBinJsonRenderer.h +++ b/src/ace_routine/LogBinJsonRenderer.h @@ -29,6 +29,7 @@ SOFTWARE. #include // Print #include "Coroutine.h" // Coroutine #include "CoroutineProfiler.h" +#include "LogBinProfiler.h" // rollupExteriorBins() namespace ace_routine { @@ -83,8 +84,8 @@ class LogBinJsonRendererTemplate { // Roll up the exterior bins in to the first and last bins if requested. const uint16_t* bins; if (rollup) { - rollupExteriorBins(bufBins, profiler->mBins, Profiler::kNumBins, - startBin, endBin); + internal::rollupExteriorBins( + bufBins, profiler->mBins, Profiler::kNumBins, startBin, endBin); bins = bufBins; } else { bins = profiler->mBins; diff --git a/src/ace_routine/LogBinProfiler.cpp b/src/ace_routine/LogBinProfiler.cpp new file mode 100644 index 0000000..ffe63f6 --- /dev/null +++ b/src/ace_routine/LogBinProfiler.cpp @@ -0,0 +1,63 @@ +/* +MIT License + +Copyright (c) 2022 Brian T. Park + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ + +#include "LogBinProfiler.h" + +namespace ace_routine { +namespace internal { + +void rollupExteriorBins( + uint16_t dst[], + const uint16_t src[], + uint8_t numBins, + uint8_t startBin, + uint8_t endBin +) { + endBin = (endBin > numBins) ? numBins : endBin; + if (endBin <= startBin) return; + + // Rollup all bins at or below startBin into the startBin. + uint32_t leftRollup = 0; + for (uint8_t i = 0; i <= startBin; i++) { + leftRollup += src[i]; + } + if (leftRollup > UINT16_MAX) leftRollup = UINT16_MAX; + dst[startBin] = leftRollup; + + // Copy the interior bins. + for (uint8_t i = startBin + 1; i < endBin - 1; i++) { + dst[i] = src[i]; + } + + // Rollup all bins at or above the last bin into the last bin. + uint32_t rightRollup = (endBin - 1 == startBin) ? leftRollup : 0; + for (uint8_t i = endBin - 1; i < numBins; i++) { + rightRollup += src[i]; + } + if (rightRollup > UINT16_MAX) rightRollup = UINT16_MAX; + dst[endBin - 1] = rightRollup; +} + +} +} diff --git a/src/ace_routine/LogBinProfiler.h b/src/ace_routine/LogBinProfiler.h index 71cdc03..568f60f 100644 --- a/src/ace_routine/LogBinProfiler.h +++ b/src/ace_routine/LogBinProfiler.h @@ -133,45 +133,25 @@ class LogBinProfilerTemplate : public CoroutineProfiler { using LogBinProfiler = LogBinProfilerTemplate; +namespace internal { + /** - * Rollup bins before `startBin` into `startBin` and bins at or after - * `endBin` into the last bin (at `endBin - 1`). This is useful to preserve - * count information when printing only a subset of the `mBins[]` array. If - * `endBin <= startBin`, this function does nothing. If `endBin < startBin - - * 1`, there is only single interior bin, so everything gets rolled up into - * the single bin. This is probably not useful, but at least it's + * Rollup bins before `startBin` into the first bin (at `startBin`) and bins at + * or after `endBin` into the last bin (at `endBin - 1`). This is useful to + * preserve count information when printing only a subset of the `mBins[]` + * array. If `endBin <= startBin`, this function does nothing. If `endBin == + * startBin + 1`, there is only single interior bin, so everything gets rolled + * up into the single bin. This is probably not useful, but at least it's * mathematically correct. */ -inline void rollupExteriorBins( +void rollupExteriorBins( uint16_t dst[], const uint16_t src[], uint8_t numBins, uint8_t startBin, uint8_t endBin -) { - endBin = (endBin > numBins) ? numBins : endBin; - if (endBin <= startBin) return; - - // Rollup all bins at or below startBin into the startBin. - uint32_t leftRollup = 0; - for (uint8_t i = 0; i <= startBin; i++) { - leftRollup += src[i]; - } - if (leftRollup > UINT16_MAX) leftRollup = UINT16_MAX; - dst[startBin] = leftRollup; - - // Copy the interior bins. - for (uint8_t i = startBin + 1; i < endBin - 1; i++) { - dst[i] = src[i]; - } - - // Rollup all bins at or above the last bin into the last bin. - uint32_t rightRollup = (endBin - 1 == startBin) ? leftRollup : 0; - for (uint8_t i = endBin - 1; i < numBins; i++) { - rightRollup += src[i]; - } - if (rightRollup > UINT16_MAX) rightRollup = UINT16_MAX; - dst[endBin - 1] = rightRollup; +); + } } diff --git a/src/ace_routine/LogBinTableRenderer.h b/src/ace_routine/LogBinTableRenderer.h index f0fef95..289b5a7 100644 --- a/src/ace_routine/LogBinTableRenderer.h +++ b/src/ace_routine/LogBinTableRenderer.h @@ -29,7 +29,7 @@ SOFTWARE. #include // Print #include // printPad5To() #include "Coroutine.h" // Coroutine -#include "LogBinProfiler.h" +#include "LogBinProfiler.h" // rollupExteriorBins() namespace ace_routine { @@ -123,8 +123,8 @@ class LogBinRendererTemplate { // Roll up the exterior bins in to the first and last bins if requested. const uint16_t* bins; if (rollup) { - rollupExteriorBins(bufBins, profiler->mBins, Profiler::kNumBins, - startBin, endBin); + internal::rollupExteriorBins( + bufBins, profiler->mBins, Profiler::kNumBins, startBin, endBin); bins = bufBins; } else { bins = profiler->mBins; diff --git a/tests/LogBinProfilerTest/LogBinProfilerTest.ino b/tests/LogBinProfilerTest/LogBinProfilerTest.ino index a69120a..0a0cd3c 100644 --- a/tests/LogBinProfilerTest/LogBinProfilerTest.ino +++ b/tests/LogBinProfilerTest/LogBinProfilerTest.ino @@ -4,7 +4,7 @@ #include using ace_routine::LogBinProfiler; -using ace_routine::rollupExteriorBins; +using ace_routine::internal::rollupExteriorBins; using aunit::TestRunner; // --------------------------------------------------------------------------- From eff2a990b087f570f36b66a531ed15bb7b8e5a47 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Thu, 17 Mar 2022 08:46:06 -0700 Subject: [PATCH 35/59] LogBinTableRenderer.cpp: Create printPStringTo() helper to pad or truncate bin-labels properly --- src/ace_routine/LogBinTableRenderer.cpp | 49 +++++++++- src/ace_routine/LogBinTableRenderer.h | 115 ++++++++++-------------- 2 files changed, 95 insertions(+), 69 deletions(-) diff --git a/src/ace_routine/LogBinTableRenderer.cpp b/src/ace_routine/LogBinTableRenderer.cpp index 0f85b18..afc619b 100644 --- a/src/ace_routine/LogBinTableRenderer.cpp +++ b/src/ace_routine/LogBinTableRenderer.cpp @@ -23,14 +23,16 @@ SOFTWARE. */ #include +#include // printPad5To() #include "LogBinTableRenderer.h" namespace ace_routine { namespace internal { // The numbers for higher duration values deviate from powers of 2 because 2^10 -// = 1024, which is not exactly 1000. The length of each string *must* be 6 or -// smaller, otherwise a bit of code in LogBinTableRenderer.h must be updated. +// = 1024, which is not exactly 1000. The length of each string should be 6 or +// smaller, otherwise it will be truncated by +// LogBinTableRenderer::printHeaderTo(). static const char kBinLabel00[] PROGMEM = "<2us"; static const char kBinLabel01[] PROGMEM = "<4us"; static const char kBinLabel02[] PROGMEM = "<8us"; @@ -99,5 +101,48 @@ const char* const kBinLabels[kNumBinLabels] PROGMEM = { kBinLabel31, }; +void printHeaderTo(Print& printer, uint8_t startBin, uint8_t endBin) { + endBin = (endBin > kNumBinLabels) ? kNumBinLabels : endBin; + if (endBin <= startBin) return; // needed if startBin = endBin = 0 + + for (uint8_t i = startBin; i < endBin - 1; i++) { + auto* label = (const char*) pgm_read_ptr(&internal::kBinLabels[i]); + printPStringTo(printer, label, 6); + } + printer.print(F(" >>")); +} + +void printPStringTo(Print& printer, const char* s, uint8_t boxSize) { + uint8_t length = strlen_P(s); + uint8_t printLength; + if (length < boxSize) { + for (uint8_t i = 0; i < (boxSize - length); i++) { + printer.print(' '); + } + printLength = length; + } else { + printLength = boxSize; + } + + for (uint8_t i = 0; i < printLength; i++) { + printer.print((char) pgm_read_byte(&s[i])); + } +} + +void printBinsTo( + Print& printer, + const uint16_t bins[], + uint8_t numBins, + uint8_t startBin, + uint8_t endBin) { + + endBin = (endBin > numBins) ? numBins : endBin; + for (uint8_t i = startBin; i < endBin; i++) { + uint16_t count = bins[i]; + printer.print(' '); + ace_common::printPad5To(printer, count); + } +} + } } diff --git a/src/ace_routine/LogBinTableRenderer.h b/src/ace_routine/LogBinTableRenderer.h index 289b5a7..2b804f7 100644 --- a/src/ace_routine/LogBinTableRenderer.h +++ b/src/ace_routine/LogBinTableRenderer.h @@ -27,19 +27,54 @@ SOFTWARE. #include // uint8_t, uint32_t #include // Print -#include // printPad5To() #include "Coroutine.h" // Coroutine #include "LogBinProfiler.h" // rollupExteriorBins() namespace ace_routine { namespace internal { - /** Number of bins in LogBinProfiler. */ - const uint8_t kNumBinLabels = 32; - /** Labels for each bin in LogBinProfiler::mBins. */ - extern const char* const kBinLabels[kNumBinLabels] PROGMEM; -} +/** Number of bins in LogBinProfiler. */ +const uint8_t kNumBinLabels = 32; + +/** Labels for each bin in LogBinProfiler::mBins. */ +extern const char* const kBinLabels[kNumBinLabels] PROGMEM; + +/** + * Print the header related to this profiler. + * + * @param printer destination of output + * @param startBin start index of the bins (0-31) + * @param endBin end index (exclusive) of the bins (0-32) + */ +void printHeaderTo( Print& printer, uint8_t startBin, uint8_t endBin); + +/** + * Print string in PROGMEM into boxSize, right justified. The string is padded + * with spaces on the left if too short, and truncated on the right if too + * long. + */ +void printPStringTo(Print& printer, const char* s, uint8_t boxSize); + +/** + * Print the bins of this profiler as a single line of text with each bin + * printed as a 5-digit number in a 6-character box. If there are any remaining + * counts after the `endBin`, the cummulative sum of the remaining bins are + * printed in another 6-character box. + * + * @param printer usual `Serial` + * @param bins pointer to array of bins + * @param startBin start index of the bins (0-31) + * @param endBin end index (exclusive) of the bins (0-32) + */ +void printBinsTo( + Print& printer, + const uint16_t bins[], + uint8_t numBins, + uint8_t startBin, + uint8_t endBin); + +} // namespace internal /** * Print the information in the LogBinProfiler for each Coroutine @@ -59,9 +94,9 @@ namespace internal { * soundRoutine 1417 0 0 1 1 1 0 0 0 0 * @endverbatim * - * The bins below the startBin are rolled into the first bin. The bins above the - * (endBin-1) are rolled into the last bin with the label `>>`. There must be at - * least 2 rendering bins (endBin >= startBin + 2) otherwise nothing is printed. + * The bins below the first bin (at `startBin`) are rolled into the first bin. + * The bins above the last bin (at `endBin-1`) are rolled into the last bin and + * printed with the label `>>`. * * @tparam T_COROUTINE class of the specific CoroutineTemplate instantiation, * usually `Coroutine` @@ -110,7 +145,7 @@ class LogBinRendererTemplate { // Print header if needed. if (! isHeaderPrinted) { printer.print(F("name ")); - printHeaderTo(printer, startBin, endBin); + internal::printHeaderTo(printer, startBin, endBin); printer.println(); isHeaderPrinted = true; } @@ -133,7 +168,8 @@ class LogBinRendererTemplate { // Print the bins. The number of digits is automatically a log10() of // the counts, so we should be able to visually scan the table and see // which coroutine is taking too long. - printBinsTo(printer, bins, Profiler::kNumBins, startBin, endBin); + internal::printBinsTo( + printer, bins, Profiler::kNumBins, startBin, endBin); printer.println(); if (clear) { @@ -142,67 +178,12 @@ class LogBinRendererTemplate { } } - private: - /** - * Print the header related to this profiler. - * - * @param printer destination of output - * @param startBin start index of the bins (0-31) - * @param endBin end index (exclusive) of the bins (0-32) - */ - static void printHeaderTo( - Print& printer, uint8_t startBin, uint8_t endBin) { - - endBin = (endBin > Profiler::kNumBins) ? Profiler::kNumBins : endBin; - if (endBin <= startBin) return; // needed if startBin = endBin = 0 - - for (uint8_t i = startBin; i < endBin - 1; i++) { - // These contortions are needed because the labels are stored in PROGMEM - // flash memory. - auto* label = (const char*) pgm_read_ptr(&internal::kBinLabels[i]); - uint8_t labelLength = strlen_P(label); - - // Print label right justified in a box of 6 characters. - for (uint8_t i = 0; i < (6 - labelLength); i++) { - printer.print(' '); - } - printer.print((const __FlashStringHelper*) label); - } - printer.print(F(" >>")); - } - - /** - * Print the bins of this profiler as a single line of text with each bin - * printed as a 5-digit number in a 6-character box. If there are any - * remaining counts after the `endBin`, the cummulative sum of the remaining - * bins are printed in another 6-character box. - * - * @param printer usual `Serial` - * @param bins pointer to array of bins - * @param startBin start index of the bins (0-31) - * @param endBin end index (exclusive) of the bins (0-32) - */ - static void printBinsTo( - Print& printer, - const uint16_t bins[], - uint8_t numBins, - uint8_t startBin, - uint8_t endBin) { - - endBin = (endBin > numBins) ? numBins : endBin; - for (uint8_t i = startBin; i < endBin; i++) { - uint16_t count = bins[i]; - printer.print(' '); - ace_common::printPad5To(printer, count); - } - } - private: T_COROUTINE** mRoot; }; using LogBinTableRenderer = LogBinRendererTemplate; -} +} // namespace ace_routine #endif From c4214bf191ac06883a76db138712e52e2ae164f7 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Thu, 17 Mar 2022 09:05:54 -0700 Subject: [PATCH 36/59] MemoryBenchmark: Regenerate after printPStringTo(), virtual destructor on 32-bit processors, etc --- examples/MemoryBenchmark/README.md | 64 +++++++++++++-------------- examples/MemoryBenchmark/attiny.txt | 2 +- examples/MemoryBenchmark/esp32.txt | 46 +++++++++---------- examples/MemoryBenchmark/esp8266.txt | 4 +- examples/MemoryBenchmark/micro.txt | 2 +- examples/MemoryBenchmark/nano.txt | 2 +- examples/MemoryBenchmark/stm32.txt | 4 +- examples/MemoryBenchmark/teensy32.txt | 4 +- 8 files changed, 64 insertions(+), 64 deletions(-) diff --git a/examples/MemoryBenchmark/README.md b/examples/MemoryBenchmark/README.md index df115b7..0278c21 100644 --- a/examples/MemoryBenchmark/README.md +++ b/examples/MemoryBenchmark/README.md @@ -215,7 +215,7 @@ $ make README.md | Scheduler, Two Coroutines (man setup) | 1150/ 63 | 750/ 52 | |---------------------------------------+--------------+-------------| | Scheduler, LogBinProfiler | 918/ 111 | 518/ 100 | -| Scheduler, LogBinTableRenderer | 2766/ 193 | 2366/ 182 | +| Scheduler, LogBinTableRenderer | 2792/ 193 | 2392/ 182 | | Scheduler, LogBinJsonRenderer | 2326/ 197 | 1926/ 186 | |---------------------------------------+--------------+-------------| | Blink Function | 546/ 14 | 146/ 3 | @@ -264,7 +264,7 @@ $ make README.md | Scheduler, Two Coroutines (man setup) | 1368/ 63 | 762/ 52 | |---------------------------------------+--------------+-------------| | Scheduler, LogBinProfiler | 1134/ 111 | 528/ 100 | -| Scheduler, LogBinTableRenderer | 3340/ 304 | 2734/ 293 | +| Scheduler, LogBinTableRenderer | 3380/ 304 | 2774/ 293 | | Scheduler, LogBinJsonRenderer | 2900/ 308 | 2294/ 297 | |---------------------------------------+--------------+-------------| | Blink Function | 938/ 14 | 332/ 3 | @@ -313,7 +313,7 @@ $ make README.md | Scheduler, Two Coroutines (man setup) | 4256/ 203 | 702/ 52 | |---------------------------------------+--------------+-------------| | Scheduler, LogBinProfiler | 4022/ 251 | 468/ 100 | -| Scheduler, LogBinTableRenderer | 5398/ 269 | 1844/ 118 | +| Scheduler, LogBinTableRenderer | 5438/ 269 | 1884/ 118 | | Scheduler, LogBinJsonRenderer | 4958/ 273 | 1404/ 122 | |---------------------------------------+--------------+-------------| | Blink Function | 3994/ 154 | 440/ 3 | @@ -362,8 +362,8 @@ $ make README.md | Scheduler, Two Coroutines (man setup) | 22344/ 3604 | 460/ 64 | |---------------------------------------+--------------+-------------| | Scheduler, LogBinProfiler | 22300/ 3644 | 416/ 104 | -| Scheduler, LogBinTableRenderer | 23644/ 3644 | 1760/ 104 | -| Scheduler, LogBinJsonRenderer | 22968/ 3644 | 1084/ 104 | +| Scheduler, LogBinTableRenderer | 23708/ 3644 | 1824/ 104 | +| Scheduler, LogBinJsonRenderer | 23172/ 3644 | 1288/ 104 | |---------------------------------------+--------------+-------------| | Blink Function | 22120/ 3540 | 236/ 0 | | Blink Coroutine | 22232/ 3568 | 348/ 28 | @@ -411,8 +411,8 @@ $ make README.md | Scheduler, Two Coroutines (man setup) | 260845/27984 | 516/ 68 | |---------------------------------------+--------------+-------------| | Scheduler, LogBinProfiler | 260781/28024 | 452/ 108 | -| Scheduler, LogBinTableRenderer | 265489/28100 | 5160/ 184 | -| Scheduler, LogBinJsonRenderer | 265057/28104 | 4728/ 188 | +| Scheduler, LogBinTableRenderer | 265505/28100 | 5176/ 184 | +| Scheduler, LogBinJsonRenderer | 264913/28104 | 4584/ 188 | |---------------------------------------+--------------+-------------| | Blink Function | 261001/27988 | 672/ 72 | | Blink Coroutine | 261149/28016 | 820/ 100 | @@ -432,39 +432,39 @@ $ make README.md |---------------------------------------+--------------+-------------| | Baseline | 204573/16060 | 0/ 0 | |---------------------------------------+--------------+-------------| -| One Delay Function | 205017/16092 | 444/ 32 | -| Two Delay Functions | 205089/16092 | 516/ 32 | +| One Delay Function | 205137/16100 | 564/ 40 | +| Two Delay Functions | 205209/16100 | 636/ 40 | |---------------------------------------+--------------+-------------| -| One Coroutine | 205129/16124 | 556/ 64 | -| Two Coroutines | 205301/16148 | 728/ 88 | +| One Coroutine | 205249/16132 | 676/ 72 | +| Two Coroutines | 205421/16156 | 848/ 96 | |---------------------------------------+--------------+-------------| -| One Coroutine (micros) | 205117/16124 | 544/ 64 | -| Two Coroutines (micros) | 205289/16148 | 716/ 88 | +| One Coroutine (micros) | 205237/16132 | 664/ 72 | +| Two Coroutines (micros) | 205409/16156 | 836/ 96 | |---------------------------------------+--------------+-------------| -| One Coroutine (seconds) | 205145/16124 | 572/ 64 | -| Two Coroutines (seconds) | 205333/16148 | 760/ 88 | +| One Coroutine (seconds) | 205265/16132 | 692/ 72 | +| Two Coroutines (seconds) | 205453/16156 | 880/ 96 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine | 205245/16124 | 672/ 64 | -| Scheduler, Two Coroutines | 205385/16156 | 812/ 96 | +| Scheduler, One Coroutine | 205365/16132 | 792/ 72 | +| Scheduler, Two Coroutines | 205505/16164 | 932/ 104 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (micros) | 205221/16124 | 648/ 64 | -| Scheduler, Two Coroutines (micros) | 205361/16156 | 788/ 96 | +| Scheduler, One Coroutine (micros) | 205341/16132 | 768/ 72 | +| Scheduler, Two Coroutines (micros) | 205481/16164 | 908/ 104 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (seconds) | 205261/16124 | 688/ 64 | -| Scheduler, Two Coroutines (seconds) | 205417/16156 | 844/ 96 | +| Scheduler, One Coroutine (seconds) | 205381/16132 | 808/ 72 | +| Scheduler, Two Coroutines (seconds) | 205537/16164 | 964/ 104 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (setup) | 205273/16124 | 700/ 64 | -| Scheduler, Two Coroutines (setup) | 205445/16156 | 872/ 96 | +| Scheduler, One Coroutine (setup) | 205393/16132 | 820/ 72 | +| Scheduler, Two Coroutines (setup) | 205565/16164 | 992/ 104 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (man setup) | 205265/16124 | 692/ 64 | -| Scheduler, Two Coroutines (man setup) | 205445/16156 | 872/ 96 | +| Scheduler, One Coroutine (man setup) | 205385/16132 | 812/ 72 | +| Scheduler, Two Coroutines (man setup) | 205565/16164 | 992/ 104 | |---------------------------------------+--------------+-------------| -| Scheduler, LogBinProfiler | 205361/16196 | 788/ 136 | -| Scheduler, LogBinTableRenderer | 210969/16276 | 6396/ 216 | -| Scheduler, LogBinJsonRenderer | 210489/16276 | 5916/ 216 | +| Scheduler, LogBinProfiler | 205481/16204 | 908/ 144 | +| Scheduler, LogBinTableRenderer | 210977/16284 | 6404/ 224 | +| Scheduler, LogBinJsonRenderer | 210425/16284 | 5852/ 224 | |---------------------------------------+--------------+-------------| -| Blink Function | 205369/16100 | 796/ 40 | -| Blink Coroutine | 205481/16124 | 908/ 64 | +| Blink Function | 205489/16108 | 916/ 48 | +| Blink Coroutine | 205601/16132 | 1028/ 72 | +--------------------------------------------------------------------+ ``` @@ -510,8 +510,8 @@ $ make README.md | Scheduler, Two Coroutines (man setup) | 10728/ 4216 | 496/ 64 | |---------------------------------------+--------------+-------------| | Scheduler, LogBinProfiler | 10952/ 4264 | 720/ 112 | -| Scheduler, LogBinTableRenderer | 13800/ 4284 | 3568/ 132 | -| Scheduler, LogBinJsonRenderer | 13284/ 4284 | 3052/ 132 | +| Scheduler, LogBinTableRenderer | 14056/ 4284 | 3824/ 132 | +| Scheduler, LogBinJsonRenderer | 13348/ 4284 | 3116/ 132 | |---------------------------------------+--------------+-------------| | Blink Function | 10688/ 4160 | 456/ 8 | | Blink Coroutine | 10820/ 4184 | 588/ 32 | diff --git a/examples/MemoryBenchmark/attiny.txt b/examples/MemoryBenchmark/attiny.txt index cab6c18..a3e86a6 100644 --- a/examples/MemoryBenchmark/attiny.txt +++ b/examples/MemoryBenchmark/attiny.txt @@ -18,7 +18,7 @@ 17 860 8192 39 512 18 1150 8192 63 512 19 918 8192 111 512 -20 2766 8192 193 512 +20 2792 8192 193 512 21 2326 8192 197 512 22 546 8192 14 512 23 766 8192 37 512 diff --git a/examples/MemoryBenchmark/esp32.txt b/examples/MemoryBenchmark/esp32.txt index c4972f8..0ac2a15 100644 --- a/examples/MemoryBenchmark/esp32.txt +++ b/examples/MemoryBenchmark/esp32.txt @@ -1,24 +1,24 @@ 0 204573 1310720 16060 327680 -1 205017 1310720 16092 327680 -2 205089 1310720 16092 327680 -3 205129 1310720 16124 327680 -4 205301 1310720 16148 327680 -5 205117 1310720 16124 327680 -6 205289 1310720 16148 327680 -7 205145 1310720 16124 327680 -8 205333 1310720 16148 327680 -9 205245 1310720 16124 327680 -10 205385 1310720 16156 327680 -11 205221 1310720 16124 327680 -12 205361 1310720 16156 327680 -13 205261 1310720 16124 327680 -14 205417 1310720 16156 327680 -15 205273 1310720 16124 327680 -16 205445 1310720 16156 327680 -17 205265 1310720 16124 327680 -18 205445 1310720 16156 327680 -19 205361 1310720 16196 327680 -20 210969 1310720 16276 327680 -21 210489 1310720 16276 327680 -22 205369 1310720 16100 327680 -23 205481 1310720 16124 327680 +1 205137 1310720 16100 327680 +2 205209 1310720 16100 327680 +3 205249 1310720 16132 327680 +4 205421 1310720 16156 327680 +5 205237 1310720 16132 327680 +6 205409 1310720 16156 327680 +7 205265 1310720 16132 327680 +8 205453 1310720 16156 327680 +9 205365 1310720 16132 327680 +10 205505 1310720 16164 327680 +11 205341 1310720 16132 327680 +12 205481 1310720 16164 327680 +13 205381 1310720 16132 327680 +14 205537 1310720 16164 327680 +15 205393 1310720 16132 327680 +16 205565 1310720 16164 327680 +17 205385 1310720 16132 327680 +18 205565 1310720 16164 327680 +19 205481 1310720 16204 327680 +20 210977 1310720 16284 327680 +21 210425 1310720 16284 327680 +22 205489 1310720 16108 327680 +23 205601 1310720 16132 327680 diff --git a/examples/MemoryBenchmark/esp8266.txt b/examples/MemoryBenchmark/esp8266.txt index 44e3525..6a8ced2 100644 --- a/examples/MemoryBenchmark/esp8266.txt +++ b/examples/MemoryBenchmark/esp8266.txt @@ -18,7 +18,7 @@ 17 260669 1044464 27952 81920 18 260845 1044464 27984 81920 19 260781 1044464 28024 81920 -20 265489 1044464 28100 81920 -21 265057 1044464 28104 81920 +20 265505 1044464 28100 81920 +21 264913 1044464 28104 81920 22 261001 1044464 27988 81920 23 261149 1044464 28016 81920 diff --git a/examples/MemoryBenchmark/micro.txt b/examples/MemoryBenchmark/micro.txt index b745eb9..83e4a66 100644 --- a/examples/MemoryBenchmark/micro.txt +++ b/examples/MemoryBenchmark/micro.txt @@ -18,7 +18,7 @@ 17 3962 28672 179 2560 18 4256 28672 203 2560 19 4022 28672 251 2560 -20 5398 28672 269 2560 +20 5438 28672 269 2560 21 4958 28672 273 2560 22 3994 28672 154 2560 23 4164 28672 177 2560 diff --git a/examples/MemoryBenchmark/nano.txt b/examples/MemoryBenchmark/nano.txt index 7e84a36..6bb19c9 100644 --- a/examples/MemoryBenchmark/nano.txt +++ b/examples/MemoryBenchmark/nano.txt @@ -18,7 +18,7 @@ 17 1074 30720 39 2048 18 1368 30720 63 2048 19 1134 30720 111 2048 -20 3340 30720 304 2048 +20 3380 30720 304 2048 21 2900 30720 308 2048 22 938 30720 14 2048 23 1168 30720 37 2048 diff --git a/examples/MemoryBenchmark/stm32.txt b/examples/MemoryBenchmark/stm32.txt index fafbe4e..d213cdb 100644 --- a/examples/MemoryBenchmark/stm32.txt +++ b/examples/MemoryBenchmark/stm32.txt @@ -18,7 +18,7 @@ 17 22208 131072 3576 20480 18 22344 131072 3604 20480 19 22300 131072 3644 20480 -20 23644 131072 3644 20480 -21 22968 131072 3644 20480 +20 23708 131072 3644 20480 +21 23172 131072 3644 20480 22 22120 131072 3540 20480 23 22232 131072 3568 20480 diff --git a/examples/MemoryBenchmark/teensy32.txt b/examples/MemoryBenchmark/teensy32.txt index 7e26fa4..30f1d54 100644 --- a/examples/MemoryBenchmark/teensy32.txt +++ b/examples/MemoryBenchmark/teensy32.txt @@ -18,7 +18,7 @@ 17 10580 262144 4188 65536 18 10728 262144 4216 65536 19 10952 262144 4264 65536 -20 13800 262144 4284 65536 -21 13284 262144 4284 65536 +20 14056 262144 4284 65536 +21 13348 262144 4284 65536 22 10688 262144 4160 65536 23 10820 262144 4184 65536 From f5c0fa3f1d63841da5ee2e6a1e8322c746e164ca Mon Sep 17 00:00:00 2001 From: Brian Park Date: Thu, 17 Mar 2022 09:20:09 -0700 Subject: [PATCH 37/59] Coroutine.h: Merge setCName() and setFName() to overloaded setName() for easier usage --- CHANGELOG.md | 2 +- USER_GUIDE.md | 10 +++++----- examples/SoundManager/SoundManager.ino | 6 +++--- src/ace_routine/Coroutine.h | 17 ++++++++++------- tests/AceRoutineTest/AceRoutineTest.ino | 18 +++++++++++++++--- tests/SchedulerTest/SchedulerTest.ino | 4 ++-- 6 files changed, 36 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e32fd7e..b34fb80 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ * Unreleased * (Re)add support for human-readable coroutine names by adding the following - methods to the `Coroutine` class: `setCName()`, `setFName()`, + methods to the `Coroutine` class: `setName()`, `setName()`, `getCName()`, `getFName()`, `getNameType()`, and `printNameTo()`. * This is an optional feature which helps debugging. Coroutines do not need to have human readable names. diff --git a/USER_GUIDE.md b/USER_GUIDE.md index bfc4c52..57672fc 100644 --- a/USER_GUIDE.md +++ b/USER_GUIDE.md @@ -263,8 +263,8 @@ class Coroutine { static const uint8_t kNameTypeFString = 1; public: - void Coroutine::setCName(const char* name); - void Coroutine::setFName(const __FlashStringHelper* name); + void Coroutine::setName(const char* name); + void Coroutine::setName(const __FlashStringHelper* name); const char* Coroutine::getCName() const; const __FlashStringHelper* Coroutine::getFName() const; @@ -274,8 +274,8 @@ class Coroutine { }; `` -It is expected that the `setCName()` or `setFName()` will be called in the -global `setup()` function. +It is expected that the `setName()` will be called in the global `setup()` +function. On most 32-bit processors, it makes little difference whether a C-string or an F-string is used. (The exception is the ESP8266.) On AVR processors, using the @@ -284,7 +284,7 @@ F-string will prevent those strings from consuming precious static RAM. The `printNameTo()` method prints the coroutine name to the given `Print` object, which will usually be the `Serial` object. If the name is not set (hence is the `nullptr`), `printNameTo()` will print the hexadecimal representation of -the pointer to the Coroutine (e.g. "0xe38a"). +the pointer to the Coroutine (e.g. "0xE38A"). The `CoroutineScheduler::list()` method will now print the coroutine name if it is defined. diff --git a/examples/SoundManager/SoundManager.ino b/examples/SoundManager/SoundManager.ino index 52e1e36..bf7f60f 100644 --- a/examples/SoundManager/SoundManager.ino +++ b/examples/SoundManager/SoundManager.ino @@ -89,12 +89,12 @@ void setup() { while (!Serial); // needed for Leonardo/Micro // Set names using both c-string and f-string for testing purposes. - soundRoutine.setCName("soundRoutine"); - soundManager.setFName(F("soundManager")); + soundRoutine.setName("soundRoutine"); + soundManager.setName(F("soundManager")); // Don't set the name of 'printProfiler' to verify that the name of the // coroutine becomes the pointer address in hexadecimal. - // printProfiler.setFName(F("printProfiler")); + // printProfiler.setName(F("printProfiler")); // Attach profilers to all coroutines. LogBinProfiler::createProfilers(Coroutine::getRoot()); diff --git a/src/ace_routine/Coroutine.h b/src/ace_routine/Coroutine.h index 3b0e0fd..8bf1443 100644 --- a/src/ace_routine/Coroutine.h +++ b/src/ace_routine/Coroutine.h @@ -348,19 +348,19 @@ class CoroutineTemplate { uint8_t getNameType() const { return mNameType; } /** Set the name of the coroutine to the given c-string. */ - void setCName(const char* name) { + void setName(const char* name) { mNameType = kNameTypeCString; mName = name; } /** Set the name of the coroutine to the given f-string. */ - void setFName(const __FlashStringHelper* name) { + void setName(const __FlashStringHelper* name) { mNameType = kNameTypeFString; - mName = (const char*) name; + mName = name; } /** Get name of the coroutine assuming it's a c-string. Nullable. */ - const char* getCName() const { return mName; } + const char* getCName() const { return (const char*) mName; } /** Get name of the coroutine assuming it's an f-string. Nullable. */ const __FlashStringHelper* getFName() const { @@ -384,7 +384,7 @@ class CoroutineTemplate { pname.print("0x"); pname.print((uintptr_t) this, 16); } else if (mNameType == kNameTypeCString) { - pname.print(mName); + pname.print((const char*) mName); } else { pname.print((const __FlashStringHelper*) mName); } @@ -772,8 +772,11 @@ class CoroutineTemplate { /** Address of the label used by the computed-goto. */ void* mJumpPoint = nullptr; - /** Name of the coroutine. (Optional) */ - const char* mName = nullptr; + /** + * Name of the coroutine, either (const char*) or (const + * __FlashStringHelper*). (Optional) + */ + const void* mName = nullptr; /** String type of the coroutine mName. */ uint8_t mNameType = kNameTypeCString; diff --git a/tests/AceRoutineTest/AceRoutineTest.ino b/tests/AceRoutineTest/AceRoutineTest.ino index 67e5b50..cf7c296 100644 --- a/tests/AceRoutineTest/AceRoutineTest.ino +++ b/tests/AceRoutineTest/AceRoutineTest.ino @@ -161,7 +161,7 @@ test(AceRoutineTest, macroCoroutine) { // --------------------------------------------------------------------------- test(AceRoutineTest, name_cstring) { - simpleCoroutine.setCName("simple"); + simpleCoroutine.setName("simple"); assertEqual(simpleCoroutine.getNameType(), Coroutine::kNameTypeCString); assertEqual(simpleCoroutine.getCName(), "simple"); @@ -171,7 +171,7 @@ test(AceRoutineTest, name_cstring) { } test(AceRoutineTest, name_fstring) { - simpleCoroutine.setFName(F("simple")); + simpleCoroutine.setName(F("simple")); assertEqual(simpleCoroutine.getNameType(), Coroutine::kNameTypeFString); assertEqual(simpleCoroutine.getFName(), F("simple")); @@ -181,7 +181,7 @@ test(AceRoutineTest, name_fstring) { } test(AceRoutineTest, name_nullptr) { - simpleCoroutine.setCName(nullptr); + simpleCoroutine.setName((const char*) nullptr); assertEqual(simpleCoroutine.getNameType(), Coroutine::kNameTypeCString); assertEqual(simpleCoroutine.getCName(), (const char*) nullptr); @@ -191,6 +191,18 @@ test(AceRoutineTest, name_nullptr) { assertEqual(strncmp(str.cstr(), "0x", 2), 0); } +test(AceRoutineTest, name_printTo_truncation_padding) { + simpleCoroutine.setName("simple"); + + PrintStr<16> str; + simpleCoroutine.printNameTo(str, 4); + assertEqual(str.cstr(), "simp"); + + str.flush(); + simpleCoroutine.printNameTo(str, 8); + assertEqual(str.cstr(), "simple "); +} + // --------------------------------------------------------------------------- void setup() { diff --git a/tests/SchedulerTest/SchedulerTest.ino b/tests/SchedulerTest/SchedulerTest.ino index 4b9fb57..62eb741 100644 --- a/tests/SchedulerTest/SchedulerTest.ino +++ b/tests/SchedulerTest/SchedulerTest.ino @@ -412,8 +412,8 @@ void setup() { extra.suspend(); // Set human-readable names to some coroutines. - a.setCName("coA"); - b.setFName(F("coB")); + a.setName("coA"); + b.setName(F("coB")); TestableCoroutineScheduler::setup(); } From e2eecedffe870cf69d0fd63eb2a0e7250c8ebc4e Mon Sep 17 00:00:00 2001 From: Brian Park Date: Thu, 17 Mar 2022 10:21:39 -0700 Subject: [PATCH 38/59] examples: Add Hello{Coroutine,Scheduler}WithProfiler demo programs --- .../HelloCoroutineWithProfiler.ino | 123 ++++++++++++++++++ examples/HelloCoroutineWithProfiler/Makefile | 6 + .../HelloSchedulerWithProfiler.ino | 116 +++++++++++++++++ examples/HelloSchedulerWithProfiler/Makefile | 6 + 4 files changed, 251 insertions(+) create mode 100644 examples/HelloCoroutineWithProfiler/HelloCoroutineWithProfiler.ino create mode 100644 examples/HelloCoroutineWithProfiler/Makefile create mode 100644 examples/HelloSchedulerWithProfiler/HelloSchedulerWithProfiler.ino create mode 100644 examples/HelloSchedulerWithProfiler/Makefile diff --git a/examples/HelloCoroutineWithProfiler/HelloCoroutineWithProfiler.ino b/examples/HelloCoroutineWithProfiler/HelloCoroutineWithProfiler.ino new file mode 100644 index 0000000..1ccabd4 --- /dev/null +++ b/examples/HelloCoroutineWithProfiler/HelloCoroutineWithProfiler.ino @@ -0,0 +1,123 @@ +/* +HelloCoroutineWithProfiler, a demo of the LogBinProfiler. This technique can be +used on resource constrained 8-bit environments which do not want to include the +overhead of the CoroutineScheduler. + +Every 5 seconds, the, following will be printed on the Serial monitor. + +**SparkFun Pro Micro** + +* flash/ram = 6840/457 + +``` +name <16us <32us <64us<128us<256us<512us <1ms <2ms <4ms <8ms >> +0x1DB 16921 52650 0 0 0 0 0 0 0 0 1 +readPin 65535 1189 0 0 0 0 0 0 0 0 0 +blinkLed 65535 830 0 0 0 0 0 0 0 0 0 +{ +"0x1DB":[16921,52650,0,0,0,0,0,0,0,0,1], +"readPin":[65535,1189,0,0,0,0,0,0,0,0,0], +"blinkLed":[65535,830,0,0,0,0,0,0,0,0,0] +} +``` + +**ESP8266** + +``` +name <8us <16us <32us <64us<128us<256us<512us <1ms <2ms <4ms >> +0x3FFEE4D0 65535 32 0 0 0 0 0 0 0 0 1 +readPin 65535 275 1 0 0 0 0 0 0 0 0 +blinkLed 65535 48 3 0 0 0 0 0 0 0 0 +{ +"0x3FFEE4D0":[65535,32,0,0,0,0,0,0,0,0,1], +"readPin":[65535,275,1,0,0,0,0,0,0,0,0], +"blinkLed":[65535,48,3,0,0,0,0,0,0,0,0] +} +``` +*/ + +#include +#include +using namespace ace_routine; + +#ifdef LED_BUILTIN + const int LED = LED_BUILTIN; +#else + // Some ESP32 boards do not define LED_BUILTIN. Sometimes they have more than + // 1. Replace this with the proper pin number. + const int LED = 5; +#endif + +const int PIN = 2; +const int LED_ON = HIGH; +const int LED_OFF = LOW; + +COROUTINE(blinkLed) { + COROUTINE_LOOP() { + digitalWrite(LED, LED_ON); + COROUTINE_DELAY(100); + digitalWrite(LED, LED_OFF); + COROUTINE_DELAY(500); + } +} + +COROUTINE(readPin) { + COROUTINE_LOOP() { + (void) digitalRead(PIN); + COROUTINE_DELAY(20); + } +} + +// A coroutine that prints the profiling information every 5 seconds. It will +// include information about itself. +COROUTINE(printProfiling) { + COROUTINE_LOOP() { + LogBinTableRenderer tableRenderer(Coroutine::getRoot()); + LogBinJsonRenderer jsonRenderer(Coroutine::getRoot()); + + #if defined(ARDUINO_ARCH_AVR) + tableRenderer.printTo( + Serial, 3 /*startBin*/, 14 /*endBin*/, false /*clear*/); + jsonRenderer.printTo( + Serial, 3 /*startBin*/, 14 /*endBin*/); + #else + tableRenderer.printTo( + Serial, 2 /*startBin*/, 13 /*endBin*/, false /*clear*/); + jsonRenderer.printTo( + Serial, 2 /*startBin*/, 13 /*endBin*/); + #endif + + COROUTINE_DELAY(5000); + } +} + +LogBinProfiler profiler1; +LogBinProfiler profiler2; +LogBinProfiler profiler3; + +void setup() { +#if ! defined(EPOXY_DUINO) + delay(1000); +#endif + Serial.begin(115200); + while (!Serial); // Leonardo/Micro + + pinMode(LED, OUTPUT); + pinMode(PIN, INPUT); + + // Coroutine names can be either C-string or F-string. + blinkLed.setName("blinkLed"); + readPin.setName(F("readPin")); + + // Manually attach the profilers to the coroutines. Replaces + // LogBinProfilers::createProfilers(). + blinkLed.setProfiler(&profiler1); + readPin.setProfiler(&profiler2); + printProfiling.setProfiler(&profiler3); +} + +void loop() { + blinkLed.runCoroutineWithProfiler(); + readPin.runCoroutineWithProfiler(); + printProfiling.runCoroutineWithProfiler(); +} diff --git a/examples/HelloCoroutineWithProfiler/Makefile b/examples/HelloCoroutineWithProfiler/Makefile new file mode 100644 index 0000000..d817446 --- /dev/null +++ b/examples/HelloCoroutineWithProfiler/Makefile @@ -0,0 +1,6 @@ +# See https://github.com/bxparks/EpoxyDuino for documentation about this +# Makefile to compile and run Arduino programs natively on Linux or MacOS. + +APP_NAME := HelloCoroutineWithProfiler +ARDUINO_LIBS := AceCommon AceRoutine +include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/examples/HelloSchedulerWithProfiler/HelloSchedulerWithProfiler.ino b/examples/HelloSchedulerWithProfiler/HelloSchedulerWithProfiler.ino new file mode 100644 index 0000000..a7bb198 --- /dev/null +++ b/examples/HelloSchedulerWithProfiler/HelloSchedulerWithProfiler.ino @@ -0,0 +1,116 @@ +/* +HelloSchedulerWithProfiler, a demo of the LogBinProfiler. The CoroutineScheduler +will automatically use the Profiler if it is defined on the Coroutine. + +Every 5 seconds, the following will be printed on the Serial monitor. + +**SparkFun Pro Micro** + +* flash/ram = 7454/271 + +``` +name <16us <32us <64us<128us<256us<512us <1ms <2ms <4ms <8ms >> +0x1DB 16898 52688 0 0 0 0 0 0 0 0 1 +readPin 65535 1128 0 0 0 0 0 0 0 0 0 +blinkLed 65535 800 0 0 0 0 0 0 0 0 0 +{ +"0x1DB":[16898,52688,0,0,0,0,0,0,0,0,1], +"readPin":[65535,1128,0,0,0,0,0,0,0,0,0], +"blinkLed":[65535,800,0,0,0,0,0,0,0,0,0] +} +``` + +**ESP8266** + +``` +name <8us <16us <32us <64us<128us<256us<512us <1ms <2ms <4ms >> +0x3FFEE4D0 65535 37 2 0 0 0 0 0 0 0 1 +readPin 65535 274 0 0 0 0 0 0 0 0 0 +blinkLed 65535 47 0 0 0 0 0 0 0 0 0 +{ +"0x3FFEE4D0":[65535,37,2,0,0,0,0,0,0,0,1], +"readPin":[65535,274,0,0,0,0,0,0,0,0,0], +"blinkLed":[65535,47,0,0,0,0,0,0,0,0,0] +} +``` +*/ + +#include +#include +using namespace ace_routine; + +#ifdef LED_BUILTIN + const int LED = LED_BUILTIN; +#else + // Some ESP32 boards do not define LED_BUILTIN. Sometimes they have more than + // 1. Replace this with the proper pin number. + const int LED = 5; +#endif + +const int PIN = 2; +const int LED_ON = HIGH; +const int LED_OFF = LOW; + +COROUTINE(blinkLed) { + COROUTINE_LOOP() { + digitalWrite(LED, LED_ON); + COROUTINE_DELAY(100); + digitalWrite(LED, LED_OFF); + COROUTINE_DELAY(500); + } +} + +COROUTINE(readPin) { + COROUTINE_LOOP() { + (void) digitalRead(PIN); + COROUTINE_DELAY(20); + } +} + +// A coroutine that prints the profiling information every 5 seconds. It will +// include information about itself. +COROUTINE(printProfiling) { + COROUTINE_LOOP() { + LogBinTableRenderer tableRenderer(Coroutine::getRoot()); + LogBinJsonRenderer jsonRenderer(Coroutine::getRoot()); + + #if defined(ARDUINO_ARCH_AVR) + tableRenderer.printTo( + Serial, 3 /*startBin*/, 14 /*endBin*/, false /*clear*/); + jsonRenderer.printTo( + Serial, 3 /*startBin*/, 14 /*endBin*/); + #else + tableRenderer.printTo( + Serial, 2 /*startBin*/, 13 /*endBin*/, false /*clear*/); + jsonRenderer.printTo( + Serial, 2 /*startBin*/, 13 /*endBin*/); + #endif + + COROUTINE_DELAY(5000); + } +} + +void setup() { +#if ! defined(EPOXY_DUINO) + delay(1000); +#endif + Serial.begin(115200); + while (!Serial); // Leonardo/Micro + + pinMode(LED, OUTPUT); + pinMode(PIN, INPUT); + + // Coroutine names can be either C-string or F-string. + blinkLed.setName("blinkLed"); + readPin.setName(F("readPin")); + + // Create a profiler on the heap for every coroutine. + LogBinProfiler::createProfilers(Coroutine::getRoot()); + + // Setup the scheduler. + CoroutineScheduler::setup(); +} + +void loop() { + CoroutineScheduler::loop(); +} diff --git a/examples/HelloSchedulerWithProfiler/Makefile b/examples/HelloSchedulerWithProfiler/Makefile new file mode 100644 index 0000000..f4e7fbe --- /dev/null +++ b/examples/HelloSchedulerWithProfiler/Makefile @@ -0,0 +1,6 @@ +# See https://github.com/bxparks/EpoxyDuino for documentation about this +# Makefile to compile and run Arduino programs natively on Linux or MacOS. + +APP_NAME := HelloSchedulerWithProfiler +ARDUINO_LIBS := AceCommon AceRoutine +include ../../../EpoxyDuino/EpoxyDuino.mk From ad91f63ec805ec7ef48e6b49dad870749d851582 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Thu, 17 Mar 2022 10:26:38 -0700 Subject: [PATCH 39/59] libraries.properties: (Re)add dependency to AceCommon library --- library.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library.properties b/library.properties index 5ad1c40..ece52b7 100644 --- a/library.properties +++ b/library.properties @@ -7,4 +7,4 @@ paragraph=Supported macros include COROUTINE(), COROUTINE_BEGIN(), COROUTINE_YIE category=Other url=https://github.com/bxparks/AceRoutine architectures=* -depends= +depends=AceCommon From 6064073c1dac35ad2cb62e541b3fa28987baf46f Mon Sep 17 00:00:00 2001 From: Brian Park Date: Thu, 17 Mar 2022 10:39:23 -0700 Subject: [PATCH 40/59] examples/SoundManager: Remove profiling code; demo code moved to Hello{Coroutine,Scheduler}WithProfiler instead --- examples/SoundManager/SoundManager.ino | 49 ++------------------------ 1 file changed, 3 insertions(+), 46 deletions(-) diff --git a/examples/SoundManager/SoundManager.ino b/examples/SoundManager/SoundManager.ino index bf7f60f..0e9ff8b 100644 --- a/examples/SoundManager/SoundManager.ino +++ b/examples/SoundManager/SoundManager.ino @@ -21,30 +21,12 @@ * Coroutine soundManager; status: Running * First BEEP * Second BEEP - * name <8us <16us <32us <64us<128us<256us<512us <1ms <2ms >> - * soundManager 1440 0 1 0 0 0 0 0 1 0 - * 0x55C5AB3CE2 1438 1 2 0 0 0 0 0 0 1 - * soundRoutine 1440 0 0 0 2 0 0 0 0 0 - * { - * "soundManager":[1440,0,1,0,0,0,0,0,1,0], - * "0x55C5AB3CE240":[1438,1,2,0,0,0,0,0,0,1], - * "soundRoutine":[1440,0,0,0,2,0,0,0,0,0] - * } * * Request Boop and wait 5 seconds... * Coroutine soundRoutine; status: Yielding * Coroutine soundManager; status: Running * First BOOP * Second BOOP - * name <8us <16us <32us <64us<128us<256us<512us <1ms <2ms >> - * soundManager 1440 0 1 0 0 0 0 0 1 0 - * 0x55C5AB3CE2 1438 1 2 0 0 0 0 0 0 1 - * soundRoutine 1440 0 0 0 2 0 0 0 0 0 - * { - * "soundManager":[1440,0,1,0,0,0,0,0,1,0], - * "0x55C5AB3CE240":[1438,1,2,0,0,0,0,0,0,1], - * "soundRoutine":[1440,0,0,0,2,0,0,0,0,0] - * } * * Request Silence and wait 5 seconds... * Coroutine soundRoutine; status: Yielding @@ -60,45 +42,20 @@ #include #include "SoundRoutine.h" -using ace_routine::Coroutine;; using ace_routine::CoroutineScheduler; -using ace_routine::LogBinProfiler; -using ace_routine::LogBinTableRenderer; -using ace_routine::LogBinJsonRenderer; -SoundRoutine soundRoutine; EXTERN_COROUTINE(soundManager); - -// Every 5 seconds, print out the elapsed time frequency distribution from the -// LogBinProfiler. -COROUTINE(printProfiler) { - COROUTINE_LOOP() { - LogBinTableRenderer tableRenderer(getRoot()); - tableRenderer.printTo(Serial, 2, 12, false /*clear*/); - - LogBinJsonRenderer jsonRenderer(getRoot()); - jsonRenderer.printTo(Serial, 2, 12); - - COROUTINE_DELAY_SECONDS(5); - } -} +SoundRoutine soundRoutine; void setup() { delay(1000); Serial.begin(115200); while (!Serial); // needed for Leonardo/Micro - // Set names using both c-string and f-string for testing purposes. - soundRoutine.setName("soundRoutine"); + // Coroutine name can be ether C-string or F-string. + soundRoutine.setName("soundRoutine"); soundManager.setName(F("soundManager")); - // Don't set the name of 'printProfiler' to verify that the name of the - // coroutine becomes the pointer address in hexadecimal. - // printProfiler.setName(F("printProfiler")); - - // Attach profilers to all coroutines. - LogBinProfiler::createProfilers(Coroutine::getRoot()); - CoroutineScheduler::setup(); } From d7a4f80e36e97476af02ad8e7448a06236106a84 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Thu, 17 Mar 2022 13:49:30 -0700 Subject: [PATCH 41/59] LogBinJsonRenderer,LogBinTableRenderer: Convert printTo() into static functions; implicitly assume T_COROUTINE::getRoot(), just like CoroutineScheduler --- .../HelloCoroutineWithProfiler.ino | 11 +++---- .../HelloSchedulerWithProfiler.ino | 13 ++++----- examples/MemoryBenchmark/MemoryBenchmark.ino | 6 ++-- examples/MemoryBenchmark/README.md | 4 +-- examples/MemoryBenchmark/stm32.txt | 4 +-- src/ace_routine/Coroutine.h | 1 + src/ace_routine/LogBinJsonRenderer.h | 13 ++------- src/ace_routine/LogBinProfiler.h | 29 ++++++++++--------- src/ace_routine/LogBinTableRenderer.h | 13 ++------- 9 files changed, 38 insertions(+), 56 deletions(-) diff --git a/examples/HelloCoroutineWithProfiler/HelloCoroutineWithProfiler.ino b/examples/HelloCoroutineWithProfiler/HelloCoroutineWithProfiler.ino index 1ccabd4..825d6b9 100644 --- a/examples/HelloCoroutineWithProfiler/HelloCoroutineWithProfiler.ino +++ b/examples/HelloCoroutineWithProfiler/HelloCoroutineWithProfiler.ino @@ -72,18 +72,15 @@ COROUTINE(readPin) { // include information about itself. COROUTINE(printProfiling) { COROUTINE_LOOP() { - LogBinTableRenderer tableRenderer(Coroutine::getRoot()); - LogBinJsonRenderer jsonRenderer(Coroutine::getRoot()); - #if defined(ARDUINO_ARCH_AVR) - tableRenderer.printTo( + LogBinTableRenderer::printTo( Serial, 3 /*startBin*/, 14 /*endBin*/, false /*clear*/); - jsonRenderer.printTo( + LogBinJsonRenderer::printTo( Serial, 3 /*startBin*/, 14 /*endBin*/); #else - tableRenderer.printTo( + LogBinTableRenderer::printTo( Serial, 2 /*startBin*/, 13 /*endBin*/, false /*clear*/); - jsonRenderer.printTo( + LogBinJsonRenderer::printTo( Serial, 2 /*startBin*/, 13 /*endBin*/); #endif diff --git a/examples/HelloSchedulerWithProfiler/HelloSchedulerWithProfiler.ino b/examples/HelloSchedulerWithProfiler/HelloSchedulerWithProfiler.ino index a7bb198..6bb4b56 100644 --- a/examples/HelloSchedulerWithProfiler/HelloSchedulerWithProfiler.ino +++ b/examples/HelloSchedulerWithProfiler/HelloSchedulerWithProfiler.ino @@ -71,18 +71,15 @@ COROUTINE(readPin) { // include information about itself. COROUTINE(printProfiling) { COROUTINE_LOOP() { - LogBinTableRenderer tableRenderer(Coroutine::getRoot()); - LogBinJsonRenderer jsonRenderer(Coroutine::getRoot()); - #if defined(ARDUINO_ARCH_AVR) - tableRenderer.printTo( + LogBinTableRenderer::printTo( Serial, 3 /*startBin*/, 14 /*endBin*/, false /*clear*/); - jsonRenderer.printTo( + LogBinJsonRenderer::printTo( Serial, 3 /*startBin*/, 14 /*endBin*/); #else - tableRenderer.printTo( + LogBinTableRenderer::printTo( Serial, 2 /*startBin*/, 13 /*endBin*/, false /*clear*/); - jsonRenderer.printTo( + LogBinJsonRenderer::printTo( Serial, 2 /*startBin*/, 13 /*endBin*/); #endif @@ -105,7 +102,7 @@ void setup() { readPin.setName(F("readPin")); // Create a profiler on the heap for every coroutine. - LogBinProfiler::createProfilers(Coroutine::getRoot()); + LogBinProfiler::createProfilers(); // Setup the scheduler. CoroutineScheduler::setup(); diff --git a/examples/MemoryBenchmark/MemoryBenchmark.ino b/examples/MemoryBenchmark/MemoryBenchmark.ino index 1ac57e9..b426fbc 100644 --- a/examples/MemoryBenchmark/MemoryBenchmark.ino +++ b/examples/MemoryBenchmark/MemoryBenchmark.ino @@ -552,12 +552,10 @@ void loop() { CoroutineScheduler::loop(); #elif FEATURE == FEATURE_LOG_BIN_TABLE_RENDERER CoroutineScheduler::loop(); - LogBinTableRenderer renderer(Coroutine::getRoot()); - renderer.printTo(Serial, 0, 32); + LogBinTableRenderer::printTo(Serial, 0, 32); #elif FEATURE == FEATURE_LOG_BIN_JSON_RENDERER CoroutineScheduler::loop(); - LogBinJsonRenderer renderer(Coroutine::getRoot()); - renderer.printTo(Serial, 0, 32); + LogBinJsonRenderer::printTo(Serial, 0, 32); #elif FEATURE == FEATURE_BLINK_COROUTINE blink.runCoroutine(); #elif FEATURE == FEATURE_BLINK_FUNCTION diff --git a/examples/MemoryBenchmark/README.md b/examples/MemoryBenchmark/README.md index 0278c21..cbecacf 100644 --- a/examples/MemoryBenchmark/README.md +++ b/examples/MemoryBenchmark/README.md @@ -362,8 +362,8 @@ $ make README.md | Scheduler, Two Coroutines (man setup) | 22344/ 3604 | 460/ 64 | |---------------------------------------+--------------+-------------| | Scheduler, LogBinProfiler | 22300/ 3644 | 416/ 104 | -| Scheduler, LogBinTableRenderer | 23708/ 3644 | 1824/ 104 | -| Scheduler, LogBinJsonRenderer | 23172/ 3644 | 1288/ 104 | +| Scheduler, LogBinTableRenderer | 23704/ 3644 | 1820/ 104 | +| Scheduler, LogBinJsonRenderer | 23164/ 3644 | 1280/ 104 | |---------------------------------------+--------------+-------------| | Blink Function | 22120/ 3540 | 236/ 0 | | Blink Coroutine | 22232/ 3568 | 348/ 28 | diff --git a/examples/MemoryBenchmark/stm32.txt b/examples/MemoryBenchmark/stm32.txt index d213cdb..0cf52ec 100644 --- a/examples/MemoryBenchmark/stm32.txt +++ b/examples/MemoryBenchmark/stm32.txt @@ -18,7 +18,7 @@ 17 22208 131072 3576 20480 18 22344 131072 3604 20480 19 22300 131072 3644 20480 -20 23708 131072 3644 20480 -21 23172 131072 3644 20480 +20 23704 131072 3644 20480 +21 23164 131072 3644 20480 22 22120 131072 3540 20480 23 22232 131072 3568 20480 diff --git a/src/ace_routine/Coroutine.h b/src/ace_routine/Coroutine.h index 8bf1443..bdd00b7 100644 --- a/src/ace_routine/Coroutine.h +++ b/src/ace_routine/Coroutine.h @@ -534,6 +534,7 @@ class CoroutineTemplate { /** Set the profiler. */ void setProfiler(CoroutineProfiler* profiler) { mProfiler = profiler; } + /** Get the profiler. Nullable. */ CoroutineProfiler* getProfiler() const { return mProfiler; } /** diff --git a/src/ace_routine/LogBinJsonRenderer.h b/src/ace_routine/LogBinJsonRenderer.h index 3a81ff4..c39a14e 100644 --- a/src/ace_routine/LogBinJsonRenderer.h +++ b/src/ace_routine/LogBinJsonRenderer.h @@ -50,11 +50,6 @@ class LogBinJsonRendererTemplate { /** Typedef of the LogBinProfiler supported by this class. */ using Profiler = LogBinProfilerTemplate; - /** Constructor. */ - LogBinJsonRendererTemplate(T_COROUTINE** root) - : mRoot(root) - {} - /** * Loop over all coroutines and print the bin counts as JSON. * @@ -66,7 +61,7 @@ class LogBinJsonRendererTemplate { * @param rollup roll-up exterior bins into the first and last bins * (default true) */ - void printTo( + static void printTo( Print& printer, uint8_t startBin, uint8_t endBin, @@ -77,7 +72,8 @@ class LogBinJsonRendererTemplate { printer.println('{'); bool lineNeedsTrailingComma = false; - for (Coroutine** p = mRoot; (*p) != nullptr; p = (*p)->getNext()) { + T_COROUTINE** root = T_COROUTINE::getRoot(); + for (T_COROUTINE** p = root; (*p) != nullptr; p = (*p)->getNext()) { auto* profiler = (Profiler*) (*p)->getProfiler(); if (! profiler) continue; @@ -113,9 +109,6 @@ class LogBinJsonRendererTemplate { printer.println(); printer.println('}'); } - - public: - T_COROUTINE** mRoot; }; using LogBinJsonRenderer = LogBinJsonRendererTemplate; diff --git a/src/ace_routine/LogBinProfiler.h b/src/ace_routine/LogBinProfiler.h index 568f60f..f78aa54 100644 --- a/src/ace_routine/LogBinProfiler.h +++ b/src/ace_routine/LogBinProfiler.h @@ -87,28 +87,30 @@ class LogBinProfilerTemplate : public CoroutineProfiler { } /** - * Create a new profiler on the heap and attach it to each coroutine in the - * singly-linked list of coroutines defined by `root`. If the coroutine has - * an existing profiler attached to it, the previous profiler is simply - * replaced, but *not* deleted. The reason is that the previous profiler - * could have been created statically, instead of on the heap, and we - * would crash the program if we tried to call `delete` on that pointer. + * Create a new profiler on the heap and attach it to each coroutine. + * If the coroutine has an existing profiler attached to it, the previous + * profiler is simply replaced, but *not* deleted. The reason is that the + * previous profiler could have been created statically, instead of on the + * heap, and we would crash the program if we tried to call `delete` on that + * pointer. * * If createProfilers() is called twice within the same application, (which * should rarely happen), the program must ensure that deleteProfilers() is * called before the second call to createProfilers(). Otherwise, heap * memory will be leaked. */ - static void createProfilers(T_COROUTINE** root) { - for (Coroutine** p = root; (*p) != nullptr; p = (*p)->getNext()) { + static void createProfilers() { + T_COROUTINE** root = T_COROUTINE::getRoot(); + for (T_COROUTINE** p = root; (*p) != nullptr; p = (*p)->getNext()) { auto* profiler = new LogBinProfilerTemplate(); (*p)->setProfiler(profiler); } } /** Delete the profilers created by createProfilers(). */ - static void deleteProfilers(T_COROUTINE** root) { - for (Coroutine** p = root; (*p) != nullptr; p = (*p)->getNext()) { + static void deleteProfilers() { + T_COROUTINE** root = T_COROUTINE::getRoot(); + for (T_COROUTINE** p = root; (*p) != nullptr; p = (*p)->getNext()) { auto* profiler = (LogBinProfilerTemplate*) (*p)->getProfiler(); if (profiler) { delete profiler; @@ -117,9 +119,10 @@ class LogBinProfilerTemplate : public CoroutineProfiler { } } - /** Clear counters for all profilers in the coroutines defined by `root`. */ - static void clearProfilers(T_COROUTINE** root) { - for (Coroutine** p = root; (*p) != nullptr; p = (*p)->getNext()) { + /** Clear counters for all profilers. */ + static void clearProfilers() { + T_COROUTINE** root = T_COROUTINE::getRoot(); + for (T_COROUTINE** p = root; (*p) != nullptr; p = (*p)->getNext()) { auto* profiler = (LogBinProfilerTemplate*) (*p)->getProfiler(); if (profiler) { profiler->clear(); diff --git a/src/ace_routine/LogBinTableRenderer.h b/src/ace_routine/LogBinTableRenderer.h index 2b804f7..3f6d394 100644 --- a/src/ace_routine/LogBinTableRenderer.h +++ b/src/ace_routine/LogBinTableRenderer.h @@ -107,11 +107,6 @@ class LogBinRendererTemplate { /** Typedef of the LogBinProfiler supported by this class. */ using Profiler = LogBinProfilerTemplate; - /** Constructor. */ - LogBinRendererTemplate(T_COROUTINE** root) - : mRoot(root) - {} - /** * Loop over all coroutines and print the ASCII version of the frequency * distribution. This assumes that all the coroutines are using the same @@ -126,7 +121,7 @@ class LogBinRendererTemplate { * @param rollup roll-up exterior bins into the first and last bins * (default true) */ - void printTo( + static void printTo( Print& printer, uint8_t startBin, uint8_t endBin, @@ -138,7 +133,8 @@ class LogBinRendererTemplate { uint16_t bufBins[Profiler::kNumBins]; bool isHeaderPrinted = false; - for (Coroutine** p = mRoot; (*p) != nullptr; p = (*p)->getNext()) { + T_COROUTINE** root = T_COROUTINE::getRoot(); + for (T_COROUTINE** p = root; (*p) != nullptr; p = (*p)->getNext()) { auto* profiler = (Profiler*) (*p)->getProfiler(); if (! profiler) continue; @@ -177,9 +173,6 @@ class LogBinRendererTemplate { } } } - - private: - T_COROUTINE** mRoot; }; using LogBinTableRenderer = LogBinRendererTemplate; From d16204e11adf08133b417549296ae85d76c7da6b Mon Sep 17 00:00:00 2001 From: Brian Park Date: Thu, 17 Mar 2022 14:41:06 -0700 Subject: [PATCH 42/59] LogBinTableRenderer.h: Rename straggers from LogBinRenderer to LogBinTableRenderer --- src/ace_routine/LogBinProfiler.h | 9 ++++++--- src/ace_routine/LogBinTableRenderer.h | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/ace_routine/LogBinProfiler.h b/src/ace_routine/LogBinProfiler.h index f78aa54..6b3deed 100644 --- a/src/ace_routine/LogBinProfiler.h +++ b/src/ace_routine/LogBinProfiler.h @@ -40,9 +40,12 @@ namespace ace_routine { * to a given coroutine through the `Coroutine::setProfiler()` method. * * After sufficient number of samples are collected, the frequency distribution - * of all profilers for all coroutines can be printed by a renderer. An - * implementation of such a render is `LogBinRendererTemplate` - * which prints the frequency distribution as a formatted table. + * of all profilers for all coroutines can be printed by a renderer. Two + * renderer are provided: + * + * * `LogBinTableRenderer` which prints the frequency distribution as a + * formatted table. + * * `LogBinJsonRenderer` which prints the info as a JSON object * * @tparam T_COROUTINE class of the specific CoroutineTemplate instantiation, * usually `Coroutine` diff --git a/src/ace_routine/LogBinTableRenderer.h b/src/ace_routine/LogBinTableRenderer.h index 3f6d394..274691b 100644 --- a/src/ace_routine/LogBinTableRenderer.h +++ b/src/ace_routine/LogBinTableRenderer.h @@ -102,7 +102,7 @@ void printBinsTo( * usually `Coroutine` */ template -class LogBinRendererTemplate { +class LogBinTableRendererTemplate { public: /** Typedef of the LogBinProfiler supported by this class. */ using Profiler = LogBinProfilerTemplate; @@ -175,7 +175,7 @@ class LogBinRendererTemplate { } }; -using LogBinTableRenderer = LogBinRendererTemplate; +using LogBinTableRenderer = LogBinTableRendererTemplate; } // namespace ace_routine From 819cb328fd437a278a64c1cdaa5742eabfb14ab5 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Thu, 17 Mar 2022 15:13:36 -0700 Subject: [PATCH 43/59] MemoryBenchmark: Subtract overhead of 'Serial' object from LogBin*Renderer numbers --- examples/MemoryBenchmark/MemoryBenchmark.ino | 33 +- examples/MemoryBenchmark/README.md | 345 ++++++++++--------- examples/MemoryBenchmark/attiny.txt | 48 +-- examples/MemoryBenchmark/esp32.txt | 48 +-- examples/MemoryBenchmark/esp8266.txt | 48 +-- examples/MemoryBenchmark/generate_readme.py | 9 +- examples/MemoryBenchmark/generate_table.awk | 12 +- examples/MemoryBenchmark/micro.txt | 48 +-- examples/MemoryBenchmark/nano.txt | 48 +-- examples/MemoryBenchmark/stm32.txt | 48 +-- examples/MemoryBenchmark/teensy32.txt | 48 +-- 11 files changed, 374 insertions(+), 361 deletions(-) diff --git a/examples/MemoryBenchmark/MemoryBenchmark.ino b/examples/MemoryBenchmark/MemoryBenchmark.ino index b426fbc..d114c1a 100644 --- a/examples/MemoryBenchmark/MemoryBenchmark.ino +++ b/examples/MemoryBenchmark/MemoryBenchmark.ino @@ -18,14 +18,14 @@ #define FEATURE_BASELINE 0 #define FEATURE_ONE_DELAY_FUNCTION 1 #define FEATURE_TWO_DELAY_FUNCTIONS 2 -#define FEATURE_ONE_COROUTINE 3 -#define FEATURE_TWO_COROUTINES 4 +#define FEATURE_ONE_COROUTINE_MILLIS 3 +#define FEATURE_TWO_COROUTINES_MILLIS 4 #define FEATURE_ONE_COROUTINE_MICROS 5 #define FEATURE_TWO_COROUTINES_MICROS 6 #define FEATURE_ONE_COROUTINE_SECONDS 7 #define FEATURE_TWO_COROUTINES_SECONDS 8 -#define FEATURE_SCHEDULER_ONE_COROUTINE 9 -#define FEATURE_SCHEDULER_TWO_COROUTINES 10 +#define FEATURE_SCHEDULER_ONE_COROUTINE_MILLIS 9 +#define FEATURE_SCHEDULER_TWO_COROUTINES_MILLIS 10 #define FEATURE_SCHEDULER_ONE_COROUTINE_MICROS 11 #define FEATURE_SCHEDULER_TWO_COROUTINES_MICROS 12 #define FEATURE_SCHEDULER_ONE_COROUTINE_SECONDS 13 @@ -90,7 +90,7 @@ volatile int disableCompilerOptimization = 0; } } -#elif FEATURE == FEATURE_ONE_COROUTINE +#elif FEATURE == FEATURE_ONE_COROUTINE_MILLIS COROUTINE(a) { COROUTINE_LOOP() { @@ -99,7 +99,7 @@ volatile int disableCompilerOptimization = 0; } } -#elif FEATURE == FEATURE_TWO_COROUTINES +#elif FEATURE == FEATURE_TWO_COROUTINES_MILLIS COROUTINE(a) { COROUTINE_LOOP() { @@ -165,7 +165,7 @@ volatile int disableCompilerOptimization = 0; } } -#elif FEATURE == FEATURE_SCHEDULER_ONE_COROUTINE +#elif FEATURE == FEATURE_SCHEDULER_ONE_COROUTINE_MILLIS class MyCoroutine : public Coroutine { public: @@ -179,7 +179,7 @@ volatile int disableCompilerOptimization = 0; MyCoroutine a; -#elif FEATURE == FEATURE_SCHEDULER_TWO_COROUTINES +#elif FEATURE == FEATURE_SCHEDULER_TWO_COROUTINES_MILLIS class MyCoroutineA : public Coroutine { public: @@ -472,13 +472,19 @@ volatile int disableCompilerOptimization = 0; void setup() { delay(1000); + // Include the `Serial` in the baseline, so that it will be subtracted out + // for LogBinTableRenderer and LogBinJsonRenderer. Otherwise, those numbers + // include the overhead of the `Serial` object. + Serial.begin(115200); + Serial.write(disableCompilerOptimization); + #if defined(TEENSYDUINO) // Force Teensy to bring in malloc(), free() and other things for virtual // dispatch. foo = new FooClass(); #endif -#if FEATURE >= FEATURE_SCHEDULER_ONE_COROUTINE \ +#if FEATURE >= FEATURE_SCHEDULER_ONE_COROUTINE_MILLIS \ && FEATURE <= FEATURE_SCHEDULER_MANUAL_SETUP_TWO_COROUTINES CoroutineScheduler::setup(); @@ -513,9 +519,9 @@ void loop() { #elif FEATURE == FEATURE_TWO_DELAY_FUNCTIONS delayFunctionA(); delayFunctionB(); -#elif FEATURE == FEATURE_ONE_COROUTINE +#elif FEATURE == FEATURE_ONE_COROUTINE_MILLIS a.runCoroutine(); -#elif FEATURE == FEATURE_TWO_COROUTINES +#elif FEATURE == FEATURE_TWO_COROUTINES_MILLIS a.runCoroutine(); b.runCoroutine(); #elif FEATURE == FEATURE_ONE_COROUTINE_MICROS @@ -528,9 +534,9 @@ void loop() { #elif FEATURE == FEATURE_TWO_COROUTINES_SECONDS a.runCoroutine(); b.runCoroutine(); -#elif FEATURE == FEATURE_SCHEDULER_ONE_COROUTINE +#elif FEATURE == FEATURE_SCHEDULER_ONE_COROUTINE_MILLIS CoroutineScheduler::loop(); -#elif FEATURE == FEATURE_SCHEDULER_TWO_COROUTINES +#elif FEATURE == FEATURE_SCHEDULER_TWO_COROUTINES_MILLIS CoroutineScheduler::loop(); #elif FEATURE == FEATURE_SCHEDULER_ONE_COROUTINE_MICROS CoroutineScheduler::loop(); @@ -550,6 +556,7 @@ void loop() { CoroutineScheduler::loop(); #elif FEATURE == FEATURE_LOG_BIN_PROFILER CoroutineScheduler::loop(); + disableCompilerOptimization = profiler.mBins[3]; #elif FEATURE == FEATURE_LOG_BIN_TABLE_RENDERER CoroutineScheduler::loop(); LogBinTableRenderer::printTo(Serial, 0, 32); diff --git a/examples/MemoryBenchmark/README.md b/examples/MemoryBenchmark/README.md index cbecacf..588e716 100644 --- a/examples/MemoryBenchmark/README.md +++ b/examples/MemoryBenchmark/README.md @@ -109,15 +109,18 @@ calculated flash size can jump around in unexpected ways. * Increases static ram by 3 bytes (AVR) and 4 bytes (32-bits) per coroutine. * Support `CoroutineProfiler` in the `CoroutineScheduler`. - * Increases the flash size of the `CoroutineScheduler` by 100-140 bytes + * Increases the flash size of the `CoroutineScheduler` by 90-140 bytes for both 8-bit and 32-bit processors, even if `CoroutineProfiler` is not used. This is a one-time hit. * Add `LogBinProfiler` * Adds about 90 bytes of flash and 70 bytes of RAM on AVR. + * Adds about 140 bytes of flash and 70 bytes of RAM on ESP8266. * Add `LogBinTableRenderer` - * Adds about 2200 bytes of flash and 200 bytes of RAM on AVR. + * Adds about 1400 bytes of flash and ~20 bytes of RAM on AVR. + * Adds about 1900 bytes of flash and ~0 bytes of RAM on ESP8266. * Add `LogBinJsonRenderer` - * Adds about 1800 bytes of flash and 200 bytes of RAM on AVR. + * Adds about 900 bytes of flash and ~20 bytes of RAM on AVR. + * Adds about 1300 bytes of flash and ~0 bytes of RAM on ESP8266. ## How to Generate @@ -185,41 +188,41 @@ $ make README.md +--------------------------------------------------------------------+ | functionality | flash/ ram | delta | |---------------------------------------+--------------+-------------| -| Baseline | 400/ 11 | 0/ 0 | +| Baseline | 1026/ 81 | 0/ 0 | |---------------------------------------+--------------+-------------| -| One Delay Function | 450/ 13 | 50/ 2 | -| Two Delay Functions | 508/ 15 | 108/ 4 | +| One Delay Function | 1080/ 83 | 54/ 2 | +| Two Delay Functions | 1134/ 85 | 108/ 4 | |---------------------------------------+--------------+-------------| -| One Coroutine | 642/ 37 | 242/ 26 | -| Two Coroutines | 834/ 61 | 434/ 50 | +| One Coroutine (millis) | 1206/ 107 | 180/ 26 | +| Two Coroutines (millis) | 1400/ 131 | 374/ 50 | |---------------------------------------+--------------+-------------| -| One Coroutine (micros) | 610/ 37 | 210/ 26 | -| Two Coroutines (micros) | 770/ 61 | 370/ 50 | +| One Coroutine (micros) | 1174/ 107 | 148/ 26 | +| Two Coroutines (micros) | 1336/ 131 | 310/ 50 | |---------------------------------------+--------------+-------------| -| One Coroutine (seconds) | 738/ 37 | 338/ 26 | -| Two Coroutines (seconds) | 958/ 61 | 558/ 50 | +| One Coroutine (seconds) | 1302/ 107 | 276/ 26 | +| Two Coroutines (seconds) | 1524/ 131 | 498/ 50 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine | 830/ 39 | 430/ 28 | -| Scheduler, Two Coroutines | 1016/ 63 | 616/ 52 | +| Scheduler, One Coroutine (millis) | 1396/ 109 | 370/ 28 | +| Scheduler, Two Coroutines (millis) | 1582/ 133 | 556/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (micros) | 798/ 39 | 398/ 28 | -| Scheduler, Two Coroutines (micros) | 952/ 63 | 552/ 52 | +| Scheduler, One Coroutine (micros) | 1364/ 109 | 338/ 28 | +| Scheduler, Two Coroutines (micros) | 1518/ 133 | 492/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (seconds) | 926/ 39 | 526/ 28 | -| Scheduler, Two Coroutines (seconds) | 1140/ 63 | 740/ 52 | +| Scheduler, One Coroutine (seconds) | 1492/ 109 | 466/ 28 | +| Scheduler, Two Coroutines (seconds) | 1706/ 133 | 680/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (setup) | 880/ 39 | 480/ 28 | -| Scheduler, Two Coroutines (setup) | 1162/ 63 | 762/ 52 | +| Scheduler, One Coroutine (setup) | 1446/ 109 | 420/ 28 | +| Scheduler, Two Coroutines (setup) | 1728/ 133 | 702/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (man setup) | 860/ 39 | 460/ 28 | -| Scheduler, Two Coroutines (man setup) | 1150/ 63 | 750/ 52 | +| Scheduler, One Coroutine (man setup) | 1424/ 109 | 398/ 28 | +| Scheduler, Two Coroutines (man setup) | 1714/ 133 | 688/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, LogBinProfiler | 918/ 111 | 518/ 100 | -| Scheduler, LogBinTableRenderer | 2792/ 193 | 2392/ 182 | -| Scheduler, LogBinJsonRenderer | 2326/ 197 | 1926/ 186 | +| Scheduler, LogBinProfiler | 1500/ 181 | 474/ 100 | +| Scheduler, LogBinTableRenderer | 2864/ 193 | 1838/ 112 | +| Scheduler, LogBinJsonRenderer | 2398/ 197 | 1372/ 116 | |---------------------------------------+--------------+-------------| -| Blink Function | 546/ 14 | 146/ 3 | -| Blink Coroutine | 766/ 37 | 366/ 26 | +| Blink Function | 1176/ 84 | 150/ 3 | +| Blink Coroutine | 1330/ 107 | 304/ 26 | +--------------------------------------------------------------------+ ``` @@ -234,41 +237,41 @@ $ make README.md +--------------------------------------------------------------------+ | functionality | flash/ ram | delta | |---------------------------------------+--------------+-------------| -| Baseline | 606/ 11 | 0/ 0 | +| Baseline | 1616/ 186 | 0/ 0 | |---------------------------------------+--------------+-------------| -| One Delay Function | 654/ 13 | 48/ 2 | -| Two Delay Functions | 714/ 15 | 108/ 4 | +| One Delay Function | 1664/ 188 | 48/ 2 | +| Two Delay Functions | 1726/ 190 | 110/ 4 | |---------------------------------------+--------------+-------------| -| One Coroutine | 854/ 37 | 248/ 26 | -| Two Coroutines | 1048/ 61 | 442/ 50 | +| One Coroutine (millis) | 1804/ 212 | 188/ 26 | +| Two Coroutines (millis) | 1998/ 236 | 382/ 50 | |---------------------------------------+--------------+-------------| -| One Coroutine (micros) | 826/ 37 | 220/ 26 | -| Two Coroutines (micros) | 992/ 61 | 386/ 50 | +| One Coroutine (micros) | 1776/ 212 | 160/ 26 | +| Two Coroutines (micros) | 1942/ 236 | 326/ 50 | |---------------------------------------+--------------+-------------| -| One Coroutine (seconds) | 954/ 37 | 348/ 26 | -| Two Coroutines (seconds) | 1180/ 61 | 574/ 50 | +| One Coroutine (seconds) | 1904/ 212 | 288/ 26 | +| Two Coroutines (seconds) | 2130/ 236 | 514/ 50 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine | 1042/ 39 | 436/ 28 | -| Scheduler, Two Coroutines | 1228/ 63 | 622/ 52 | +| Scheduler, One Coroutine (millis) | 1992/ 214 | 376/ 28 | +| Scheduler, Two Coroutines (millis) | 2178/ 238 | 562/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (micros) | 1014/ 39 | 408/ 28 | -| Scheduler, Two Coroutines (micros) | 1172/ 63 | 566/ 52 | +| Scheduler, One Coroutine (micros) | 1964/ 214 | 348/ 28 | +| Scheduler, Two Coroutines (micros) | 2122/ 238 | 506/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (seconds) | 1142/ 39 | 536/ 28 | -| Scheduler, Two Coroutines (seconds) | 1360/ 63 | 754/ 52 | +| Scheduler, One Coroutine (seconds) | 2092/ 214 | 476/ 28 | +| Scheduler, Two Coroutines (seconds) | 2310/ 238 | 694/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (setup) | 1096/ 39 | 490/ 28 | -| Scheduler, Two Coroutines (setup) | 1382/ 63 | 776/ 52 | +| Scheduler, One Coroutine (setup) | 2046/ 214 | 430/ 28 | +| Scheduler, Two Coroutines (setup) | 2332/ 238 | 716/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (man setup) | 1074/ 39 | 468/ 28 | -| Scheduler, Two Coroutines (man setup) | 1368/ 63 | 762/ 52 | +| Scheduler, One Coroutine (man setup) | 2024/ 214 | 408/ 28 | +| Scheduler, Two Coroutines (man setup) | 2318/ 238 | 702/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, LogBinProfiler | 1134/ 111 | 528/ 100 | -| Scheduler, LogBinTableRenderer | 3380/ 304 | 2774/ 293 | -| Scheduler, LogBinJsonRenderer | 2900/ 308 | 2294/ 297 | +| Scheduler, LogBinProfiler | 2100/ 286 | 484/ 100 | +| Scheduler, LogBinTableRenderer | 3502/ 304 | 1886/ 118 | +| Scheduler, LogBinJsonRenderer | 3022/ 308 | 1406/ 122 | |---------------------------------------+--------------+-------------| -| Blink Function | 938/ 14 | 332/ 3 | -| Blink Coroutine | 1168/ 37 | 562/ 26 | +| Blink Function | 1948/ 189 | 332/ 3 | +| Blink Coroutine | 2118/ 212 | 502/ 26 | +--------------------------------------------------------------------+ ``` @@ -283,41 +286,41 @@ $ make README.md +--------------------------------------------------------------------+ | functionality | flash/ ram | delta | |---------------------------------------+--------------+-------------| -| Baseline | 3554/ 151 | 0/ 0 | +| Baseline | 3582/ 151 | 0/ 0 | |---------------------------------------+--------------+-------------| -| One Delay Function | 3602/ 153 | 48/ 2 | -| Two Delay Functions | 3662/ 155 | 108/ 4 | +| One Delay Function | 3630/ 153 | 48/ 2 | +| Two Delay Functions | 3690/ 155 | 108/ 4 | |---------------------------------------+--------------+-------------| -| One Coroutine | 3742/ 177 | 188/ 26 | -| Two Coroutines | 3936/ 201 | 382/ 50 | +| One Coroutine (millis) | 3770/ 177 | 188/ 26 | +| Two Coroutines (millis) | 3964/ 201 | 382/ 50 | |---------------------------------------+--------------+-------------| -| One Coroutine (micros) | 3714/ 177 | 160/ 26 | -| Two Coroutines (micros) | 3880/ 201 | 326/ 50 | +| One Coroutine (micros) | 3742/ 177 | 160/ 26 | +| Two Coroutines (micros) | 3908/ 201 | 326/ 50 | |---------------------------------------+--------------+-------------| -| One Coroutine (seconds) | 3842/ 177 | 288/ 26 | -| Two Coroutines (seconds) | 4068/ 201 | 514/ 50 | +| One Coroutine (seconds) | 3870/ 177 | 288/ 26 | +| Two Coroutines (seconds) | 4096/ 201 | 514/ 50 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine | 3930/ 179 | 376/ 28 | -| Scheduler, Two Coroutines | 4116/ 203 | 562/ 52 | +| Scheduler, One Coroutine (millis) | 3958/ 179 | 376/ 28 | +| Scheduler, Two Coroutines (millis) | 4144/ 203 | 562/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (micros) | 3902/ 179 | 348/ 28 | -| Scheduler, Two Coroutines (micros) | 4060/ 203 | 506/ 52 | +| Scheduler, One Coroutine (micros) | 3930/ 179 | 348/ 28 | +| Scheduler, Two Coroutines (micros) | 4088/ 203 | 506/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (seconds) | 4030/ 179 | 476/ 28 | -| Scheduler, Two Coroutines (seconds) | 4248/ 203 | 694/ 52 | +| Scheduler, One Coroutine (seconds) | 4058/ 179 | 476/ 28 | +| Scheduler, Two Coroutines (seconds) | 4276/ 203 | 694/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (setup) | 3984/ 179 | 430/ 28 | -| Scheduler, Two Coroutines (setup) | 4270/ 203 | 716/ 52 | +| Scheduler, One Coroutine (setup) | 4012/ 179 | 430/ 28 | +| Scheduler, Two Coroutines (setup) | 4298/ 203 | 716/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (man setup) | 3962/ 179 | 408/ 28 | -| Scheduler, Two Coroutines (man setup) | 4256/ 203 | 702/ 52 | +| Scheduler, One Coroutine (man setup) | 3990/ 179 | 408/ 28 | +| Scheduler, Two Coroutines (man setup) | 4284/ 203 | 702/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, LogBinProfiler | 4022/ 251 | 468/ 100 | -| Scheduler, LogBinTableRenderer | 5438/ 269 | 1884/ 118 | -| Scheduler, LogBinJsonRenderer | 4958/ 273 | 1404/ 122 | +| Scheduler, LogBinProfiler | 4066/ 251 | 484/ 100 | +| Scheduler, LogBinTableRenderer | 5466/ 269 | 1884/ 118 | +| Scheduler, LogBinJsonRenderer | 4986/ 273 | 1404/ 122 | |---------------------------------------+--------------+-------------| -| Blink Function | 3994/ 154 | 440/ 3 | -| Blink Coroutine | 4164/ 177 | 610/ 26 | +| Blink Function | 4022/ 154 | 440/ 3 | +| Blink Coroutine | 4192/ 177 | 610/ 26 | +--------------------------------------------------------------------+ ``` @@ -332,41 +335,41 @@ $ make README.md +--------------------------------------------------------------------+ | functionality | flash/ ram | delta | |---------------------------------------+--------------+-------------| -| Baseline | 21884/ 3540 | 0/ 0 | +| Baseline | 21932/ 3540 | 0/ 0 | |---------------------------------------+--------------+-------------| -| One Delay Function | 21912/ 3544 | 28/ 4 | -| Two Delay Functions | 21960/ 3544 | 76/ 4 | +| One Delay Function | 21960/ 3544 | 28/ 4 | +| Two Delay Functions | 22008/ 3544 | 76/ 4 | |---------------------------------------+--------------+-------------| -| One Coroutine | 22016/ 3572 | 132/ 32 | -| Two Coroutines | 22164/ 3600 | 280/ 60 | +| One Coroutine (millis) | 22064/ 3572 | 132/ 32 | +| Two Coroutines (millis) | 22212/ 3600 | 280/ 60 | |---------------------------------------+--------------+-------------| -| One Coroutine (micros) | 22080/ 3572 | 196/ 32 | -| Two Coroutines (micros) | 22228/ 3600 | 344/ 60 | +| One Coroutine (micros) | 22128/ 3572 | 196/ 32 | +| Two Coroutines (micros) | 22276/ 3600 | 344/ 60 | |---------------------------------------+--------------+-------------| -| One Coroutine (seconds) | 22032/ 3572 | 148/ 32 | -| Two Coroutines (seconds) | 22196/ 3600 | 312/ 60 | +| One Coroutine (seconds) | 22080/ 3572 | 148/ 32 | +| Two Coroutines (seconds) | 22244/ 3600 | 312/ 60 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine | 22192/ 3576 | 308/ 36 | -| Scheduler, Two Coroutines | 22296/ 3604 | 412/ 64 | +| Scheduler, One Coroutine (millis) | 22232/ 3576 | 300/ 36 | +| Scheduler, Two Coroutines (millis) | 22336/ 3604 | 404/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (micros) | 22192/ 3576 | 308/ 36 | -| Scheduler, Two Coroutines (micros) | 22296/ 3604 | 412/ 64 | +| Scheduler, One Coroutine (micros) | 22232/ 3576 | 300/ 36 | +| Scheduler, Two Coroutines (micros) | 22336/ 3604 | 404/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (seconds) | 22208/ 3576 | 324/ 36 | -| Scheduler, Two Coroutines (seconds) | 22328/ 3604 | 444/ 64 | +| Scheduler, One Coroutine (seconds) | 22248/ 3576 | 316/ 36 | +| Scheduler, Two Coroutines (seconds) | 22368/ 3604 | 436/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (setup) | 22216/ 3576 | 332/ 36 | -| Scheduler, Two Coroutines (setup) | 22348/ 3604 | 464/ 64 | +| Scheduler, One Coroutine (setup) | 22252/ 3576 | 320/ 36 | +| Scheduler, Two Coroutines (setup) | 22384/ 3604 | 452/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (man setup) | 22208/ 3576 | 324/ 36 | -| Scheduler, Two Coroutines (man setup) | 22344/ 3604 | 460/ 64 | +| Scheduler, One Coroutine (man setup) | 22244/ 3576 | 312/ 36 | +| Scheduler, Two Coroutines (man setup) | 22376/ 3604 | 444/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, LogBinProfiler | 22300/ 3644 | 416/ 104 | -| Scheduler, LogBinTableRenderer | 23704/ 3644 | 1820/ 104 | -| Scheduler, LogBinJsonRenderer | 23164/ 3644 | 1280/ 104 | +| Scheduler, LogBinProfiler | 22356/ 3644 | 424/ 104 | +| Scheduler, LogBinTableRenderer | 23740/ 3644 | 1808/ 104 | +| Scheduler, LogBinJsonRenderer | 23200/ 3644 | 1268/ 104 | |---------------------------------------+--------------+-------------| -| Blink Function | 22120/ 3540 | 236/ 0 | -| Blink Coroutine | 22232/ 3568 | 348/ 28 | +| Blink Function | 22168/ 3544 | 236/ 4 | +| Blink Coroutine | 22280/ 3572 | 348/ 32 | +--------------------------------------------------------------------+ ``` @@ -381,41 +384,41 @@ $ make README.md +--------------------------------------------------------------------+ | functionality | flash/ ram | delta | |---------------------------------------+--------------+-------------| -| Baseline | 260329/27916 | 0/ 0 | +| Baseline | 264981/27984 | 0/ 0 | |---------------------------------------+--------------+-------------| -| One Delay Function | 260377/27916 | 48/ 0 | -| Two Delay Functions | 260441/27916 | 112/ 0 | +| One Delay Function | 265045/27992 | 64/ 8 | +| Two Delay Functions | 265109/27992 | 128/ 8 | |---------------------------------------+--------------+-------------| -| One Coroutine | 260525/27952 | 196/ 36 | -| Two Coroutines | 260685/27976 | 356/ 60 | +| One Coroutine (millis) | 265177/28028 | 196/ 44 | +| Two Coroutines (millis) | 265337/28060 | 356/ 76 | |---------------------------------------+--------------+-------------| -| One Coroutine (micros) | 260541/27952 | 212/ 36 | -| Two Coroutines (micros) | 260701/27976 | 372/ 60 | +| One Coroutine (micros) | 265209/28028 | 228/ 44 | +| Two Coroutines (micros) | 265369/28060 | 388/ 76 | |---------------------------------------+--------------+-------------| -| One Coroutine (seconds) | 260541/27952 | 212/ 36 | -| Two Coroutines (seconds) | 260717/27976 | 388/ 60 | +| One Coroutine (seconds) | 265209/28028 | 228/ 44 | +| Two Coroutines (seconds) | 265385/28060 | 404/ 76 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine | 260653/27952 | 324/ 36 | -| Scheduler, Two Coroutines | 260797/27984 | 468/ 68 | +| Scheduler, One Coroutine (millis) | 265321/28036 | 340/ 52 | +| Scheduler, Two Coroutines (millis) | 265449/28060 | 468/ 76 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (micros) | 260653/27952 | 324/ 36 | -| Scheduler, Two Coroutines (micros) | 260797/27984 | 468/ 68 | +| Scheduler, One Coroutine (micros) | 265321/28036 | 340/ 52 | +| Scheduler, Two Coroutines (micros) | 265449/28060 | 468/ 76 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (seconds) | 260669/27952 | 340/ 36 | -| Scheduler, Two Coroutines (seconds) | 260829/27984 | 500/ 68 | +| Scheduler, One Coroutine (seconds) | 265337/28036 | 356/ 52 | +| Scheduler, Two Coroutines (seconds) | 265497/28060 | 516/ 76 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (setup) | 260685/27952 | 356/ 36 | -| Scheduler, Two Coroutines (setup) | 260861/27984 | 532/ 68 | +| Scheduler, One Coroutine (setup) | 265337/28036 | 356/ 52 | +| Scheduler, Two Coroutines (setup) | 265513/28060 | 532/ 76 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (man setup) | 260669/27952 | 340/ 36 | -| Scheduler, Two Coroutines (man setup) | 260845/27984 | 516/ 68 | +| Scheduler, One Coroutine (man setup) | 265337/28036 | 356/ 52 | +| Scheduler, Two Coroutines (man setup) | 265513/28060 | 532/ 76 | |---------------------------------------+--------------+-------------| -| Scheduler, LogBinProfiler | 260781/28024 | 452/ 108 | -| Scheduler, LogBinTableRenderer | 265505/28100 | 5176/ 184 | -| Scheduler, LogBinJsonRenderer | 264913/28104 | 4584/ 188 | +| Scheduler, LogBinProfiler | 265449/28100 | 468/ 116 | +| Scheduler, LogBinTableRenderer | 267381/28100 | 2400/ 116 | +| Scheduler, LogBinJsonRenderer | 266773/28104 | 1792/ 120 | |---------------------------------------+--------------+-------------| -| Blink Function | 261001/27988 | 672/ 72 | -| Blink Coroutine | 261149/28016 | 820/ 100 | +| Blink Function | 265669/28064 | 688/ 80 | +| Blink Coroutine | 265801/28100 | 820/ 116 | +--------------------------------------------------------------------+ ``` @@ -430,41 +433,41 @@ $ make README.md +--------------------------------------------------------------------+ | functionality | flash/ ram | delta | |---------------------------------------+--------------+-------------| -| Baseline | 204573/16060 | 0/ 0 | +| Baseline | 230413/16220 | 0/ 0 | |---------------------------------------+--------------+-------------| -| One Delay Function | 205137/16100 | 564/ 40 | -| Two Delay Functions | 205209/16100 | 636/ 40 | +| One Delay Function | 230953/16260 | 540/ 40 | +| Two Delay Functions | 231025/16260 | 612/ 40 | |---------------------------------------+--------------+-------------| -| One Coroutine | 205249/16132 | 676/ 72 | -| Two Coroutines | 205421/16156 | 848/ 96 | +| One Coroutine (millis) | 231065/16292 | 652/ 72 | +| Two Coroutines (millis) | 231237/16316 | 824/ 96 | |---------------------------------------+--------------+-------------| -| One Coroutine (micros) | 205237/16132 | 664/ 72 | -| Two Coroutines (micros) | 205409/16156 | 836/ 96 | +| One Coroutine (micros) | 231077/16292 | 664/ 72 | +| Two Coroutines (micros) | 231249/16316 | 836/ 96 | |---------------------------------------+--------------+-------------| -| One Coroutine (seconds) | 205265/16132 | 692/ 72 | -| Two Coroutines (seconds) | 205453/16156 | 880/ 96 | +| One Coroutine (seconds) | 231081/16292 | 668/ 72 | +| Two Coroutines (seconds) | 231269/16316 | 856/ 96 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine | 205365/16132 | 792/ 72 | -| Scheduler, Two Coroutines | 205505/16164 | 932/ 104 | +| Scheduler, One Coroutine (millis) | 231181/16292 | 768/ 72 | +| Scheduler, Two Coroutines (millis) | 231321/16324 | 908/ 104 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (micros) | 205341/16132 | 768/ 72 | -| Scheduler, Two Coroutines (micros) | 205481/16164 | 908/ 104 | +| Scheduler, One Coroutine (micros) | 231181/16292 | 768/ 72 | +| Scheduler, Two Coroutines (micros) | 231321/16324 | 908/ 104 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (seconds) | 205381/16132 | 808/ 72 | -| Scheduler, Two Coroutines (seconds) | 205537/16164 | 964/ 104 | +| Scheduler, One Coroutine (seconds) | 231197/16292 | 784/ 72 | +| Scheduler, Two Coroutines (seconds) | 231353/16324 | 940/ 104 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (setup) | 205393/16132 | 820/ 72 | -| Scheduler, Two Coroutines (setup) | 205565/16164 | 992/ 104 | +| Scheduler, One Coroutine (setup) | 231209/16292 | 796/ 72 | +| Scheduler, Two Coroutines (setup) | 231381/16324 | 968/ 104 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (man setup) | 205385/16132 | 812/ 72 | -| Scheduler, Two Coroutines (man setup) | 205565/16164 | 992/ 104 | +| Scheduler, One Coroutine (man setup) | 231197/16292 | 784/ 72 | +| Scheduler, Two Coroutines (man setup) | 231373/16324 | 960/ 104 | |---------------------------------------+--------------+-------------| -| Scheduler, LogBinProfiler | 205481/16204 | 908/ 144 | -| Scheduler, LogBinTableRenderer | 210977/16284 | 6404/ 224 | -| Scheduler, LogBinJsonRenderer | 210425/16284 | 5852/ 224 | +| Scheduler, LogBinProfiler | 231313/16364 | 900/ 144 | +| Scheduler, LogBinTableRenderer | 232645/16364 | 2232/ 144 | +| Scheduler, LogBinJsonRenderer | 232093/16364 | 1680/ 144 | |---------------------------------------+--------------+-------------| -| Blink Function | 205489/16108 | 916/ 48 | -| Blink Coroutine | 205601/16132 | 1028/ 72 | +| Blink Function | 231301/16268 | 888/ 48 | +| Blink Coroutine | 231413/16300 | 1000/ 80 | +--------------------------------------------------------------------+ ``` @@ -480,41 +483,41 @@ $ make README.md +--------------------------------------------------------------------+ | functionality | flash/ ram | delta | |---------------------------------------+--------------+-------------| -| Baseline | 10232/ 4152 | 0/ 0 | +| Baseline | 10648/ 4156 | 0/ 0 | |---------------------------------------+--------------+-------------| -| One Delay Function | 10264/ 4156 | 32/ 4 | -| Two Delay Functions | 10292/ 4156 | 60/ 4 | +| One Delay Function | 10680/ 4160 | 32/ 4 | +| Two Delay Functions | 10708/ 4160 | 60/ 4 | |---------------------------------------+--------------+-------------| -| One Coroutine | 10388/ 4184 | 156/ 32 | -| Two Coroutines | 10508/ 4212 | 276/ 60 | +| One Coroutine (millis) | 10804/ 4188 | 156/ 32 | +| Two Coroutines (millis) | 10924/ 4216 | 276/ 60 | |---------------------------------------+--------------+-------------| -| One Coroutine (micros) | 10444/ 4184 | 212/ 32 | -| Two Coroutines (micros) | 10552/ 4212 | 320/ 60 | +| One Coroutine (micros) | 10860/ 4188 | 212/ 32 | +| Two Coroutines (micros) | 10968/ 4216 | 320/ 60 | |---------------------------------------+--------------+-------------| -| One Coroutine (seconds) | 10408/ 4184 | 176/ 32 | -| Two Coroutines (seconds) | 10548/ 4212 | 316/ 60 | +| One Coroutine (seconds) | 10824/ 4188 | 176/ 32 | +| Two Coroutines (seconds) | 10964/ 4216 | 316/ 60 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine | 10560/ 4188 | 328/ 36 | -| Scheduler, Two Coroutines | 10676/ 4216 | 444/ 64 | +| Scheduler, One Coroutine (millis) | 10976/ 4192 | 328/ 36 | +| Scheduler, Two Coroutines (millis) | 11092/ 4220 | 444/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (micros) | 10548/ 4188 | 316/ 36 | -| Scheduler, Two Coroutines (micros) | 10652/ 4216 | 420/ 64 | +| Scheduler, One Coroutine (micros) | 10964/ 4192 | 316/ 36 | +| Scheduler, Two Coroutines (micros) | 11068/ 4220 | 420/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (seconds) | 10580/ 4188 | 348/ 36 | -| Scheduler, Two Coroutines (seconds) | 10716/ 4216 | 484/ 64 | +| Scheduler, One Coroutine (seconds) | 10996/ 4192 | 348/ 36 | +| Scheduler, Two Coroutines (seconds) | 11132/ 4220 | 484/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (setup) | 10592/ 4188 | 360/ 36 | -| Scheduler, Two Coroutines (setup) | 10740/ 4216 | 508/ 64 | +| Scheduler, One Coroutine (setup) | 11012/ 4192 | 364/ 36 | +| Scheduler, Two Coroutines (setup) | 11160/ 4220 | 512/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (man setup) | 10580/ 4188 | 348/ 36 | -| Scheduler, Two Coroutines (man setup) | 10728/ 4216 | 496/ 64 | +| Scheduler, One Coroutine (man setup) | 10988/ 4192 | 340/ 36 | +| Scheduler, Two Coroutines (man setup) | 11140/ 4220 | 492/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, LogBinProfiler | 10952/ 4264 | 720/ 112 | -| Scheduler, LogBinTableRenderer | 14056/ 4284 | 3824/ 132 | -| Scheduler, LogBinJsonRenderer | 13348/ 4284 | 3116/ 132 | +| Scheduler, LogBinProfiler | 11380/ 4268 | 732/ 112 | +| Scheduler, LogBinTableRenderer | 14120/ 4284 | 3472/ 128 | +| Scheduler, LogBinJsonRenderer | 13412/ 4284 | 2764/ 128 | |---------------------------------------+--------------+-------------| -| Blink Function | 10688/ 4160 | 456/ 8 | -| Blink Coroutine | 10820/ 4184 | 588/ 32 | +| Blink Function | 11104/ 4164 | 456/ 8 | +| Blink Coroutine | 11236/ 4188 | 588/ 32 | +--------------------------------------------------------------------+ ``` diff --git a/examples/MemoryBenchmark/attiny.txt b/examples/MemoryBenchmark/attiny.txt index a3e86a6..a51bca5 100644 --- a/examples/MemoryBenchmark/attiny.txt +++ b/examples/MemoryBenchmark/attiny.txt @@ -1,24 +1,24 @@ -0 400 8192 11 512 -1 450 8192 13 512 -2 508 8192 15 512 -3 642 8192 37 512 -4 834 8192 61 512 -5 610 8192 37 512 -6 770 8192 61 512 -7 738 8192 37 512 -8 958 8192 61 512 -9 830 8192 39 512 -10 1016 8192 63 512 -11 798 8192 39 512 -12 952 8192 63 512 -13 926 8192 39 512 -14 1140 8192 63 512 -15 880 8192 39 512 -16 1162 8192 63 512 -17 860 8192 39 512 -18 1150 8192 63 512 -19 918 8192 111 512 -20 2792 8192 193 512 -21 2326 8192 197 512 -22 546 8192 14 512 -23 766 8192 37 512 +0 1026 8192 81 512 +1 1080 8192 83 512 +2 1134 8192 85 512 +3 1206 8192 107 512 +4 1400 8192 131 512 +5 1174 8192 107 512 +6 1336 8192 131 512 +7 1302 8192 107 512 +8 1524 8192 131 512 +9 1396 8192 109 512 +10 1582 8192 133 512 +11 1364 8192 109 512 +12 1518 8192 133 512 +13 1492 8192 109 512 +14 1706 8192 133 512 +15 1446 8192 109 512 +16 1728 8192 133 512 +17 1424 8192 109 512 +18 1714 8192 133 512 +19 1500 8192 181 512 +20 2864 8192 193 512 +21 2398 8192 197 512 +22 1176 8192 84 512 +23 1330 8192 107 512 diff --git a/examples/MemoryBenchmark/esp32.txt b/examples/MemoryBenchmark/esp32.txt index 0ac2a15..70415fa 100644 --- a/examples/MemoryBenchmark/esp32.txt +++ b/examples/MemoryBenchmark/esp32.txt @@ -1,24 +1,24 @@ -0 204573 1310720 16060 327680 -1 205137 1310720 16100 327680 -2 205209 1310720 16100 327680 -3 205249 1310720 16132 327680 -4 205421 1310720 16156 327680 -5 205237 1310720 16132 327680 -6 205409 1310720 16156 327680 -7 205265 1310720 16132 327680 -8 205453 1310720 16156 327680 -9 205365 1310720 16132 327680 -10 205505 1310720 16164 327680 -11 205341 1310720 16132 327680 -12 205481 1310720 16164 327680 -13 205381 1310720 16132 327680 -14 205537 1310720 16164 327680 -15 205393 1310720 16132 327680 -16 205565 1310720 16164 327680 -17 205385 1310720 16132 327680 -18 205565 1310720 16164 327680 -19 205481 1310720 16204 327680 -20 210977 1310720 16284 327680 -21 210425 1310720 16284 327680 -22 205489 1310720 16108 327680 -23 205601 1310720 16132 327680 +0 230413 1310720 16220 327680 +1 230953 1310720 16260 327680 +2 231025 1310720 16260 327680 +3 231065 1310720 16292 327680 +4 231237 1310720 16316 327680 +5 231077 1310720 16292 327680 +6 231249 1310720 16316 327680 +7 231081 1310720 16292 327680 +8 231269 1310720 16316 327680 +9 231181 1310720 16292 327680 +10 231321 1310720 16324 327680 +11 231181 1310720 16292 327680 +12 231321 1310720 16324 327680 +13 231197 1310720 16292 327680 +14 231353 1310720 16324 327680 +15 231209 1310720 16292 327680 +16 231381 1310720 16324 327680 +17 231197 1310720 16292 327680 +18 231373 1310720 16324 327680 +19 231313 1310720 16364 327680 +20 232645 1310720 16364 327680 +21 232093 1310720 16364 327680 +22 231301 1310720 16268 327680 +23 231413 1310720 16300 327680 diff --git a/examples/MemoryBenchmark/esp8266.txt b/examples/MemoryBenchmark/esp8266.txt index 6a8ced2..8b241fe 100644 --- a/examples/MemoryBenchmark/esp8266.txt +++ b/examples/MemoryBenchmark/esp8266.txt @@ -1,24 +1,24 @@ -0 260329 1044464 27916 81920 -1 260377 1044464 27916 81920 -2 260441 1044464 27916 81920 -3 260525 1044464 27952 81920 -4 260685 1044464 27976 81920 -5 260541 1044464 27952 81920 -6 260701 1044464 27976 81920 -7 260541 1044464 27952 81920 -8 260717 1044464 27976 81920 -9 260653 1044464 27952 81920 -10 260797 1044464 27984 81920 -11 260653 1044464 27952 81920 -12 260797 1044464 27984 81920 -13 260669 1044464 27952 81920 -14 260829 1044464 27984 81920 -15 260685 1044464 27952 81920 -16 260861 1044464 27984 81920 -17 260669 1044464 27952 81920 -18 260845 1044464 27984 81920 -19 260781 1044464 28024 81920 -20 265505 1044464 28100 81920 -21 264913 1044464 28104 81920 -22 261001 1044464 27988 81920 -23 261149 1044464 28016 81920 +0 264981 1044464 27984 81920 +1 265045 1044464 27992 81920 +2 265109 1044464 27992 81920 +3 265177 1044464 28028 81920 +4 265337 1044464 28060 81920 +5 265209 1044464 28028 81920 +6 265369 1044464 28060 81920 +7 265209 1044464 28028 81920 +8 265385 1044464 28060 81920 +9 265321 1044464 28036 81920 +10 265449 1044464 28060 81920 +11 265321 1044464 28036 81920 +12 265449 1044464 28060 81920 +13 265337 1044464 28036 81920 +14 265497 1044464 28060 81920 +15 265337 1044464 28036 81920 +16 265513 1044464 28060 81920 +17 265337 1044464 28036 81920 +18 265513 1044464 28060 81920 +19 265449 1044464 28100 81920 +20 267381 1044464 28100 81920 +21 266773 1044464 28104 81920 +22 265669 1044464 28064 81920 +23 265801 1044464 28100 81920 diff --git a/examples/MemoryBenchmark/generate_readme.py b/examples/MemoryBenchmark/generate_readme.py index 7d79a77..f7d7d20 100755 --- a/examples/MemoryBenchmark/generate_readme.py +++ b/examples/MemoryBenchmark/generate_readme.py @@ -133,15 +133,18 @@ * Increases static ram by 3 bytes (AVR) and 4 bytes (32-bits) per coroutine. * Support `CoroutineProfiler` in the `CoroutineScheduler`. - * Increases the flash size of the `CoroutineScheduler` by 100-140 bytes + * Increases the flash size of the `CoroutineScheduler` by 90-140 bytes for both 8-bit and 32-bit processors, even if `CoroutineProfiler` is not used. This is a one-time hit. * Add `LogBinProfiler` * Adds about 90 bytes of flash and 70 bytes of RAM on AVR. + * Adds about 140 bytes of flash and 70 bytes of RAM on ESP8266. * Add `LogBinTableRenderer` - * Adds about 2200 bytes of flash and 200 bytes of RAM on AVR. + * Adds about 1400 bytes of flash and ~20 bytes of RAM on AVR. + * Adds about 1900 bytes of flash and ~0 bytes of RAM on ESP8266. * Add `LogBinJsonRenderer` - * Adds about 1800 bytes of flash and 200 bytes of RAM on AVR. + * Adds about 900 bytes of flash and ~20 bytes of RAM on AVR. + * Adds about 1300 bytes of flash and ~0 bytes of RAM on ESP8266. ## How to Generate diff --git a/examples/MemoryBenchmark/generate_table.awk b/examples/MemoryBenchmark/generate_table.awk index 59c439f..50c4037 100755 --- a/examples/MemoryBenchmark/generate_table.awk +++ b/examples/MemoryBenchmark/generate_table.awk @@ -9,14 +9,14 @@ BEGIN { labels[0] = "Baseline" labels[1] = "One Delay Function" labels[2] = "Two Delay Functions" - labels[3] = "One Coroutine" - labels[4] = "Two Coroutines" + labels[3] = "One Coroutine (millis)" + labels[4] = "Two Coroutines (millis)" labels[5] = "One Coroutine (micros)" labels[6] = "Two Coroutines (micros)" labels[7] = "One Coroutine (seconds)" labels[8] = "Two Coroutines (seconds)" - labels[9] = "Scheduler, One Coroutine" - labels[10] = "Scheduler, Two Coroutines" + labels[9] = "Scheduler, One Coroutine (millis)" + labels[10] = "Scheduler, Two Coroutines (millis)" labels[11] = "Scheduler, One Coroutine (micros)" labels[12] = "Scheduler, Two Coroutines (micros)" labels[13] = "Scheduler, One Coroutine (seconds)" @@ -52,10 +52,10 @@ END { for (i = 0; i < NUM_ENTRIES; i++) { if (labels[i] ~ /^Baseline$/ \ || labels[i] ~ /^One Delay Function$/ \ - || labels[i] ~ /^One Coroutine$/ \ + || labels[i] ~ /^One Coroutine \(millis\)$/ \ || labels[i] ~ /^One Coroutine \(micros\)$/ \ || labels[i] ~ /^One Coroutine \(seconds\)$/ \ - || labels[i] ~ /^Scheduler, One Coroutine$/ \ + || labels[i] ~ /^Scheduler, One Coroutine \(millis\)$/ \ || labels[i] ~ /^Scheduler, One Coroutine \(micros\)$/ \ || labels[i] ~ /^Scheduler, One Coroutine \(seconds\)$/ \ || labels[i] ~ /^Scheduler, One Coroutine \(setup\)$/ \ diff --git a/examples/MemoryBenchmark/micro.txt b/examples/MemoryBenchmark/micro.txt index 83e4a66..0cec484 100644 --- a/examples/MemoryBenchmark/micro.txt +++ b/examples/MemoryBenchmark/micro.txt @@ -1,24 +1,24 @@ -0 3554 28672 151 2560 -1 3602 28672 153 2560 -2 3662 28672 155 2560 -3 3742 28672 177 2560 -4 3936 28672 201 2560 -5 3714 28672 177 2560 -6 3880 28672 201 2560 -7 3842 28672 177 2560 -8 4068 28672 201 2560 -9 3930 28672 179 2560 -10 4116 28672 203 2560 -11 3902 28672 179 2560 -12 4060 28672 203 2560 -13 4030 28672 179 2560 -14 4248 28672 203 2560 -15 3984 28672 179 2560 -16 4270 28672 203 2560 -17 3962 28672 179 2560 -18 4256 28672 203 2560 -19 4022 28672 251 2560 -20 5438 28672 269 2560 -21 4958 28672 273 2560 -22 3994 28672 154 2560 -23 4164 28672 177 2560 +0 3582 28672 151 2560 +1 3630 28672 153 2560 +2 3690 28672 155 2560 +3 3770 28672 177 2560 +4 3964 28672 201 2560 +5 3742 28672 177 2560 +6 3908 28672 201 2560 +7 3870 28672 177 2560 +8 4096 28672 201 2560 +9 3958 28672 179 2560 +10 4144 28672 203 2560 +11 3930 28672 179 2560 +12 4088 28672 203 2560 +13 4058 28672 179 2560 +14 4276 28672 203 2560 +15 4012 28672 179 2560 +16 4298 28672 203 2560 +17 3990 28672 179 2560 +18 4284 28672 203 2560 +19 4066 28672 251 2560 +20 5466 28672 269 2560 +21 4986 28672 273 2560 +22 4022 28672 154 2560 +23 4192 28672 177 2560 diff --git a/examples/MemoryBenchmark/nano.txt b/examples/MemoryBenchmark/nano.txt index 6bb19c9..8bf4fc5 100644 --- a/examples/MemoryBenchmark/nano.txt +++ b/examples/MemoryBenchmark/nano.txt @@ -1,24 +1,24 @@ -0 606 30720 11 2048 -1 654 30720 13 2048 -2 714 30720 15 2048 -3 854 30720 37 2048 -4 1048 30720 61 2048 -5 826 30720 37 2048 -6 992 30720 61 2048 -7 954 30720 37 2048 -8 1180 30720 61 2048 -9 1042 30720 39 2048 -10 1228 30720 63 2048 -11 1014 30720 39 2048 -12 1172 30720 63 2048 -13 1142 30720 39 2048 -14 1360 30720 63 2048 -15 1096 30720 39 2048 -16 1382 30720 63 2048 -17 1074 30720 39 2048 -18 1368 30720 63 2048 -19 1134 30720 111 2048 -20 3380 30720 304 2048 -21 2900 30720 308 2048 -22 938 30720 14 2048 -23 1168 30720 37 2048 +0 1616 30720 186 2048 +1 1664 30720 188 2048 +2 1726 30720 190 2048 +3 1804 30720 212 2048 +4 1998 30720 236 2048 +5 1776 30720 212 2048 +6 1942 30720 236 2048 +7 1904 30720 212 2048 +8 2130 30720 236 2048 +9 1992 30720 214 2048 +10 2178 30720 238 2048 +11 1964 30720 214 2048 +12 2122 30720 238 2048 +13 2092 30720 214 2048 +14 2310 30720 238 2048 +15 2046 30720 214 2048 +16 2332 30720 238 2048 +17 2024 30720 214 2048 +18 2318 30720 238 2048 +19 2100 30720 286 2048 +20 3502 30720 304 2048 +21 3022 30720 308 2048 +22 1948 30720 189 2048 +23 2118 30720 212 2048 diff --git a/examples/MemoryBenchmark/stm32.txt b/examples/MemoryBenchmark/stm32.txt index 0cf52ec..5822dd1 100644 --- a/examples/MemoryBenchmark/stm32.txt +++ b/examples/MemoryBenchmark/stm32.txt @@ -1,24 +1,24 @@ -0 21884 131072 3540 20480 -1 21912 131072 3544 20480 -2 21960 131072 3544 20480 -3 22016 131072 3572 20480 -4 22164 131072 3600 20480 -5 22080 131072 3572 20480 -6 22228 131072 3600 20480 -7 22032 131072 3572 20480 -8 22196 131072 3600 20480 -9 22192 131072 3576 20480 -10 22296 131072 3604 20480 -11 22192 131072 3576 20480 -12 22296 131072 3604 20480 -13 22208 131072 3576 20480 -14 22328 131072 3604 20480 -15 22216 131072 3576 20480 -16 22348 131072 3604 20480 -17 22208 131072 3576 20480 -18 22344 131072 3604 20480 -19 22300 131072 3644 20480 -20 23704 131072 3644 20480 -21 23164 131072 3644 20480 -22 22120 131072 3540 20480 -23 22232 131072 3568 20480 +0 21932 131072 3540 20480 +1 21960 131072 3544 20480 +2 22008 131072 3544 20480 +3 22064 131072 3572 20480 +4 22212 131072 3600 20480 +5 22128 131072 3572 20480 +6 22276 131072 3600 20480 +7 22080 131072 3572 20480 +8 22244 131072 3600 20480 +9 22232 131072 3576 20480 +10 22336 131072 3604 20480 +11 22232 131072 3576 20480 +12 22336 131072 3604 20480 +13 22248 131072 3576 20480 +14 22368 131072 3604 20480 +15 22252 131072 3576 20480 +16 22384 131072 3604 20480 +17 22244 131072 3576 20480 +18 22376 131072 3604 20480 +19 22356 131072 3644 20480 +20 23740 131072 3644 20480 +21 23200 131072 3644 20480 +22 22168 131072 3544 20480 +23 22280 131072 3572 20480 diff --git a/examples/MemoryBenchmark/teensy32.txt b/examples/MemoryBenchmark/teensy32.txt index 30f1d54..cf905b3 100644 --- a/examples/MemoryBenchmark/teensy32.txt +++ b/examples/MemoryBenchmark/teensy32.txt @@ -1,24 +1,24 @@ -0 10232 262144 4152 65536 -1 10264 262144 4156 65536 -2 10292 262144 4156 65536 -3 10388 262144 4184 65536 -4 10508 262144 4212 65536 -5 10444 262144 4184 65536 -6 10552 262144 4212 65536 -7 10408 262144 4184 65536 -8 10548 262144 4212 65536 -9 10560 262144 4188 65536 -10 10676 262144 4216 65536 -11 10548 262144 4188 65536 -12 10652 262144 4216 65536 -13 10580 262144 4188 65536 -14 10716 262144 4216 65536 -15 10592 262144 4188 65536 -16 10740 262144 4216 65536 -17 10580 262144 4188 65536 -18 10728 262144 4216 65536 -19 10952 262144 4264 65536 -20 14056 262144 4284 65536 -21 13348 262144 4284 65536 -22 10688 262144 4160 65536 -23 10820 262144 4184 65536 +0 10648 262144 4156 65536 +1 10680 262144 4160 65536 +2 10708 262144 4160 65536 +3 10804 262144 4188 65536 +4 10924 262144 4216 65536 +5 10860 262144 4188 65536 +6 10968 262144 4216 65536 +7 10824 262144 4188 65536 +8 10964 262144 4216 65536 +9 10976 262144 4192 65536 +10 11092 262144 4220 65536 +11 10964 262144 4192 65536 +12 11068 262144 4220 65536 +13 10996 262144 4192 65536 +14 11132 262144 4220 65536 +15 11012 262144 4192 65536 +16 11160 262144 4220 65536 +17 10988 262144 4192 65536 +18 11140 262144 4220 65536 +19 11380 262144 4268 65536 +20 14120 262144 4284 65536 +21 13412 262144 4284 65536 +22 11104 262144 4164 65536 +23 11236 262144 4188 65536 From 110b6d68b8d137735e79ae4db3e3e6d4c8b6df0d Mon Sep 17 00:00:00 2001 From: Brian Park Date: Thu, 17 Mar 2022 15:28:14 -0700 Subject: [PATCH 44/59] AutoBenchmark: Faster CoroutineScheduler::runCoroutine() by delegating to Coroutine::runCoroutineWithProfiler() --- examples/AutoBenchmark/README.md | 30 +++++++++++------------ examples/AutoBenchmark/esp32.txt | 4 +-- examples/AutoBenchmark/esp8266.txt | 4 +-- examples/AutoBenchmark/generate_readme.py | 10 ++++---- examples/AutoBenchmark/micro.txt | 6 ++--- examples/AutoBenchmark/nano.txt | 2 +- examples/AutoBenchmark/stm32.txt | 2 +- 7 files changed, 29 insertions(+), 29 deletions(-) diff --git a/examples/AutoBenchmark/README.md b/examples/AutoBenchmark/README.md index 1dda3d9..01b8a00 100644 --- a/examples/AutoBenchmark/README.md +++ b/examples/AutoBenchmark/README.md @@ -124,11 +124,11 @@ $ make README.md * v1.5.0 * Add `CoroutineProfiler` to `CoroutineScheduler`. * `CoroutineScheduler::runCoroutine()` becomes slightly slower: - * 0.7 microseconds (AVR) - * 0.5 microseconds (STM32) - * 0.2 microseconds (ESP8266) - * 0.07 microseconds (ESP32) - * 0.15 microseconds (Teensy 3.2) + * 0.100 microseconds (AVR) + * 0.133 microseconds (STM32) + * 0.100 microseconds (ESP8266) + * 0.033 microseconds (ESP32) + * 0.133 microseconds (Teensy 3.2) ## Arduino Nano @@ -149,7 +149,7 @@ CPU: |---------------------+--------+-------------+--------| | EmptyLoop | 10000 | 1.700 | 0.000 | | DirectScheduling | 10000 | 2.900 | 1.200 | -| CoroutineScheduling | 10000 | 7.900 | 6.200 | +| CoroutineScheduling | 10000 | 7.200 | 5.500 | +---------------------+--------+-------------+--------+ ``` @@ -171,9 +171,9 @@ CPU: +---------------------+--------+-------------+--------+ | Functionality | iters | micros/iter | diff | |---------------------+--------+-------------+--------| -| EmptyLoop | 10000 | 1.700 | 0.000 | -| DirectScheduling | 10000 | 2.900 | 1.200 | -| CoroutineScheduling | 10000 | 7.900 | 6.200 | +| EmptyLoop | 10000 | 1.800 | 0.000 | +| DirectScheduling | 10000 | 2.800 | 1.000 | +| CoroutineScheduling | 10000 | 7.200 | 5.400 | +---------------------+--------+-------------+--------+ ``` @@ -196,7 +196,7 @@ CPU: |---------------------+--------+-------------+--------| | EmptyLoop | 30000 | 0.133 | 0.000 | | DirectScheduling | 30000 | 0.533 | 0.400 | -| CoroutineScheduling | 30000 | 1.600 | 1.467 | +| CoroutineScheduling | 30000 | 1.266 | 1.133 | +---------------------+--------+-------------+--------+ ``` @@ -217,9 +217,9 @@ CPU: +---------------------+--------+-------------+--------+ | Functionality | iters | micros/iter | diff | |---------------------+--------+-------------+--------| -| EmptyLoop | 10000 | 0.200 | 0.000 | -| DirectScheduling | 10000 | 0.500 | 0.300 | -| CoroutineScheduling | 10000 | 1.200 | 1.000 | +| EmptyLoop | 10000 | 0.100 | 0.000 | +| DirectScheduling | 10000 | 0.500 | 0.400 | +| CoroutineScheduling | 10000 | 1.000 | 0.900 | +---------------------+--------+-------------+--------+ ``` @@ -241,8 +241,8 @@ CPU: | Functionality | iters | micros/iter | diff | |---------------------+--------+-------------+--------| | EmptyLoop | 30000 | 0.066 | 0.000 | -| DirectScheduling | 30000 | 0.100 | 0.034 | -| CoroutineScheduling | 30000 | 0.400 | 0.334 | +| DirectScheduling | 30000 | 0.133 | 0.067 | +| CoroutineScheduling | 30000 | 0.366 | 0.300 | +---------------------+--------+-------------+--------+ ``` diff --git a/examples/AutoBenchmark/esp32.txt b/examples/AutoBenchmark/esp32.txt index 489da42..08a0c39 100644 --- a/examples/AutoBenchmark/esp32.txt +++ b/examples/AutoBenchmark/esp32.txt @@ -4,6 +4,6 @@ sizeof(CoroutineScheduler): 4 sizeof(Channel): 12 BENCHMARKS EmptyLoop 0.066 30000 -DirectScheduling 0.100 30000 -CoroutineScheduling 0.400 30000 +DirectScheduling 0.133 30000 +CoroutineScheduling 0.366 30000 END diff --git a/examples/AutoBenchmark/esp8266.txt b/examples/AutoBenchmark/esp8266.txt index f6ee050..c256052 100644 --- a/examples/AutoBenchmark/esp8266.txt +++ b/examples/AutoBenchmark/esp8266.txt @@ -3,7 +3,7 @@ sizeof(Coroutine): 28 sizeof(CoroutineScheduler): 4 sizeof(Channel): 12 BENCHMARKS -EmptyLoop 0.200 10000 +EmptyLoop 0.100 10000 DirectScheduling 0.500 10000 -CoroutineScheduling 1.200 10000 +CoroutineScheduling 1.000 10000 END diff --git a/examples/AutoBenchmark/generate_readme.py b/examples/AutoBenchmark/generate_readme.py index 15e394c..37d862b 100755 --- a/examples/AutoBenchmark/generate_readme.py +++ b/examples/AutoBenchmark/generate_readme.py @@ -148,11 +148,11 @@ * v1.5.0 * Add `CoroutineProfiler` to `CoroutineScheduler`. * `CoroutineScheduler::runCoroutine()` becomes slightly slower: - * 0.7 microseconds (AVR) - * 0.5 microseconds (STM32) - * 0.2 microseconds (ESP8266) - * 0.07 microseconds (ESP32) - * 0.15 microseconds (Teensy 3.2) + * 0.100 microseconds (AVR) + * 0.133 microseconds (STM32) + * 0.100 microseconds (ESP8266) + * 0.033 microseconds (ESP32) + * 0.133 microseconds (Teensy 3.2) ## Arduino Nano diff --git a/examples/AutoBenchmark/micro.txt b/examples/AutoBenchmark/micro.txt index 12320ef..55c853a 100644 --- a/examples/AutoBenchmark/micro.txt +++ b/examples/AutoBenchmark/micro.txt @@ -3,7 +3,7 @@ sizeof(Coroutine): 16 sizeof(CoroutineScheduler): 2 sizeof(Channel): 5 BENCHMARKS -EmptyLoop 1.700 10000 -DirectScheduling 2.900 10000 -CoroutineScheduling 7.900 10000 +EmptyLoop 1.800 10000 +DirectScheduling 2.800 10000 +CoroutineScheduling 7.200 10000 END diff --git a/examples/AutoBenchmark/nano.txt b/examples/AutoBenchmark/nano.txt index 12320ef..bd6e659 100644 --- a/examples/AutoBenchmark/nano.txt +++ b/examples/AutoBenchmark/nano.txt @@ -5,5 +5,5 @@ sizeof(Channel): 5 BENCHMARKS EmptyLoop 1.700 10000 DirectScheduling 2.900 10000 -CoroutineScheduling 7.900 10000 +CoroutineScheduling 7.200 10000 END diff --git a/examples/AutoBenchmark/stm32.txt b/examples/AutoBenchmark/stm32.txt index d3caab3..dcfb5c7 100644 --- a/examples/AutoBenchmark/stm32.txt +++ b/examples/AutoBenchmark/stm32.txt @@ -5,5 +5,5 @@ sizeof(Channel): 12 BENCHMARKS EmptyLoop 0.133 30000 DirectScheduling 0.533 30000 -CoroutineScheduling 1.600 30000 +CoroutineScheduling 1.266 30000 END From 15ed3ecf1bd4530a8dad1b9344e29244d3fdd5a9 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Thu, 17 Mar 2022 15:31:43 -0700 Subject: [PATCH 45/59] README.md,USER_GUIDE.md: Add coroutine name, coroutine profiling --- CHANGELOG.md | 57 ++++++---- README.md | 294 ++++++++++++++++++++++++++++++++++++++++++-------- USER_GUIDE.md | 270 +++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 550 insertions(+), 71 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b34fb80..0467399 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,33 +1,48 @@ # Changelog * Unreleased - * (Re)add support for human-readable coroutine names by adding the following - methods to the `Coroutine` class: `setName()`, `setName()`, - `getCName()`, `getFName()`, `getNameType()`, and `printNameTo()`. - * This is an optional feature which helps debugging. Coroutines do not - need to have human readable names. - * Increases flash usage by 6-10 bytes per coroutine. - * Increases static ram usage by 3 bytes (AVR) or 4 bytes (32-bit) per - coroutine. - * Support `CoroutineProfiler` in `CoroutineScheduler`. - * If a coroutine contains a valid pointer to a `CoroutineProfiler`, then - `CoroutineScheduler::runCoroutine()` will measure the elapsed - microseconds for the `Coroutine::runCoroutine()` to run. - * It then calls `CoroutineProfiler::updateElapsedMicros()` to allow the - profiler to update its internal tracking. - * Provide `LogBinProfiler`, and specific subclass that collects - the frequency count of the elapsed microseconds using 32 bins - representing the `log2()` function of the microseconds. + * (Re)add support for human-readable coroutine names. + * See [Coroutine Names](USER_GUIDE.md#CoroutineNames) in the + `USER_GUIDE.md`. + * Adds the following methods to the `Coroutine` class: `setName()`, + `setName()`, `getCName()`, `getFName()`, `getNameType()`, and + `printNameTo()`. + * Resource consumption + * Increases flash usage by 6-10 bytes per coroutine. + * Increases static ram usage by 3 bytes (AVR) or 4 bytes (32-bit) + per coroutine. + * Support profiling of `Coroutine::runCoroutine()` execution time. + * See [Coroutine Profiling](USER_GUIDE.md#CoroutineProfiling) in the + `USER_GUIDE.md`. + * API changes + * Add `CoroutineProfiler` interface with a `updateElapsedMicros()` + method. + * Add `Coroutine::setProfiler()`. + * Add `Coroutine::runCoroutineWithProfiler()` which measures the + elapsed time of `runCoroutine()`. + * Update `CoroutineScheduler::runCoroutine()` to call + `runCoroutineWithProfiler()`. + * Provide `LogBinProfiler` subclass of `CoroutineProfiler`. + * Keeps a frequency count of the elapsed microseconds using 32 bins + representing the `log2()` function of the elapsed microseconds. * Provide 2 renderers: * `LogBinTableRenderer::printTo()` prints a formatted table of the frequency count over all coroutines. This represents a poor-man's version of the log-log graph of the frequency count. * `LogBinJsonRenderer::printTo()` prints the frequency count in JSON format. - * Increases the flash size of the `CoroutineScheduler` by 100-140 bytes - for both 8-bit and 32-bit processors, even if `CoroutineProfiler` is - not used. This is a one-time hit. - * See [examples/SoundManager](examples/SoundManager) for an example. + * Resource consumption + * Increases static ram usage by 2 bytes (AVR) or 4 bytes (32-bit) + per coroutine. + * Increases latency of `CoroutineScheduler::runCoroutine()` by only + 100ns (AVR, ESP8266), 133ns (STM32, Teensy 3.2), and 33ns (ESP32). + * Increases the flash size of the `CoroutineScheduler` by 100-140 + bytes for both 8-bit and 32-bit processors, even if + `CoroutineProfiler` is not used. This is a one-time hit. + * See [HelloCoroutineWithProfiler](examples/HelloCoroutineWithProfiler) + and [HelloSchedulerWithProfiler](examples/HelloSchedulerWithProfiler). + * Thanks to peufeu2@ who provided the ideas and proof of concept in + [Discussion#50](https://github.com/bxparks/AceRoutine/discussions/50). * 1.4.2 (2022-02-04) * Remove dependency to AceCommon library in `libraries.properties`. * AceRoutine core no longer depends on AceCommon. diff --git a/README.md b/README.md index b6ed267..ec4f280 100644 --- a/README.md +++ b/README.md @@ -114,6 +114,8 @@ additional macros that can reduce boilerplate code. * [Hello Coroutine](#HelloCoroutine) * [Hello Scheduler](#HelloScheduler) * [Hello Manual Coroutine](#HelloManualCoroutine) + * [Hello Coroutine with Profiler](#HelloCoroutineWithProfiler) + * [Hello Scheduler with Profiler](#HelloSchedulerWithProfiler) * [Installation](#Installation) * [Source Code](#SourceCode) * [Documentation](#Documentation) @@ -289,6 +291,197 @@ void loop() { } ``` +### HelloCoroutineWithProfiler + +Version 1.5 added support for profiling the execution time of +`Coroutine::runCoroutine()` through the `CoroutineProfiler` interface. Currently +only a single implementation (`LogBinProfiler`) is provided. + +The [HelloCoroutineWithProfiler.ino](examples/HelloCoroutineWithProfiler) +program shows how to setup the profilers and extract the profiling information. +This example is intended for resource constrained 8-bit processors which do not +want to pay for the cost of the `CoroutineScheduler`. + +```C++ +#include +using namespace ace_routine; + +const int PIN = 2; +const int LED = LED_BUILTIN; +const int LED_ON = HIGH; +const int LED_OFF = LOW; + +COROUTINE(blinkLed) { + COROUTINE_LOOP() { + digitalWrite(LED, LED_ON); + COROUTINE_DELAY(100); + digitalWrite(LED, LED_OFF); + COROUTINE_DELAY(500); + } +} + +COROUTINE(printHelloWorld) { + COROUTINE_LOOP() { + Serial.print(F("Hello, ")); + Serial.flush(); + COROUTINE_DELAY(1000); + Serial.println(F("World")); + COROUTINE_DELAY(4000); + } +} + +COROUTINE(printProfiling) { + COROUTINE_LOOP() { + LogBinTableRenderer tableRenderer(Coroutine::getRoot()); + LogBinJsonRenderer jsonRenderer(Coroutine::getRoot()); + + tableRenderer.printTo( + Serial, 3 /*startBin*/, 14 /*endBin*/, false /*clear*/); + jsonRenderer.printTo( + Serial, 3 /*startBin*/, 14 /*endBin*/); + + COROUTINE_DELAY(5000); + } +} + +LogBinProfiler profiler1; +LogBinProfiler profiler2; +LogBinProfiler profiler3; + +void setup() { + delay(1000); + Serial.begin(115200); + while (!Serial); // Leonardo/Micro + + pinMode(LED, OUTPUT); + pinMode(PIN, INPUT); + + // Coroutine names can be either C-string or F-string. + blinkLed.setName("blinkLed"); + readPin.setName(F("readPin")); + + // Manually attach the profilers to the coroutines. + blinkLed.setProfiler(&profiler1); + readPin.setProfiler(&profiler2); + printProfiling.setProfiler(&profiler3); +} + +void loop() { + blinkLed.runCoroutineWithProfiling(); + printHelloWorld.runCoroutineWithProfiling(); + printProfiling.runCoroutineWithProfiler(); +} +``` + +Every 5 seconds, the `printProfiling` coroutine will print the profiling +information in 2 formats on the `Serial` port: + +* a formatted table through the `LogBinTableRenderer` +* a JSON object using the `LogBinJsonRenderer` + +``` +name <16us <32us <64us<128us<256us<512us <1ms <2ms <4ms <8ms >> +0x1DB 16921 52650 0 0 0 0 0 0 0 0 1 +readPin 65535 1189 0 0 0 0 0 0 0 0 0 +blinkLed 65535 830 0 0 0 0 0 0 0 0 0 +{ +"0x1DB":[16921,52650,0,0,0,0,0,0,0,0,1], +"readPin":[65535,1189,0,0,0,0,0,0,0,0,0], +"blinkLed":[65535,830,0,0,0,0,0,0,0,0,0] +} +``` + + +### HelloSchedulerWithProfiler + +The [HelloSchedulerWithProfiler.ino](examples/HelloSchedulerWithProfiler) sketch +implements the same thing as `HelloCoroutineWithProfiler` using the +`CoroutineScheduler` which automatically supports the `CoroutineProfiler`. +The assumption was that if the environment has enough resources to support +a `CoroutineScheduler`, then it is probably not a large burden to include the +code to support `CoroutineProfiler` by default. Hence, this is intended for +32-bit environments where flash and static RAM resources are more plentiful. + +```C++ +#include +using namespace ace_routine; + +const int PIN = 2; +const int LED = LED_BUILTIN; +const int LED_ON = HIGH; +const int LED_OFF = LOW; + +COROUTINE(blinkLed) { + COROUTINE_LOOP() { + digitalWrite(LED, LED_ON); + COROUTINE_DELAY(100); + digitalWrite(LED, LED_OFF); + COROUTINE_DELAY(500); + } +} + +COROUTINE(printHelloWorld) { + COROUTINE_LOOP() { + Serial.print(F("Hello, ")); + Serial.flush(); + COROUTINE_DELAY(1000); + Serial.println(F("World")); + COROUTINE_DELAY(4000); + } +} + +COROUTINE(printProfiling) { + COROUTINE_LOOP() { + LogBinTableRenderer tableRenderer(Coroutine::getRoot()); + LogBinJsonRenderer jsonRenderer(Coroutine::getRoot()); + + tableRenderer.printTo( + Serial, 3 /*startBin*/, 14 /*endBin*/, false /*clear*/); + jsonRenderer.printTo( + Serial, 3 /*startBin*/, 14 /*endBin*/); + + COROUTINE_DELAY(5000); + } +} + +void setup() { + delay(1000); + Serial.begin(115200); + while (!Serial); // Leonardo/Micro + + pinMode(LED, OUTPUT); + pinMode(PIN, INPUT); + + // Coroutine names can be either C-string or F-string. + blinkLed.setName("blinkLed"); + readPin.setName(F("readPin")); + + // Create profilers on the heap and attach them to all coroutines. + LogBinProfiler::createProfilers(Coroutine::getRoot()); + + CoroutineScheduler::setup(); +} + +void loop() { + CoroutineScheduler::loop(); +} +``` + +The `printProfiling` coroutine will print the same information as before every 5 +seconds: + +``` +name <16us <32us <64us<128us<256us<512us <1ms <2ms <4ms <8ms >> +0x1DB 16921 52650 0 0 0 0 0 0 0 0 1 +readPin 65535 1189 0 0 0 0 0 0 0 0 0 +blinkLed 65535 830 0 0 0 0 0 0 0 0 0 +{ +"0x1DB":[16921,52650,0,0,0,0,0,0,0,0,1], +"readPin":[65535,1189,0,0,0,0,0,0,0,0,0], +"blinkLed":[65535,830,0,0,0,0,0,0,0,0,0] +} +``` + ## Installation @@ -344,6 +537,9 @@ The following programs are provided under the `examples` directory: * [HelloManualCoroutine.ino](examples/HelloManualCoroutine): same as `HelloCoroutine` except the `Coroutine` subclasses and instances are created and registered manually + * [HelloCoroutineWithProfiler.ino](examples/HelloCoroutineWithProfiler) + * [HelloSchedulerWithProfiler.ino](examples/HelloSchedulerWithProfiler): + same as `HelloCoroutineWithProfiler` using `CoroutineScheduler` * Intermediate Examples * [BlinkSlowFastRoutine.ino](examples/BlinkSlowFastRoutine): use coroutines to read a button and control how the LED blinks @@ -466,7 +662,7 @@ All objects are statically allocated (i.e. not heap or stack). On 8-bit processors (AVR Nano, Uno, etc): ``` -sizeof(Coroutine): 11 +sizeof(Coroutine): 16 sizeof(CoroutineScheduler): 2 sizeof(Channel): 5 ``` @@ -474,7 +670,7 @@ sizeof(Channel): 5 On 32-bit processors (e.g. Teensy ARM, ESP8266, ESP32): ``` -sizeof(Coroutine): 20 +sizeof(Coroutine): 28 sizeof(CoroutineScheduler): 4 sizeof(Channel): 12 ``` @@ -503,37 +699,41 @@ etc) for a handful of AceRoutine features. Here are some highlights: +--------------------------------------------------------------------+ | functionality | flash/ ram | delta | |---------------------------------------+--------------+-------------| -| Baseline | 606/ 11 | 0/ 0 | +| Baseline | 1616/ 186 | 0/ 0 | +|---------------------------------------+--------------+-------------| +| One Delay Function | 1664/ 188 | 48/ 2 | +| Two Delay Functions | 1726/ 190 | 110/ 4 | |---------------------------------------+--------------+-------------| -| One Delay Function | 654/ 13 | 48/ 2 | -| Two Delay Functions | 714/ 15 | 108/ 4 | +| One Coroutine (millis) | 1804/ 212 | 188/ 26 | +| Two Coroutines (millis) | 1998/ 236 | 382/ 50 | |---------------------------------------+--------------+-------------| -| One Coroutine | 844/ 32 | 238/ 21 | -| Two Coroutines | 1016/ 51 | 410/ 40 | +| One Coroutine (micros) | 1776/ 212 | 160/ 26 | +| Two Coroutines (micros) | 1942/ 236 | 326/ 50 | |---------------------------------------+--------------+-------------| -| One Coroutine (micros) | 816/ 32 | 210/ 21 | -| Two Coroutines (micros) | 960/ 51 | 354/ 40 | +| One Coroutine (seconds) | 1904/ 212 | 288/ 26 | +| Two Coroutines (seconds) | 2130/ 236 | 514/ 50 | |---------------------------------------+--------------+-------------| -| One Coroutine (seconds) | 944/ 32 | 338/ 21 | -| Two Coroutines (seconds) | 1148/ 51 | 542/ 40 | +| Scheduler, One Coroutine (millis) | 1992/ 214 | 376/ 28 | +| Scheduler, Two Coroutines (millis) | 2178/ 238 | 562/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine | 968/ 34 | 362/ 23 | -| Scheduler, Two Coroutines | 1132/ 53 | 526/ 42 | +| Scheduler, One Coroutine (micros) | 1964/ 214 | 348/ 28 | +| Scheduler, Two Coroutines (micros) | 2122/ 238 | 506/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (micros) | 940/ 34 | 334/ 23 | -| Scheduler, Two Coroutines (micros) | 1076/ 53 | 470/ 42 | +| Scheduler, One Coroutine (seconds) | 2092/ 214 | 476/ 28 | +| Scheduler, Two Coroutines (seconds) | 2310/ 238 | 694/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (seconds) | 1068/ 34 | 462/ 23 | -| Scheduler, Two Coroutines (seconds) | 1264/ 53 | 658/ 42 | +| Scheduler, One Coroutine (setup) | 2046/ 214 | 430/ 28 | +| Scheduler, Two Coroutines (setup) | 2332/ 238 | 716/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (setup) | 1018/ 34 | 412/ 23 | -| Scheduler, Two Coroutines (setup) | 1282/ 53 | 676/ 42 | +| Scheduler, One Coroutine (man setup) | 2024/ 214 | 408/ 28 | +| Scheduler, Two Coroutines (man setup) | 2318/ 238 | 702/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (man setup) | 996/ 34 | 390/ 23 | -| Scheduler, Two Coroutines (man setup) | 1268/ 53 | 662/ 42 | +| Scheduler, LogBinProfiler | 2100/ 286 | 484/ 100 | +| Scheduler, LogBinTableRenderer | 3502/ 304 | 1886/ 118 | +| Scheduler, LogBinJsonRenderer | 3022/ 308 | 1406/ 122 | |---------------------------------------+--------------+-------------| -| Blink Function | 938/ 14 | 332/ 3 | -| Blink Coroutine | 1158/ 32 | 552/ 21 | +| Blink Function | 1948/ 189 | 332/ 3 | +| Blink Coroutine | 2118/ 212 | 502/ 26 | +--------------------------------------------------------------------+ ``` @@ -543,37 +743,41 @@ etc) for a handful of AceRoutine features. Here are some highlights: +--------------------------------------------------------------------+ | functionality | flash/ ram | delta | |---------------------------------------+--------------+-------------| -| Baseline | 260329/27916 | 0/ 0 | +| Baseline | 264981/27984 | 0/ 0 | +|---------------------------------------+--------------+-------------| +| One Delay Function | 265045/27992 | 64/ 8 | +| Two Delay Functions | 265109/27992 | 128/ 8 | |---------------------------------------+--------------+-------------| -| One Delay Function | 260377/27916 | 48/ 0 | -| Two Delay Functions | 260441/27916 | 112/ 0 | +| One Coroutine (millis) | 265177/28028 | 196/ 44 | +| Two Coroutines (millis) | 265337/28060 | 356/ 76 | |---------------------------------------+--------------+-------------| -| One Coroutine | 260525/27944 | 196/ 28 | -| Two Coroutines | 260669/27960 | 340/ 44 | +| One Coroutine (micros) | 265209/28028 | 228/ 44 | +| Two Coroutines (micros) | 265369/28060 | 388/ 76 | |---------------------------------------+--------------+-------------| -| One Coroutine (micros) | 260541/27944 | 212/ 28 | -| Two Coroutines (micros) | 260701/27960 | 372/ 44 | +| One Coroutine (seconds) | 265209/28028 | 228/ 44 | +| Two Coroutines (seconds) | 265385/28060 | 404/ 76 | |---------------------------------------+--------------+-------------| -| One Coroutine (seconds) | 260541/27944 | 212/ 28 | -| Two Coroutines (seconds) | 260717/27960 | 388/ 44 | +| Scheduler, One Coroutine (millis) | 265321/28036 | 340/ 52 | +| Scheduler, Two Coroutines (millis) | 265449/28060 | 468/ 76 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine | 260573/27944 | 244/ 28 | -| Scheduler, Two Coroutines | 260701/27968 | 372/ 52 | +| Scheduler, One Coroutine (micros) | 265321/28036 | 340/ 52 | +| Scheduler, Two Coroutines (micros) | 265449/28060 | 468/ 76 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (micros) | 260589/27944 | 260/ 28 | -| Scheduler, Two Coroutines (micros) | 260733/27968 | 404/ 52 | +| Scheduler, One Coroutine (seconds) | 265337/28036 | 356/ 52 | +| Scheduler, Two Coroutines (seconds) | 265497/28060 | 516/ 76 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (seconds) | 260589/27944 | 260/ 28 | -| Scheduler, Two Coroutines (seconds) | 260749/27968 | 420/ 52 | +| Scheduler, One Coroutine (setup) | 265337/28036 | 356/ 52 | +| Scheduler, Two Coroutines (setup) | 265513/28060 | 532/ 76 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (setup) | 260605/27944 | 276/ 28 | -| Scheduler, Two Coroutines (setup) | 260765/27968 | 436/ 52 | +| Scheduler, One Coroutine (man setup) | 265337/28036 | 356/ 52 | +| Scheduler, Two Coroutines (man setup) | 265513/28060 | 532/ 76 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (man setup) | 260589/27944 | 260/ 28 | -| Scheduler, Two Coroutines (man setup) | 260749/27968 | 420/ 52 | +| Scheduler, LogBinProfiler | 265449/28100 | 468/ 116 | +| Scheduler, LogBinTableRenderer | 267381/28100 | 2400/ 116 | +| Scheduler, LogBinJsonRenderer | 266773/28104 | 1792/ 120 | |---------------------------------------+--------------+-------------| -| Blink Function | 261001/27988 | 672/ 72 | -| Blink Coroutine | 261133/28008 | 804/ 92 | +| Blink Function | 265669/28064 | 688/ 80 | +| Blink Coroutine | 265801/28100 | 820/ 116 | +--------------------------------------------------------------------+ ``` @@ -614,7 +818,7 @@ ESP8266: |---------------------+--------+-------------+--------| | EmptyLoop | 10000 | 0.100 | 0.000 | | DirectScheduling | 10000 | 0.500 | 0.400 | -| CoroutineScheduling | 10000 | 0.900 | 0.800 | +| CoroutineScheduling | 10000 | 1.000 | 0.900 | +---------------------+--------+-------------+--------+ ``` diff --git a/USER_GUIDE.md b/USER_GUIDE.md index 57672fc..3661e46 100644 --- a/USER_GUIDE.md +++ b/USER_GUIDE.md @@ -39,6 +39,12 @@ is installed. * [Custom Coroutines](#CustomCoroutines) * [Manual Coroutines](#ManualCoroutines) * [Coroutine Setup](#CoroutineSetup) +* [Coroutine Profiling](#CoroutineProfiling) + * [Creating Profilers Directly](#CreatingProfilersDirectly) + * [Creating Profilers on Heap](#CreatingProfilersOnHeap) + * [Running Coroutine With Profiler](#RunningCoroutineWithProfiler) + * [Running Scheduler With Profiler](#RunningSchedulerWithProfiler) + * [Rendering the Profiler Results](#RenderingProfilerResults) * [Coroutine Communication](#Communication) * [Instance Variables](#InstanceVariables) * [Channels (Experimental)](#Channels) @@ -819,11 +825,6 @@ necessary because the `Coroutine::Coroutine()` constructor automatically inserts itself into the internal singly-linked list. The `setupCoroutine()` is retained for backwards compatibility, but is now marked deprecated. -Starting with v1.3, the name of the coroutine is no longer saved, and -`Coroutine::getName()` does not exist anymore. `CoroutineScheduler::list()` -prints the integer value of the coroutine instance instead of the name of the -coroutine. - ### Direct Scheduling or CoroutineScheduler @@ -1148,6 +1149,265 @@ flash per coroutine. On 32-bit processors, it takes slightly less memory, about AVR processors. The virtual dispatch on `Coroutine::setupCoroutine()` consumes about 14 bytes of flash per invocation. + +## Coroutine Profiling + +Version 1.5 added the ability to profile the execution time of +`Coroutine::runCoroutine()` and render the information as a formatted table, or +as a JSON object. The `CoroutineProfiler` is an interface that allows an object +to receive information about the execution time of the +`Coroutine::runCoroutine()` method: + +```C++ +class CoroutineProfiler { + public: + /** + * Process the completion of the runCoroutine() method which took + * `micros` microseconds. + */ + virtual void updateElapsedMicros(uint32_t micros) = 0; +}; +``` + +Each `Coroutine` object has the ability to hold a pointer to a +`CoroutineProfiler` object: + +```C++ +class Coroutine { + ... + public: + void setProfiler(CoroutineProfiler* profiler); + CoroutineProfiler* getProfiler() const; + + int runCoroutineWithProfiler(); + ... +}; +``` + +Currently only a single implementation of `CoroutineProfiler` is provided, the +`LogBinProfiler`. It contains 32 bins of `uint16_t` which tracks the number of +times a `micros` was seen. The bins are logarithmically scaled, so that Bin 0 +collects all events `<2us`, Bin 1 collects events `<4us`, Bin 2 collects events +`<8us`, Bin 30 collects events `<2147s`, and the last Bin 31 collects events +`<4295s`. + +```C++ +class LogBinProfiler : public CoroutineProfiler { + public: + static const uint8_t kNumBins = 32; + + public: + LogBinProfiler(); + + void updateElapsedMicros(uint32_t micros) override; + void clear(); + + static void createProfilers(); + static void deleteProfilers(); + static void clearProfilers(); + + public: + uint16_t mBins[kNumBins]; +}; +``` + +Details on how to configure and use these are are provided below, but it may +help to look at 2 examples while looking through the following subsections: + +* [HelloCoroutineWithProfiler](examples/HelloCoroutineWithProfiler) +* [HelloSchedulerWithProfiler](examples/HelloSchedulerWithProfiler) + + +### Creating Profilers Directly + +By default, a `Coroutine` has no reference to a `CoroutineProfiler`. The user +can directly assign a profiler instance by creating it statically, then calling +`Coroutine::setProfiler()` like this: + +```C++ +#include +using namespace ace_routine; + +COROUTINE(coroutine1) { + ... +} + +COROUTINE(coroutine1) { + ... +} + +LogBinProfiler profiler1; +LogBinProfiler profiler2; + +void setup() { + ... + coroutine1.setProfiler(&profiler1); + coroutine2.setProfiler(&profiler2); + ... +} +``` + +This technique works well if you have a small number of coroutines. + + +### Creating Profilers on Heap + +If you are using a substantial number of coroutines, it is cumbersome to +manually create these profilers for all coroutines. In that case, you can use +the `LogBinProfiler::createProfilers()` convenience function which loops through +every coroutine (defined by `Coroutine::getRoot()`, and assigns an instance of +`LogBinProfiler` that is created on the heap: + +```C++ +#include +using namespace ace_routine; + +void setup() { + ... + LogBinProfiler::createProfilers(); +} +``` + +In the unlikely event that you delete the Profiler instances which were created +on the heap, you can call the `LogBinProfiler::deleteProfilers()` static method. + +Finally, the `LogBinProfiler::clearProfilers()` static method calls the +`LogBinProfiler::clear()` method on every profiler attached to every coroutine +so that the event count in all the bins are cleared to 0. + + +### Running Coroutine with Profiler + +Once a `Coroutine` is assigned a `CoroutineProfiler`, the statistics can be +gathered in a couple of ways. The simplest is to call the new +`Coroutine::runCoroutineWithProfiler()` instead of the normal +`Coroutine::runCoroutine()` in the global `loop()` function like this: + +```C++ +#include +using namespace ace_routine; + +COROUTINE(myCoroutine) { + ... +} + +LogBinProfiler profiler; + +void setup() { + ... + myCoroutine.setName(F("myCoroutine")); + myCoroutine.setProfiler(&profiler); + ... +} + +void loop() { + myCoroutine.runCoroutineWithProfiler(); + ... +} + +This technique is intended for resource constrained environments, usually 8-bit +processors, where the overhead of a `CoroutineScheduler` is not desired. + + +### Running Scheduler with Profiler + +If the environment is using the `CoroutineScheduler`, it will automatically call +the `Coroutine::runCoroutineWithProfiler()` on each coroutine and gather the +profiling information automatically. + +```C++ +#include +using namespace ace_routine; + +COROUTINE(myCoroutine) { + ... +} + +void setup() { + ... + myCoroutine.setName(F("myCoroutine")); + myCoroutine.setProfiler(&profiler); + + LogBinProfiler::createProfilers(); + CoroutineScheduler::setup(); +} + +void loop() { + CoroutineScheduler::loop(); +} +``` + + +### Rendering the Profiler Results + +The `LogBinProfiler` comes with 2 rendering classes: + +* `LogBinTableRenderer` + * displays the event count in a human-readable formatted table with fixed + column widths +* `LogBinJsonRenderer` + * prints the same info as a JSON object + +These classes expose a simple `printTo()` static function like this: + +``` +class LogBinTableRenderer { + public: + static void printTo( + Print& printer, + uint8_t startBin, + uint8_t endBin, + bool clear = true, + bool rollup = true + ); +}; + +class LogBinJsonRenderer{ + public: + static void printTo( + Print& printer, + uint8_t startBin, + uint8_t endBin, + bool clear = true, + bool rollup = true + ); +}; +``` + +* The `printer` is usually the `Serial` object, but can be changed to something + else if needed. +* The `startBin` (0-31) and `endBin` (0-32) identify the bins which should be + printed. + * A range of something like [2, 14) is useful to keep the width of the table + reasonable. + * Often the bins lower and higher than this range do not contain any events. +* The `clear` flag (default true) causes the bins to be cleared (through the + `LogBinProfiler::clear()` method) so that new events can be tracked. +* The `rollup` flag (default true) causes roll up of the exterior bins. + * Events before `startBin` are added to the first bin. + * Events at or after `endBin` are added to the last bin (at `endBin-1`) + +For example, calling `LogBinTableRenderer::printTo(Serial, 2, 16)` prints +something like this: + +``` +name <16us <32us <64us<128us<256us<512us <1ms <2ms <4ms <8ms >> +0x1DB 16898 52688 0 0 0 0 0 0 0 0 1 +readPin 65535 1128 0 0 0 0 0 0 0 0 0 +blinkLed 65535 800 0 0 0 0 0 0 0 0 0 +``` + +And calling `LogBinJsonRenderer::printTo(Serial, 2, 16)` prints something like +this: + +``` +{ +"0x1DB":[16898,52688,0,0,0,0,0,0,0,0,1], +"readPin":[65535,1128,0,0,0,0,0,0,0,0,0], +"blinkLed":[65535,800,0,0,0,0,0,0,0,0,0] +} +``` + ## Coroutine Communication From 07bfdc16e17fe1bd5b265295be5354fecc1a9189 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Thu, 17 Mar 2022 15:52:37 -0700 Subject: [PATCH 46/59] Coroutine.cpp: Store sStatusStrings[] in PROGMEM, saving 14 bytes (8-bits) and 28 bytes (ESP8266) of static RAM if Coroutine::statusPrintTo() is used --- src/ace_routine/Coroutine.cpp | 9 +++++---- src/ace_routine/Coroutine.h | 5 +++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/ace_routine/Coroutine.cpp b/src/ace_routine/Coroutine.cpp index 85b9ea2..ba40647 100644 --- a/src/ace_routine/Coroutine.cpp +++ b/src/ace_routine/Coroutine.cpp @@ -29,9 +29,8 @@ namespace ace_routine { // Create the sStatusStrings lookup table to translate Status integer to a // human-readable string. When it is used, it increases flash memory by 86 -// bytes, and static RAM by 14 bytes. It is currently only used by -// CoroutineScheduler::list() but I think it's worth it to make debugging -// easier. +// bytes. It is currently only used by CoroutineScheduler::list() but I think +// it's worth it to make debugging easier. static const char kStatusSuspendedString[] PROGMEM = "Suspended"; static const char kStatusYieldingString[] PROGMEM = "Yielding"; @@ -40,7 +39,9 @@ static const char kStatusRunningString[] PROGMEM = "Running"; static const char kStatusEndingString[] PROGMEM = "Ending"; static const char kStatusTerminatedString[] PROGMEM = "Terminated"; -const __FlashStringHelper* const sStatusStrings[] = { +// Store the array of PROGMEM pointers in PROGMEM as well, saving 14 bytes of +// RAM on AVR, and 28 bytes on ESP8266. +const __FlashStringHelper* const sStatusStrings[] PROGMEM = { FPSTR(kStatusSuspendedString), FPSTR(kStatusYieldingString), FPSTR(kStatusDelayingString), diff --git a/src/ace_routine/Coroutine.h b/src/ace_routine/Coroutine.h index bdd00b7..0554b83 100644 --- a/src/ace_routine/Coroutine.h +++ b/src/ace_routine/Coroutine.h @@ -267,7 +267,7 @@ extern className##_##name name namespace ace_routine { /** A lookup table from Status integer to human-readable strings. */ -extern const __FlashStringHelper* const sStatusStrings[]; +extern const __FlashStringHelper* const sStatusStrings[] PROGMEM; // Forward declaration of CoroutineSchedulerTemplate template class CoroutineSchedulerTemplate; @@ -637,7 +637,8 @@ class CoroutineTemplate { /** Print the human-readable string of the Status. */ void statusPrintTo(Print& printer) { - printer.print(sStatusStrings[mStatus]); + printer.print((const __FlashStringHelper*) + pgm_read_ptr(&sStatusStrings[mStatus])); } /** From c0fe99942b6010b5e58360c13bd9803f35e66f40 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Thu, 17 Mar 2022 16:06:56 -0700 Subject: [PATCH 47/59] Coroutine.h: Add a T_DELAY template parameter to CoroutineTemplate class, set it to uint16_t --- src/ace_routine/Coroutine.h | 41 ++++++++++++++------- src/ace_routine/testing/TestableCoroutine.h | 2 +- 2 files changed, 28 insertions(+), 15 deletions(-) diff --git a/src/ace_routine/Coroutine.h b/src/ace_routine/Coroutine.h index 0554b83..48d8e24 100644 --- a/src/ace_routine/Coroutine.h +++ b/src/ace_routine/Coroutine.h @@ -30,6 +30,7 @@ SOFTWARE. #include // PrintStr<> #include "CoroutineProfiler.h" #include "ClockInterface.h" +#include "compat.h" // PROGMEM class __FlashStringHelper; class AceRoutineTest_statusStrings; @@ -275,10 +276,21 @@ template class CoroutineSchedulerTemplate; /** * Base class of all coroutines. The actual coroutine code is an implementation * of the virtual runCoroutine() method. + * + * @tparam T_CLOCK class that provides micros(), millis() and seconds() + * functions, usually `ClockInterface` but can be something else for testing + * purposes. + * @tparam T_DELAY type used to store the mDelayStart and mDelayDuration, + * usually `uint16_t`. It may be possible to create a variant set of + * Coroutine32 and CoroutineScheduler32 classes which use a `uint32_t` + * instead of a `uint16_t`. This would probably allow the + * `COROUTINE_DELAY()`, `COROUTINE_DELAY_MICROS()` and + * `COROUTINE_DELAY_SECONDS()` macros to accept 32-bit integers instead of + * 16-bits. I have not tested this possibility at all. */ -template +template class CoroutineTemplate { - friend class CoroutineSchedulerTemplate>; + friend class CoroutineSchedulerTemplate>; friend class ::AceRoutineTest_statusStrings; friend class ::SuspendTest_suspendAndResume; @@ -459,22 +471,22 @@ class CoroutineTemplate { /** Check if delay millis time is over. */ bool isDelayExpired() const { - uint16_t nowMillis = coroutineMillis(); - uint16_t elapsed = nowMillis - mDelayStart; + T_DELAY nowMillis = coroutineMillis(); + T_DELAY elapsed = nowMillis - mDelayStart; return elapsed >= mDelayDuration; } /** Check if delay micros time is over. */ bool isDelayMicrosExpired() const { - uint16_t nowMicros = coroutineMicros(); - uint16_t elapsed = nowMicros - mDelayStart; + T_DELAY nowMicros = coroutineMicros(); + T_DELAY elapsed = nowMicros - mDelayStart; return elapsed >= mDelayDuration; } /** Check if delay seconds time is over. */ bool isDelaySecondsExpired() const { - uint16_t nowSeconds = coroutineSeconds(); - uint16_t elapsed = nowSeconds - mDelayStart; + T_DELAY nowSeconds = coroutineSeconds(); + T_DELAY elapsed = nowSeconds - mDelayStart; return elapsed >= mDelayDuration; } @@ -684,7 +696,7 @@ class CoroutineTemplate { * COROUTINE_DELAY() macro inside Coroutine::runCoroutine()) because the * clock increments by 1 millisecond.) */ - void setDelayMillis(uint16_t delayMillis) { + void setDelayMillis(T_DELAY delayMillis) { mDelayStart = coroutineMillis(); // If delayMillis is a compile-time constant, the compiler seems to @@ -698,7 +710,7 @@ class CoroutineTemplate { * Configure the delay timer for delayMicros. Similar to seDelayMillis(), * the maximum delay is 32767 micros. */ - void setDelayMicros(uint16_t delayMicros) { + void setDelayMicros(T_DELAY delayMicros) { mDelayStart = coroutineMicros(); // If delayMicros is a compile-time constant, the compiler seems to @@ -712,7 +724,7 @@ class CoroutineTemplate { * Configure the delay timer for delaySeconds. Similar to seDelayMillis(), * the maximum delay is 32767 seconds. */ - void setDelaySeconds(uint16_t delaySeconds) { + void setDelaySeconds(T_DELAY delaySeconds) { mDelayStart = coroutineSeconds(); // If delaySeconds is a compile-time constant, the compiler seems to @@ -791,15 +803,16 @@ class CoroutineTemplate { * COROUTINE_DELAY_SECONDS(). The unit of this number is context dependent, * milliseconds, microseconds, or seconds. */ - uint16_t mDelayStart; + T_DELAY mDelayStart; /** * Delay time specified by COROUTINE_DELAY(), COROUTINE_DELAY_MICROS() or, * COROUTINE_DELAY_SECONDS(). The unit of this number is context dependent, * milliseconds, microseconds, or seconds. */ - uint16_t mDelayDuration; + T_DELAY mDelayDuration; + /** Pointer to a profiler instance, either static or on the heap. */ CoroutineProfiler* mProfiler = nullptr; }; @@ -809,7 +822,7 @@ class CoroutineTemplate { * class of all user-defined coroutines created using the COROUTINE() macro or * through manual subclassing of this class. */ -using Coroutine = CoroutineTemplate; +using Coroutine = CoroutineTemplate; } diff --git a/src/ace_routine/testing/TestableCoroutine.h b/src/ace_routine/testing/TestableCoroutine.h index 2cbb512..71878df 100644 --- a/src/ace_routine/testing/TestableCoroutine.h +++ b/src/ace_routine/testing/TestableCoroutine.h @@ -35,7 +35,7 @@ namespace testing { * A version of Coroutine that uses the TestableClockInterface to provide the * clock can for unit testing purposes. */ -using TestableCoroutine = CoroutineTemplate; +using TestableCoroutine = CoroutineTemplate; } } From 0d56460c6ed5e8ed9dcee87b08793e0e89ef565a Mon Sep 17 00:00:00 2001 From: Brian Park Date: Thu, 17 Mar 2022 16:38:18 -0700 Subject: [PATCH 48/59] USER_GUIDE.md: Fix markdown errors --- USER_GUIDE.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/USER_GUIDE.md b/USER_GUIDE.md index 3661e46..ccb2416 100644 --- a/USER_GUIDE.md +++ b/USER_GUIDE.md @@ -1262,6 +1262,14 @@ every coroutine (defined by `Coroutine::getRoot()`, and assigns an instance of #include using namespace ace_routine; +COROUTINE(coroutine1) { + ... +} + +COROUTINE(coroutine1) { + ... +} + void setup() { ... LogBinProfiler::createProfilers(); @@ -1304,6 +1312,7 @@ void loop() { myCoroutine.runCoroutineWithProfiler(); ... } +``` This technique is intended for resource constrained environments, usually 8-bit processors, where the overhead of a `CoroutineScheduler` is not desired. @@ -1350,7 +1359,7 @@ The `LogBinProfiler` comes with 2 rendering classes: These classes expose a simple `printTo()` static function like this: -``` +```C++ class LogBinTableRenderer { public: static void printTo( From 4c63da534c73e581a0207e47b3f92e583b0f1af3 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Fri, 18 Mar 2022 11:56:22 -0700 Subject: [PATCH 49/59] CoroutineScheduler.h: Extract profiling code into loopWithProfiler(), keeping loop() free of profiling --- CHANGELOG.md | 25 +++---- USER_GUIDE.md | 73 ++++++++++++++----- .../HelloSchedulerWithProfiler.ino | 2 +- src/ace_routine/CoroutineScheduler.h | 69 +++++++++++++++--- 4 files changed, 124 insertions(+), 45 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0467399..b41977f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,35 +10,32 @@ * Resource consumption * Increases flash usage by 6-10 bytes per coroutine. * Increases static ram usage by 3 bytes (AVR) or 4 bytes (32-bit) - per coroutine. + per coroutine, plus the additional storage for string itself. * Support profiling of `Coroutine::runCoroutine()` execution time. * See [Coroutine Profiling](USER_GUIDE.md#CoroutineProfiling) in the `USER_GUIDE.md`. * API changes * Add `CoroutineProfiler` interface with a `updateElapsedMicros()` method. - * Add `Coroutine::setProfiler()`. + * Add `Coroutine::setProfiler()` to store the profiler pointer. * Add `Coroutine::runCoroutineWithProfiler()` which measures the - elapsed time of `runCoroutine()`. - * Update `CoroutineScheduler::runCoroutine()` to call - `runCoroutineWithProfiler()`. + elapsed time of `runCoroutine()` and calls + `CoroutineProfiler::updateElapsedMicros()`. + * Add `CoroutineScheduler::runCoroutineWithProfiler()` which calls + `Coroutine::runCoroutineWithProfiler()` instead of the normal + `Coroutine::runCoroutine()`. + * Add `CoroutineScheduler::loopWithProfiler()` public static method + which calls `runCoroutineWithProfiler()`. * Provide `LogBinProfiler` subclass of `CoroutineProfiler`. * Keeps a frequency count of the elapsed microseconds using 32 bins representing the `log2()` function of the elapsed microseconds. - * Provide 2 renderers: + * Provide 2 renderers of `LogBinProfiler`: * `LogBinTableRenderer::printTo()` prints a formatted table of the frequency count over all coroutines. This represents a poor-man's version of the log-log graph of the frequency count. * `LogBinJsonRenderer::printTo()` prints the frequency count in JSON format. - * Resource consumption - * Increases static ram usage by 2 bytes (AVR) or 4 bytes (32-bit) - per coroutine. - * Increases latency of `CoroutineScheduler::runCoroutine()` by only - 100ns (AVR, ESP8266), 133ns (STM32, Teensy 3.2), and 33ns (ESP32). - * Increases the flash size of the `CoroutineScheduler` by 100-140 - bytes for both 8-bit and 32-bit processors, even if - `CoroutineProfiler` is not used. This is a one-time hit. + * Memory consumption * See [HelloCoroutineWithProfiler](examples/HelloCoroutineWithProfiler) and [HelloSchedulerWithProfiler](examples/HelloSchedulerWithProfiler). * Thanks to peufeu2@ who provided the ideas and proof of concept in diff --git a/USER_GUIDE.md b/USER_GUIDE.md index ccb2416..621b172 100644 --- a/USER_GUIDE.md +++ b/USER_GUIDE.md @@ -40,11 +40,12 @@ is installed. * [Manual Coroutines](#ManualCoroutines) * [Coroutine Setup](#CoroutineSetup) * [Coroutine Profiling](#CoroutineProfiling) - * [Creating Profilers Directly](#CreatingProfilersDirectly) - * [Creating Profilers on Heap](#CreatingProfilersOnHeap) + * [Creating Profilers Manually](#CreatingProfilersManually) + * [Creating Profilers Automatically](#CreatingProfilersAutomatically) * [Running Coroutine With Profiler](#RunningCoroutineWithProfiler) * [Running Scheduler With Profiler](#RunningSchedulerWithProfiler) * [Rendering the Profiler Results](#RenderingProfilerResults) + * [Profiling Resource Consumption](#ProfilingResourceConsumption) * [Coroutine Communication](#Communication) * [Instance Variables](#InstanceVariables) * [Channels (Experimental)](#Channels) @@ -1217,8 +1218,8 @@ help to look at 2 examples while looking through the following subsections: * [HelloCoroutineWithProfiler](examples/HelloCoroutineWithProfiler) * [HelloSchedulerWithProfiler](examples/HelloSchedulerWithProfiler) - -### Creating Profilers Directly + +### Creating Profilers Manually By default, a `Coroutine` has no reference to a `CoroutineProfiler`. The user can directly assign a profiler instance by creating it statically, then calling @@ -1249,14 +1250,13 @@ void setup() { This technique works well if you have a small number of coroutines. - -### Creating Profilers on Heap + +### Creating Profilers Automatically If you are using a substantial number of coroutines, it is cumbersome to manually create these profilers for all coroutines. In that case, you can use the `LogBinProfiler::createProfilers()` convenience function which loops through -every coroutine (defined by `Coroutine::getRoot()`, and assigns an instance of -`LogBinProfiler` that is created on the heap: +every coroutine and creates an instance of `LogBinProfiler` on the heap: ```C++ #include @@ -1276,8 +1276,9 @@ void setup() { } ``` -In the unlikely event that you delete the Profiler instances which were created -on the heap, you can call the `LogBinProfiler::deleteProfilers()` static method. +In the unlikely event that you need to delete the Profiler instances which were +created on the heap, you can call the `LogBinProfiler::deleteProfilers()` static +method. Finally, the `LogBinProfiler::clearProfilers()` static method calls the `LogBinProfiler::clear()` method on every profiler attached to every coroutine @@ -1309,20 +1310,16 @@ void setup() { } void loop() { - myCoroutine.runCoroutineWithProfiler(); + myCoroutine.runCoroutineWithProfiler(); // <---- instead of runCoroutine() ... } ``` -This technique is intended for resource constrained environments, usually 8-bit -processors, where the overhead of a `CoroutineScheduler` is not desired. - ### Running Scheduler with Profiler -If the environment is using the `CoroutineScheduler`, it will automatically call -the `Coroutine::runCoroutineWithProfiler()` on each coroutine and gather the -profiling information automatically. +To activate profiling when using the `CoroutineScheduler`, just replace the call +to `CoroutineScheduler::loop()` with `CoroutineScheduler::loopWithProfiler()`. ```C++ #include @@ -1342,7 +1339,7 @@ void setup() { } void loop() { - CoroutineScheduler::loop(); + CoroutineScheduler::loopWithProfiler(); // <---- instead of loop() } ``` @@ -1417,6 +1414,46 @@ this: } ``` + +### Profiling Resource Consumption + +The ability to profile the execution time of coroutines does not come for free, +but I have tried to make it as cheap as possible. + +**Memory consumption** + +If the profiling feature is not wanted, you can continue to use the +`Coroutine::runCoroutine()` or the `CoroutineScheduler::loop()` functions, and +the flash usage will not increase. The only additional resource is 2 extra bytes +(8-bit processors) or 4 extra bytes (32-bit processors) of static RAM, *per +coroutine*, because each coroutine holds a pointer to the `CoroutineProfiler`, +even if it is not used. + +If the profiling feature is enabled, the +[MemoryBenchmark](examples/MemoryBenchmark) program shows that: + +* Using `Coroutine::runCoroutineWithProfiler()` consumes 50-80 bytes of extra + bytes of flash *per coroutine* compared to the normal + `Coroutine::runCoroutine()`, probably due to the virtual dispatch. +* Using `CoroutineScheduler::loopWithProfiler()` consumes an additional 50-100 + bytes of flash compared to using `CoroutineScheduler::loop()`, *plus* the + additional 50-80 bytes of flash *per coroutine* because the dispatching is + routed to `Coroutine::runCoroutineWithProfiler()`. +* The `LogBinProfiler` consumes at least 64 bytes of static RAM per instance + because it holds an array of 32 bin of `uint16_t` integers. It also increases + the flash usage by 120-150 bytes, but that's a one-time hit, not per profiler + or coroutine. +* The `LogBinTableRenderer` increases flash usage by 1300-2000 bytes. +* The `LogBinJsonRenderer` increases flash usage by 700-1200 bytes. + +**CPU consumption** + +The [AutoBenchmark](examples/AutoBenchmark) program shows that calling the +profiler-enabled methods, `Coroutine::runCoroutineWithProfiler()` and +`CoroutineScheduler::loopWithProfiler(), increases latency by only 100ns (AVR, +ESP8266), 133ns (STM32, Teensy 3.2), and 33ns (ESP32). Most applications should +not be affected by this small increase in latency. + ## Coroutine Communication diff --git a/examples/HelloSchedulerWithProfiler/HelloSchedulerWithProfiler.ino b/examples/HelloSchedulerWithProfiler/HelloSchedulerWithProfiler.ino index 6bb4b56..07ead9c 100644 --- a/examples/HelloSchedulerWithProfiler/HelloSchedulerWithProfiler.ino +++ b/examples/HelloSchedulerWithProfiler/HelloSchedulerWithProfiler.ino @@ -109,5 +109,5 @@ void setup() { } void loop() { - CoroutineScheduler::loop(); + CoroutineScheduler::loopWithProfiler(); } diff --git a/src/ace_routine/CoroutineScheduler.h b/src/ace_routine/CoroutineScheduler.h index 71e7043..2fcc094 100644 --- a/src/ace_routine/CoroutineScheduler.h +++ b/src/ace_routine/CoroutineScheduler.h @@ -92,11 +92,21 @@ class CoroutineSchedulerTemplate { /** * Run the current coroutine using the current scheduler. This method * returns when the underlying Coroutine suspends execution, which allows - * the system loop() to return to do systems processing, such as WiFi. + * the system loop() to return to do systems processing. * Everyone must cooperate to make the whole thing work. */ static void loop() { getScheduler()->runCoroutine(); } + /** + * Run the current coroutine using the current scheduler with the coroutine + * profiler enabled. This method returns when the underlying Coroutine + * suspends execution, which allows the system loop() to return to do + * systems processing. Everyone must cooperate to make the whole thing work. + */ + static void loopWithProfiler() { + getScheduler()->runCoroutineWithProfiler(); + } + /** * Print out the known coroutines to the printer (usually Serial). Note that * if this method is never called, the linker will strip out the code. If @@ -146,7 +156,10 @@ class CoroutineSchedulerTemplate { } } - /** Run the current coroutine. */ + /** + * Run the current coroutine without the overhead of the profiler by calling + * Coroutine::runCoroutine(). + */ void runCoroutine() { // If reached the end, start from the beginning again. if (*mCurrent == nullptr) { @@ -159,11 +172,46 @@ class CoroutineSchedulerTemplate { } } - #if ACE_ROUTINE_DEBUG == 1 - Serial.print(F("Processing ")); - Serial.print((uintptr_t) (*mCurrent)); - Serial.println(); - #endif + // Handle the coroutine's dispatch back to the last known internal status. + switch ((*mCurrent)->getStatus()) { + case T_COROUTINE::kStatusYielding: + case T_COROUTINE::kStatusDelaying: + // The coroutine itself knows whether it is yielding or delaying, and + // its continuation context determines whether to call + // Coroutine::isDelayExpired(), Coroutine::isDelayMicrosExpired(), or + // Coroutine::isDelaySecondsExpired(). + (*mCurrent)->runCoroutine(); + break; + + case T_COROUTINE::kStatusEnding: + // mark it terminated + (*mCurrent)->setTerminated(); + break; + + default: + // For all other cases, just skip to the next coroutine. + break; + } + + // Go to the next coroutine + mCurrent = (*mCurrent)->getNext(); + } + + /* + * Run the current coroutine with profiling enabled by calling + * Coroutine::runCoroutineWithProfiler(). + */ + void runCoroutineWithProfiler() { + // If reached the end, start from the beginning again. + if (*mCurrent == nullptr) { + mCurrent = T_COROUTINE::getRoot(); + // Return if the list is empty. Checking for a null getRoot() inside the + // if-statement is deliberate, since it optimizes the common case where + // the linked list is not empty. + if (*mCurrent == nullptr) { + return; + } + } // Handle the coroutine's dispatch back to the last known internal status. switch ((*mCurrent)->getStatus()) { @@ -174,11 +222,8 @@ class CoroutineSchedulerTemplate { // Coroutine::isDelayExpired(), Coroutine::isDelayMicrosExpired(), or // Coroutine::isDelaySecondsExpired(). // - // The `CoroutineScheduler` always enables the profiler by calling - // `Coroutine::runCoroutineWithProfiler()`. If memory usage is a - // problem, then consider calling the `Coroutine::runCoroutine()` - // directly in the global `loop()` function, instead of going through - // the `CoroutineScheduler`. + // This version calls `Coroutine::runCoroutineWithProfiler()` to + // enable the profiler. (*mCurrent)->runCoroutineWithProfiler(); break; From 25f42d6d9e51938239172dc2aa7903de4136e243 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Fri, 18 Mar 2022 11:57:15 -0700 Subject: [PATCH 50/59] MemoryBenchmark: Add separate benchmarks for Coroutine::runCoroutineWithProfiler() and CoroutineScheduler::loopWithProfiler() --- examples/MemoryBenchmark/MemoryBenchmark.ino | 156 +++++++++---- examples/MemoryBenchmark/README.md | 220 +++++++++++------- examples/MemoryBenchmark/attiny.txt | 34 +-- examples/MemoryBenchmark/collect.sh | 2 +- examples/MemoryBenchmark/esp32.txt | 34 +-- examples/MemoryBenchmark/esp8266.txt | 34 +-- examples/MemoryBenchmark/generate_table.awk | 36 +-- examples/MemoryBenchmark/micro.txt | 34 +-- examples/MemoryBenchmark/nano.txt | 34 +-- examples/MemoryBenchmark/stm32.txt | 34 +-- examples/MemoryBenchmark/teensy32.txt | 34 +-- .../validate_using_epoxy_duino.sh | 2 +- 12 files changed, 404 insertions(+), 250 deletions(-) diff --git a/examples/MemoryBenchmark/MemoryBenchmark.ino b/examples/MemoryBenchmark/MemoryBenchmark.ino index d114c1a..d99d3b2 100644 --- a/examples/MemoryBenchmark/MemoryBenchmark.ino +++ b/examples/MemoryBenchmark/MemoryBenchmark.ino @@ -24,21 +24,25 @@ #define FEATURE_TWO_COROUTINES_MICROS 6 #define FEATURE_ONE_COROUTINE_SECONDS 7 #define FEATURE_TWO_COROUTINES_SECONDS 8 -#define FEATURE_SCHEDULER_ONE_COROUTINE_MILLIS 9 -#define FEATURE_SCHEDULER_TWO_COROUTINES_MILLIS 10 -#define FEATURE_SCHEDULER_ONE_COROUTINE_MICROS 11 -#define FEATURE_SCHEDULER_TWO_COROUTINES_MICROS 12 -#define FEATURE_SCHEDULER_ONE_COROUTINE_SECONDS 13 -#define FEATURE_SCHEDULER_TWO_COROUTINES_SECONDS 14 -#define FEATURE_SCHEDULER_SETUP_ONE_COROUTINE 15 -#define FEATURE_SCHEDULER_SETUP_TWO_COROUTINES 16 -#define FEATURE_SCHEDULER_MANUAL_SETUP_ONE_COROUTINE 17 -#define FEATURE_SCHEDULER_MANUAL_SETUP_TWO_COROUTINES 18 -#define FEATURE_LOG_BIN_PROFILER 19 -#define FEATURE_LOG_BIN_TABLE_RENDERER 20 -#define FEATURE_LOG_BIN_JSON_RENDERER 21 -#define FEATURE_BLINK_FUNCTION 22 -#define FEATURE_BLINK_COROUTINE 23 +#define FEATURE_ONE_COROUTINE_WITH_PROFILER 9 +#define FEATURE_TWO_COROUTINES_WITH_PROFILER 10 +#define FEATURE_SCHEDULER_ONE_COROUTINE_MILLIS 11 +#define FEATURE_SCHEDULER_TWO_COROUTINES_MILLIS 12 +#define FEATURE_SCHEDULER_ONE_COROUTINE_MICROS 13 +#define FEATURE_SCHEDULER_TWO_COROUTINES_MICROS 14 +#define FEATURE_SCHEDULER_ONE_COROUTINE_SECONDS 15 +#define FEATURE_SCHEDULER_TWO_COROUTINES_SECONDS 16 +#define FEATURE_SCHEDULER_SETUP_ONE_COROUTINE 17 +#define FEATURE_SCHEDULER_SETUP_TWO_COROUTINES 18 +#define FEATURE_SCHEDULER_MANUAL_SETUP_ONE_COROUTINE 19 +#define FEATURE_SCHEDULER_MANUAL_SETUP_TWO_COROUTINES 20 +#define FEATURE_SCHEDULER_ONE_COROUTINE_WITH_PROFILER 21 +#define FEATURE_SCHEDULER_TWO_COROUTINES_WITH_PROFILER 22 +#define FEATURE_SCHEDULER_LOG_BIN_PROFILER 23 +#define FEATURE_SCHEDULER_LOG_BIN_TABLE_RENDERER 24 +#define FEATURE_SCHEDULER_LOG_BIN_JSON_RENDERER 25 +#define FEATURE_BLINK_FUNCTION 26 +#define FEATURE_BLINK_COROUTINE 27 #if FEATURE != FEATURE_BASELINE #include @@ -165,6 +169,31 @@ volatile int disableCompilerOptimization = 0; } } +#elif FEATURE == FEATURE_ONE_COROUTINE_WITH_PROFILER + + COROUTINE(a) { + COROUTINE_LOOP() { + disableCompilerOptimization = 1; + COROUTINE_DELAY(10); + } + } + +#elif FEATURE == FEATURE_TWO_COROUTINES_WITH_PROFILER + + COROUTINE(a) { + COROUTINE_LOOP() { + disableCompilerOptimization = 1; + COROUTINE_DELAY(10); + } + } + + COROUTINE(b) { + COROUTINE_LOOP() { + disableCompilerOptimization = 1; + COROUTINE_DELAY(10); + } + } + #elif FEATURE == FEATURE_SCHEDULER_ONE_COROUTINE_MILLIS class MyCoroutine : public Coroutine { @@ -384,6 +413,56 @@ volatile int disableCompilerOptimization = 0; MyCoroutineA a; MyCoroutineB b; +#elif FEATURE == FEATURE_SCHEDULER_ONE_COROUTINE_WITH_PROFILER + + class MyCoroutine : public Coroutine { + public: + int runCoroutine() override { + COROUTINE_LOOP() { + disableCompilerOptimization = 1; + COROUTINE_DELAY(10); + } + } + }; + + MyCoroutine a; + +#elif FEATURE == FEATURE_SCHEDULER_TWO_COROUTINES_WITH_PROFILER + + class MyCoroutineA : public Coroutine { + public: + int runCoroutine() override { + COROUTINE_LOOP() { + disableCompilerOptimization = 1; + COROUTINE_DELAY(10); + } + } + }; + + class MyCoroutineB : public Coroutine { + public: + int runCoroutine() override { + COROUTINE_LOOP() { + disableCompilerOptimization = 1; + COROUTINE_DELAY(10); + } + } + }; + + MyCoroutineA a; + MyCoroutineB b; + +#elif FEATURE == FEATURE_SCHEDULER_LOG_BIN_PROFILER \ + || FEATURE == FEATURE_SCHEDULER_LOG_BIN_TABLE_RENDERER \ + || FEATURE == FEATURE_SCHEDULER_LOG_BIN_JSON_RENDERER + + COROUTINE(profiled) { + COROUTINE_LOOP() { + disableCompilerOptimization = 1; + COROUTINE_DELAY(10); + } + } + #elif FEATURE == FEATURE_BLINK_FUNCTION #ifndef LED_BUILTIN @@ -416,17 +495,6 @@ volatile int disableCompilerOptimization = 0; } } -#elif FEATURE == FEATURE_LOG_BIN_PROFILER \ - || FEATURE == FEATURE_LOG_BIN_TABLE_RENDERER \ - || FEATURE == FEATURE_LOG_BIN_JSON_RENDERER - - COROUTINE(profiled) { - COROUTINE_LOOP() { - disableCompilerOptimization = 1; - COROUTINE_DELAY(10); - } - } - #elif FEATURE == FEATURE_BLINK_COROUTINE #ifndef LED_BUILTIN @@ -463,9 +531,9 @@ volatile int disableCompilerOptimization = 0; FooClass* foo; #endif -#if FEATURE == FEATURE_LOG_BIN_PROFILER \ - || FEATURE == FEATURE_LOG_BIN_TABLE_RENDERER \ - || FEATURE == FEATURE_LOG_BIN_JSON_RENDERER +#if FEATURE == FEATURE_SCHEDULER_LOG_BIN_PROFILER \ + || FEATURE == FEATURE_SCHEDULER_LOG_BIN_TABLE_RENDERER \ + || FEATURE == FEATURE_SCHEDULER_LOG_BIN_JSON_RENDERER LogBinProfiler profiler; #endif @@ -484,8 +552,9 @@ void setup() { foo = new FooClass(); #endif +// Setup the CoroutineScheduler for FEATURE_* which use it. #if FEATURE >= FEATURE_SCHEDULER_ONE_COROUTINE_MILLIS \ - && FEATURE <= FEATURE_SCHEDULER_MANUAL_SETUP_TWO_COROUTINES + && FEATURE < FEATURE_BLINK_FUNCTION CoroutineScheduler::setup(); #if FEATURE == FEATURE_SCHEDULER_SETUP_ONE_COROUTINE \ @@ -500,9 +569,9 @@ void setup() { #endif -#if FEATURE == FEATURE_LOG_BIN_PROFILER \ - || FEATURE == FEATURE_LOG_BIN_TABLE_RENDERER \ - || FEATURE == FEATURE_LOG_BIN_JSON_RENDERER +#if FEATURE == FEATURE_SCHEDULER_LOG_BIN_PROFILER \ + || FEATURE == FEATURE_SCHEDULER_LOG_BIN_TABLE_RENDERER \ + || FEATURE == FEATURE_SCHEDULER_LOG_BIN_JSON_RENDERER profiled.setProfiler(&profiler); #endif } @@ -534,6 +603,11 @@ void loop() { #elif FEATURE == FEATURE_TWO_COROUTINES_SECONDS a.runCoroutine(); b.runCoroutine(); +#elif FEATURE == FEATURE_ONE_COROUTINE_WITH_PROFILER + a.runCoroutineWithProfiler(); +#elif FEATURE == FEATURE_TWO_COROUTINES_WITH_PROFILER + a.runCoroutineWithProfiler(); + b.runCoroutineWithProfiler(); #elif FEATURE == FEATURE_SCHEDULER_ONE_COROUTINE_MILLIS CoroutineScheduler::loop(); #elif FEATURE == FEATURE_SCHEDULER_TWO_COROUTINES_MILLIS @@ -554,14 +628,18 @@ void loop() { CoroutineScheduler::loop(); #elif FEATURE == FEATURE_SCHEDULER_MANUAL_SETUP_TWO_COROUTINES CoroutineScheduler::loop(); -#elif FEATURE == FEATURE_LOG_BIN_PROFILER - CoroutineScheduler::loop(); +#elif FEATURE == FEATURE_SCHEDULER_ONE_COROUTINE_WITH_PROFILER + CoroutineScheduler::loopWithProfiler(); +#elif FEATURE == FEATURE_SCHEDULER_TWO_COROUTINES_WITH_PROFILER + CoroutineScheduler::loopWithProfiler(); +#elif FEATURE == FEATURE_SCHEDULER_LOG_BIN_PROFILER + CoroutineScheduler::loopWithProfiler(); disableCompilerOptimization = profiler.mBins[3]; -#elif FEATURE == FEATURE_LOG_BIN_TABLE_RENDERER - CoroutineScheduler::loop(); +#elif FEATURE == FEATURE_SCHEDULER_LOG_BIN_TABLE_RENDERER + CoroutineScheduler::loopWithProfiler(); LogBinTableRenderer::printTo(Serial, 0, 32); -#elif FEATURE == FEATURE_LOG_BIN_JSON_RENDERER - CoroutineScheduler::loop(); +#elif FEATURE == FEATURE_SCHEDULER_LOG_BIN_JSON_RENDERER + CoroutineScheduler::loopWithProfiler(); LogBinJsonRenderer::printTo(Serial, 0, 32); #elif FEATURE == FEATURE_BLINK_COROUTINE blink.runCoroutine(); diff --git a/examples/MemoryBenchmark/README.md b/examples/MemoryBenchmark/README.md index 588e716..7bf7d18 100644 --- a/examples/MemoryBenchmark/README.md +++ b/examples/MemoryBenchmark/README.md @@ -202,24 +202,30 @@ $ make README.md | One Coroutine (seconds) | 1302/ 107 | 276/ 26 | | Two Coroutines (seconds) | 1524/ 131 | 498/ 50 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (millis) | 1396/ 109 | 370/ 28 | -| Scheduler, Two Coroutines (millis) | 1582/ 133 | 556/ 52 | +| One Coroutine, Profiler | 1276/ 107 | 250/ 26 | +| Two Coroutines, Profiler | 1528/ 131 | 502/ 50 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (micros) | 1364/ 109 | 338/ 28 | -| Scheduler, Two Coroutines (micros) | 1518/ 133 | 492/ 52 | +| Scheduler, One Coroutine (millis) | 1336/ 109 | 310/ 28 | +| Scheduler, Two Coroutines (millis) | 1522/ 133 | 496/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (seconds) | 1492/ 109 | 466/ 28 | -| Scheduler, Two Coroutines (seconds) | 1706/ 133 | 680/ 52 | +| Scheduler, One Coroutine (micros) | 1304/ 109 | 278/ 28 | +| Scheduler, Two Coroutines (micros) | 1458/ 133 | 432/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (setup) | 1446/ 109 | 420/ 28 | -| Scheduler, Two Coroutines (setup) | 1728/ 133 | 702/ 52 | +| Scheduler, One Coroutine (seconds) | 1432/ 109 | 406/ 28 | +| Scheduler, Two Coroutines (seconds) | 1646/ 133 | 620/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (man setup) | 1424/ 109 | 398/ 28 | -| Scheduler, Two Coroutines (man setup) | 1714/ 133 | 688/ 52 | +| Scheduler, One Coroutine (setup) | 1388/ 109 | 362/ 28 | +| Scheduler, Two Coroutines (setup) | 1670/ 133 | 644/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, LogBinProfiler | 1500/ 181 | 474/ 100 | -| Scheduler, LogBinTableRenderer | 2864/ 193 | 1838/ 112 | -| Scheduler, LogBinJsonRenderer | 2398/ 197 | 1372/ 116 | +| Scheduler, One Coroutine (man setup) | 1364/ 109 | 338/ 28 | +| Scheduler, Two Coroutines (man setup) | 1654/ 133 | 628/ 52 | +|---------------------------------------+--------------+-------------| +| Scheduler, One Coroutine, Profiler | 1396/ 109 | 370/ 28 | +| Scheduler, Two Coroutines, Profiler | 1582/ 133 | 556/ 52 | +|---------------------------------------+--------------+-------------| +| Scheduler, LogBinProfiler | 1512/ 181 | 486/ 100 | +| Scheduler, LogBinTableRenderer | 2876/ 193 | 1850/ 112 | +| Scheduler, LogBinJsonRenderer | 2410/ 197 | 1384/ 116 | |---------------------------------------+--------------+-------------| | Blink Function | 1176/ 84 | 150/ 3 | | Blink Coroutine | 1330/ 107 | 304/ 26 | @@ -251,24 +257,30 @@ $ make README.md | One Coroutine (seconds) | 1904/ 212 | 288/ 26 | | Two Coroutines (seconds) | 2130/ 236 | 514/ 50 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (millis) | 1992/ 214 | 376/ 28 | -| Scheduler, Two Coroutines (millis) | 2178/ 238 | 562/ 52 | +| One Coroutine, Profiler | 1874/ 212 | 258/ 26 | +| Two Coroutines, Profiler | 2132/ 236 | 516/ 50 | +|---------------------------------------+--------------+-------------| +| Scheduler, One Coroutine (millis) | 1928/ 214 | 312/ 28 | +| Scheduler, Two Coroutines (millis) | 2114/ 238 | 498/ 52 | +|---------------------------------------+--------------+-------------| +| Scheduler, One Coroutine (micros) | 1900/ 214 | 284/ 28 | +| Scheduler, Two Coroutines (micros) | 2058/ 238 | 442/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (micros) | 1964/ 214 | 348/ 28 | -| Scheduler, Two Coroutines (micros) | 2122/ 238 | 506/ 52 | +| Scheduler, One Coroutine (seconds) | 2028/ 214 | 412/ 28 | +| Scheduler, Two Coroutines (seconds) | 2246/ 238 | 630/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (seconds) | 2092/ 214 | 476/ 28 | -| Scheduler, Two Coroutines (seconds) | 2310/ 238 | 694/ 52 | +| Scheduler, One Coroutine (setup) | 1978/ 214 | 362/ 28 | +| Scheduler, Two Coroutines (setup) | 2264/ 238 | 648/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (setup) | 2046/ 214 | 430/ 28 | -| Scheduler, Two Coroutines (setup) | 2332/ 238 | 716/ 52 | +| Scheduler, One Coroutine (man setup) | 1956/ 214 | 340/ 28 | +| Scheduler, Two Coroutines (man setup) | 2250/ 238 | 634/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (man setup) | 2024/ 214 | 408/ 28 | -| Scheduler, Two Coroutines (man setup) | 2318/ 238 | 702/ 52 | +| Scheduler, One Coroutine, Profiler | 1992/ 214 | 376/ 28 | +| Scheduler, Two Coroutines, Profiler | 2178/ 238 | 562/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, LogBinProfiler | 2100/ 286 | 484/ 100 | -| Scheduler, LogBinTableRenderer | 3502/ 304 | 1886/ 118 | -| Scheduler, LogBinJsonRenderer | 3022/ 308 | 1406/ 122 | +| Scheduler, LogBinProfiler | 2112/ 286 | 496/ 100 | +| Scheduler, LogBinTableRenderer | 3514/ 304 | 1898/ 118 | +| Scheduler, LogBinJsonRenderer | 3034/ 308 | 1418/ 122 | |---------------------------------------+--------------+-------------| | Blink Function | 1948/ 189 | 332/ 3 | | Blink Coroutine | 2118/ 212 | 502/ 26 | @@ -300,24 +312,30 @@ $ make README.md | One Coroutine (seconds) | 3870/ 177 | 288/ 26 | | Two Coroutines (seconds) | 4096/ 201 | 514/ 50 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (millis) | 3958/ 179 | 376/ 28 | -| Scheduler, Two Coroutines (millis) | 4144/ 203 | 562/ 52 | +| One Coroutine, Profiler | 3840/ 177 | 258/ 26 | +| Two Coroutines, Profiler | 4098/ 201 | 516/ 50 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (micros) | 3930/ 179 | 348/ 28 | -| Scheduler, Two Coroutines (micros) | 4088/ 203 | 506/ 52 | +| Scheduler, One Coroutine (millis) | 3894/ 179 | 312/ 28 | +| Scheduler, Two Coroutines (millis) | 4080/ 203 | 498/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (seconds) | 4058/ 179 | 476/ 28 | -| Scheduler, Two Coroutines (seconds) | 4276/ 203 | 694/ 52 | +| Scheduler, One Coroutine (micros) | 3866/ 179 | 284/ 28 | +| Scheduler, Two Coroutines (micros) | 4024/ 203 | 442/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (setup) | 4012/ 179 | 430/ 28 | -| Scheduler, Two Coroutines (setup) | 4298/ 203 | 716/ 52 | +| Scheduler, One Coroutine (seconds) | 3994/ 179 | 412/ 28 | +| Scheduler, Two Coroutines (seconds) | 4212/ 203 | 630/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (man setup) | 3990/ 179 | 408/ 28 | -| Scheduler, Two Coroutines (man setup) | 4284/ 203 | 702/ 52 | +| Scheduler, One Coroutine (setup) | 3944/ 179 | 362/ 28 | +| Scheduler, Two Coroutines (setup) | 4230/ 203 | 648/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, LogBinProfiler | 4066/ 251 | 484/ 100 | -| Scheduler, LogBinTableRenderer | 5466/ 269 | 1884/ 118 | -| Scheduler, LogBinJsonRenderer | 4986/ 273 | 1404/ 122 | +| Scheduler, One Coroutine (man setup) | 3922/ 179 | 340/ 28 | +| Scheduler, Two Coroutines (man setup) | 4216/ 203 | 634/ 52 | +|---------------------------------------+--------------+-------------| +| Scheduler, One Coroutine, Profiler | 3958/ 179 | 376/ 28 | +| Scheduler, Two Coroutines, Profiler | 4144/ 203 | 562/ 52 | +|---------------------------------------+--------------+-------------| +| Scheduler, LogBinProfiler | 4078/ 251 | 496/ 100 | +| Scheduler, LogBinTableRenderer | 5478/ 269 | 1896/ 118 | +| Scheduler, LogBinJsonRenderer | 4998/ 273 | 1416/ 122 | |---------------------------------------+--------------+-------------| | Blink Function | 4022/ 154 | 440/ 3 | | Blink Coroutine | 4192/ 177 | 610/ 26 | @@ -349,24 +367,30 @@ $ make README.md | One Coroutine (seconds) | 22080/ 3572 | 148/ 32 | | Two Coroutines (seconds) | 22244/ 3600 | 312/ 60 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (millis) | 22232/ 3576 | 300/ 36 | -| Scheduler, Two Coroutines (millis) | 22336/ 3604 | 404/ 64 | +| One Coroutine, Profiler | 22172/ 3572 | 240/ 32 | +| Two Coroutines, Profiler | 22328/ 3600 | 396/ 60 | +|---------------------------------------+--------------+-------------| +| Scheduler, One Coroutine (millis) | 22132/ 3576 | 200/ 36 | +| Scheduler, Two Coroutines (millis) | 22236/ 3604 | 304/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (micros) | 22232/ 3576 | 300/ 36 | -| Scheduler, Two Coroutines (micros) | 22336/ 3604 | 404/ 64 | +| Scheduler, One Coroutine (micros) | 22196/ 3576 | 264/ 36 | +| Scheduler, Two Coroutines (micros) | 22300/ 3604 | 368/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (seconds) | 22248/ 3576 | 316/ 36 | -| Scheduler, Two Coroutines (seconds) | 22368/ 3604 | 436/ 64 | +| Scheduler, One Coroutine (seconds) | 22148/ 3576 | 216/ 36 | +| Scheduler, Two Coroutines (seconds) | 22268/ 3604 | 336/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (setup) | 22252/ 3576 | 320/ 36 | -| Scheduler, Two Coroutines (setup) | 22384/ 3604 | 452/ 64 | +| Scheduler, One Coroutine (setup) | 22152/ 3576 | 220/ 36 | +| Scheduler, Two Coroutines (setup) | 22284/ 3604 | 352/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (man setup) | 22244/ 3576 | 312/ 36 | -| Scheduler, Two Coroutines (man setup) | 22376/ 3604 | 444/ 64 | +| Scheduler, One Coroutine (man setup) | 22144/ 3576 | 212/ 36 | +| Scheduler, Two Coroutines (man setup) | 22276/ 3604 | 344/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, LogBinProfiler | 22356/ 3644 | 424/ 104 | -| Scheduler, LogBinTableRenderer | 23740/ 3644 | 1808/ 104 | -| Scheduler, LogBinJsonRenderer | 23200/ 3644 | 1268/ 104 | +| Scheduler, One Coroutine, Profiler | 22232/ 3576 | 300/ 36 | +| Scheduler, Two Coroutines, Profiler | 22336/ 3604 | 404/ 64 | +|---------------------------------------+--------------+-------------| +| Scheduler, LogBinProfiler | 22368/ 3644 | 436/ 104 | +| Scheduler, LogBinTableRenderer | 23752/ 3644 | 1820/ 104 | +| Scheduler, LogBinJsonRenderer | 23212/ 3644 | 1280/ 104 | |---------------------------------------+--------------+-------------| | Blink Function | 22168/ 3544 | 236/ 4 | | Blink Coroutine | 22280/ 3572 | 348/ 32 | @@ -398,24 +422,30 @@ $ make README.md | One Coroutine (seconds) | 265209/28028 | 228/ 44 | | Two Coroutines (seconds) | 265385/28060 | 404/ 76 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (millis) | 265321/28036 | 340/ 52 | -| Scheduler, Two Coroutines (millis) | 265449/28060 | 468/ 76 | +| One Coroutine, Profiler | 265257/28028 | 276/ 44 | +| Two Coroutines, Profiler | 265433/28060 | 452/ 76 | +|---------------------------------------+--------------+-------------| +| Scheduler, One Coroutine (millis) | 265241/28036 | 260/ 52 | +| Scheduler, Two Coroutines (millis) | 265385/28060 | 404/ 76 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (micros) | 265321/28036 | 340/ 52 | -| Scheduler, Two Coroutines (micros) | 265449/28060 | 468/ 76 | +| Scheduler, One Coroutine (micros) | 265257/28036 | 276/ 52 | +| Scheduler, Two Coroutines (micros) | 265401/28060 | 420/ 76 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (seconds) | 265337/28036 | 356/ 52 | -| Scheduler, Two Coroutines (seconds) | 265497/28060 | 516/ 76 | +| Scheduler, One Coroutine (seconds) | 265257/28036 | 276/ 52 | +| Scheduler, Two Coroutines (seconds) | 265417/28060 | 436/ 76 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (setup) | 265337/28036 | 356/ 52 | -| Scheduler, Two Coroutines (setup) | 265513/28060 | 532/ 76 | +| Scheduler, One Coroutine (setup) | 265273/28036 | 292/ 52 | +| Scheduler, Two Coroutines (setup) | 265433/28060 | 452/ 76 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (man setup) | 265337/28036 | 356/ 52 | -| Scheduler, Two Coroutines (man setup) | 265513/28060 | 532/ 76 | +| Scheduler, One Coroutine (man setup) | 265257/28036 | 276/ 52 | +| Scheduler, Two Coroutines (man setup) | 265433/28060 | 452/ 76 | |---------------------------------------+--------------+-------------| -| Scheduler, LogBinProfiler | 265449/28100 | 468/ 116 | +| Scheduler, One Coroutine, Profiler | 265321/28036 | 340/ 52 | +| Scheduler, Two Coroutines, Profiler | 265449/28060 | 468/ 76 | +|---------------------------------------+--------------+-------------| +| Scheduler, LogBinProfiler | 265465/28100 | 484/ 116 | | Scheduler, LogBinTableRenderer | 267381/28100 | 2400/ 116 | -| Scheduler, LogBinJsonRenderer | 266773/28104 | 1792/ 120 | +| Scheduler, LogBinJsonRenderer | 266789/28104 | 1808/ 120 | |---------------------------------------+--------------+-------------| | Blink Function | 265669/28064 | 688/ 80 | | Blink Coroutine | 265801/28100 | 820/ 116 | @@ -447,24 +477,30 @@ $ make README.md | One Coroutine (seconds) | 231081/16292 | 668/ 72 | | Two Coroutines (seconds) | 231269/16316 | 856/ 96 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (millis) | 231181/16292 | 768/ 72 | -| Scheduler, Two Coroutines (millis) | 231321/16324 | 908/ 104 | +| One Coroutine, Profiler | 231117/16292 | 704/ 72 | +| Two Coroutines, Profiler | 231333/16316 | 920/ 96 | +|---------------------------------------+--------------+-------------| +| Scheduler, One Coroutine (millis) | 231129/16292 | 716/ 72 | +| Scheduler, Two Coroutines (millis) | 231269/16324 | 856/ 104 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (micros) | 231181/16292 | 768/ 72 | -| Scheduler, Two Coroutines (micros) | 231321/16324 | 908/ 104 | +| Scheduler, One Coroutine (micros) | 231141/16292 | 728/ 72 | +| Scheduler, Two Coroutines (micros) | 231281/16324 | 868/ 104 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (seconds) | 231197/16292 | 784/ 72 | -| Scheduler, Two Coroutines (seconds) | 231353/16324 | 940/ 104 | +| Scheduler, One Coroutine (seconds) | 231145/16292 | 732/ 72 | +| Scheduler, Two Coroutines (seconds) | 231301/16324 | 888/ 104 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (setup) | 231209/16292 | 796/ 72 | -| Scheduler, Two Coroutines (setup) | 231381/16324 | 968/ 104 | +| Scheduler, One Coroutine (setup) | 231157/16292 | 744/ 72 | +| Scheduler, Two Coroutines (setup) | 231329/16324 | 916/ 104 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (man setup) | 231197/16292 | 784/ 72 | -| Scheduler, Two Coroutines (man setup) | 231373/16324 | 960/ 104 | +| Scheduler, One Coroutine (man setup) | 231145/16292 | 732/ 72 | +| Scheduler, Two Coroutines (man setup) | 231321/16324 | 908/ 104 | |---------------------------------------+--------------+-------------| -| Scheduler, LogBinProfiler | 231313/16364 | 900/ 144 | -| Scheduler, LogBinTableRenderer | 232645/16364 | 2232/ 144 | -| Scheduler, LogBinJsonRenderer | 232093/16364 | 1680/ 144 | +| Scheduler, One Coroutine, Profiler | 231181/16292 | 768/ 72 | +| Scheduler, Two Coroutines, Profiler | 231321/16324 | 908/ 104 | +|---------------------------------------+--------------+-------------| +| Scheduler, LogBinProfiler | 231321/16364 | 908/ 144 | +| Scheduler, LogBinTableRenderer | 232653/16364 | 2240/ 144 | +| Scheduler, LogBinJsonRenderer | 232101/16364 | 1688/ 144 | |---------------------------------------+--------------+-------------| | Blink Function | 231301/16268 | 888/ 48 | | Blink Coroutine | 231413/16300 | 1000/ 80 | @@ -497,24 +533,30 @@ $ make README.md | One Coroutine (seconds) | 10824/ 4188 | 176/ 32 | | Two Coroutines (seconds) | 10964/ 4216 | 316/ 60 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (millis) | 10976/ 4192 | 328/ 36 | -| Scheduler, Two Coroutines (millis) | 11092/ 4220 | 444/ 64 | +| One Coroutine, Profiler | 10904/ 4188 | 256/ 32 | +| Two Coroutines, Profiler | 11072/ 4216 | 424/ 60 | +|---------------------------------------+--------------+-------------| +| Scheduler, One Coroutine (millis) | 10868/ 4192 | 220/ 36 | +| Scheduler, Two Coroutines (millis) | 10984/ 4220 | 336/ 64 | +|---------------------------------------+--------------+-------------| +| Scheduler, One Coroutine (micros) | 10924/ 4192 | 276/ 36 | +| Scheduler, Two Coroutines (micros) | 11028/ 4220 | 380/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (micros) | 10964/ 4192 | 316/ 36 | -| Scheduler, Two Coroutines (micros) | 11068/ 4220 | 420/ 64 | +| Scheduler, One Coroutine (seconds) | 10888/ 4192 | 240/ 36 | +| Scheduler, Two Coroutines (seconds) | 11024/ 4220 | 376/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (seconds) | 10996/ 4192 | 348/ 36 | -| Scheduler, Two Coroutines (seconds) | 11132/ 4220 | 484/ 64 | +| Scheduler, One Coroutine (setup) | 10904/ 4192 | 256/ 36 | +| Scheduler, Two Coroutines (setup) | 11052/ 4220 | 404/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (setup) | 11012/ 4192 | 364/ 36 | -| Scheduler, Two Coroutines (setup) | 11160/ 4220 | 512/ 64 | +| Scheduler, One Coroutine (man setup) | 10880/ 4192 | 232/ 36 | +| Scheduler, Two Coroutines (man setup) | 11032/ 4220 | 384/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (man setup) | 10988/ 4192 | 340/ 36 | -| Scheduler, Two Coroutines (man setup) | 11140/ 4220 | 492/ 64 | +| Scheduler, One Coroutine, Profiler | 10976/ 4192 | 328/ 36 | +| Scheduler, Two Coroutines, Profiler | 11092/ 4220 | 444/ 64 | |---------------------------------------+--------------+-------------| -| Scheduler, LogBinProfiler | 11380/ 4268 | 732/ 112 | +| Scheduler, LogBinProfiler | 11396/ 4268 | 748/ 112 | | Scheduler, LogBinTableRenderer | 14120/ 4284 | 3472/ 128 | -| Scheduler, LogBinJsonRenderer | 13412/ 4284 | 2764/ 128 | +| Scheduler, LogBinJsonRenderer | 13476/ 4284 | 2828/ 128 | |---------------------------------------+--------------+-------------| | Blink Function | 11104/ 4164 | 456/ 8 | | Blink Coroutine | 11236/ 4188 | 588/ 32 | diff --git a/examples/MemoryBenchmark/attiny.txt b/examples/MemoryBenchmark/attiny.txt index a51bca5..363ddc9 100644 --- a/examples/MemoryBenchmark/attiny.txt +++ b/examples/MemoryBenchmark/attiny.txt @@ -7,18 +7,22 @@ 6 1336 8192 131 512 7 1302 8192 107 512 8 1524 8192 131 512 -9 1396 8192 109 512 -10 1582 8192 133 512 -11 1364 8192 109 512 -12 1518 8192 133 512 -13 1492 8192 109 512 -14 1706 8192 133 512 -15 1446 8192 109 512 -16 1728 8192 133 512 -17 1424 8192 109 512 -18 1714 8192 133 512 -19 1500 8192 181 512 -20 2864 8192 193 512 -21 2398 8192 197 512 -22 1176 8192 84 512 -23 1330 8192 107 512 +9 1276 8192 107 512 +10 1528 8192 131 512 +11 1336 8192 109 512 +12 1522 8192 133 512 +13 1304 8192 109 512 +14 1458 8192 133 512 +15 1432 8192 109 512 +16 1646 8192 133 512 +17 1388 8192 109 512 +18 1670 8192 133 512 +19 1364 8192 109 512 +20 1654 8192 133 512 +21 1396 8192 109 512 +22 1582 8192 133 512 +23 1512 8192 181 512 +24 2876 8192 193 512 +25 2410 8192 197 512 +26 1176 8192 84 512 +27 1330 8192 107 512 diff --git a/examples/MemoryBenchmark/collect.sh b/examples/MemoryBenchmark/collect.sh index 9e84de6..8786b1f 100755 --- a/examples/MemoryBenchmark/collect.sh +++ b/examples/MemoryBenchmark/collect.sh @@ -16,7 +16,7 @@ set -eu PROGRAM_NAME='MemoryBenchmark.ino' -NUM_FEATURES=23 # excluding FEATURE_BASELINE +NUM_FEATURES=27 # excluding FEATURE_BASELINE # Assume that https://github.com/bxparks/AUniter is installed as a # sibling project to AceRoutine. diff --git a/examples/MemoryBenchmark/esp32.txt b/examples/MemoryBenchmark/esp32.txt index 70415fa..87d83f4 100644 --- a/examples/MemoryBenchmark/esp32.txt +++ b/examples/MemoryBenchmark/esp32.txt @@ -7,18 +7,22 @@ 6 231249 1310720 16316 327680 7 231081 1310720 16292 327680 8 231269 1310720 16316 327680 -9 231181 1310720 16292 327680 -10 231321 1310720 16324 327680 -11 231181 1310720 16292 327680 -12 231321 1310720 16324 327680 -13 231197 1310720 16292 327680 -14 231353 1310720 16324 327680 -15 231209 1310720 16292 327680 -16 231381 1310720 16324 327680 -17 231197 1310720 16292 327680 -18 231373 1310720 16324 327680 -19 231313 1310720 16364 327680 -20 232645 1310720 16364 327680 -21 232093 1310720 16364 327680 -22 231301 1310720 16268 327680 -23 231413 1310720 16300 327680 +9 231117 1310720 16292 327680 +10 231333 1310720 16316 327680 +11 231129 1310720 16292 327680 +12 231269 1310720 16324 327680 +13 231141 1310720 16292 327680 +14 231281 1310720 16324 327680 +15 231145 1310720 16292 327680 +16 231301 1310720 16324 327680 +17 231157 1310720 16292 327680 +18 231329 1310720 16324 327680 +19 231145 1310720 16292 327680 +20 231321 1310720 16324 327680 +21 231181 1310720 16292 327680 +22 231321 1310720 16324 327680 +23 231321 1310720 16364 327680 +24 232653 1310720 16364 327680 +25 232101 1310720 16364 327680 +26 231301 1310720 16268 327680 +27 231413 1310720 16300 327680 diff --git a/examples/MemoryBenchmark/esp8266.txt b/examples/MemoryBenchmark/esp8266.txt index 8b241fe..6bae3ef 100644 --- a/examples/MemoryBenchmark/esp8266.txt +++ b/examples/MemoryBenchmark/esp8266.txt @@ -7,18 +7,22 @@ 6 265369 1044464 28060 81920 7 265209 1044464 28028 81920 8 265385 1044464 28060 81920 -9 265321 1044464 28036 81920 -10 265449 1044464 28060 81920 -11 265321 1044464 28036 81920 -12 265449 1044464 28060 81920 -13 265337 1044464 28036 81920 -14 265497 1044464 28060 81920 -15 265337 1044464 28036 81920 -16 265513 1044464 28060 81920 -17 265337 1044464 28036 81920 -18 265513 1044464 28060 81920 -19 265449 1044464 28100 81920 -20 267381 1044464 28100 81920 -21 266773 1044464 28104 81920 -22 265669 1044464 28064 81920 -23 265801 1044464 28100 81920 +9 265257 1044464 28028 81920 +10 265433 1044464 28060 81920 +11 265241 1044464 28036 81920 +12 265385 1044464 28060 81920 +13 265257 1044464 28036 81920 +14 265401 1044464 28060 81920 +15 265257 1044464 28036 81920 +16 265417 1044464 28060 81920 +17 265273 1044464 28036 81920 +18 265433 1044464 28060 81920 +19 265257 1044464 28036 81920 +20 265433 1044464 28060 81920 +21 265321 1044464 28036 81920 +22 265449 1044464 28060 81920 +23 265465 1044464 28100 81920 +24 267381 1044464 28100 81920 +25 266789 1044464 28104 81920 +26 265669 1044464 28064 81920 +27 265801 1044464 28100 81920 diff --git a/examples/MemoryBenchmark/generate_table.awk b/examples/MemoryBenchmark/generate_table.awk index 50c4037..f175cb4 100755 --- a/examples/MemoryBenchmark/generate_table.awk +++ b/examples/MemoryBenchmark/generate_table.awk @@ -15,21 +15,25 @@ BEGIN { labels[6] = "Two Coroutines (micros)" labels[7] = "One Coroutine (seconds)" labels[8] = "Two Coroutines (seconds)" - labels[9] = "Scheduler, One Coroutine (millis)" - labels[10] = "Scheduler, Two Coroutines (millis)" - labels[11] = "Scheduler, One Coroutine (micros)" - labels[12] = "Scheduler, Two Coroutines (micros)" - labels[13] = "Scheduler, One Coroutine (seconds)" - labels[14] = "Scheduler, Two Coroutines (seconds)" - labels[15] = "Scheduler, One Coroutine (setup)" - labels[16] = "Scheduler, Two Coroutines (setup)" - labels[17] = "Scheduler, One Coroutine (man setup)" - labels[18] = "Scheduler, Two Coroutines (man setup)" - labels[19] = "Scheduler, LogBinProfiler" - labels[20] = "Scheduler, LogBinTableRenderer" - labels[21] = "Scheduler, LogBinJsonRenderer" - labels[22] = "Blink Function" - labels[23] = "Blink Coroutine" + labels[9] = "One Coroutine, Profiler" + labels[10] = "Two Coroutines, Profiler" + labels[11] = "Scheduler, One Coroutine (millis)" + labels[12] = "Scheduler, Two Coroutines (millis)" + labels[13] = "Scheduler, One Coroutine (micros)" + labels[14] = "Scheduler, Two Coroutines (micros)" + labels[15] = "Scheduler, One Coroutine (seconds)" + labels[16] = "Scheduler, Two Coroutines (seconds)" + labels[17] = "Scheduler, One Coroutine (setup)" + labels[18] = "Scheduler, Two Coroutines (setup)" + labels[19] = "Scheduler, One Coroutine (man setup)" + labels[20] = "Scheduler, Two Coroutines (man setup)" + labels[21] = "Scheduler, One Coroutine, Profiler" + labels[22] = "Scheduler, Two Coroutines, Profiler" + labels[23] = "Scheduler, LogBinProfiler" + labels[24] = "Scheduler, LogBinTableRenderer" + labels[25] = "Scheduler, LogBinJsonRenderer" + labels[26] = "Blink Function" + labels[27] = "Blink Coroutine" record_index = 0 } { @@ -55,11 +59,13 @@ END { || labels[i] ~ /^One Coroutine \(millis\)$/ \ || labels[i] ~ /^One Coroutine \(micros\)$/ \ || labels[i] ~ /^One Coroutine \(seconds\)$/ \ + || labels[i] ~ /^One Coroutine, Profiler$/ \ || labels[i] ~ /^Scheduler, One Coroutine \(millis\)$/ \ || labels[i] ~ /^Scheduler, One Coroutine \(micros\)$/ \ || labels[i] ~ /^Scheduler, One Coroutine \(seconds\)$/ \ || labels[i] ~ /^Scheduler, One Coroutine \(setup\)$/ \ || labels[i] ~ /^Scheduler, One Coroutine \(man setup\)$/ \ + || labels[i] ~ /^Scheduler, One Coroutine, Profiler$/ \ || labels[i] ~ /^Scheduler, LogBinProfiler$/ \ || labels[i] ~ /^Blink Function$/ \ ) { diff --git a/examples/MemoryBenchmark/micro.txt b/examples/MemoryBenchmark/micro.txt index 0cec484..536bc36 100644 --- a/examples/MemoryBenchmark/micro.txt +++ b/examples/MemoryBenchmark/micro.txt @@ -7,18 +7,22 @@ 6 3908 28672 201 2560 7 3870 28672 177 2560 8 4096 28672 201 2560 -9 3958 28672 179 2560 -10 4144 28672 203 2560 -11 3930 28672 179 2560 -12 4088 28672 203 2560 -13 4058 28672 179 2560 -14 4276 28672 203 2560 -15 4012 28672 179 2560 -16 4298 28672 203 2560 -17 3990 28672 179 2560 -18 4284 28672 203 2560 -19 4066 28672 251 2560 -20 5466 28672 269 2560 -21 4986 28672 273 2560 -22 4022 28672 154 2560 -23 4192 28672 177 2560 +9 3840 28672 177 2560 +10 4098 28672 201 2560 +11 3894 28672 179 2560 +12 4080 28672 203 2560 +13 3866 28672 179 2560 +14 4024 28672 203 2560 +15 3994 28672 179 2560 +16 4212 28672 203 2560 +17 3944 28672 179 2560 +18 4230 28672 203 2560 +19 3922 28672 179 2560 +20 4216 28672 203 2560 +21 3958 28672 179 2560 +22 4144 28672 203 2560 +23 4078 28672 251 2560 +24 5478 28672 269 2560 +25 4998 28672 273 2560 +26 4022 28672 154 2560 +27 4192 28672 177 2560 diff --git a/examples/MemoryBenchmark/nano.txt b/examples/MemoryBenchmark/nano.txt index 8bf4fc5..255fc99 100644 --- a/examples/MemoryBenchmark/nano.txt +++ b/examples/MemoryBenchmark/nano.txt @@ -7,18 +7,22 @@ 6 1942 30720 236 2048 7 1904 30720 212 2048 8 2130 30720 236 2048 -9 1992 30720 214 2048 -10 2178 30720 238 2048 -11 1964 30720 214 2048 -12 2122 30720 238 2048 -13 2092 30720 214 2048 -14 2310 30720 238 2048 -15 2046 30720 214 2048 -16 2332 30720 238 2048 -17 2024 30720 214 2048 -18 2318 30720 238 2048 -19 2100 30720 286 2048 -20 3502 30720 304 2048 -21 3022 30720 308 2048 -22 1948 30720 189 2048 -23 2118 30720 212 2048 +9 1874 30720 212 2048 +10 2132 30720 236 2048 +11 1928 30720 214 2048 +12 2114 30720 238 2048 +13 1900 30720 214 2048 +14 2058 30720 238 2048 +15 2028 30720 214 2048 +16 2246 30720 238 2048 +17 1978 30720 214 2048 +18 2264 30720 238 2048 +19 1956 30720 214 2048 +20 2250 30720 238 2048 +21 1992 30720 214 2048 +22 2178 30720 238 2048 +23 2112 30720 286 2048 +24 3514 30720 304 2048 +25 3034 30720 308 2048 +26 1948 30720 189 2048 +27 2118 30720 212 2048 diff --git a/examples/MemoryBenchmark/stm32.txt b/examples/MemoryBenchmark/stm32.txt index 5822dd1..b4ada5d 100644 --- a/examples/MemoryBenchmark/stm32.txt +++ b/examples/MemoryBenchmark/stm32.txt @@ -7,18 +7,22 @@ 6 22276 131072 3600 20480 7 22080 131072 3572 20480 8 22244 131072 3600 20480 -9 22232 131072 3576 20480 -10 22336 131072 3604 20480 -11 22232 131072 3576 20480 -12 22336 131072 3604 20480 -13 22248 131072 3576 20480 -14 22368 131072 3604 20480 -15 22252 131072 3576 20480 -16 22384 131072 3604 20480 -17 22244 131072 3576 20480 -18 22376 131072 3604 20480 -19 22356 131072 3644 20480 -20 23740 131072 3644 20480 -21 23200 131072 3644 20480 -22 22168 131072 3544 20480 -23 22280 131072 3572 20480 +9 22172 131072 3572 20480 +10 22328 131072 3600 20480 +11 22132 131072 3576 20480 +12 22236 131072 3604 20480 +13 22196 131072 3576 20480 +14 22300 131072 3604 20480 +15 22148 131072 3576 20480 +16 22268 131072 3604 20480 +17 22152 131072 3576 20480 +18 22284 131072 3604 20480 +19 22144 131072 3576 20480 +20 22276 131072 3604 20480 +21 22232 131072 3576 20480 +22 22336 131072 3604 20480 +23 22368 131072 3644 20480 +24 23752 131072 3644 20480 +25 23212 131072 3644 20480 +26 22168 131072 3544 20480 +27 22280 131072 3572 20480 diff --git a/examples/MemoryBenchmark/teensy32.txt b/examples/MemoryBenchmark/teensy32.txt index cf905b3..92024c4 100644 --- a/examples/MemoryBenchmark/teensy32.txt +++ b/examples/MemoryBenchmark/teensy32.txt @@ -7,18 +7,22 @@ 6 10968 262144 4216 65536 7 10824 262144 4188 65536 8 10964 262144 4216 65536 -9 10976 262144 4192 65536 -10 11092 262144 4220 65536 -11 10964 262144 4192 65536 -12 11068 262144 4220 65536 -13 10996 262144 4192 65536 -14 11132 262144 4220 65536 -15 11012 262144 4192 65536 -16 11160 262144 4220 65536 -17 10988 262144 4192 65536 -18 11140 262144 4220 65536 -19 11380 262144 4268 65536 -20 14120 262144 4284 65536 -21 13412 262144 4284 65536 -22 11104 262144 4164 65536 -23 11236 262144 4188 65536 +9 10904 262144 4188 65536 +10 11072 262144 4216 65536 +11 10868 262144 4192 65536 +12 10984 262144 4220 65536 +13 10924 262144 4192 65536 +14 11028 262144 4220 65536 +15 10888 262144 4192 65536 +16 11024 262144 4220 65536 +17 10904 262144 4192 65536 +18 11052 262144 4220 65536 +19 10880 262144 4192 65536 +20 11032 262144 4220 65536 +21 10976 262144 4192 65536 +22 11092 262144 4220 65536 +23 11396 262144 4268 65536 +24 14120 262144 4284 65536 +25 13476 262144 4284 65536 +26 11104 262144 4164 65536 +27 11236 262144 4188 65536 diff --git a/examples/MemoryBenchmark/validate_using_epoxy_duino.sh b/examples/MemoryBenchmark/validate_using_epoxy_duino.sh index 1841ffd..91be6e0 100755 --- a/examples/MemoryBenchmark/validate_using_epoxy_duino.sh +++ b/examples/MemoryBenchmark/validate_using_epoxy_duino.sh @@ -8,7 +8,7 @@ set -eu PROGRAM_NAME='MemoryBenchmark.ino' -NUM_FEATURES=23 # excluding FEATURE_BASELINE +NUM_FEATURES=27 # excluding FEATURE_BASELINE temp_out_file= function cleanup() { From 7c15d8b455c133937c47c9011456cb92ec6f27b4 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Fri, 18 Mar 2022 12:38:30 -0700 Subject: [PATCH 51/59] AutoBenchmark: Add benchmarks for runCoroutineWithProfiler() and loopWithProfiler() --- examples/AutoBenchmark/AutoBenchmark.ino | 91 ++++++++++++---- examples/AutoBenchmark/README.md | 126 ++++++++++++++-------- examples/AutoBenchmark/esp32.txt | 9 +- examples/AutoBenchmark/esp8266.txt | 7 +- examples/AutoBenchmark/generate_table.awk | 17 +-- examples/AutoBenchmark/micro.txt | 9 +- examples/AutoBenchmark/nano.txt | 11 +- examples/AutoBenchmark/stm32.txt | 12 +-- examples/AutoBenchmark/teensy32.txt | 7 +- 9 files changed, 199 insertions(+), 90 deletions(-) diff --git a/examples/AutoBenchmark/AutoBenchmark.ino b/examples/AutoBenchmark/AutoBenchmark.ino index 2feddc6..8573e20 100644 --- a/examples/AutoBenchmark/AutoBenchmark.ino +++ b/examples/AutoBenchmark/AutoBenchmark.ino @@ -8,9 +8,11 @@ #include #include -#include // printPad3To() +#include // printUint32AsFloat3To() using namespace ace_routine; -using ace_common::printPad3To; +using ace_common::printUint32AsFloat3To; + +//----------------------------------------------------------------------------- // NUM_ITERATIONS must be in multiples of 1000, due to the algorithm used to // convert to nanos below. @@ -57,69 +59,96 @@ void checkEqual( } } -uint16_t doEmptyLoop(uint32_t iterations) { +//----------------------------------------------------------------------------- + +uint32_t doEmptyLoop(uint32_t iterations) { yield(); counter = 0; - uint16_t start = millis(); + uint32_t start = millis(); for (uint32_t i = 0; i < iterations; i++) { counter++; } - uint16_t end = millis(); + uint32_t end = millis(); yield(); checkEqual(F("doEmptyLoop(): "), counter, iterations); return end - start; } -uint16_t doDirectScheduling(uint32_t iterations) { +uint32_t doDirectScheduling(uint32_t iterations) { yield(); counter = 0; - uint16_t start = millis(); + uint32_t start = millis(); // Run for 1/2 as many iterations because each loop calls 2 coroutines. for (uint32_t i = 0; i < iterations / 2; i++) { counterA.runCoroutine(); counterB.runCoroutine(); } - uint16_t end = millis(); + uint32_t end = millis(); yield(); checkEqual(F("doDirectScheduling(): "), counter, iterations); return end - start; } -uint16_t doCoroutineScheduling(uint32_t iterations) { +uint32_t doDirectSchedulingWithProfiler(uint32_t iterations) { + yield(); + counter = 0; + uint32_t start = millis(); + + // Run for 1/2 as many iterations because each loop calls 2 coroutines. + for (uint32_t i = 0; i < iterations / 2; i++) { + counterA.runCoroutineWithProfiler(); + counterB.runCoroutineWithProfiler(); + } + uint32_t end = millis(); + yield(); + checkEqual(F("doDirectSchedulingWithProfiler(): "), counter, iterations); + return end - start; +} + +uint32_t doCoroutineScheduling(uint32_t iterations) { yield(); counter = 0; - uint16_t start = millis(); + uint32_t start = millis(); for (uint32_t i = 0; i < iterations; i++) { CoroutineScheduler::loop(); } - uint16_t end = millis(); + uint32_t end = millis(); yield(); checkEqual(F("doCoroutineScheduling()"), counter, iterations); return end - start; } -void printNanosAsMicros(Print& printer, uint16_t nanos) { - uint16_t wholeMicros = nanos / 1000; - uint16_t fracMicros = nanos - wholeMicros * 1000; - printer.print(wholeMicros); - printer.print('.'); - printPad3To(printer, fracMicros, '0'); +uint32_t doCoroutineSchedulingWithProfiler(uint32_t iterations) { + yield(); + counter = 0; + uint32_t start = millis(); + for (uint32_t i = 0; i < iterations; i++) { + CoroutineScheduler::loopWithProfiler(); + } + uint32_t end = millis(); + yield(); + checkEqual(F("doCoroutineSchedulingWithProfiler()"), counter, iterations); + return end - start; } +//----------------------------------------------------------------------------- + // Print millis 'ms' as micros (to 3 decimal places) per iteration as a floating // point number. The number of 'iterations' must be divisible by 1000. void printStats( - const __FlashStringHelper* name, uint16_t ms, uint32_t iterations) { - uint16_t nanosPerIteration = (uint32_t) ms * 1000 / (iterations / 1000); + const __FlashStringHelper* name, uint32_t ms, uint32_t iterations) { + uint32_t nanosPerIteration = ms * 1000 / (iterations / 1000); SERIAL_PORT_MONITOR.print(name); SERIAL_PORT_MONITOR.print(' '); - printNanosAsMicros(SERIAL_PORT_MONITOR, nanosPerIteration); + printUint32AsFloat3To(SERIAL_PORT_MONITOR, nanosPerIteration); SERIAL_PORT_MONITOR.print(' '); SERIAL_PORT_MONITOR.print(iterations); SERIAL_PORT_MONITOR.println(); } +//----------------------------------------------------------------------------- + void setup() { #if ! defined(EPOXY_DUINO) delay(1000); @@ -136,21 +165,37 @@ void setup() { SERIAL_PORT_MONITOR.println(sizeof(CoroutineScheduler)); SERIAL_PORT_MONITOR.print(F("sizeof(Channel): ")); SERIAL_PORT_MONITOR.println(sizeof(Channel)); + SERIAL_PORT_MONITOR.print(F("sizeof(LogBinProfiler): ")); + SERIAL_PORT_MONITOR.println(sizeof(LogBinProfiler)); + SERIAL_PORT_MONITOR.print(F("sizeof(LogBinTableRenderer): ")); + SERIAL_PORT_MONITOR.println(sizeof(LogBinTableRenderer)); + SERIAL_PORT_MONITOR.print(F("sizeof(LogBinJsonRenderer): ")); + SERIAL_PORT_MONITOR.println(sizeof(LogBinJsonRenderer)); CoroutineScheduler::setup(); //CoroutineScheduler::list(SERIAL_PORT_MONITOR); SERIAL_PORT_MONITOR.println(F("BENCHMARKS")); - uint16_t emptyLoopMillis = doEmptyLoop(NUM_ITERATIONS); + uint32_t emptyLoopMillis = doEmptyLoop(NUM_ITERATIONS); printStats(F("EmptyLoop"), emptyLoopMillis, NUM_ITERATIONS); - uint16_t directMillis = doDirectScheduling(NUM_ITERATIONS); + uint32_t directMillis = doDirectScheduling(NUM_ITERATIONS); printStats(F("DirectScheduling"), directMillis, NUM_ITERATIONS); - uint16_t schedulerMillis = doCoroutineScheduling(NUM_ITERATIONS); + uint32_t directMillisWithProfiler = + doDirectSchedulingWithProfiler(NUM_ITERATIONS); + printStats(F("DirectSchedulingWithProfiler"), + directMillisWithProfiler, NUM_ITERATIONS); + + uint32_t schedulerMillis = doCoroutineScheduling(NUM_ITERATIONS); printStats(F("CoroutineScheduling"), schedulerMillis, NUM_ITERATIONS); + uint32_t schedulerMillisWithProfiler = + doCoroutineSchedulingWithProfiler(NUM_ITERATIONS); + printStats(F("CoroutineSchedulingWithProfiler"), + schedulerMillisWithProfiler, NUM_ITERATIONS); + SERIAL_PORT_MONITOR.println(F("END")); #if defined(EPOXY_DUINO) diff --git a/examples/AutoBenchmark/README.md b/examples/AutoBenchmark/README.md index 01b8a00..c78a3f8 100644 --- a/examples/AutoBenchmark/README.md +++ b/examples/AutoBenchmark/README.md @@ -142,15 +142,22 @@ Sizes of Objects: sizeof(Coroutine): 16 sizeof(CoroutineScheduler): 2 sizeof(Channel): 5 +sizeof(LogBinProfiler): 66 +sizeof(LogBinTableRenderer): 1 +sizeof(LogBinJsonRenderer): 1 CPU: -+---------------------+--------+-------------+--------+ -| Functionality | iters | micros/iter | diff | -|---------------------+--------+-------------+--------| -| EmptyLoop | 10000 | 1.700 | 0.000 | -| DirectScheduling | 10000 | 2.900 | 1.200 | -| CoroutineScheduling | 10000 | 7.200 | 5.500 | -+---------------------+--------+-------------+--------+ ++---------------------------------+--------+-------------+--------+ +| Functionality | iters | micros/iter | diff | +|---------------------------------+--------+-------------+--------| +| EmptyLoop | 10000 | 1.900 | 0.000 | +|---------------------------------+--------+-------------+--------| +| DirectScheduling | 10000 | 2.800 | 0.900 | +| DirectSchedulingWithProfiler | 10000 | 5.800 | 3.900 | +|---------------------------------+--------+-------------+--------| +| CoroutineScheduling | 10000 | 7.000 | 5.100 | +| CoroutineSchedulingWithProfiler | 10000 | 9.300 | 7.400 | ++---------------------------------+--------+-------------+--------+ ``` @@ -166,15 +173,22 @@ Sizes of Objects: sizeof(Coroutine): 16 sizeof(CoroutineScheduler): 2 sizeof(Channel): 5 +sizeof(LogBinProfiler): 66 +sizeof(LogBinTableRenderer): 1 +sizeof(LogBinJsonRenderer): 1 CPU: -+---------------------+--------+-------------+--------+ -| Functionality | iters | micros/iter | diff | -|---------------------+--------+-------------+--------| -| EmptyLoop | 10000 | 1.800 | 0.000 | -| DirectScheduling | 10000 | 2.800 | 1.000 | -| CoroutineScheduling | 10000 | 7.200 | 5.400 | -+---------------------+--------+-------------+--------+ ++---------------------------------+--------+-------------+--------+ +| Functionality | iters | micros/iter | diff | +|---------------------------------+--------+-------------+--------| +| EmptyLoop | 10000 | 1.700 | 0.000 | +|---------------------------------+--------+-------------+--------| +| DirectScheduling | 10000 | 2.800 | 1.100 | +| DirectSchedulingWithProfiler | 10000 | 5.800 | 4.100 | +|---------------------------------+--------+-------------+--------| +| CoroutineScheduling | 10000 | 7.100 | 5.400 | +| CoroutineSchedulingWithProfiler | 10000 | 9.400 | 7.700 | ++---------------------------------+--------+-------------+--------+ ``` @@ -186,18 +200,19 @@ CPU: ``` Sizes of Objects: -sizeof(Coroutine): 28 -sizeof(CoroutineScheduler): 4 -sizeof(Channel): 12 CPU: -+---------------------+--------+-------------+--------+ -| Functionality | iters | micros/iter | diff | -|---------------------+--------+-------------+--------| -| EmptyLoop | 30000 | 0.133 | 0.000 | -| DirectScheduling | 30000 | 0.533 | 0.400 | -| CoroutineScheduling | 30000 | 1.266 | 1.133 | -+---------------------+--------+-------------+--------+ ++---------------------------------+--------+-------------+--------+ +| Functionality | iters | micros/iter | diff | +|---------------------------------+--------+-------------+--------| +| EmptyLoop | 30000 | 0.166 | 0.000 | +|---------------------------------+--------+-------------+--------| +| DirectScheduling | 30000 | 0.533 | 0.367 | +| DirectSchedulingWithProfiler | 30000 | 0.933 | 0.767 | +|---------------------------------+--------+-------------+--------| +| CoroutineScheduling | 30000 | 1.066 | 0.900 | +| CoroutineSchedulingWithProfiler | 30000 | 1.466 | 1.300 | ++---------------------------------+--------+-------------+--------+ ``` @@ -212,15 +227,22 @@ Sizes of Objects: sizeof(Coroutine): 28 sizeof(CoroutineScheduler): 4 sizeof(Channel): 12 +sizeof(LogBinProfiler): 68 +sizeof(LogBinTableRenderer): 1 +sizeof(LogBinJsonRenderer): 1 CPU: -+---------------------+--------+-------------+--------+ -| Functionality | iters | micros/iter | diff | -|---------------------+--------+-------------+--------| -| EmptyLoop | 10000 | 0.100 | 0.000 | -| DirectScheduling | 10000 | 0.500 | 0.400 | -| CoroutineScheduling | 10000 | 1.000 | 0.900 | -+---------------------+--------+-------------+--------+ ++---------------------------------+--------+-------------+--------+ +| Functionality | iters | micros/iter | diff | +|---------------------------------+--------+-------------+--------| +| EmptyLoop | 10000 | 0.100 | 0.000 | +|---------------------------------+--------+-------------+--------| +| DirectScheduling | 10000 | 0.500 | 0.400 | +| DirectSchedulingWithProfiler | 10000 | 0.800 | 0.700 | +|---------------------------------+--------+-------------+--------| +| CoroutineScheduling | 10000 | 0.900 | 0.800 | +| CoroutineSchedulingWithProfiler | 10000 | 1.100 | 1.000 | ++---------------------------------+--------+-------------+--------+ ``` @@ -235,15 +257,22 @@ Sizes of Objects: sizeof(Coroutine): 28 sizeof(CoroutineScheduler): 4 sizeof(Channel): 12 +sizeof(LogBinProfiler): 68 +sizeof(LogBinTableRenderer): 1 +sizeof(LogBinJsonRenderer): 1 CPU: -+---------------------+--------+-------------+--------+ -| Functionality | iters | micros/iter | diff | -|---------------------+--------+-------------+--------| -| EmptyLoop | 30000 | 0.066 | 0.000 | -| DirectScheduling | 30000 | 0.133 | 0.067 | -| CoroutineScheduling | 30000 | 0.366 | 0.300 | -+---------------------+--------+-------------+--------+ ++---------------------------------+--------+-------------+--------+ +| Functionality | iters | micros/iter | diff | +|---------------------------------+--------+-------------+--------| +| EmptyLoop | 30000 | 0.033 | 0.000 | +|---------------------------------+--------+-------------+--------| +| DirectScheduling | 30000 | 0.133 | 0.100 | +| DirectSchedulingWithProfiler | 30000 | 0.233 | 0.200 | +|---------------------------------+--------+-------------+--------| +| CoroutineScheduling | 30000 | 0.333 | 0.300 | +| CoroutineSchedulingWithProfiler | 30000 | 0.433 | 0.400 | ++---------------------------------+--------+-------------+--------+ ``` @@ -259,15 +288,22 @@ Sizes of Objects: sizeof(Coroutine): 28 sizeof(CoroutineScheduler): 4 sizeof(Channel): 12 +sizeof(LogBinProfiler): 68 +sizeof(LogBinTableRenderer): 1 +sizeof(LogBinJsonRenderer): 1 CPU: -+---------------------+--------+-------------+--------+ -| Functionality | iters | micros/iter | diff | -|---------------------+--------+-------------+--------| -| EmptyLoop | 30000 | 0.066 | 0.000 | -| DirectScheduling | 30000 | 0.233 | 0.167 | -| CoroutineScheduling | 30000 | 0.666 | 0.600 | -+---------------------+--------+-------------+--------+ ++---------------------------------+--------+-------------+--------+ +| Functionality | iters | micros/iter | diff | +|---------------------------------+--------+-------------+--------| +| EmptyLoop | 30000 | 0.066 | 0.000 | +|---------------------------------+--------+-------------+--------| +| DirectScheduling | 30000 | 0.233 | 0.167 | +| DirectSchedulingWithProfiler | 30000 | 0.266 | 0.200 | +|---------------------------------+--------+-------------+--------| +| CoroutineScheduling | 30000 | 0.500 | 0.434 | +| CoroutineSchedulingWithProfiler | 30000 | 0.666 | 0.600 | ++---------------------------------+--------+-------------+--------+ ``` diff --git a/examples/AutoBenchmark/esp32.txt b/examples/AutoBenchmark/esp32.txt index 08a0c39..8962292 100644 --- a/examples/AutoBenchmark/esp32.txt +++ b/examples/AutoBenchmark/esp32.txt @@ -2,8 +2,13 @@ SIZEOF sizeof(Coroutine): 28 sizeof(CoroutineScheduler): 4 sizeof(Channel): 12 +sizeof(LogBinProfiler): 68 +sizeof(LogBinTableRenderer): 1 +sizeof(LogBinJsonRenderer): 1 BENCHMARKS -EmptyLoop 0.066 30000 +EmptyLoop 0.033 30000 DirectScheduling 0.133 30000 -CoroutineScheduling 0.366 30000 +DirectSchedulingWithProfiler 0.233 30000 +CoroutineScheduling 0.333 30000 +CoroutineSchedulingWithProfiler 0.433 30000 END diff --git a/examples/AutoBenchmark/esp8266.txt b/examples/AutoBenchmark/esp8266.txt index c256052..b095164 100644 --- a/examples/AutoBenchmark/esp8266.txt +++ b/examples/AutoBenchmark/esp8266.txt @@ -2,8 +2,13 @@ SIZEOF sizeof(Coroutine): 28 sizeof(CoroutineScheduler): 4 sizeof(Channel): 12 +sizeof(LogBinProfiler): 68 +sizeof(LogBinTableRenderer): 1 +sizeof(LogBinJsonRenderer): 1 BENCHMARKS EmptyLoop 0.100 10000 DirectScheduling 0.500 10000 -CoroutineScheduling 1.000 10000 +DirectSchedulingWithProfiler 0.800 10000 +CoroutineScheduling 0.900 10000 +CoroutineSchedulingWithProfiler 1.100 10000 END diff --git a/examples/AutoBenchmark/generate_table.awk b/examples/AutoBenchmark/generate_table.awk index 09ae2bf..5ff3128 100755 --- a/examples/AutoBenchmark/generate_table.awk +++ b/examples/AutoBenchmark/generate_table.awk @@ -59,16 +59,19 @@ END { print "" print "CPU:" - printf("+---------------------+--------+-------------+--------+\n") - printf("| Functionality | iters | micros/iter | diff |\n") + printf("+---------------------------------+--------+-------------+--------+\n") + printf("| Functionality | iters | micros/iter | diff |\n") for (i = 0; i < TOTAL_BENCHMARKS; i++) { name = u[i]["name"] - if (name ~ /^EmptyLoop$/ || name ~ /^DirectScheduler$/){ - printf("|---------------------+--------+-------------+--------|\n") + if (name ~ /^EmptyLoop$/ \ + || name ~ /^DirectScheduling$/ \ + || name ~ /^CoroutineScheduling$/ \ + ) { + printf("|---------------------------------+--------+-------------+--------|\n") } - printf("| %-19s | %6d | %11.3f | %6.3f |\n", - u[i]["name"], u[i]["iterations"], u[i]["micros"], u[i]["diff"]) + printf("| %-31s | %6d | %11.3f | %6.3f |\n", + name, u[i]["iterations"], u[i]["micros"], u[i]["diff"]) } - printf("+---------------------+--------+-------------+--------+\n") + printf("+---------------------------------+--------+-------------+--------+\n") } diff --git a/examples/AutoBenchmark/micro.txt b/examples/AutoBenchmark/micro.txt index 55c853a..6584918 100644 --- a/examples/AutoBenchmark/micro.txt +++ b/examples/AutoBenchmark/micro.txt @@ -2,8 +2,13 @@ SIZEOF sizeof(Coroutine): 16 sizeof(CoroutineScheduler): 2 sizeof(Channel): 5 +sizeof(LogBinProfiler): 66 +sizeof(LogBinTableRenderer): 1 +sizeof(LogBinJsonRenderer): 1 BENCHMARKS -EmptyLoop 1.800 10000 +EmptyLoop 1.700 10000 DirectScheduling 2.800 10000 -CoroutineScheduling 7.200 10000 +DirectSchedulingWithProfiler 5.800 10000 +CoroutineScheduling 7.100 10000 +CoroutineSchedulingWithProfiler 9.400 10000 END diff --git a/examples/AutoBenchmark/nano.txt b/examples/AutoBenchmark/nano.txt index bd6e659..e545e53 100644 --- a/examples/AutoBenchmark/nano.txt +++ b/examples/AutoBenchmark/nano.txt @@ -2,8 +2,13 @@ SIZEOF sizeof(Coroutine): 16 sizeof(CoroutineScheduler): 2 sizeof(Channel): 5 +sizeof(LogBinProfiler): 66 +sizeof(LogBinTableRenderer): 1 +sizeof(LogBinJsonRenderer): 1 BENCHMARKS -EmptyLoop 1.700 10000 -DirectScheduling 2.900 10000 -CoroutineScheduling 7.200 10000 +EmptyLoop 1.900 10000 +DirectScheduling 2.800 10000 +DirectSchedulingWithProfiler 5.800 10000 +CoroutineScheduling 7.000 10000 +CoroutineSchedulingWithProfiler 9.300 10000 END diff --git a/examples/AutoBenchmark/stm32.txt b/examples/AutoBenchmark/stm32.txt index dcfb5c7..a50013e 100644 --- a/examples/AutoBenchmark/stm32.txt +++ b/examples/AutoBenchmark/stm32.txt @@ -1,9 +1,9 @@ -SIZEOF -sizeof(Coroutine): 28 -sizeof(CoroutineScheduler): 4 -sizeof(Channel): 12 +sizeof(LogBinTableRenderer): 1 +sizeof(LogBinJsonRenderer): 1 BENCHMARKS -EmptyLoop 0.133 30000 +EmptyLoop 0.166 30000 DirectScheduling 0.533 30000 -CoroutineScheduling 1.266 30000 +DirectSchedulingWithProfiler 0.933 30000 +CoroutineScheduling 1.066 30000 +CoroutineSchedulingWithProfiler 1.466 30000 END diff --git a/examples/AutoBenchmark/teensy32.txt b/examples/AutoBenchmark/teensy32.txt index 358df17..2d497b6 100644 --- a/examples/AutoBenchmark/teensy32.txt +++ b/examples/AutoBenchmark/teensy32.txt @@ -2,8 +2,13 @@ SIZEOF sizeof(Coroutine): 28 sizeof(CoroutineScheduler): 4 sizeof(Channel): 12 +sizeof(LogBinProfiler): 68 +sizeof(LogBinTableRenderer): 1 +sizeof(LogBinJsonRenderer): 1 BENCHMARKS EmptyLoop 0.066 30000 DirectScheduling 0.233 30000 -CoroutineScheduling 0.666 30000 +DirectSchedulingWithProfiler 0.266 30000 +CoroutineScheduling 0.500 30000 +CoroutineSchedulingWithProfiler 0.666 30000 END From 46d7b60db188f5cb9c2983e8402de4e31b2c9d85 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Fri, 18 Mar 2022 12:55:11 -0700 Subject: [PATCH 52/59] USER_GUIDE.md: Update new CPU latency numbers; update HelloCoroutineWithProfiler and HelloSchedulerWithProfiler --- CHANGELOG.md | 1 - README.md | 151 ++++++++++++++++++++++++++++---------------------- USER_GUIDE.md | 19 +++++-- 3 files changed, 99 insertions(+), 72 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b41977f..ee7b03b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,7 +35,6 @@ version of the log-log graph of the frequency count. * `LogBinJsonRenderer::printTo()` prints the frequency count in JSON format. - * Memory consumption * See [HelloCoroutineWithProfiler](examples/HelloCoroutineWithProfiler) and [HelloSchedulerWithProfiler](examples/HelloSchedulerWithProfiler). * Thanks to peufeu2@ who provided the ideas and proof of concept in diff --git a/README.md b/README.md index ec4f280..1c2ec41 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ others (in my opinion of course): and 4 bytes of static RAM independent of the number of coroutines * extremely fast context switching * Direct Scheduling (call `Coroutine::runCoroutine()` directly) - * ~1.2 microseconds on a 16 MHz ATmega328P + * ~1.0 microseconds on a 16 MHz ATmega328P * ~0.4 microseconds on a 48 MHz SAMD21 * ~0.3 microseconds on a 72 MHz STM32 * ~0.3 microseconds on a 80 MHz ESP8266 @@ -67,12 +67,12 @@ others (in my opinion of course): * ~0.17 microseconds on 96 MHz Teensy 3.2 (depending on compiler settings) * Coroutine Scheduling (use `CoroutineScheduler::loop()`): - * ~5.5 microseconds on a 16 MHz ATmega328P + * ~5.2 microseconds on a 16 MHz ATmega328P * ~1.3 microseconds on a 48 MHz SAMD21 * ~0.9 microseconds on a 72 MHz STM32 - * ~0.6 microseconds on a 80 MHz ESP8266 - * ~0.2 microseconds on a 240 MHz ESP32 - * ~0.5 microseconds on 96 MHz Teensy 3.2 (depending on compiler + * ~0.8 microseconds on a 80 MHz ESP8266 + * ~0.3 microseconds on a 240 MHz ESP32 + * ~0.4 microseconds on 96 MHz Teensy 3.2 (depending on compiler settings) * uses the [computed goto](https://gcc.gnu.org/onlinedocs/gcc/Labels-as-Values.html) feature of the GCC compiler (also supported by Clang) to avoid the @@ -298,9 +298,9 @@ Version 1.5 added support for profiling the execution time of only a single implementation (`LogBinProfiler`) is provided. The [HelloCoroutineWithProfiler.ino](examples/HelloCoroutineWithProfiler) -program shows how to setup the profilers and extract the profiling information. -This example is intended for resource constrained 8-bit processors which do not -want to pay for the cost of the `CoroutineScheduler`. +program shows how to setup the profilers and extract the profiling information +using the `Coroutine::runCoroutineWithProfiler()` instead of the usual +`Coroutine::runCoroutine()`: ```C++ #include @@ -332,12 +332,9 @@ COROUTINE(printHelloWorld) { COROUTINE(printProfiling) { COROUTINE_LOOP() { - LogBinTableRenderer tableRenderer(Coroutine::getRoot()); - LogBinJsonRenderer jsonRenderer(Coroutine::getRoot()); - - tableRenderer.printTo( + LogBinTableRenderer::printTo( Serial, 3 /*startBin*/, 14 /*endBin*/, false /*clear*/); - jsonRenderer.printTo( + LogBinJsonRenderer::printTo( Serial, 3 /*startBin*/, 14 /*endBin*/); COROUTINE_DELAY(5000); @@ -395,12 +392,13 @@ blinkLed 65535 830 0 0 0 0 0 0 0 0 0 ### HelloSchedulerWithProfiler The [HelloSchedulerWithProfiler.ino](examples/HelloSchedulerWithProfiler) sketch -implements the same thing as `HelloCoroutineWithProfiler` using the -`CoroutineScheduler` which automatically supports the `CoroutineProfiler`. -The assumption was that if the environment has enough resources to support -a `CoroutineScheduler`, then it is probably not a large burden to include the -code to support `CoroutineProfiler` by default. Hence, this is intended for -32-bit environments where flash and static RAM resources are more plentiful. +implements the same thing as `HelloCoroutineWithProfiler` using 2 techniques to +handle larger numbers of coroutines: + +* use `LogBinProfiler::createProfilers()` to automatically create the profilers + on the heap and assign them to all coroutines +* use `CoroutineScheduler::loopWithProfiler()` method instead of the + `CoroutineScheduler::loop()` method. ```C++ #include @@ -432,12 +430,9 @@ COROUTINE(printHelloWorld) { COROUTINE(printProfiling) { COROUTINE_LOOP() { - LogBinTableRenderer tableRenderer(Coroutine::getRoot()); - LogBinJsonRenderer jsonRenderer(Coroutine::getRoot()); - - tableRenderer.printTo( + LogBinTableRenderer::printTo( Serial, 3 /*startBin*/, 14 /*endBin*/, false /*clear*/); - jsonRenderer.printTo( + LogBinJsonRenderer::printTo( Serial, 3 /*startBin*/, 14 /*endBin*/); COROUTINE_DELAY(5000); @@ -457,13 +452,13 @@ void setup() { readPin.setName(F("readPin")); // Create profilers on the heap and attach them to all coroutines. - LogBinProfiler::createProfilers(Coroutine::getRoot()); + LogBinProfiler::createProfilers(); CoroutineScheduler::setup(); } void loop() { - CoroutineScheduler::loop(); + CoroutineScheduler::loopWithProfiler(); } ``` @@ -665,6 +660,9 @@ On 8-bit processors (AVR Nano, Uno, etc): sizeof(Coroutine): 16 sizeof(CoroutineScheduler): 2 sizeof(Channel): 5 +sizeof(LogBinProfiler): 66 +sizeof(LogBinTableRenderer): 1 +sizeof(LogBinJsonRenderer): 1 ``` On 32-bit processors (e.g. Teensy ARM, ESP8266, ESP32): @@ -673,6 +671,9 @@ On 32-bit processors (e.g. Teensy ARM, ESP8266, ESP32): sizeof(Coroutine): 28 sizeof(CoroutineScheduler): 4 sizeof(Channel): 12 +sizeof(LogBinProfiler): 68 +sizeof(LogBinTableRenderer): 1 +sizeof(LogBinJsonRenderer): 1 ``` The `CoroutineScheduler` consumes only 2 bytes (8-bit processors) or 4 bytes @@ -713,24 +714,30 @@ etc) for a handful of AceRoutine features. Here are some highlights: | One Coroutine (seconds) | 1904/ 212 | 288/ 26 | | Two Coroutines (seconds) | 2130/ 236 | 514/ 50 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (millis) | 1992/ 214 | 376/ 28 | -| Scheduler, Two Coroutines (millis) | 2178/ 238 | 562/ 52 | +| One Coroutine, Profiler | 1874/ 212 | 258/ 26 | +| Two Coroutines, Profiler | 2132/ 236 | 516/ 50 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (micros) | 1964/ 214 | 348/ 28 | -| Scheduler, Two Coroutines (micros) | 2122/ 238 | 506/ 52 | +| Scheduler, One Coroutine (millis) | 1928/ 214 | 312/ 28 | +| Scheduler, Two Coroutines (millis) | 2114/ 238 | 498/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (seconds) | 2092/ 214 | 476/ 28 | -| Scheduler, Two Coroutines (seconds) | 2310/ 238 | 694/ 52 | +| Scheduler, One Coroutine (micros) | 1900/ 214 | 284/ 28 | +| Scheduler, Two Coroutines (micros) | 2058/ 238 | 442/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (setup) | 2046/ 214 | 430/ 28 | -| Scheduler, Two Coroutines (setup) | 2332/ 238 | 716/ 52 | +| Scheduler, One Coroutine (seconds) | 2028/ 214 | 412/ 28 | +| Scheduler, Two Coroutines (seconds) | 2246/ 238 | 630/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (man setup) | 2024/ 214 | 408/ 28 | -| Scheduler, Two Coroutines (man setup) | 2318/ 238 | 702/ 52 | +| Scheduler, One Coroutine (setup) | 1978/ 214 | 362/ 28 | +| Scheduler, Two Coroutines (setup) | 2264/ 238 | 648/ 52 | |---------------------------------------+--------------+-------------| -| Scheduler, LogBinProfiler | 2100/ 286 | 484/ 100 | -| Scheduler, LogBinTableRenderer | 3502/ 304 | 1886/ 118 | -| Scheduler, LogBinJsonRenderer | 3022/ 308 | 1406/ 122 | +| Scheduler, One Coroutine (man setup) | 1956/ 214 | 340/ 28 | +| Scheduler, Two Coroutines (man setup) | 2250/ 238 | 634/ 52 | +|---------------------------------------+--------------+-------------| +| Scheduler, One Coroutine, Profiler | 1992/ 214 | 376/ 28 | +| Scheduler, Two Coroutines, Profiler | 2178/ 238 | 562/ 52 | +|---------------------------------------+--------------+-------------| +| Scheduler, LogBinProfiler | 2112/ 286 | 496/ 100 | +| Scheduler, LogBinTableRenderer | 3514/ 304 | 1898/ 118 | +| Scheduler, LogBinJsonRenderer | 3034/ 308 | 1418/ 122 | |---------------------------------------+--------------+-------------| | Blink Function | 1948/ 189 | 332/ 3 | | Blink Coroutine | 2118/ 212 | 502/ 26 | @@ -757,24 +764,30 @@ etc) for a handful of AceRoutine features. Here are some highlights: | One Coroutine (seconds) | 265209/28028 | 228/ 44 | | Two Coroutines (seconds) | 265385/28060 | 404/ 76 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (millis) | 265321/28036 | 340/ 52 | -| Scheduler, Two Coroutines (millis) | 265449/28060 | 468/ 76 | +| One Coroutine, Profiler | 265257/28028 | 276/ 44 | +| Two Coroutines, Profiler | 265433/28060 | 452/ 76 | +|---------------------------------------+--------------+-------------| +| Scheduler, One Coroutine (millis) | 265241/28036 | 260/ 52 | +| Scheduler, Two Coroutines (millis) | 265385/28060 | 404/ 76 | +|---------------------------------------+--------------+-------------| +| Scheduler, One Coroutine (micros) | 265257/28036 | 276/ 52 | +| Scheduler, Two Coroutines (micros) | 265401/28060 | 420/ 76 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (micros) | 265321/28036 | 340/ 52 | -| Scheduler, Two Coroutines (micros) | 265449/28060 | 468/ 76 | +| Scheduler, One Coroutine (seconds) | 265257/28036 | 276/ 52 | +| Scheduler, Two Coroutines (seconds) | 265417/28060 | 436/ 76 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (seconds) | 265337/28036 | 356/ 52 | -| Scheduler, Two Coroutines (seconds) | 265497/28060 | 516/ 76 | +| Scheduler, One Coroutine (setup) | 265273/28036 | 292/ 52 | +| Scheduler, Two Coroutines (setup) | 265433/28060 | 452/ 76 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (setup) | 265337/28036 | 356/ 52 | -| Scheduler, Two Coroutines (setup) | 265513/28060 | 532/ 76 | +| Scheduler, One Coroutine (man setup) | 265257/28036 | 276/ 52 | +| Scheduler, Two Coroutines (man setup) | 265433/28060 | 452/ 76 | |---------------------------------------+--------------+-------------| -| Scheduler, One Coroutine (man setup) | 265337/28036 | 356/ 52 | -| Scheduler, Two Coroutines (man setup) | 265513/28060 | 532/ 76 | +| Scheduler, One Coroutine, Profiler | 265321/28036 | 340/ 52 | +| Scheduler, Two Coroutines, Profiler | 265449/28060 | 468/ 76 | |---------------------------------------+--------------+-------------| -| Scheduler, LogBinProfiler | 265449/28100 | 468/ 116 | +| Scheduler, LogBinProfiler | 265465/28100 | 484/ 116 | | Scheduler, LogBinTableRenderer | 267381/28100 | 2400/ 116 | -| Scheduler, LogBinJsonRenderer | 266773/28104 | 1792/ 120 | +| Scheduler, LogBinJsonRenderer | 266789/28104 | 1808/ 120 | |---------------------------------------+--------------+-------------| | Blink Function | 265669/28064 | 688/ 80 | | Blink Coroutine | 265801/28100 | 820/ 116 | @@ -801,25 +814,33 @@ See [examples/AutoBenchmark](examples/AutoBenchmark). Here are 2 samples: Arduino Nano: ``` -+---------------------+--------+-------------+--------+ -| Functionality | iters | micros/iter | diff | -|---------------------+--------+-------------+--------| -| EmptyLoop | 10000 | 1.700 | 0.000 | -| DirectScheduling | 10000 | 2.900 | 1.200 | -| CoroutineScheduling | 10000 | 7.200 | 5.500 | -+---------------------+--------+-------------+--------+ ++---------------------------------+--------+-------------+--------+ +| Functionality | iters | micros/iter | diff | +|---------------------------------+--------+-------------+--------| +| EmptyLoop | 10000 | 1.900 | 0.000 | +|---------------------------------+--------+-------------+--------| +| DirectScheduling | 10000 | 2.800 | 0.900 | +| DirectSchedulingWithProfiler | 10000 | 5.800 | 3.900 | +|---------------------------------+--------+-------------+--------| +| CoroutineScheduling | 10000 | 7.000 | 5.100 | +| CoroutineSchedulingWithProfiler | 10000 | 9.300 | 7.400 | ++---------------------------------+--------+-------------+--------+ ``` ESP8266: ``` -+---------------------+--------+-------------+--------+ -| Functionality | iters | micros/iter | diff | -|---------------------+--------+-------------+--------| -| EmptyLoop | 10000 | 0.100 | 0.000 | -| DirectScheduling | 10000 | 0.500 | 0.400 | -| CoroutineScheduling | 10000 | 1.000 | 0.900 | -+---------------------+--------+-------------+--------+ ++---------------------------------+--------+-------------+--------+ +| Functionality | iters | micros/iter | diff | +|---------------------------------+--------+-------------+--------| +| EmptyLoop | 10000 | 0.100 | 0.000 | +|---------------------------------+--------+-------------+--------| +| DirectScheduling | 10000 | 0.500 | 0.400 | +| DirectSchedulingWithProfiler | 10000 | 0.800 | 0.700 | +|---------------------------------+--------+-------------+--------| +| CoroutineScheduling | 10000 | 0.900 | 0.800 | +| CoroutineSchedulingWithProfiler | 10000 | 1.100 | 1.000 | ++---------------------------------+--------+-------------+--------+ ``` diff --git a/USER_GUIDE.md b/USER_GUIDE.md index 621b172..f8b3797 100644 --- a/USER_GUIDE.md +++ b/USER_GUIDE.md @@ -45,7 +45,7 @@ is installed. * [Running Coroutine With Profiler](#RunningCoroutineWithProfiler) * [Running Scheduler With Profiler](#RunningSchedulerWithProfiler) * [Rendering the Profiler Results](#RenderingProfilerResults) - * [Profiling Resource Consumption](#ProfilingResourceConsumption) + * [Profiler Resource Consumption](#ProfilerResourceConsumption) * [Coroutine Communication](#Communication) * [Instance Variables](#InstanceVariables) * [Channels (Experimental)](#Channels) @@ -1414,8 +1414,8 @@ this: } ``` - -### Profiling Resource Consumption + +### Profiler Resource Consumption The ability to profile the execution time of coroutines does not come for free, but I have tried to make it as cheap as possible. @@ -1450,9 +1450,16 @@ If the profiling feature is enabled, the The [AutoBenchmark](examples/AutoBenchmark) program shows that calling the profiler-enabled methods, `Coroutine::runCoroutineWithProfiler()` and -`CoroutineScheduler::loopWithProfiler(), increases latency by only 100ns (AVR, -ESP8266), 133ns (STM32, Teensy 3.2), and 33ns (ESP32). Most applications should -not be affected by this small increase in latency. +`CoroutineScheduler::loopWithProfiler(), increases latency by: + +* 3 - 3.2 micros on AVR +* 0.4 micros on STM32F1 +* 0.2 - 0.3 micros on ESP8266 +* 0.1 micros on ESP32 +* 0.033 - 0.166 micros on Teensy 3.2 + +On 32-bit processors, the overhead seems neglegible. On 8-bit processors, the 3 +microsecond of overhead might be an issue with sensitive applications. ## Coroutine Communication From f6bc4671b999a032df5c2e98ce044f4911464541 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Sat, 19 Mar 2022 16:14:14 -0700 Subject: [PATCH 53/59] README.md,USER_GUIDE.md: Update list of classes in library; add AceCommon as a required library --- README.md | 53 ++++++++++++++++++++++++++++++++++----------------- USER_GUIDE.md | 43 ++++++++++++++++++++++++----------------- 2 files changed, 61 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index 1c2ec41..a78207b 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,10 @@ [![AUnit Tests](https://github.com/bxparks/AceRoutine/actions/workflows/aunit_tests.yml/badge.svg)](https://github.com/bxparks/AceRoutine/actions/workflows/aunit_tests.yml) -**Breaking Changes in v1.3**: Breaking changes were made in v1.3 to reduce the -flash memory consumption of `Coroutine` instances by 800-1000 bytes. See the -[CHANGELOG.md](CHANGELOG.md) for a complete list. +**NEW: Profiling in v1.5**: Version 1.5 adds the ability to profile the +execution time of `Coroutine::runCoroutine()` and render the histogram as a +table or a JSON object. See [Coroutine +Profiling](USER_GUIDE.md#CoroutineProfiling) for details. A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms. @@ -16,15 +17,28 @@ using a `yield()` or `delay()` functionality to allow other coroutines to execute. When the scheduler makes its way back to the original coroutine, the execution continues right after the `yield()` or `delay()`. -There are only 3 classes in this library: -* `Coroutine` class provides the context variables for all coroutines, -* `CoroutineScheduler` class optionally handles the scheduling, +There are only 2 core classes in this library: + +* `Coroutine` class provides the context variables for all coroutines +* `CoroutineScheduler` class handles the scheduling (optional) + +The following classes are used for profiling: + +* `CoroutineProfiler` interface +* `LogBinProfiler` provides an implementation that tracks the execution time + in 32 logarithmic bins between 1us to 4295s. +* `LogBinTableRenderer` prints the histogram as a table +* `LogBinJsonRenderer` prints the history as a JSON object + +The following is an experimental feature: + * `Channel` class allows coroutines to send messages to each other. This is an experimental feature whose API and feature may change considerably in the future. The library provides a number of macros to help create coroutines and manage their life cycle: + * `COROUTINE()`: defines an instance of the `Coroutine` class or an instance of a user-defined subclass of `Coroutine` * `COROUTINE_BEGIN()`: must occur at the start of a coroutine body @@ -44,6 +58,7 @@ their life cycle: Here are some of the compelling features of this library compared to others (in my opinion of course): + * low memory usage * 8-bit (e.g. AVR) processors: * the first `Coroutine` consumes about 230 bytes of flash @@ -84,6 +99,7 @@ others (in my opinion of course): * fully unit tested using [AUnit](https://github.com/bxparks/AUnit) Some limitations are: + * A `Coroutine` cannot return any values. * A `Coroutine` is stackless and therefore cannot preserve local stack variables across multiple calls. Often the class member variables or function static @@ -104,7 +120,7 @@ AceRoutine is a self-contained library that works on any platform supporting the Arduino API (AVR, Teensy, ESP8266, ESP32, etc), and it provides a handful of additional macros that can reduce boilerplate code. -**Version**: 1.4.2 (2022-02-04) +**Version**: 1.5.0 (2022-03-19) **Changelog**: [CHANGELOG.md](CHANGELOG.md) @@ -393,7 +409,7 @@ blinkLed 65535 830 0 0 0 0 0 0 0 0 0 The [HelloSchedulerWithProfiler.ino](examples/HelloSchedulerWithProfiler) sketch implements the same thing as `HelloCoroutineWithProfiler` using 2 techniques to -handle larger numbers of coroutines: +handle more than a handful of coroutines: * use `LogBinProfiler::createProfilers()` to automatically create the profilers on the heap and assign them to all coroutines @@ -480,22 +496,22 @@ blinkLed 65535 830 0 0 0 0 0 0 0 0 0 ## Installation -The latest stable release is available in the Arduino IDE Library Manager. Only -a single library needs to be installed since v1.1: +The latest stable release is available in the Arduino IDE Library Manager. Two +libraries need to be installed as of v1.5.0: * Search for "AceRoutine". Click Install. +* It should automatically install (or prompt you to install) the "AceCommon" + library. -The direct dependency to the [AceCommon](https://github.com/bxparks/AceCommon) -library was removed in v1.4.2, but some of the programs under `tests/` and -`examples/` may still require the `AceCommon` library to be installed. - -The development version can be installed by cloning the following git repo: +The development version can be installed by cloning the following git repos: * AceRoutine (https://github.com/bxparks/AceRoutine) +* AceCommon (https://github.com/bxparks/AceCommon) -You can copy this directory to the `./libraries` directory used by the -Arduino IDE. (The result is a directory named `./libraries/AceRoutine`). Or you -can create symlinks from `/.libraries` to this directory. +You can copy these directories to the `./libraries` directory used by the +Arduino IDE. (You should see 2 directories, named `./libraries/AceRoutine` and +`./libraries/AceCommon). Or you can create symlinks from `/.libraries` to these +directories. The `develop` branch contains the latest working version. The `master` branch contains the stable release. @@ -504,6 +520,7 @@ The `master` branch contains the stable release. ### Source Code The source files are organized as follows: + * `src/AceRoutine.h` - main header file * `src/ace_routine/` - implementation files * `src/ace_routine/testing/` - internal testing files diff --git a/USER_GUIDE.md b/USER_GUIDE.md index f8b3797..f792228 100644 --- a/USER_GUIDE.md +++ b/USER_GUIDE.md @@ -4,7 +4,7 @@ See the [README.md](README.md) for installation instructions and other background information. This document describes how to use the library once it is installed. -**Version**: 1.4.2 (2022-02-04) +**Version**: 1.5.0 (2022-03-19) ## Table of Contents @@ -1059,12 +1059,10 @@ class ManualCoroutine : public Coroutine { ManualCoroutine manualRoutine(params, ..., objects, ...); ``` -Prior to v1.3, a manual coroutine (created without the `COROUTINE()` macro) was -*not* automatically added to the linked list used by the `CoroutineScheduler`. -This was changed in v1.3 so that the `Coroutine::Coroutine()` constructor -now automatically adds itself to the internal linked list. Calling -`setupCoroutine()` is no longer required. The method is retained for backwards -compatibility, but it is a no-op and is marked deprecated. +The `Coroutine::Coroutine()` constructor automatically adds itself to the +internal list of coroutines, so manually created coroutines are available to the +`CoroutineScheduler` automatically just like the coroutines defined by the +`COROUTINE()` macro. Some examples of manual coroutines: @@ -1139,7 +1137,7 @@ void setup() { You need to call `CoroutineScheduler::setupCoroutines()` explicitly if you want it. The `CoroutineScheduler::setup()` method does *not* call `setupCoroutines()` -automatically. +automatically in order to save flash memory if the feature is not used. **Warning**: The `Coroutine::setupCoroutine()` can consume significant amounts of memory, especially on AVR processors. On AVR processors, each @@ -1155,9 +1153,14 @@ about 14 bytes of flash per invocation. Version 1.5 added the ability to profile the execution time of `Coroutine::runCoroutine()` and render the information as a formatted table, or -as a JSON object. The `CoroutineProfiler` is an interface that allows an object -to receive information about the execution time of the -`Coroutine::runCoroutine()` method: +as a JSON object. If the profiling feature is not used, no additional flash +memory is consumed. The static RAM usage does increase by 2 bytes (8-bits) and 4 +bytes (32-bits) per coroutine. + +The following classes and API methods were added to support the profiling +feature. The `CoroutineProfiler` class is an interface that allows an object to +receive information about the execution time of the `Coroutine::runCoroutine()` +method: ```C++ class CoroutineProfiler { @@ -1185,12 +1188,18 @@ class Coroutine { }; ``` +**Note**: When creating Coroutines with profiling enabled, it will probably be +necessary to assign human-readable names to each coroutine for identification +purposes. See [Coroutine Names](#CoroutineNames) for information on the +`setName()`, `getCName()`, `getFName()`, `getNameType()`, and `printNameTo()` +methods. Each coroutine name will consume additional flash memory. + Currently only a single implementation of `CoroutineProfiler` is provided, the `LogBinProfiler`. It contains 32 bins of `uint16_t` which tracks the number of times a `micros` was seen. The bins are logarithmically scaled, so that Bin 0 collects all events `<2us`, Bin 1 collects events `<4us`, Bin 2 collects events -`<8us`, Bin 30 collects events `<2147s`, and the last Bin 31 collects events -`<4295s`. +`<8us`, ..., Bin 30 collects events `<2147s`, and the last Bin 31 collects +events `<4295s`. ```C++ class LogBinProfiler : public CoroutineProfiler { @@ -1384,16 +1393,16 @@ class LogBinJsonRenderer{ else if needed. * The `startBin` (0-31) and `endBin` (0-32) identify the bins which should be printed. - * A range of something like [2, 14) is useful to keep the width of the table + * A range of something like [2, 13) is useful to keep the width of the table reasonable. - * Often the bins lower and higher than this range do not contain any events. + * Often the bins below and above than this range do not contain any events. * The `clear` flag (default true) causes the bins to be cleared (through the `LogBinProfiler::clear()` method) so that new events can be tracked. * The `rollup` flag (default true) causes roll up of the exterior bins. * Events before `startBin` are added to the first bin. * Events at or after `endBin` are added to the last bin (at `endBin-1`) -For example, calling `LogBinTableRenderer::printTo(Serial, 2, 16)` prints +For example, calling `LogBinTableRenderer::printTo(Serial, 2, 13)` prints something like this: ``` @@ -1403,7 +1412,7 @@ readPin 65535 1128 0 0 0 0 0 0 0 0 0 blinkLed 65535 800 0 0 0 0 0 0 0 0 0 ``` -And calling `LogBinJsonRenderer::printTo(Serial, 2, 16)` prints something like +And calling `LogBinJsonRenderer::printTo(Serial, 2, 13)` prints something like this: ``` From 9aefe3fe36bf2b2037e9d3409961ce34aa132236 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Sat, 19 Mar 2022 16:15:01 -0700 Subject: [PATCH 54/59] Bump version to 1.5.0 --- CHANGELOG.md | 1 + docs/doxygen.cfg | 2 +- examples/ChannelBenchmark/README.md | 2 +- examples/ChannelBenchmark/generate_readme.py | 2 +- library.properties | 2 +- src/AceRoutine.h | 4 ++-- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee7b03b..cdd1503 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Changelog * Unreleased +* 1.5.0 (2022-03-19) * (Re)add support for human-readable coroutine names. * See [Coroutine Names](USER_GUIDE.md#CoroutineNames) in the `USER_GUIDE.md`. diff --git a/docs/doxygen.cfg b/docs/doxygen.cfg index a42090d..1ced2eb 100644 --- a/docs/doxygen.cfg +++ b/docs/doxygen.cfg @@ -38,7 +38,7 @@ PROJECT_NAME = "AceRoutine" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 1.4.2 +PROJECT_NUMBER = 1.5.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/examples/ChannelBenchmark/README.md b/examples/ChannelBenchmark/README.md index 8a88508..f95d9e9 100644 --- a/examples/ChannelBenchmark/README.md +++ b/examples/ChannelBenchmark/README.md @@ -16,7 +16,7 @@ operations took, per iteration. All times in below are in microseconds. -**Version**: AceRoutine v1.4.2 +**Version**: AceRoutine v1.5.0 **DO NOT EDIT**: This file was auto-generated using `make README.md`. diff --git a/examples/ChannelBenchmark/generate_readme.py b/examples/ChannelBenchmark/generate_readme.py index 0cf4d70..a409a84 100755 --- a/examples/ChannelBenchmark/generate_readme.py +++ b/examples/ChannelBenchmark/generate_readme.py @@ -40,7 +40,7 @@ All times in below are in microseconds. -**Version**: AceRoutine v1.4.2 +**Version**: AceRoutine v1.5.0 **DO NOT EDIT**: This file was auto-generated using `make README.md`. diff --git a/library.properties b/library.properties index ece52b7..14c5494 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=AceRoutine -version=1.4.2 +version=1.5.0 author=Brian T. Park maintainer=Brian T. Park sentence=A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms. diff --git a/src/AceRoutine.h b/src/AceRoutine.h index 9947f94..0ef39b4 100644 --- a/src/AceRoutine.h +++ b/src/AceRoutine.h @@ -43,8 +43,8 @@ SOFTWARE. #endif // Version format: xxyyzz == "xx.yy.zz" -#define ACE_ROUTINE_VERSION 10402 -#define ACE_ROUTINE_VERSION_STRING "1.4.2" +#define ACE_ROUTINE_VERSION 10500 +#define ACE_ROUTINE_VERSION_STRING "1.5.0" #include "ace_routine/Coroutine.h" #include "ace_routine/CoroutineScheduler.h" From ece7b55245b67ca03af9742bb82927b3d9295a90 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Sat, 19 Mar 2022 16:19:03 -0700 Subject: [PATCH 55/59] src: Fix doxygen warnings --- src/ace_routine/CoroutineProfiler.h | 4 ++++ src/ace_routine/LogBinJsonRenderer.h | 2 +- src/ace_routine/LogBinProfiler.h | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/ace_routine/CoroutineProfiler.h b/src/ace_routine/CoroutineProfiler.h index 14bf99f..af18cb3 100644 --- a/src/ace_routine/CoroutineProfiler.h +++ b/src/ace_routine/CoroutineProfiler.h @@ -29,6 +29,10 @@ SOFTWARE. namespace ace_routine { +/** + * An interface class for profiling classes that can track the elapsed time + * consumed by `Coroutine::runCoroutine()`. + */ class CoroutineProfiler { public: /** Use default constructor. */ diff --git a/src/ace_routine/LogBinJsonRenderer.h b/src/ace_routine/LogBinJsonRenderer.h index c39a14e..ce33da8 100644 --- a/src/ace_routine/LogBinJsonRenderer.h +++ b/src/ace_routine/LogBinJsonRenderer.h @@ -34,7 +34,7 @@ SOFTWARE. namespace ace_routine { /** - * Print the `LogBinProfiler bins as a JSON array. For example, here + * Print the `LogBinProfiler` bins as a JSON array. For example, here * is the output from `examples/SoundManager`: * * @verbatim diff --git a/src/ace_routine/LogBinProfiler.h b/src/ace_routine/LogBinProfiler.h index 6b3deed..b0ef8c0 100644 --- a/src/ace_routine/LogBinProfiler.h +++ b/src/ace_routine/LogBinProfiler.h @@ -53,6 +53,7 @@ namespace ace_routine { template class LogBinProfilerTemplate : public CoroutineProfiler { public: + /** Number of event counter bins used by this class. */ static const uint8_t kNumBins = 32; public: @@ -134,6 +135,7 @@ class LogBinProfilerTemplate : public CoroutineProfiler { } public: + /** Event count bins. */ uint16_t mBins[kNumBins]; }; From e60321feb6efdef29199bc84db2f6a696d6ac030 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Sat, 19 Mar 2022 16:19:26 -0700 Subject: [PATCH 56/59] docs: Regenerate doxygen --- docs/html/AceRoutine_8h_source.html | 14 +- docs/html/Channel_8h_source.html | 2 +- docs/html/ClockInterface_8h_source.html | 2 +- docs/html/CoroutineProfiler_8h_source.html | 133 +++ docs/html/CoroutineScheduler_8h_source.html | 279 ++--- docs/html/Coroutine_8cpp_source.html | 45 +- docs/html/Coroutine_8h.html | 94 +- docs/html/Coroutine_8h__dep__incl.map | 11 +- docs/html/Coroutine_8h__dep__incl.md5 | 2 +- docs/html/Coroutine_8h__dep__incl.png | Bin 24212 -> 64074 bytes docs/html/Coroutine_8h__incl.map | 14 +- docs/html/Coroutine_8h__incl.md5 | 2 +- docs/html/Coroutine_8h__incl.png | Bin 12138 -> 24033 bytes docs/html/Coroutine_8h_source.html | 840 ++++++++------- docs/html/LogBinJsonRenderer_8h_source.html | 182 ++++ docs/html/LogBinProfiler_8cpp_source.html | 145 +++ docs/html/LogBinProfiler_8h_source.html | 206 ++++ .../html/LogBinTableRenderer_8cpp_source.html | 230 +++++ docs/html/LogBinTableRenderer_8h_source.html | 204 ++++ docs/html/annotated.html | 10 +- .../classace__routine_1_1Channel-members.html | 2 +- docs/html/classace__routine_1_1Channel.html | 2 +- ...ce__routine_1_1ClockInterface-members.html | 2 +- .../classace__routine_1_1ClockInterface.html | 2 +- ..._routine_1_1CoroutineProfiler-members.html | 88 ++ ...lassace__routine_1_1CoroutineProfiler.html | 151 +++ ...e_1_1CoroutineProfiler__inherit__graph.map | 4 + ...e_1_1CoroutineProfiler__inherit__graph.md5 | 1 + ...e_1_1CoroutineProfiler__inherit__graph.png | Bin 0 -> 6308 bytes ...1_1CoroutineSchedulerTemplate-members.html | 7 +- ...routine_1_1CoroutineSchedulerTemplate.html | 47 +- ..._routine_1_1CoroutineTemplate-members.html | 120 ++- ...lassace__routine_1_1CoroutineTemplate.html | 971 ++++++++++++------ ...tine_1_1CoroutineTemplate__coll__graph.map | 5 +- ...tine_1_1CoroutineTemplate__coll__graph.md5 | 2 +- ...tine_1_1CoroutineTemplate__coll__graph.png | Bin 4111 -> 7671 bytes ...1_1LogBinJsonRendererTemplate-members.html | 87 ++ ...routine_1_1LogBinJsonRendererTemplate.html | 191 ++++ ...ine_1_1LogBinProfilerTemplate-members.html | 95 ++ ...ce__routine_1_1LogBinProfilerTemplate.html | 253 +++++ ...1_1LogBinProfilerTemplate__coll__graph.map | 4 + ...1_1LogBinProfilerTemplate__coll__graph.md5 | 1 + ...1_1LogBinProfilerTemplate__coll__graph.png | Bin 0 -> 6280 bytes ...LogBinProfilerTemplate__inherit__graph.map | 4 + ...LogBinProfilerTemplate__inherit__graph.md5 | 1 + ...LogBinProfilerTemplate__inherit__graph.png | Bin 0 -> 6280 bytes ..._1LogBinTableRendererTemplate-members.html | 87 ++ ...outine_1_1LogBinTableRendererTemplate.html | 199 ++++ docs/html/classes.html | 21 +- docs/html/compat_8h.html | 15 +- docs/html/compat_8h__dep__incl.map | 13 +- docs/html/compat_8h__dep__incl.md5 | 2 +- docs/html/compat_8h__dep__incl.png | Bin 6226 -> 62175 bytes docs/html/compat_8h_source.html | 2 +- docs/html/dir_000000_000001.html | 2 +- .../dir_68267d1309a1af8e8297ef4c3efbcdba.html | 2 +- .../dir_bbf1ec131ffa96b8d365d81f56025723.html | 2 +- docs/html/files.html | 10 +- docs/html/functions.html | 189 +++- docs/html/functions_func.html | 140 ++- docs/html/functions_type.html | 8 +- docs/html/functions_vars.html | 45 +- docs/html/globals.html | 2 +- docs/html/globals_defs.html | 2 +- docs/html/graph_legend.html | 2 +- docs/html/hierarchy.html | 92 ++ docs/html/index.html | 2 +- docs/html/inherit_graph_0.map | 3 + docs/html/inherit_graph_0.md5 | 1 + docs/html/inherit_graph_0.png | Bin 0 -> 1846 bytes docs/html/inherit_graph_1.map | 3 + docs/html/inherit_graph_1.md5 | 1 + docs/html/inherit_graph_1.png | Bin 0 -> 1916 bytes docs/html/inherit_graph_2.map | 4 + docs/html/inherit_graph_2.md5 | 1 + docs/html/inherit_graph_2.png | Bin 0 -> 5216 bytes docs/html/inherit_graph_3.map | 3 + docs/html/inherit_graph_3.md5 | 1 + docs/html/inherit_graph_3.png | Bin 0 -> 3496 bytes docs/html/inherit_graph_4.map | 3 + docs/html/inherit_graph_4.md5 | 1 + docs/html/inherit_graph_4.png | Bin 0 -> 3144 bytes docs/html/inherit_graph_5.map | 3 + docs/html/inherit_graph_5.md5 | 1 + docs/html/inherit_graph_5.png | Bin 0 -> 4044 bytes docs/html/inherit_graph_6.map | 3 + docs/html/inherit_graph_6.md5 | 1 + docs/html/inherit_graph_6.png | Bin 0 -> 3936 bytes docs/html/inherits.html | 118 +++ docs/html/menudata.js | 7 + docs/html/search/all_1.js | 44 +- docs/html/search/all_2.js | 4 +- docs/html/search/all_3.js | 4 +- docs/html/search/all_4.js | 5 +- docs/html/search/all_5.js | 20 +- docs/html/search/all_6.js | 16 +- docs/html/search/all_7.js | 11 +- docs/html/search/all_8.js | 13 +- docs/html/search/all_9.js | 15 +- docs/html/search/all_a.js | 20 +- docs/html/search/all_b.js | 6 +- docs/html/search/all_c.js | 20 +- docs/html/search/all_d.html | 30 + docs/html/search/all_d.js | 4 + docs/html/search/all_e.html | 30 + docs/html/search/all_e.js | 4 + docs/html/search/all_f.html | 30 + docs/html/search/all_f.js | 5 + docs/html/search/classes_0.js | 9 +- docs/html/search/classes_1.html | 30 + docs/html/search/classes_1.js | 6 + docs/html/search/defines_0.js | 2 +- docs/html/search/defines_1.js | 24 +- docs/html/search/defines_2.js | 6 +- docs/html/search/defines_3.js | 2 +- docs/html/search/defines_4.js | 4 +- docs/html/search/files_0.js | 4 +- docs/html/search/functions_0.js | 14 +- docs/html/search/functions_1.js | 3 +- docs/html/search/functions_2.js | 18 +- docs/html/search/functions_3.js | 12 +- docs/html/search/functions_4.js | 6 +- docs/html/search/functions_5.js | 6 +- docs/html/search/functions_6.js | 18 +- docs/html/search/functions_7.js | 6 +- docs/html/search/functions_8.js | 19 +- docs/html/search/functions_9.html | 30 + docs/html/search/functions_9.js | 4 + docs/html/search/functions_a.html | 30 + docs/html/search/functions_a.js | 4 + docs/html/search/functions_b.html | 30 + docs/html/search/functions_b.js | 5 + docs/html/search/pages_0.js | 2 +- docs/html/search/searchdata.js | 8 +- docs/html/search/typedefs_0.js | 2 +- docs/html/search/typedefs_1.js | 2 +- docs/html/search/typedefs_2.html | 30 + docs/html/search/typedefs_2.js | 4 + docs/html/search/variables_0.js | 15 +- docs/html/search/variables_1.js | 14 +- 140 files changed, 4867 insertions(+), 1229 deletions(-) create mode 100644 docs/html/CoroutineProfiler_8h_source.html create mode 100644 docs/html/LogBinJsonRenderer_8h_source.html create mode 100644 docs/html/LogBinProfiler_8cpp_source.html create mode 100644 docs/html/LogBinProfiler_8h_source.html create mode 100644 docs/html/LogBinTableRenderer_8cpp_source.html create mode 100644 docs/html/LogBinTableRenderer_8h_source.html create mode 100644 docs/html/classace__routine_1_1CoroutineProfiler-members.html create mode 100644 docs/html/classace__routine_1_1CoroutineProfiler.html create mode 100644 docs/html/classace__routine_1_1CoroutineProfiler__inherit__graph.map create mode 100644 docs/html/classace__routine_1_1CoroutineProfiler__inherit__graph.md5 create mode 100644 docs/html/classace__routine_1_1CoroutineProfiler__inherit__graph.png create mode 100644 docs/html/classace__routine_1_1LogBinJsonRendererTemplate-members.html create mode 100644 docs/html/classace__routine_1_1LogBinJsonRendererTemplate.html create mode 100644 docs/html/classace__routine_1_1LogBinProfilerTemplate-members.html create mode 100644 docs/html/classace__routine_1_1LogBinProfilerTemplate.html create mode 100644 docs/html/classace__routine_1_1LogBinProfilerTemplate__coll__graph.map create mode 100644 docs/html/classace__routine_1_1LogBinProfilerTemplate__coll__graph.md5 create mode 100644 docs/html/classace__routine_1_1LogBinProfilerTemplate__coll__graph.png create mode 100644 docs/html/classace__routine_1_1LogBinProfilerTemplate__inherit__graph.map create mode 100644 docs/html/classace__routine_1_1LogBinProfilerTemplate__inherit__graph.md5 create mode 100644 docs/html/classace__routine_1_1LogBinProfilerTemplate__inherit__graph.png create mode 100644 docs/html/classace__routine_1_1LogBinTableRendererTemplate-members.html create mode 100644 docs/html/classace__routine_1_1LogBinTableRendererTemplate.html create mode 100644 docs/html/hierarchy.html create mode 100644 docs/html/inherit_graph_0.map create mode 100644 docs/html/inherit_graph_0.md5 create mode 100644 docs/html/inherit_graph_0.png create mode 100644 docs/html/inherit_graph_1.map create mode 100644 docs/html/inherit_graph_1.md5 create mode 100644 docs/html/inherit_graph_1.png create mode 100644 docs/html/inherit_graph_2.map create mode 100644 docs/html/inherit_graph_2.md5 create mode 100644 docs/html/inherit_graph_2.png create mode 100644 docs/html/inherit_graph_3.map create mode 100644 docs/html/inherit_graph_3.md5 create mode 100644 docs/html/inherit_graph_3.png create mode 100644 docs/html/inherit_graph_4.map create mode 100644 docs/html/inherit_graph_4.md5 create mode 100644 docs/html/inherit_graph_4.png create mode 100644 docs/html/inherit_graph_5.map create mode 100644 docs/html/inherit_graph_5.md5 create mode 100644 docs/html/inherit_graph_5.png create mode 100644 docs/html/inherit_graph_6.map create mode 100644 docs/html/inherit_graph_6.md5 create mode 100644 docs/html/inherit_graph_6.png create mode 100644 docs/html/inherits.html create mode 100644 docs/html/search/all_d.html create mode 100644 docs/html/search/all_d.js create mode 100644 docs/html/search/all_e.html create mode 100644 docs/html/search/all_e.js create mode 100644 docs/html/search/all_f.html create mode 100644 docs/html/search/all_f.js create mode 100644 docs/html/search/classes_1.html create mode 100644 docs/html/search/classes_1.js create mode 100644 docs/html/search/functions_9.html create mode 100644 docs/html/search/functions_9.js create mode 100644 docs/html/search/functions_a.html create mode 100644 docs/html/search/functions_a.js create mode 100644 docs/html/search/functions_b.html create mode 100644 docs/html/search/functions_b.js create mode 100644 docs/html/search/typedefs_2.html create mode 100644 docs/html/search/typedefs_2.js diff --git a/docs/html/AceRoutine_8h_source.html b/docs/html/AceRoutine_8h_source.html index a18f0af..8cc21cf 100644 --- a/docs/html/AceRoutine_8h_source.html +++ b/docs/html/AceRoutine_8h_source.html @@ -22,7 +22,7 @@
AceRoutine -  1.4.2 +  1.5.0
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
@@ -105,14 +105,18 @@
43 #endif
44 
45 // Version format: xxyyzz == "xx.yy.zz"
-
46 #define ACE_ROUTINE_VERSION 10402
-
47 #define ACE_ROUTINE_VERSION_STRING "1.4.2"
+
46 #define ACE_ROUTINE_VERSION 10500
+
47 #define ACE_ROUTINE_VERSION_STRING "1.5.0"
48 
49 #include "ace_routine/Coroutine.h"
50 #include "ace_routine/CoroutineScheduler.h"
51 #include "ace_routine/Channel.h"
-
52 
-
53 #endif
+
52 #include "ace_routine/CoroutineProfiler.h"
+
53 #include "ace_routine/LogBinProfiler.h"
+
54 #include "ace_routine/LogBinTableRenderer.h"
+
55 #include "ace_routine/LogBinJsonRenderer.h"
+
56 
+
57 #endif
diff --git a/docs/html/Channel_8h_source.html b/docs/html/Channel_8h_source.html index bf623cd..7f69fed 100644 --- a/docs/html/Channel_8h_source.html +++ b/docs/html/Channel_8h_source.html @@ -22,7 +22,7 @@
AceRoutine -  1.4.2 +  1.5.0
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
diff --git a/docs/html/ClockInterface_8h_source.html b/docs/html/ClockInterface_8h_source.html index 882dded..353d93b 100644 --- a/docs/html/ClockInterface_8h_source.html +++ b/docs/html/ClockInterface_8h_source.html @@ -22,7 +22,7 @@
AceRoutine -  1.4.2 +  1.5.0
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
diff --git a/docs/html/CoroutineProfiler_8h_source.html b/docs/html/CoroutineProfiler_8h_source.html new file mode 100644 index 0000000..64e2b0a --- /dev/null +++ b/docs/html/CoroutineProfiler_8h_source.html @@ -0,0 +1,133 @@ + + + + + + + +AceRoutine: /home/brian/src/AceRoutine/src/ace_routine/CoroutineProfiler.h Source File + + + + + + + + + +
+
+ + + + + + +
+
AceRoutine +  1.5.0 +
+
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
+
+
+ + + + + + + + +
+
+ + +
+ +
+ + +
+
+
+
CoroutineProfiler.h
+
+
+
1 /*
+
2 MIT License
+
3 
+
4 Copyright (c) 2022 Brian T. Park
+
5 
+
6 Permission is hereby granted, free of charge, to any person obtaining a copy
+
7 of this software and associated documentation files (the "Software"), to deal
+
8 in the Software without restriction, including without limitation the rights
+
9 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+
10 copies of the Software, and to permit persons to whom the Software is
+
11 furnished to do so, subject to the following conditions:
+
12 
+
13 The above copyright notice and this permission notice shall be included in all
+
14 copies or substantial portions of the Software.
+
15 
+
16 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+
17 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+
18 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+
19 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+
20 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+
21 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+
22 SOFTWARE.
+
23 */
+
24 
+
25 #ifndef ACE_ROUTINE_COROUTINE_PROFILER_H
+
26 #define ACE_ROUTINE_COROUTINE_PROFILER_H
+
27 
+
28 #include <stdint.h> // uint32_t
+
29 
+
30 namespace ace_routine {
+
31 
+
36 class CoroutineProfiler {
+
37  public:
+
39  CoroutineProfiler() = default;
+
40 
+
64  #if defined(ARDUINO_ARCH_AVR)
+
65  ~CoroutineProfiler() = default;
+
66  #else
+
67  virtual ~CoroutineProfiler() = default;
+
68  #endif
+
69 
+
74  virtual void updateElapsedMicros(uint32_t micros) = 0;
+
75 };
+
76 
+
77 }
+
78 
+
79 #endif
+
+
ace_routine::CoroutineProfiler::updateElapsedMicros
virtual void updateElapsedMicros(uint32_t micros)=0
Process the completion of the runCoroutine() method which took micros microseconds.
+
ace_routine::CoroutineProfiler
An interface class for profiling classes that can track the elapsed time consumed by Coroutine::runCo...
Definition: CoroutineProfiler.h:36
+
ace_routine::CoroutineProfiler::~CoroutineProfiler
virtual ~CoroutineProfiler()=default
The destructor is NON-virtual on AVR processors because adding a virtual destructor causes flash cons...
+
ace_routine::CoroutineProfiler::CoroutineProfiler
CoroutineProfiler()=default
Use default constructor.
+ +
+Generated by   +doxygen + 1.8.17 +
+ + diff --git a/docs/html/CoroutineScheduler_8h_source.html b/docs/html/CoroutineScheduler_8h_source.html index 4978f0b..5b46b04 100644 --- a/docs/html/CoroutineScheduler_8h_source.html +++ b/docs/html/CoroutineScheduler_8h_source.html @@ -22,7 +22,7 @@
AceRoutine -  1.4.2 +  1.5.0
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
@@ -102,124 +102,167 @@
29  #include <Arduino.h> // Serial, Print
30 #endif
31 #include "Coroutine.h"
-
32 
-
33 class Print;
-
34 
-
35 namespace ace_routine {
-
36 
-
80 template <typename T_COROUTINE>
-
81 class CoroutineSchedulerTemplate {
-
82  public:
-
84  static void setup() { getScheduler()->setupScheduler(); }
-
85 
-
87  static void setupCoroutines() {
-
88  getScheduler()->setupCoroutinesInternal();
-
89  }
-
90 
-
97  static void loop() { getScheduler()->runCoroutine(); }
-
98 
-
105  static void list(Print& printer) {
-
106  getScheduler()->listCoroutines(printer);
-
107  }
-
108 
-
109  private:
-
110  // Disable copy-constructor and assignment operator
-
111  CoroutineSchedulerTemplate(const CoroutineSchedulerTemplate&) = delete;
-
112  CoroutineSchedulerTemplate& operator=(const CoroutineSchedulerTemplate&) =
-
113  delete;
-
114 
-
116  static CoroutineSchedulerTemplate* getScheduler() {
-
117  static CoroutineSchedulerTemplate singletonScheduler;
-
118  return &singletonScheduler;
-
119  }
-
120 
-
122  CoroutineSchedulerTemplate() = default;
-
123 
-
134  void setupScheduler() {
-
135  mCurrent = T_COROUTINE::getRoot();
-
136  }
-
137 
-
139  void setupCoroutinesInternal() {
-
140  for (T_COROUTINE** p = T_COROUTINE::getRoot();
-
141  (*p) != nullptr;
-
142  p = (*p)->getNext()) {
-
143 
-
144  (*p)->setupCoroutine();
-
145  }
-
146  }
-
147 
-
149  void runCoroutine() {
-
150  // If reached the end, start from the beginning again.
-
151  if (*mCurrent == nullptr) {
-
152  mCurrent = T_COROUTINE::getRoot();
-
153  // Return if the list is empty. Checking for a null getRoot() inside the
-
154  // if-statement is deliberate, since it optimizes the common case where
-
155  // the linked list is not empty.
-
156  if (*mCurrent == nullptr) {
-
157  return;
-
158  }
-
159  }
-
160 
-
161  #if ACE_ROUTINE_DEBUG == 1
-
162  Serial.print(F("Processing "));
-
163  Serial.print((uintptr_t) (*mCurrent));
-
164  Serial.println();
-
165  #endif
-
166 
-
167  // Handle the coroutine's dispatch back to the last known internal status.
-
168  switch ((*mCurrent)->getStatus()) {
-
169  case T_COROUTINE::kStatusYielding:
-
170  case T_COROUTINE::kStatusDelaying:
-
171  // The coroutine itself knows whether it is yielding or delaying, and
-
172  // its continuation context determines whether to call
-
173  // Coroutine::isDelayExpired(), Coroutine::isDelayMicrosExpired(), or
-
174  // Coroutine::isDelaySecondsExpired().
-
175  (*mCurrent)->runCoroutine();
-
176  break;
-
177 
-
178  case T_COROUTINE::kStatusEnding:
-
179  // mark it terminated
-
180  (*mCurrent)->setTerminated();
-
181  break;
-
182 
-
183  default:
-
184  // For all other cases, just skip to the next coroutine.
-
185  break;
-
186  }
-
187 
-
188  // Go to the next coroutine
-
189  mCurrent = (*mCurrent)->getNext();
-
190  }
-
191 
-
192 
-
194  void listCoroutines(Print& printer) {
-
195  for (T_COROUTINE** p = T_COROUTINE::getRoot(); (*p) != nullptr;
-
196  p = (*p)->getNext()) {
-
197  printer.print(F("Coroutine "));
-
198  printer.print((uintptr_t) *p);
-
199  printer.print(F("; status: "));
-
200  (*p)->statusPrintTo(printer);
-
201  printer.println();
-
202  }
-
203  }
-
204 
-
205  // The current coroutine is represented by a pointer to a pointer. This
-
206  // allows the root node to be treated the same as all the other nodes, and
-
207  // simplifies the code that traverses the singly-linked list.
-
208  T_COROUTINE** mCurrent = nullptr;
-
209 };
-
210 
-
211 using CoroutineScheduler = CoroutineSchedulerTemplate<Coroutine>;
-
212 
-
213 }
-
214 
-
215 #endif
+
32 #include "CoroutineProfiler.h"
+
33 
+
34 class Print;
+
35 
+
36 namespace ace_routine {
+
37 
+
81 template <typename T_COROUTINE>
+
82 class CoroutineSchedulerTemplate {
+
83  public:
+
85  static void setup() { getScheduler()->setupScheduler(); }
+
86 
+
88  static void setupCoroutines() {
+
89  getScheduler()->setupCoroutinesInternal();
+
90  }
+
91 
+
98  static void loop() { getScheduler()->runCoroutine(); }
+
99 
+
106  static void loopWithProfiler() {
+
107  getScheduler()->runCoroutineWithProfiler();
+
108  }
+
109 
+
116  static void list(Print& printer) {
+
117  getScheduler()->listCoroutines(printer);
+
118  }
+
119 
+
120  private:
+
121  // Disable copy-constructor and assignment operator
+
122  CoroutineSchedulerTemplate(const CoroutineSchedulerTemplate&) = delete;
+
123  CoroutineSchedulerTemplate& operator=(const CoroutineSchedulerTemplate&) =
+
124  delete;
+
125 
+
127  static CoroutineSchedulerTemplate* getScheduler() {
+
128  static CoroutineSchedulerTemplate singletonScheduler;
+
129  return &singletonScheduler;
+
130  }
+
131 
+
133  CoroutineSchedulerTemplate() = default;
+
134 
+
145  void setupScheduler() {
+
146  mCurrent = T_COROUTINE::getRoot();
+
147  }
+
148 
+
150  void setupCoroutinesInternal() {
+
151  for (T_COROUTINE** p = T_COROUTINE::getRoot();
+
152  (*p) != nullptr;
+
153  p = (*p)->getNext()) {
+
154 
+
155  (*p)->setupCoroutine();
+
156  }
+
157  }
+
158 
+
163  void runCoroutine() {
+
164  // If reached the end, start from the beginning again.
+
165  if (*mCurrent == nullptr) {
+
166  mCurrent = T_COROUTINE::getRoot();
+
167  // Return if the list is empty. Checking for a null getRoot() inside the
+
168  // if-statement is deliberate, since it optimizes the common case where
+
169  // the linked list is not empty.
+
170  if (*mCurrent == nullptr) {
+
171  return;
+
172  }
+
173  }
+
174 
+
175  // Handle the coroutine's dispatch back to the last known internal status.
+
176  switch ((*mCurrent)->getStatus()) {
+
177  case T_COROUTINE::kStatusYielding:
+
178  case T_COROUTINE::kStatusDelaying:
+
179  // The coroutine itself knows whether it is yielding or delaying, and
+
180  // its continuation context determines whether to call
+
181  // Coroutine::isDelayExpired(), Coroutine::isDelayMicrosExpired(), or
+
182  // Coroutine::isDelaySecondsExpired().
+
183  (*mCurrent)->runCoroutine();
+
184  break;
+
185 
+
186  case T_COROUTINE::kStatusEnding:
+
187  // mark it terminated
+
188  (*mCurrent)->setTerminated();
+
189  break;
+
190 
+
191  default:
+
192  // For all other cases, just skip to the next coroutine.
+
193  break;
+
194  }
+
195 
+
196  // Go to the next coroutine
+
197  mCurrent = (*mCurrent)->getNext();
+
198  }
+
199 
+
200  /*
+
201  * Run the current coroutine with profiling enabled by calling
+
202  * Coroutine::runCoroutineWithProfiler().
+
203  */
+
204  void runCoroutineWithProfiler() {
+
205  // If reached the end, start from the beginning again.
+
206  if (*mCurrent == nullptr) {
+
207  mCurrent = T_COROUTINE::getRoot();
+
208  // Return if the list is empty. Checking for a null getRoot() inside the
+
209  // if-statement is deliberate, since it optimizes the common case where
+
210  // the linked list is not empty.
+
211  if (*mCurrent == nullptr) {
+
212  return;
+
213  }
+
214  }
+
215 
+
216  // Handle the coroutine's dispatch back to the last known internal status.
+
217  switch ((*mCurrent)->getStatus()) {
+
218  case T_COROUTINE::kStatusYielding:
+
219  case T_COROUTINE::kStatusDelaying:
+
220  // The coroutine itself knows whether it is yielding or delaying, and
+
221  // its continuation context determines whether to call
+
222  // Coroutine::isDelayExpired(), Coroutine::isDelayMicrosExpired(), or
+
223  // Coroutine::isDelaySecondsExpired().
+
224  //
+
225  // This version calls `Coroutine::runCoroutineWithProfiler()` to
+
226  // enable the profiler.
+
227  (*mCurrent)->runCoroutineWithProfiler();
+
228  break;
+
229 
+
230  case T_COROUTINE::kStatusEnding:
+
231  // mark it terminated
+
232  (*mCurrent)->setTerminated();
+
233  break;
+
234 
+
235  default:
+
236  // For all other cases, just skip to the next coroutine.
+
237  break;
+
238  }
+
239 
+
240  // Go to the next coroutine
+
241  mCurrent = (*mCurrent)->getNext();
+
242  }
+
243 
+
245  void listCoroutines(Print& printer) {
+
246  for (T_COROUTINE** p = T_COROUTINE::getRoot(); (*p) != nullptr;
+
247  p = (*p)->getNext()) {
+
248  printer.print(F("Coroutine "));
+
249  (*p)->printNameTo(printer);
+
250  printer.print(F("; status: "));
+
251  (*p)->statusPrintTo(printer);
+
252  printer.println();
+
253  }
+
254  }
+
255 
+
256  // The current coroutine is represented by a pointer to a pointer. This
+
257  // allows the root node to be treated the same as all the other nodes, and
+
258  // simplifies the code that traverses the singly-linked list.
+
259  T_COROUTINE** mCurrent = nullptr;
+
260 };
+
261 
+
262 using CoroutineScheduler = CoroutineSchedulerTemplate<Coroutine>;
+
263 
+
264 }
+
265 
+
266 #endif
-
ace_routine::CoroutineSchedulerTemplate::loop
static void loop()
Run the current coroutine using the current scheduler.
Definition: CoroutineScheduler.h:97
-
ace_routine::CoroutineSchedulerTemplate::setupCoroutines
static void setupCoroutines()
Set up the coroutines by calling their setupCoroutine() methods.
Definition: CoroutineScheduler.h:87
-
ace_routine::CoroutineSchedulerTemplate::setup
static void setup()
Set up the scheduler.
Definition: CoroutineScheduler.h:84
-
ace_routine::CoroutineSchedulerTemplate::list
static void list(Print &printer)
Print out the known coroutines to the printer (usually Serial).
Definition: CoroutineScheduler.h:105
-
ace_routine::CoroutineSchedulerTemplate
Class that manages instances of the Coroutine class, and executes them in a round-robin fashion.
Definition: Coroutine.h:270
+
ace_routine::CoroutineSchedulerTemplate::loop
static void loop()
Run the current coroutine using the current scheduler.
Definition: CoroutineScheduler.h:98
+
ace_routine::CoroutineSchedulerTemplate::setupCoroutines
static void setupCoroutines()
Set up the coroutines by calling their setupCoroutine() methods.
Definition: CoroutineScheduler.h:88
+
ace_routine::CoroutineSchedulerTemplate::loopWithProfiler
static void loopWithProfiler()
Run the current coroutine using the current scheduler with the coroutine profiler enabled.
Definition: CoroutineScheduler.h:106
+
ace_routine::CoroutineSchedulerTemplate::setup
static void setup()
Set up the scheduler.
Definition: CoroutineScheduler.h:85
+
ace_routine::CoroutineSchedulerTemplate::list
static void list(Print &printer)
Print out the known coroutines to the printer (usually Serial).
Definition: CoroutineScheduler.h:116
+
ace_routine::CoroutineSchedulerTemplate
Class that manages instances of the Coroutine class, and executes them in a round-robin fashion.
Definition: Coroutine.h:274
diff --git a/docs/html/Coroutine_8cpp_source.html b/docs/html/Coroutine_8cpp_source.html index 804d102..10fd63e 100644 --- a/docs/html/Coroutine_8cpp_source.html +++ b/docs/html/Coroutine_8cpp_source.html @@ -22,7 +22,7 @@
AceRoutine -  1.4.2 +  1.5.0
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
@@ -102,27 +102,28 @@
29 
30 // Create the sStatusStrings lookup table to translate Status integer to a
31 // human-readable string. When it is used, it increases flash memory by 86
-
32 // bytes, and static RAM by 14 bytes. It is currently only used by
-
33 // CoroutineScheduler::list() but I think it's worth it to make debugging
-
34 // easier.
-
35 
-
36 static const char kStatusSuspendedString[] PROGMEM = "Suspended";
-
37 static const char kStatusYieldingString[] PROGMEM = "Yielding";
-
38 static const char kStatusDelayingString[] PROGMEM = "Delaying";
-
39 static const char kStatusRunningString[] PROGMEM = "Running";
-
40 static const char kStatusEndingString[] PROGMEM = "Ending";
-
41 static const char kStatusTerminatedString[] PROGMEM = "Terminated";
-
42 
-
43 const __FlashStringHelper* const sStatusStrings[] = {
-
44  FPSTR(kStatusSuspendedString),
-
45  FPSTR(kStatusYieldingString),
-
46  FPSTR(kStatusDelayingString),
-
47  FPSTR(kStatusRunningString),
-
48  FPSTR(kStatusEndingString),
-
49  FPSTR(kStatusTerminatedString),
-
50 };
-
51 
-
52 }
+
32 // bytes. It is currently only used by CoroutineScheduler::list() but I think
+
33 // it's worth it to make debugging easier.
+
34 
+
35 static const char kStatusSuspendedString[] PROGMEM = "Suspended";
+
36 static const char kStatusYieldingString[] PROGMEM = "Yielding";
+
37 static const char kStatusDelayingString[] PROGMEM = "Delaying";
+
38 static const char kStatusRunningString[] PROGMEM = "Running";
+
39 static const char kStatusEndingString[] PROGMEM = "Ending";
+
40 static const char kStatusTerminatedString[] PROGMEM = "Terminated";
+
41 
+
42 // Store the array of PROGMEM pointers in PROGMEM as well, saving 14 bytes of
+
43 // RAM on AVR, and 28 bytes on ESP8266.
+
44 const __FlashStringHelper* const sStatusStrings[] PROGMEM = {
+
45  FPSTR(kStatusSuspendedString),
+
46  FPSTR(kStatusYieldingString),
+
47  FPSTR(kStatusDelayingString),
+
48  FPSTR(kStatusRunningString),
+
49  FPSTR(kStatusEndingString),
+
50  FPSTR(kStatusTerminatedString),
+
51 };
+
52 
+
53 }
FPSTR
#define FPSTR(p)
A macro that converts a const char* that already points to a PROGMEM string to a const __FlashStringH...
Definition: compat.h:87
diff --git a/docs/html/Coroutine_8h.html b/docs/html/Coroutine_8h.html index d4083b8..46fa9d7 100644 --- a/docs/html/Coroutine_8h.html +++ b/docs/html/Coroutine_8h.html @@ -22,7 +22,7 @@
AceRoutine -  1.4.2 +  1.5.0
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
@@ -77,17 +77,24 @@
#include <stdint.h>
#include <Print.h>
+#include <AceCommon.h>
+#include "CoroutineProfiler.h"
#include "ClockInterface.h"
+#include "compat.h"
Include dependency graph for Coroutine.h:
- - - - - + + + + + + + + +
@@ -95,11 +102,16 @@
- - - + + + + + + + +
@@ -110,7 +122,7 @@ class  ace_routine::CoroutineSchedulerTemplate< T_COROUTINE >  Class that manages instances of the Coroutine class, and executes them in a round-robin fashion. More...
  -class  ace_routine::CoroutineTemplate< T_CLOCK > +class  ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >  Base class of all coroutines. More...
  @@ -176,9 +188,9 @@
- - - + + +

Typedefs

using ace_routine::Coroutine = CoroutineTemplate< ClockInterface >
 A concrete template instance of CoroutineTemplate that uses ClockInterface which uses the built-in millis() or micros() function. More...
 
using ace_routine::Coroutine = CoroutineTemplate< ClockInterface, uint16_t >
 A concrete template instance of CoroutineTemplate that uses ClockInterface which uses the built-in millis() or micros() function. More...
 

Detailed Description

All coroutines are instances of the Coroutine base class. The COROUTINE() macro creates these instances, and registers them to automatically run when CoroutineScheduler::loop() is called.

@@ -212,7 +224,7 @@

Definition at line 77 of file Coroutine.h.

+

Definition at line 81 of file Coroutine.h.

@@ -233,7 +245,7 @@

Value:
struct Coroutine_##name : ace_routine::Coroutine { \
Coroutine_##name(); \
-
int runCoroutine() override; \
+
int runCoroutine() override; \
} name; \
Coroutine_##name :: Coroutine_##name() { \
} \
@@ -241,7 +253,7 @@

COROUTINE() macro.

-

Definition at line 84 of file Coroutine.h.

+

Definition at line 88 of file Coroutine.h.

@@ -280,7 +292,7 @@

COROUTINE() macro.

-

Definition at line 94 of file Coroutine.h.

+

Definition at line 98 of file Coroutine.h.

@@ -312,7 +324,7 @@

while (!condition) COROUTINE_YIELD();

but potentially slightly more efficient.

-

Definition at line 181 of file Coroutine.h.

+

Definition at line 185 of file Coroutine.h.

@@ -337,7 +349,7 @@

Definition at line 137 of file Coroutine.h.

+

Definition at line 141 of file Coroutine.h.

@@ -370,7 +382,7 @@

COROUTINE_DELAY() as many times as necessary.

This could have been implemented using COROUTINE_AWAIT() but this macro matches the global delay(millis) function already provided by the Arduino API. Also having a separate kStatusDelaying state allows the CoroutineScheduler to be slightly more efficient by avoiding the call to Coroutine::runCoroutine() if the delay has not expired.

-

Definition at line 205 of file Coroutine.h.

+

Definition at line 209 of file Coroutine.h.

@@ -401,7 +413,7 @@

COROUTINE_DELAY(delayMillis).

-

Definition at line 216 of file Coroutine.h.

+

Definition at line 220 of file Coroutine.h.

@@ -434,7 +446,7 @@

On microcontrollers without hardware integer division instruction, (i.e. AVR, SAMD21, ESP8266), the division by 1000 is relatively slow and consumes significant amount of flash memory (100-150 bytes on AVR).

-

Definition at line 241 of file Coroutine.h.

+

Definition at line 245 of file Coroutine.h.

@@ -463,7 +475,7 @@

Definition at line 255 of file Coroutine.h.

+

Definition at line 259 of file Coroutine.h.

@@ -487,7 +499,7 @@

COROUTINE_BEGIN() at the beginning of a Coroutine.

-

Definition at line 147 of file Coroutine.h.

+

Definition at line 151 of file Coroutine.h.

@@ -513,7 +525,7 @@

Definition at line 164 of file Coroutine.h.

+

Definition at line 168 of file Coroutine.h.

@@ -540,7 +552,7 @@

COROUTINE_YIELD(), COROUTINE_AWAIT(), COROUTINE_DELAY().

-

Definition at line 155 of file Coroutine.h.

+

Definition at line 159 of file Coroutine.h.

@@ -569,7 +581,7 @@

EXTERN_COROUTINE(className, name); -

Definition at line 111 of file Coroutine.h.

+

Definition at line 115 of file Coroutine.h.

@@ -590,13 +602,13 @@

Value:
struct Coroutine_##name : ace_routine::Coroutine { \
Coroutine_##name(); \
-
int runCoroutine() override; \
+
int runCoroutine() override; \
}; \
extern Coroutine_##name name

Implement the 1-argument EXTERN_COROUTINE() macro.

-

Definition at line 121 of file Coroutine.h.

+

Definition at line 125 of file Coroutine.h.

@@ -633,19 +645,19 @@

EXTERN_COROUTINE() macro.

-

Definition at line 129 of file Coroutine.h.

+

Definition at line 133 of file Coroutine.h.

Typedef Documentation

- -

◆ Coroutine

+ +

◆ Coroutine

- +
using ace_routine::Coroutine = typedef CoroutineTemplate<ClockInterface>using ace_routine::Coroutine = typedef CoroutineTemplate<ClockInterface, uint16_t>
@@ -653,18 +665,18 @@

COROUTINE() macro or through manual subclassing of this class.

-

Definition at line 695 of file Coroutine.h.

+

Definition at line 825 of file Coroutine.h.

-
COROUTINE_BEGIN
#define COROUTINE_BEGIN()
Mark the beginning of a coroutine.
Definition: Coroutine.h:137
-
EXTERN_COROUTINE2
#define EXTERN_COROUTINE2(className, name)
Implement the 2-argument EXTERN_COROUTINE() macro.
Definition: Coroutine.h:129
-
COROUTINE_YIELD
#define COROUTINE_YIELD()
Yield execution to another coroutine.
Definition: Coroutine.h:164
-
ace_routine::CoroutineTemplate
Base class of all coroutines.
Definition: Coroutine.h:277
-
ace_routine::CoroutineTemplate::runCoroutine
virtual int runCoroutine()=0
The body of the coroutine.
-
EXTERN_COROUTINE1
#define EXTERN_COROUTINE1(name)
Implement the 1-argument EXTERN_COROUTINE() macro.
Definition: Coroutine.h:121
-
GET_EXTERN_COROUTINE
#define GET_EXTERN_COROUTINE(_1, _2, NAME,...)
Internal helper macro to allow overloading of the EXTERN_COROUTINE() macro.
Definition: Coroutine.h:118
+
COROUTINE_BEGIN
#define COROUTINE_BEGIN()
Mark the beginning of a coroutine.
Definition: Coroutine.h:141
+
EXTERN_COROUTINE2
#define EXTERN_COROUTINE2(className, name)
Implement the 2-argument EXTERN_COROUTINE() macro.
Definition: Coroutine.h:133
+
ace_routine::CoroutineTemplate::runCoroutine
virtual int runCoroutine()=0
The body of the coroutine.
+
COROUTINE_YIELD
#define COROUTINE_YIELD()
Yield execution to another coroutine.
Definition: Coroutine.h:168
+
ace_routine::CoroutineTemplate
Base class of all coroutines.
Definition: Coroutine.h:292
+
EXTERN_COROUTINE1
#define EXTERN_COROUTINE1(name)
Implement the 1-argument EXTERN_COROUTINE() macro.
Definition: Coroutine.h:125
+
GET_EXTERN_COROUTINE
#define GET_EXTERN_COROUTINE(_1, _2, NAME,...)
Internal helper macro to allow overloading of the EXTERN_COROUTINE() macro.
Definition: Coroutine.h:122
Generated by   diff --git a/docs/html/Coroutine_8h__dep__incl.map b/docs/html/Coroutine_8h__dep__incl.map index e718361..f52e9bd 100644 --- a/docs/html/Coroutine_8h__dep__incl.map +++ b/docs/html/Coroutine_8h__dep__incl.map @@ -1,7 +1,12 @@ - - - + + + + + + + + diff --git a/docs/html/Coroutine_8h__dep__incl.md5 b/docs/html/Coroutine_8h__dep__incl.md5 index cd81714..76a124b 100644 --- a/docs/html/Coroutine_8h__dep__incl.md5 +++ b/docs/html/Coroutine_8h__dep__incl.md5 @@ -1 +1 @@ -3fee777087f75d86d9670115cf91e7b3 \ No newline at end of file +e516b8c0aea4d94272a4a77a89df3974 \ No newline at end of file diff --git a/docs/html/Coroutine_8h__dep__incl.png b/docs/html/Coroutine_8h__dep__incl.png index 32f80b66f1e4c6897faca74616d2313b4b559ab8..726aa86fa22c1fb0c791352746f02a9673f2f50c 100644 GIT binary patch literal 64074 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

g>=M}{A)>4#BeSfmWEDmB%nU_V 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 - - - - - + + + + + + + + + diff --git a/docs/html/Coroutine_8h__incl.md5 b/docs/html/Coroutine_8h__incl.md5 index ec8569f..f19ead9 100644 --- a/docs/html/Coroutine_8h__incl.md5 +++ b/docs/html/Coroutine_8h__incl.md5 @@ -1 +1 @@ -8daedb32c80a57d456263ea2da8691cb \ No newline at end of file +560a8be5d36b44561ce8376d71288f61 \ No newline at end of file diff --git a/docs/html/Coroutine_8h__incl.png b/docs/html/Coroutine_8h__incl.png index 80d62bcb6c42ea03c094852e7d74e4fe9ba0884a..f37e053ffb4b048b397d3367236992e049e321ee 100644 GIT binary patch literal 24033 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

-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 SC^KNTBmTarr&+9S{p3GHl35%8 literal 12138 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 XZikdyoh~B~&qEYtRb{HAOoRUqRewWw diff --git a/docs/html/Coroutine_8h_source.html b/docs/html/Coroutine_8h_source.html index 8d0aba8..bd2c752 100644 --- a/docs/html/Coroutine_8h_source.html +++ b/docs/html/Coroutine_8h_source.html @@ -22,7 +22,7 @@

AceRoutine -  1.4.2 +  1.5.0
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
@@ -100,386 +100,488 @@
27 
28 #include <stdint.h> // UINT16_MAX
29 #include <Print.h> // Print
-
30 #include "ClockInterface.h"
-
31 
-
32 class AceRoutineTest_statusStrings;
-
33 class SuspendTest_suspendAndResume;
+
30 #include <AceCommon.h> // PrintStr<>
+
31 #include "CoroutineProfiler.h"
+
32 #include "ClockInterface.h"
+
33 #include "compat.h" // PROGMEM
34 
-
53 // https://stackoverflow.com/questions/295120
-
55 #if defined(__GNUC__) || defined(__clang__)
-
56  #define ACE_ROUTINE_DEPRECATED __attribute__((deprecated))
-
57 #elif defined(_MSC_VER)
-
58  #define ACE_ROUTINE_DEPRECATED __declspec(deprecated)
-
59 #else
-
60  #pragma message("WARNING: Implement ACE_ROUTINE_DEPRECATED for this compiler")
-
61  #define ACE_ROUTINE_DEPRECATED
-
62 #endif
-
63 
-
77 #define COROUTINE(...) \
-
78  GET_COROUTINE(__VA_ARGS__, COROUTINE2, COROUTINE1)(__VA_ARGS__)
-
79 
-
81 #define GET_COROUTINE(_1, _2, NAME, ...) NAME
-
82 
-
84 #define COROUTINE1(name) \
-
85 struct Coroutine_##name : ace_routine::Coroutine { \
-
86  Coroutine_##name(); \
-
87  int runCoroutine() override; \
-
88 } name; \
-
89 Coroutine_##name :: Coroutine_##name() { \
-
90 } \
-
91 int Coroutine_##name :: runCoroutine()
-
92 
-
94 #define COROUTINE2(className, name) \
-
95 struct className##_##name : className { \
-
96  className##_##name(); \
-
97  int runCoroutine() override; \
-
98 } name; \
-
99 className##_##name :: className##_##name() { \
-
100 } \
-
101 int className##_##name :: runCoroutine()
-
102 
-
111 #define EXTERN_COROUTINE(...) \
-
112  GET_EXTERN_COROUTINE(\
-
113  __VA_ARGS__, EXTERN_COROUTINE2, EXTERN_COROUTINE1)(__VA_ARGS__)
-
114 
-
118 #define GET_EXTERN_COROUTINE(_1, _2, NAME, ...) NAME
-
119 
-
121 #define EXTERN_COROUTINE1(name) \
-
122 struct Coroutine_##name : ace_routine::Coroutine { \
-
123  Coroutine_##name(); \
-
124  int runCoroutine() override; \
-
125 }; \
-
126 extern Coroutine_##name name
-
127 
-
129 #define EXTERN_COROUTINE2(className, name) \
-
130 struct className##_##name : className { \
-
131  className##_##name(); \
-
132  int runCoroutine() override; \
-
133 }; \
-
134 extern className##_##name name
-
135 
-
137 #define COROUTINE_BEGIN() \
-
138  void* p = this->getJump(); \
-
139  if (p != nullptr) { \
-
140  goto *p; \
-
141  }
-
142 
-
147 #define COROUTINE_LOOP() \
-
148  COROUTINE_BEGIN(); \
-
149  while (true) \
-
150 
-
151 
-
155 #define COROUTINE_YIELD_INTERNAL() \
-
156  do { \
-
157  __label__ jumpLabel; \
-
158  this->setJump(&& jumpLabel); \
-
159  return 0; \
-
160  jumpLabel: ; \
-
161  } while (false)
-
162 
-
164 #define COROUTINE_YIELD() \
-
165  do { \
-
166  this->setYielding(); \
-
167  COROUTINE_YIELD_INTERNAL(); \
-
168  this->setRunning(); \
-
169  } while (false)
-
170 
-
181 #define COROUTINE_AWAIT(condition) \
-
182  do { \
-
183  this->setYielding(); \
-
184  do { \
-
185  COROUTINE_YIELD_INTERNAL(); \
-
186  } while (!(condition)); \
-
187  this->setRunning(); \
-
188  } while (false)
-
189 
-
205 #define COROUTINE_DELAY(delayMillis) \
-
206  do { \
-
207  this->setDelayMillis(delayMillis); \
-
208  this->setDelaying(); \
-
209  do { \
-
210  COROUTINE_YIELD_INTERNAL(); \
-
211  } while (!this->isDelayExpired()); \
-
212  this->setRunning(); \
-
213  } while (false)
-
214 
-
216 #define COROUTINE_DELAY_MICROS(delayMicros) \
-
217  do { \
-
218  this->setDelayMicros(delayMicros); \
-
219  this->setDelaying(); \
-
220  do { \
-
221  COROUTINE_YIELD_INTERNAL(); \
-
222  } while (!this->isDelayMicrosExpired()); \
-
223  this->setRunning(); \
-
224  } while (false)
-
225 
-
241 #define COROUTINE_DELAY_SECONDS(delaySeconds) \
-
242  do { \
-
243  this->setDelaySeconds(delaySeconds); \
-
244  this->setDelaying(); \
-
245  do { \
-
246  COROUTINE_YIELD_INTERNAL(); \
-
247  } while (!this->isDelaySecondsExpired()); \
-
248  this->setRunning(); \
-
249  } while (false)
-
250 
-
255 #define COROUTINE_END() \
-
256  do { \
-
257  __label__ jumpLabel; \
-
258  this->setEnding(); \
-
259  this->setJump(&& jumpLabel); \
-
260  jumpLabel: ; \
-
261  return 0; \
-
262  } while (false)
-
263 
-
264 namespace ace_routine {
-
265 
-
267 extern const __FlashStringHelper* const sStatusStrings[];
-
268 
-
269 // Forward declaration of CoroutineSchedulerTemplate<T>
-
270 template <typename T> class CoroutineSchedulerTemplate;
-
271 
-
276 template <typename T_CLOCK>
-
277 class CoroutineTemplate {
-
278  friend class CoroutineSchedulerTemplate<CoroutineTemplate<T_CLOCK>>;
-
279  friend class ::AceRoutineTest_statusStrings;
-
280  friend class ::SuspendTest_suspendAndResume;
-
281 
-
282  public:
-
293  virtual int runCoroutine() = 0;
-
294 
-
309  virtual void setupCoroutine() {}
-
310 
-
321  void suspend() {
-
322  if (isDone()) return;
-
323  mStatus = kStatusSuspended;
-
324  }
-
325 
-
332  void resume() {
-
333  if (mStatus != kStatusSuspended) return;
-
334 
-
335  // We lost the original state of the coroutine when suspend() was called
-
336  // but the coroutine will automatically go back into the original state
-
337  // when Coroutine::runCoroutine() is called because COROUTINE_YIELD(),
-
338  // COROUTINE_DELAY() and COROUTINE_AWAIT() are written to restore their
-
339  // status.
-
340  mStatus = kStatusYielding;
-
341  }
-
342 
-
356  void reset() {
-
357  mStatus = kStatusYielding;
-
358  mJumpPoint = nullptr;
-
359  }
-
360 
-
362  bool isDelayExpired() const {
-
363  uint16_t nowMillis = coroutineMillis();
-
364  uint16_t elapsed = nowMillis - mDelayStart;
-
365  return elapsed >= mDelayDuration;
+
35 class __FlashStringHelper;
+
36 class AceRoutineTest_statusStrings;
+
37 class SuspendTest_suspendAndResume;
+
38 
+
57 // https://stackoverflow.com/questions/295120
+
59 #if defined(__GNUC__) || defined(__clang__)
+
60  #define ACE_ROUTINE_DEPRECATED __attribute__((deprecated))
+
61 #elif defined(_MSC_VER)
+
62  #define ACE_ROUTINE_DEPRECATED __declspec(deprecated)
+
63 #else
+
64  #pragma message("WARNING: Implement ACE_ROUTINE_DEPRECATED for this compiler")
+
65  #define ACE_ROUTINE_DEPRECATED
+
66 #endif
+
67 
+
81 #define COROUTINE(...) \
+
82  GET_COROUTINE(__VA_ARGS__, COROUTINE2, COROUTINE1)(__VA_ARGS__)
+
83 
+
85 #define GET_COROUTINE(_1, _2, NAME, ...) NAME
+
86 
+
88 #define COROUTINE1(name) \
+
89 struct Coroutine_##name : ace_routine::Coroutine { \
+
90  Coroutine_##name(); \
+
91  int runCoroutine() override; \
+
92 } name; \
+
93 Coroutine_##name :: Coroutine_##name() { \
+
94 } \
+
95 int Coroutine_##name :: runCoroutine()
+
96 
+
98 #define COROUTINE2(className, name) \
+
99 struct className##_##name : className { \
+
100  className##_##name(); \
+
101  int runCoroutine() override; \
+
102 } name; \
+
103 className##_##name :: className##_##name() { \
+
104 } \
+
105 int className##_##name :: runCoroutine()
+
106 
+
115 #define EXTERN_COROUTINE(...) \
+
116  GET_EXTERN_COROUTINE(\
+
117  __VA_ARGS__, EXTERN_COROUTINE2, EXTERN_COROUTINE1)(__VA_ARGS__)
+
118 
+
122 #define GET_EXTERN_COROUTINE(_1, _2, NAME, ...) NAME
+
123 
+
125 #define EXTERN_COROUTINE1(name) \
+
126 struct Coroutine_##name : ace_routine::Coroutine { \
+
127  Coroutine_##name(); \
+
128  int runCoroutine() override; \
+
129 }; \
+
130 extern Coroutine_##name name
+
131 
+
133 #define EXTERN_COROUTINE2(className, name) \
+
134 struct className##_##name : className { \
+
135  className##_##name(); \
+
136  int runCoroutine() override; \
+
137 }; \
+
138 extern className##_##name name
+
139 
+
141 #define COROUTINE_BEGIN() \
+
142  void* p = this->getJump(); \
+
143  if (p != nullptr) { \
+
144  goto *p; \
+
145  }
+
146 
+
151 #define COROUTINE_LOOP() \
+
152  COROUTINE_BEGIN(); \
+
153  while (true) \
+
154 
+
155 
+
159 #define COROUTINE_YIELD_INTERNAL() \
+
160  do { \
+
161  __label__ jumpLabel; \
+
162  this->setJump(&& jumpLabel); \
+
163  return 0; \
+
164  jumpLabel: ; \
+
165  } while (false)
+
166 
+
168 #define COROUTINE_YIELD() \
+
169  do { \
+
170  this->setYielding(); \
+
171  COROUTINE_YIELD_INTERNAL(); \
+
172  this->setRunning(); \
+
173  } while (false)
+
174 
+
185 #define COROUTINE_AWAIT(condition) \
+
186  do { \
+
187  this->setYielding(); \
+
188  do { \
+
189  COROUTINE_YIELD_INTERNAL(); \
+
190  } while (!(condition)); \
+
191  this->setRunning(); \
+
192  } while (false)
+
193 
+
209 #define COROUTINE_DELAY(delayMillis) \
+
210  do { \
+
211  this->setDelayMillis(delayMillis); \
+
212  this->setDelaying(); \
+
213  do { \
+
214  COROUTINE_YIELD_INTERNAL(); \
+
215  } while (!this->isDelayExpired()); \
+
216  this->setRunning(); \
+
217  } while (false)
+
218 
+
220 #define COROUTINE_DELAY_MICROS(delayMicros) \
+
221  do { \
+
222  this->setDelayMicros(delayMicros); \
+
223  this->setDelaying(); \
+
224  do { \
+
225  COROUTINE_YIELD_INTERNAL(); \
+
226  } while (!this->isDelayMicrosExpired()); \
+
227  this->setRunning(); \
+
228  } while (false)
+
229 
+
245 #define COROUTINE_DELAY_SECONDS(delaySeconds) \
+
246  do { \
+
247  this->setDelaySeconds(delaySeconds); \
+
248  this->setDelaying(); \
+
249  do { \
+
250  COROUTINE_YIELD_INTERNAL(); \
+
251  } while (!this->isDelaySecondsExpired()); \
+
252  this->setRunning(); \
+
253  } while (false)
+
254 
+
259 #define COROUTINE_END() \
+
260  do { \
+
261  __label__ jumpLabel; \
+
262  this->setEnding(); \
+
263  this->setJump(&& jumpLabel); \
+
264  jumpLabel: ; \
+
265  return 0; \
+
266  } while (false)
+
267 
+
268 namespace ace_routine {
+
269 
+
271 extern const __FlashStringHelper* const sStatusStrings[] PROGMEM;
+
272 
+
273 // Forward declaration of CoroutineSchedulerTemplate<T>
+
274 template <typename T> class CoroutineSchedulerTemplate;
+
275 
+
291 template <typename T_CLOCK, typename T_DELAY>
+
292 class CoroutineTemplate {
+
293  friend class CoroutineSchedulerTemplate<CoroutineTemplate<T_CLOCK, T_DELAY>>;
+
294  friend class ::AceRoutineTest_statusStrings;
+
295  friend class ::SuspendTest_suspendAndResume;
+
296 
+
297  public:
+
299  static const uint8_t kNameTypeCString = 0;
+
300 
+
302  static const uint8_t kNameTypeFString = 1;
+
303 
+
304  public:
+
315  virtual int runCoroutine() = 0;
+
316 
+
331  virtual void setupCoroutine() {}
+
332 
+
344  int runCoroutineWithProfiler() {
+
345  if (mProfiler) {
+
346  uint32_t startMicros = coroutineMicros();
+
347  runCoroutine();
+
348  uint32_t elapsedMicros = coroutineMicros() - startMicros;
+
349  mProfiler->updateElapsedMicros(elapsedMicros);
+
350  return 0;
+
351  } else {
+
352  return runCoroutine();
+
353  }
+
354  }
+
355 
+
360  uint8_t getNameType() const { return mNameType; }
+
361 
+
363  void setName(const char* name) {
+
364  mNameType = kNameTypeCString;
+
365  mName = name;
366  }
367 
-
369  bool isDelayMicrosExpired() const {
-
370  uint16_t nowMicros = coroutineMicros();
-
371  uint16_t elapsed = nowMicros - mDelayStart;
-
372  return elapsed >= mDelayDuration;
-
373  }
-
374 
-
376  bool isDelaySecondsExpired() const {
-
377  uint16_t nowSeconds = coroutineSeconds();
-
378  uint16_t elapsed = nowSeconds - mDelayStart;
-
379  return elapsed >= mDelayDuration;
+
369  void setName(const __FlashStringHelper* name) {
+
370  mNameType = kNameTypeFString;
+
371  mName = name;
+
372  }
+
373 
+
375  const char* getCName() const { return (const char*) mName; }
+
376 
+
378  const __FlashStringHelper* getFName() const {
+
379  return (const __FlashStringHelper*) mName;
380  }
381 
-
383  bool isSuspended() const { return mStatus == kStatusSuspended; }
-
384 
-
386  bool isYielding() const { return mStatus == kStatusYielding; }
-
387 
-
389  bool isDelaying() const { return mStatus == kStatusDelaying; }
-
390 
-
392  bool isRunning() const { return mStatus == kStatusRunning; }
-
393 
-
399  bool isEnding() const { return mStatus == kStatusEnding; }
-
400 
-
407  bool isTerminated() const { return mStatus == kStatusTerminated; }
-
408 
-
414  bool isDone() const {
-
415  return mStatus == kStatusEnding || mStatus == kStatusTerminated;
-
416  }
-
417 
-
424  void setupCoroutine(const char* /*name*/) ACE_ROUTINE_DEPRECATED {}
-
425 
-
432  void setupCoroutine(const __FlashStringHelper* /*name*/)
-
433  ACE_ROUTINE_DEPRECATED {}
-
434 
-
435  protected:
-
466  typedef uint8_t Status;
-
467 
-
474  static const Status kStatusSuspended = 0;
-
475 
-
477  static const Status kStatusYielding = 1;
+
389  void printNameTo(Print& printer, uint8_t maxLen = 0) const {
+
390  // Need to go through this contortion because vsnprintf() does not support
+
391  // flash string parameters, so I can't use something like "%12.12s" with
+
392  // a flash string.
+
393  ace_common::PrintStr<64> pname;
+
394 
+
395  if (mName == nullptr) {
+
396  pname.print("0x");
+
397  pname.print((uintptr_t) this, 16);
+
398  } else if (mNameType == kNameTypeCString) {
+
399  pname.print((const char*) mName);
+
400  } else {
+
401  pname.print((const __FlashStringHelper*) mName);
+
402  }
+
403 
+
404  // Print name, truncated to maxLen or padded to maxLen.
+
405  if (maxLen) {
+
406  if (pname.length() < maxLen) {
+
407  printer.write(pname.cstr());
+
408  for (uint8_t i = pname.length(); i < maxLen; i++) {
+
409  printer.write(' ');
+
410  }
+
411  } else {
+
412  // NOTE: Must cast to (const uint8_t*) because the ATtiny85 core does
+
413  // not have a version of write() that accepts a (const char*), in
+
414  // contrast to every other Arduino Core.
+
415  printer.write((const uint8_t*) pname.cstr(), maxLen);
+
416  }
+
417  } else {
+
418  printer.write(pname.cstr());
+
419  }
+
420  }
+
421 
+
432  void suspend() {
+
433  if (isDone()) return;
+
434  mStatus = kStatusSuspended;
+
435  }
+
436 
+
443  void resume() {
+
444  if (mStatus != kStatusSuspended) return;
+
445 
+
446  // We lost the original state of the coroutine when suspend() was called
+
447  // but the coroutine will automatically go back into the original state
+
448  // when Coroutine::runCoroutine() is called because COROUTINE_YIELD(),
+
449  // COROUTINE_DELAY() and COROUTINE_AWAIT() are written to restore their
+
450  // status.
+
451  mStatus = kStatusYielding;
+
452  }
+
453 
+
467  void reset() {
+
468  mStatus = kStatusYielding;
+
469  mJumpPoint = nullptr;
+
470  }
+
471 
+
473  bool isDelayExpired() const {
+
474  T_DELAY nowMillis = coroutineMillis();
+
475  T_DELAY elapsed = nowMillis - mDelayStart;
+
476  return elapsed >= mDelayDuration;
+
477  }
478 
-
480  static const Status kStatusDelaying = 2;
-
481 
-
483  static const Status kStatusRunning = 3;
-
484 
-
486  static const Status kStatusEnding = 4;
-
487 
-
489  static const Status kStatusTerminated = 5;
-
490 
-
492  CoroutineTemplate() {
-
493  insertAtRoot();
-
494  }
+
480  bool isDelayMicrosExpired() const {
+
481  T_DELAY nowMicros = coroutineMicros();
+
482  T_DELAY elapsed = nowMicros - mDelayStart;
+
483  return elapsed >= mDelayDuration;
+
484  }
+
485 
+
487  bool isDelaySecondsExpired() const {
+
488  T_DELAY nowSeconds = coroutineSeconds();
+
489  T_DELAY elapsed = nowSeconds - mDelayStart;
+
490  return elapsed >= mDelayDuration;
+
491  }
+
492 
+
494  bool isSuspended() const { return mStatus == kStatusSuspended; }
495 
-
508  ~CoroutineTemplate() = default;
-
509 
-
511  Status getStatus() const { return mStatus; }
-
512 
-
514  void statusPrintTo(Print& printer) {
-
515  printer.print(sStatusStrings[mStatus]);
-
516  }
-
517 
-
522  void setJump(void* jumpPoint) { mJumpPoint = jumpPoint; }
-
523 
-
528  void* getJump() const { return mJumpPoint; }
-
529 
-
531  void setRunning() { mStatus = kStatusRunning; }
-
532 
-
534  void setYielding() { mStatus = kStatusYielding; }
-
535 
-
537  void setDelaying() { mStatus = kStatusDelaying; }
-
538 
-
540  void setEnding() { mStatus = kStatusEnding; }
-
541 
-
546  void setTerminated() { mStatus = kStatusTerminated; }
-
547 
-
561  void setDelayMillis(uint16_t delayMillis) {
-
562  mDelayStart = coroutineMillis();
+
497  bool isYielding() const { return mStatus == kStatusYielding; }
+
498 
+
500  bool isDelaying() const { return mStatus == kStatusDelaying; }
+
501 
+
503  bool isRunning() const { return mStatus == kStatusRunning; }
+
504 
+
510  bool isEnding() const { return mStatus == kStatusEnding; }
+
511 
+
518  bool isTerminated() const { return mStatus == kStatusTerminated; }
+
519 
+
525  bool isDone() const {
+
526  return mStatus == kStatusEnding || mStatus == kStatusTerminated;
+
527  }
+
528 
+
535  void setupCoroutine(const char* /*name*/) ACE_ROUTINE_DEPRECATED {}
+
536 
+
543  void setupCoroutine(const __FlashStringHelper* /*name*/)
+
544  ACE_ROUTINE_DEPRECATED {}
+
545 
+
547  void setProfiler(CoroutineProfiler* profiler) { mProfiler = profiler; }
+
548 
+
550  CoroutineProfiler* getProfiler() const { return mProfiler; }
+
551 
+
557  static CoroutineTemplate** getRoot() {
+
558  // Use a static variable inside a function to solve the static
+
559  // initialization ordering problem.
+
560  static CoroutineTemplate* root;
+
561  return &root;
+
562  }
563 
-
564  // If delayMillis is a compile-time constant, the compiler seems to
-
565  // completely optimize away this bounds checking code.
-
566  mDelayDuration = (delayMillis >= UINT16_MAX / 2)
-
567  ? UINT16_MAX / 2
-
568  : delayMillis;
-
569  }
-
570 
-
575  void setDelayMicros(uint16_t delayMicros) {
-
576  mDelayStart = coroutineMicros();
-
577 
-
578  // If delayMicros is a compile-time constant, the compiler seems to
-
579  // completely optimize away this bounds checking code.
-
580  mDelayDuration = (delayMicros >= UINT16_MAX / 2)
-
581  ? UINT16_MAX / 2
-
582  : delayMicros;
-
583  }
-
584 
-
589  void setDelaySeconds(uint16_t delaySeconds) {
-
590  mDelayStart = coroutineSeconds();
-
591 
-
592  // If delaySeconds is a compile-time constant, the compiler seems to
-
593  // completely optimize away this bounds checking code.
-
594  mDelayDuration = (delaySeconds >= UINT16_MAX / 2)
-
595  ? UINT16_MAX / 2
-
596  : delaySeconds;
-
597  }
-
598 
-
604  static unsigned long coroutineMillis() {
-
605  return T_CLOCK::millis();
-
606  }
-
607 
-
613  static unsigned long coroutineMicros() {
-
614  return T_CLOCK::micros();
-
615  }
-
616 
-
623  static unsigned long coroutineSeconds() {
-
624  return T_CLOCK::seconds();
-
625  }
-
626 
-
627  private:
-
628  // Disable copy-constructor and assignment operator
-
629  CoroutineTemplate(const CoroutineTemplate&) = delete;
-
630  CoroutineTemplate& operator=(const CoroutineTemplate&) = delete;
-
631 
-
637  static CoroutineTemplate** getRoot() {
-
638  // Use a static variable inside a function to solve the static
-
639  // initialization ordering problem.
-
640  static CoroutineTemplate* root;
-
641  return &root;
-
642  }
-
643 
-
650  CoroutineTemplate** getNext() { return &mNext; }
-
651 
-
658  void insertAtRoot() {
-
659  CoroutineTemplate** root = getRoot();
-
660  mNext = *root;
-
661  *root = this;
-
662  }
-
663 
-
664  protected:
-
666  CoroutineTemplate* mNext = nullptr;
+
570  CoroutineTemplate** getNext() { return &mNext; }
+
571 
+
572  protected:
+
603  typedef uint8_t Status;
+
604 
+
611  static const Status kStatusSuspended = 0;
+
612 
+
614  static const Status kStatusYielding = 1;
+
615 
+
617  static const Status kStatusDelaying = 2;
+
618 
+
620  static const Status kStatusRunning = 3;
+
621 
+
623  static const Status kStatusEnding = 4;
+
624 
+
626  static const Status kStatusTerminated = 5;
+
627 
+
629  CoroutineTemplate() {
+
630  insertAtRoot();
+
631  }
+
632 
+
645  ~CoroutineTemplate() = default;
+
646 
+
648  Status getStatus() const { return mStatus; }
+
649 
+
651  void statusPrintTo(Print& printer) {
+
652  printer.print((const __FlashStringHelper*)
+
653  pgm_read_ptr(&sStatusStrings[mStatus]));
+
654  }
+
655 
+
660  void setJump(void* jumpPoint) { mJumpPoint = jumpPoint; }
+
661 
+
666  void* getJump() const { return mJumpPoint; }
667 
-
669  void* mJumpPoint = nullptr;
+
669  void setRunning() { mStatus = kStatusRunning; }
670 
-
672  Status mStatus = kStatusYielding;
+
672  void setYielding() { mStatus = kStatusYielding; }
673 
-
679  uint16_t mDelayStart;
-
680 
-
686  uint16_t mDelayDuration;
-
687 };
-
688 
-
695 using Coroutine = CoroutineTemplate<ClockInterface>;
-
696 
-
697 }
-
698 
-
699 #endif
+
675  void setDelaying() { mStatus = kStatusDelaying; }
+
676 
+
678  void setEnding() { mStatus = kStatusEnding; }
+
679 
+
684  void setTerminated() { mStatus = kStatusTerminated; }
+
685 
+
699  void setDelayMillis(T_DELAY delayMillis) {
+
700  mDelayStart = coroutineMillis();
+
701 
+
702  // If delayMillis is a compile-time constant, the compiler seems to
+
703  // completely optimize away this bounds checking code.
+
704  mDelayDuration = (delayMillis >= UINT16_MAX / 2)
+
705  ? UINT16_MAX / 2
+
706  : delayMillis;
+
707  }
+
708 
+
713  void setDelayMicros(T_DELAY delayMicros) {
+
714  mDelayStart = coroutineMicros();
+
715 
+
716  // If delayMicros is a compile-time constant, the compiler seems to
+
717  // completely optimize away this bounds checking code.
+
718  mDelayDuration = (delayMicros >= UINT16_MAX / 2)
+
719  ? UINT16_MAX / 2
+
720  : delayMicros;
+
721  }
+
722 
+
727  void setDelaySeconds(T_DELAY delaySeconds) {
+
728  mDelayStart = coroutineSeconds();
+
729 
+
730  // If delaySeconds is a compile-time constant, the compiler seems to
+
731  // completely optimize away this bounds checking code.
+
732  mDelayDuration = (delaySeconds >= UINT16_MAX / 2)
+
733  ? UINT16_MAX / 2
+
734  : delaySeconds;
+
735  }
+
736 
+
742  static unsigned long coroutineMillis() {
+
743  return T_CLOCK::millis();
+
744  }
+
745 
+
751  static unsigned long coroutineMicros() {
+
752  return T_CLOCK::micros();
+
753  }
+
754 
+
761  static unsigned long coroutineSeconds() {
+
762  return T_CLOCK::seconds();
+
763  }
+
764 
+
765  private:
+
766  // Disable copy-constructor and assignment operator
+
767  CoroutineTemplate(const CoroutineTemplate&) = delete;
+
768  CoroutineTemplate& operator=(const CoroutineTemplate&) = delete;
+
769 
+
776  void insertAtRoot() {
+
777  CoroutineTemplate** root = getRoot();
+
778  mNext = *root;
+
779  *root = this;
+
780  }
+
781 
+
782  protected:
+
784  CoroutineTemplate* mNext = nullptr;
+
785 
+
787  void* mJumpPoint = nullptr;
+
788 
+
793  const void* mName = nullptr;
+
794 
+
796  uint8_t mNameType = kNameTypeCString;
+
797 
+
799  Status mStatus = kStatusYielding;
+
800 
+
806  T_DELAY mDelayStart;
+
807 
+
813  T_DELAY mDelayDuration;
+
814 
+
816  CoroutineProfiler* mProfiler = nullptr;
+
817 };
+
818 
+
825 using Coroutine = CoroutineTemplate<ClockInterface, uint16_t>;
+
826 
+
827 }
+
828 
+
829 #endif
-
ace_routine::CoroutineTemplate::isYielding
bool isYielding() const
The coroutine returned using COROUTINE_YIELD().
Definition: Coroutine.h:386
-
ace_routine::CoroutineTemplate::coroutineMillis
static unsigned long coroutineMillis()
Returns the current millisecond clock.
Definition: Coroutine.h:604
-
ace_routine::CoroutineTemplate::kStatusYielding
static const Status kStatusYielding
Coroutine returned using the COROUTINE_YIELD() statement.
Definition: Coroutine.h:477
-
ace_routine::CoroutineTemplate::kStatusEnding
static const Status kStatusEnding
Coroutine executed the COROUTINE_END() statement.
Definition: Coroutine.h:486
-
ace_routine::CoroutineTemplate::mDelayStart
uint16_t mDelayStart
Start time provided by COROUTINE_DELAY(), COROUTINE_DELAY_MICROS(), or COROUTINE_DELAY_SECONDS().
Definition: Coroutine.h:679
-
ace_routine::CoroutineTemplate::mNext
CoroutineTemplate * mNext
Pointer to the next coroutine in a singly-linked list.
Definition: Coroutine.h:666
-
ace_routine::CoroutineTemplate::Status
uint8_t Status
The execution status of the coroutine, corresponding to the COROUTINE_YIELD(), COROUTINE_DELAY(),...
Definition: Coroutine.h:466
-
ace_routine::CoroutineTemplate::CoroutineTemplate
CoroutineTemplate()
Constructor.
Definition: Coroutine.h:492
-
ace_routine::CoroutineTemplate::setupCoroutine
void setupCoroutine(const __FlashStringHelper *) ACE_ROUTINE_DEPRECATED
Deprecated method that does nothing.
Definition: Coroutine.h:432
-
ace_routine::CoroutineTemplate::isTerminated
bool isTerminated() const
The coroutine was terminated by the scheduler with a call to setTerminated().
Definition: Coroutine.h:407
-
ace_routine::CoroutineTemplate::suspend
void suspend()
Suspend the coroutine at the next scheduler iteration.
Definition: Coroutine.h:321
-
ace_routine::CoroutineTemplate::setYielding
void setYielding()
Set the kStatusDelaying state.
Definition: Coroutine.h:534
-
ace_routine::CoroutineTemplate::setDelaySeconds
void setDelaySeconds(uint16_t delaySeconds)
Configure the delay timer for delaySeconds.
Definition: Coroutine.h:589
-
ace_routine::CoroutineTemplate::~CoroutineTemplate
~CoroutineTemplate()=default
Destructor.
-
ace_routine::CoroutineTemplate::coroutineMicros
static unsigned long coroutineMicros()
Returns the current microseconds clock.
Definition: Coroutine.h:613
-
ace_routine::CoroutineTemplate::kStatusSuspended
static const Status kStatusSuspended
Coroutine has been suspended using suspend() and the scheduler should remove it from the queue upon t...
Definition: Coroutine.h:474
-
ace_routine::CoroutineTemplate::reset
void reset()
Reset the coroutine to its initial state.
Definition: Coroutine.h:356
-
ace_routine::CoroutineTemplate::resume
void resume()
Add a Suspended coroutine into the head of the scheduler linked list, and change the state to Yieldin...
Definition: Coroutine.h:332
-
ace_routine::CoroutineTemplate::setJump
void setJump(void *jumpPoint)
Pointer to label where execute will start on the next call to runCoroutine().
Definition: Coroutine.h:522
-
ace_routine::CoroutineTemplate::setDelayMillis
void setDelayMillis(uint16_t delayMillis)
Configure the delay timer for delayMillis.
Definition: Coroutine.h:561
-
ace_routine::CoroutineTemplate::kStatusRunning
static const Status kStatusRunning
Coroutine is currenly running.
Definition: Coroutine.h:483
-
ace_routine::CoroutineTemplate
Base class of all coroutines.
Definition: Coroutine.h:277
-
ace_routine::CoroutineTemplate::isRunning
bool isRunning() const
The coroutine is currently running.
Definition: Coroutine.h:392
-
ace_routine::CoroutineTemplate::kStatusDelaying
static const Status kStatusDelaying
Coroutine returned using the COROUTINE_DELAY() statement.
Definition: Coroutine.h:480
-
ace_routine::CoroutineTemplate::setTerminated
void setTerminated()
Set status to indicate that the Coroutine has been removed from the Scheduler queue.
Definition: Coroutine.h:546
-
ace_routine::CoroutineTemplate::getStatus
Status getStatus() const
Return the status of the coroutine.
Definition: Coroutine.h:511
-
ace_routine::CoroutineTemplate::runCoroutine
virtual int runCoroutine()=0
The body of the coroutine.
-
ace_routine::CoroutineTemplate::setRunning
void setRunning()
Set the kStatusRunning state.
Definition: Coroutine.h:531
-
ace_routine::CoroutineTemplate::kStatusTerminated
static const Status kStatusTerminated
Coroutine has ended and no longer in the scheduler queue.
Definition: Coroutine.h:489
-
ace_routine::CoroutineTemplate::isSuspended
bool isSuspended() const
The coroutine was suspended with a call to suspend().
Definition: Coroutine.h:383
-
ace_routine::CoroutineTemplate::isDelaySecondsExpired
bool isDelaySecondsExpired() const
Check if delay seconds time is over.
Definition: Coroutine.h:376
-
ace_routine::CoroutineTemplate::setDelaying
void setDelaying()
Set the kStatusDelaying state.
Definition: Coroutine.h:537
-
ace_routine::CoroutineSchedulerTemplate
Class that manages instances of the Coroutine class, and executes them in a round-robin fashion.
Definition: Coroutine.h:270
-
ace_routine::CoroutineTemplate::isDone
bool isDone() const
The coroutine is either Ending or Terminated.
Definition: Coroutine.h:414
-
ace_routine::CoroutineTemplate::mStatus
Status mStatus
Run-state of the coroutine.
Definition: Coroutine.h:672
-
ace_routine::CoroutineTemplate::mDelayDuration
uint16_t mDelayDuration
Delay time specified by COROUTINE_DELAY(), COROUTINE_DELAY_MICROS() or, COROUTINE_DELAY_SECONDS().
Definition: Coroutine.h:686
-
ace_routine::CoroutineTemplate::setupCoroutine
void setupCoroutine(const char *) ACE_ROUTINE_DEPRECATED
Deprecated method that does nothing.
Definition: Coroutine.h:424
-
ace_routine::CoroutineTemplate::isDelayExpired
bool isDelayExpired() const
Check if delay millis time is over.
Definition: Coroutine.h:362
-
ace_routine::CoroutineTemplate::mJumpPoint
void * mJumpPoint
Address of the label used by the computed-goto.
Definition: Coroutine.h:669
-
ace_routine::CoroutineTemplate::isDelayMicrosExpired
bool isDelayMicrosExpired() const
Check if delay micros time is over.
Definition: Coroutine.h:369
-
ace_routine::CoroutineTemplate::isDelaying
bool isDelaying() const
The coroutine returned using COROUTINE_DELAY().
Definition: Coroutine.h:389
-
ace_routine::CoroutineTemplate::isEnding
bool isEnding() const
The coroutine returned using COROUTINE_END().
Definition: Coroutine.h:399
-
ace_routine::CoroutineTemplate::coroutineSeconds
static unsigned long coroutineSeconds()
Returns the current clock in unit of seconds, truncated to the lower 16-bits.
Definition: Coroutine.h:623
-
ace_routine::CoroutineTemplate::getJump
void * getJump() const
Pointer to label where execute will start on the next call to runCoroutine().
Definition: Coroutine.h:528
-
ace_routine::CoroutineTemplate::setEnding
void setEnding()
Set the kStatusEnding state.
Definition: Coroutine.h:540
-
ace_routine::CoroutineTemplate::statusPrintTo
void statusPrintTo(Print &printer)
Print the human-readable string of the Status.
Definition: Coroutine.h:514
-
ACE_ROUTINE_DEPRECATED
#define ACE_ROUTINE_DEPRECATED
Macro that indicates a deprecation.
Definition: Coroutine.h:61
-
ace_routine::CoroutineTemplate::setupCoroutine
virtual void setupCoroutine()
Perform coroutine initialization.
Definition: Coroutine.h:309
-
ace_routine::CoroutineTemplate::setDelayMicros
void setDelayMicros(uint16_t delayMicros)
Configure the delay timer for delayMicros.
Definition: Coroutine.h:575
+
ace_routine::CoroutineTemplate::printNameTo
void printNameTo(Print &printer, uint8_t maxLen=0) const
Print name to the given Printer.
Definition: Coroutine.h:389
+
ace_routine::CoroutineTemplate::kNameTypeFString
static const uint8_t kNameTypeFString
Coroutine name is a const __FlashStringHelper* f-string.
Definition: Coroutine.h:302
+
ace_routine::CoroutineProfiler::updateElapsedMicros
virtual void updateElapsedMicros(uint32_t micros)=0
Process the completion of the runCoroutine() method which took micros microseconds.
+
ace_routine::CoroutineTemplate::mNext
CoroutineTemplate * mNext
Pointer to the next coroutine in a singly-linked list.
Definition: Coroutine.h:784
+
ace_routine::CoroutineTemplate::getStatus
Status getStatus() const
Return the status of the coroutine.
Definition: Coroutine.h:648
+
ace_routine::CoroutineTemplate::isDelaying
bool isDelaying() const
The coroutine returned using COROUTINE_DELAY().
Definition: Coroutine.h:500
+
ace_routine::CoroutineTemplate::setEnding
void setEnding()
Set the kStatusEnding state.
Definition: Coroutine.h:678
+
ace_routine::CoroutineTemplate::getJump
void * getJump() const
Pointer to label where execute will start on the next call to runCoroutine().
Definition: Coroutine.h:666
+
ace_routine::CoroutineTemplate::kStatusYielding
static const Status kStatusYielding
Coroutine returned using the COROUTINE_YIELD() statement.
Definition: Coroutine.h:614
+
ace_routine::CoroutineTemplate::isDone
bool isDone() const
The coroutine is either Ending or Terminated.
Definition: Coroutine.h:525
+
ace_routine::CoroutineTemplate::getCName
const char * getCName() const
Get name of the coroutine assuming it's a c-string.
Definition: Coroutine.h:375
+
ace_routine::CoroutineTemplate::setName
void setName(const char *name)
Set the name of the coroutine to the given c-string.
Definition: Coroutine.h:363
+
ace_routine::CoroutineTemplate::getNameType
uint8_t getNameType() const
Return the type of the name string, either kNameTypeCString or kNameTypeFString.
Definition: Coroutine.h:360
+
ace_routine::CoroutineTemplate::isYielding
bool isYielding() const
The coroutine returned using COROUTINE_YIELD().
Definition: Coroutine.h:497
+
ace_routine::CoroutineTemplate::setDelayMicros
void setDelayMicros(T_DELAY delayMicros)
Configure the delay timer for delayMicros.
Definition: Coroutine.h:713
+
ace_routine::CoroutineTemplate::~CoroutineTemplate
~CoroutineTemplate()=default
Destructor.
+
ace_routine::CoroutineTemplate::getNext
CoroutineTemplate ** getNext()
Return the next pointer as a pointer to the pointer, similar to getRoot().
Definition: Coroutine.h:570
+
ace_routine::CoroutineTemplate::setYielding
void setYielding()
Set the kStatusDelaying state.
Definition: Coroutine.h:672
+
ace_routine::CoroutineTemplate::setJump
void setJump(void *jumpPoint)
Pointer to label where execute will start on the next call to runCoroutine().
Definition: Coroutine.h:660
+
ace_routine::CoroutineTemplate::getRoot
static CoroutineTemplate ** getRoot()
Get the pointer to the root pointer.
Definition: Coroutine.h:557
+
ace_routine::CoroutineTemplate::CoroutineTemplate
CoroutineTemplate()
Constructor.
Definition: Coroutine.h:629
+
ace_routine::CoroutineTemplate::mNameType
uint8_t mNameType
String type of the coroutine mName.
Definition: Coroutine.h:796
+
ace_routine::CoroutineTemplate::kNameTypeCString
static const uint8_t kNameTypeCString
Coroutine name is a const char* c-string.
Definition: Coroutine.h:299
+
ace_routine::CoroutineTemplate::getProfiler
CoroutineProfiler * getProfiler() const
Get the profiler.
Definition: Coroutine.h:550
+
ace_routine::CoroutineTemplate::suspend
void suspend()
Suspend the coroutine at the next scheduler iteration.
Definition: Coroutine.h:432
+
ace_routine::CoroutineTemplate::runCoroutine
virtual int runCoroutine()=0
The body of the coroutine.
+
ace_routine::CoroutineTemplate
Base class of all coroutines.
Definition: Coroutine.h:292
+
ace_routine::CoroutineTemplate::setupCoroutine
void setupCoroutine(const char *) ACE_ROUTINE_DEPRECATED
Deprecated method that does nothing.
Definition: Coroutine.h:535
+
ace_routine::CoroutineTemplate::coroutineMillis
static unsigned long coroutineMillis()
Returns the current millisecond clock.
Definition: Coroutine.h:742
+
ace_routine::CoroutineTemplate::setProfiler
void setProfiler(CoroutineProfiler *profiler)
Set the profiler.
Definition: Coroutine.h:547
+
ace_routine::CoroutineTemplate::mStatus
Status mStatus
Run-state of the coroutine.
Definition: Coroutine.h:799
+
ace_routine::CoroutineTemplate::setName
void setName(const __FlashStringHelper *name)
Set the name of the coroutine to the given f-string.
Definition: Coroutine.h:369
+ +
ace_routine::CoroutineTemplate::isDelayMicrosExpired
bool isDelayMicrosExpired() const
Check if delay micros time is over.
Definition: Coroutine.h:480
+
ace_routine::CoroutineProfiler
An interface class for profiling classes that can track the elapsed time consumed by Coroutine::runCo...
Definition: CoroutineProfiler.h:36
+
ace_routine::CoroutineTemplate::setDelaying
void setDelaying()
Set the kStatusDelaying state.
Definition: Coroutine.h:675
+
ace_routine::CoroutineTemplate::mName
const void * mName
Name of the coroutine, either (const char*) or (const __FlashStringHelper*).
Definition: Coroutine.h:793
+
ace_routine::CoroutineTemplate::setDelayMillis
void setDelayMillis(T_DELAY delayMillis)
Configure the delay timer for delayMillis.
Definition: Coroutine.h:699
+
ace_routine::CoroutineTemplate::isDelaySecondsExpired
bool isDelaySecondsExpired() const
Check if delay seconds time is over.
Definition: Coroutine.h:487
+
ace_routine::CoroutineTemplate::resume
void resume()
Add a Suspended coroutine into the head of the scheduler linked list, and change the state to Yieldin...
Definition: Coroutine.h:443
+
ace_routine::CoroutineTemplate::kStatusSuspended
static const Status kStatusSuspended
Coroutine has been suspended using suspend() and the scheduler should remove it from the queue upon t...
Definition: Coroutine.h:611
+
ace_routine::CoroutineTemplate::Status
uint8_t Status
The execution status of the coroutine, corresponding to the COROUTINE_YIELD(), COROUTINE_DELAY(),...
Definition: Coroutine.h:603
+
ace_routine::CoroutineTemplate::setRunning
void setRunning()
Set the kStatusRunning state.
Definition: Coroutine.h:669
+
ace_routine::CoroutineTemplate::kStatusEnding
static const Status kStatusEnding
Coroutine executed the COROUTINE_END() statement.
Definition: Coroutine.h:623
+
ace_routine::CoroutineTemplate::coroutineSeconds
static unsigned long coroutineSeconds()
Returns the current clock in unit of seconds, truncated to the lower 16-bits.
Definition: Coroutine.h:761
+
ace_routine::CoroutineTemplate::reset
void reset()
Reset the coroutine to its initial state.
Definition: Coroutine.h:467
+
ace_routine::CoroutineTemplate::kStatusTerminated
static const Status kStatusTerminated
Coroutine has ended and no longer in the scheduler queue.
Definition: Coroutine.h:626
+
ace_routine::CoroutineTemplate::isRunning
bool isRunning() const
The coroutine is currently running.
Definition: Coroutine.h:503
+
ace_routine::CoroutineTemplate::mDelayStart
T_DELAY mDelayStart
Start time provided by COROUTINE_DELAY(), COROUTINE_DELAY_MICROS(), or COROUTINE_DELAY_SECONDS().
Definition: Coroutine.h:806
+
ace_routine::CoroutineTemplate::getFName
const __FlashStringHelper * getFName() const
Get name of the coroutine assuming it's an f-string.
Definition: Coroutine.h:378
+
ace_routine::CoroutineTemplate::runCoroutineWithProfiler
int runCoroutineWithProfiler()
This is a variant of runCoroutine() which measures the execution time of runCoroutine() and updates t...
Definition: Coroutine.h:344
+
ace_routine::CoroutineTemplate::setDelaySeconds
void setDelaySeconds(T_DELAY delaySeconds)
Configure the delay timer for delaySeconds.
Definition: Coroutine.h:727
+
ace_routine::CoroutineTemplate::setupCoroutine
virtual void setupCoroutine()
Perform coroutine initialization.
Definition: Coroutine.h:331
+
ace_routine::CoroutineTemplate::isDelayExpired
bool isDelayExpired() const
Check if delay millis time is over.
Definition: Coroutine.h:473
+
ace_routine::CoroutineTemplate::coroutineMicros
static unsigned long coroutineMicros()
Returns the current microseconds clock.
Definition: Coroutine.h:751
+
ace_routine::CoroutineSchedulerTemplate
Class that manages instances of the Coroutine class, and executes them in a round-robin fashion.
Definition: Coroutine.h:274
+
ace_routine::CoroutineTemplate::mDelayDuration
T_DELAY mDelayDuration
Delay time specified by COROUTINE_DELAY(), COROUTINE_DELAY_MICROS() or, COROUTINE_DELAY_SECONDS().
Definition: Coroutine.h:813
+
ace_routine::CoroutineTemplate::mProfiler
CoroutineProfiler * mProfiler
Pointer to a profiler instance, either static or on the heap.
Definition: Coroutine.h:816
+
ace_routine::CoroutineTemplate::setTerminated
void setTerminated()
Set status to indicate that the Coroutine has been removed from the Scheduler queue.
Definition: Coroutine.h:684
+
ace_routine::CoroutineTemplate::isSuspended
bool isSuspended() const
The coroutine was suspended with a call to suspend().
Definition: Coroutine.h:494
+
ace_routine::CoroutineTemplate::isTerminated
bool isTerminated() const
The coroutine was terminated by the scheduler with a call to setTerminated().
Definition: Coroutine.h:518
+
ace_routine::CoroutineTemplate::isEnding
bool isEnding() const
The coroutine returned using COROUTINE_END().
Definition: Coroutine.h:510
+
ace_routine::CoroutineTemplate::mJumpPoint
void * mJumpPoint
Address of the label used by the computed-goto.
Definition: Coroutine.h:787
+
ace_routine::CoroutineTemplate::setupCoroutine
void setupCoroutine(const __FlashStringHelper *) ACE_ROUTINE_DEPRECATED
Deprecated method that does nothing.
Definition: Coroutine.h:543
+
ACE_ROUTINE_DEPRECATED
#define ACE_ROUTINE_DEPRECATED
Macro that indicates a deprecation.
Definition: Coroutine.h:65
+
ace_routine::CoroutineTemplate::kStatusDelaying
static const Status kStatusDelaying
Coroutine returned using the COROUTINE_DELAY() statement.
Definition: Coroutine.h:617
+
ace_routine::CoroutineTemplate::statusPrintTo
void statusPrintTo(Print &printer)
Print the human-readable string of the Status.
Definition: Coroutine.h:651
+
ace_routine::CoroutineTemplate::kStatusRunning
static const Status kStatusRunning
Coroutine is currenly running.
Definition: Coroutine.h:620
Generated by   diff --git a/docs/html/LogBinJsonRenderer_8h_source.html b/docs/html/LogBinJsonRenderer_8h_source.html new file mode 100644 index 0000000..7092e11 --- /dev/null +++ b/docs/html/LogBinJsonRenderer_8h_source.html @@ -0,0 +1,182 @@ + + + + + + + +AceRoutine: /home/brian/src/AceRoutine/src/ace_routine/LogBinJsonRenderer.h Source File + + + + + + + + + + +
+
+
LogBinJsonRenderer.h
+
+
+
1 /*
+
2 MIT License
+
3 
+
4 Copyright (c) 2022 Brian T. Park
+
5 
+
6 Permission is hereby granted, free of charge, to any person obtaining a copy
+
7 of this software and associated documentation files (the "Software"), to deal
+
8 in the Software without restriction, including without limitation the rights
+
9 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+
10 copies of the Software, and to permit persons to whom the Software is
+
11 furnished to do so, subject to the following conditions:
+
12 
+
13 The above copyright notice and this permission notice shall be included in all
+
14 copies or substantial portions of the Software.
+
15 
+
16 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+
17 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+
18 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+
19 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+
20 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+
21 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+
22 SOFTWARE.
+
23 */
+
24 
+
25 #ifndef ACE_ROUTINE_LOG_BIN_JSON_RENDERER_H
+
26 #define ACE_ROUTINE_LOG_BIN_JSON_RENDERER_H
+
27 
+
28 #include <stdint.h> // uint8_t, uint32_t
+
29 #include <Arduino.h> // Print
+
30 #include "Coroutine.h" // Coroutine
+
31 #include "CoroutineProfiler.h"
+
32 #include "LogBinProfiler.h" // rollupExteriorBins()
+
33 
+
34 namespace ace_routine {
+
35 
+
47 template <typename T_COROUTINE>
+
48 class LogBinJsonRendererTemplate {
+
49  public:
+
51  using Profiler = LogBinProfilerTemplate<T_COROUTINE>;
+
52 
+
64  static void printTo(
+
65  Print& printer,
+
66  uint8_t startBin,
+
67  uint8_t endBin,
+
68  bool clear = true,
+
69  bool rollup = true
+
70  ) {
+
71  uint16_t bufBins[Profiler::kNumBins];
+
72 
+
73  printer.println('{');
+
74  bool lineNeedsTrailingComma = false;
+
75  T_COROUTINE** root = T_COROUTINE::getRoot();
+
76  for (T_COROUTINE** p = root; (*p) != nullptr; p = (*p)->getNext()) {
+
77  auto* profiler = (Profiler*) (*p)->getProfiler();
+
78  if (! profiler) continue;
+
79 
+
80  // Roll up the exterior bins in to the first and last bins if requested.
+
81  const uint16_t* bins;
+
82  if (rollup) {
+
83  internal::rollupExteriorBins(
+
84  bufBins, profiler->mBins, Profiler::kNumBins, startBin, endBin);
+
85  bins = bufBins;
+
86  } else {
+
87  bins = profiler->mBins;
+
88  }
+
89 
+
90  if (lineNeedsTrailingComma) printer.println(',');
+
91  lineNeedsTrailingComma = true;
+
92 
+
93  printer.print('"');
+
94  (*p)->printNameTo(printer);
+
95  printer.print("\":[");
+
96 
+
97  bool elementNeedsTrailingComma = false;
+
98  for (uint8_t i = startBin; i < endBin; i++) {
+
99  if (elementNeedsTrailingComma) printer.print(',');
+
100  elementNeedsTrailingComma = true;
+
101  printer.print(bins[i]);
+
102  }
+
103  printer.print(']');
+
104 
+
105  if (clear) {
+
106  profiler->clear();
+
107  }
+
108  }
+
109  printer.println();
+
110  printer.println('}');
+
111  }
+
112 };
+
113 
+
114 using LogBinJsonRenderer = LogBinJsonRendererTemplate<Coroutine>;
+
115 
+
116 }
+
117 
+
118 #endif
+
+
ace_routine::LogBinJsonRendererTemplate
Print the LogBinProfiler bins as a JSON array.
Definition: LogBinJsonRenderer.h:48
+
ace_routine::LogBinJsonRendererTemplate::printTo
static void printTo(Print &printer, uint8_t startBin, uint8_t endBin, bool clear=true, bool rollup=true)
Loop over all coroutines and print the bin counts as JSON.
Definition: LogBinJsonRenderer.h:64
+
ace_routine::LogBinProfilerTemplate
Class that maintains the frequency count of the elapsed time of runCoroutine() in an array of bins wh...
Definition: LogBinProfiler.h:54
+
ace_routine::LogBinProfilerTemplate::kNumBins
static const uint8_t kNumBins
Number of event counter bins used by this class.
Definition: LogBinProfiler.h:57
+ + +
+Generated by   +doxygen + 1.8.17 +
+ + diff --git a/docs/html/LogBinProfiler_8cpp_source.html b/docs/html/LogBinProfiler_8cpp_source.html new file mode 100644 index 0000000..8613739 --- /dev/null +++ b/docs/html/LogBinProfiler_8cpp_source.html @@ -0,0 +1,145 @@ + + + + + + + +AceRoutine: /home/brian/src/AceRoutine/src/ace_routine/LogBinProfiler.cpp Source File + + + + + + + + + +
+
+ + + + + + +
+
AceRoutine +  1.5.0 +
+
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
+
+
+ + + + + + + + +
+
+ + +
+ +
+ + +
+
+
+
LogBinProfiler.cpp
+
+
+
1 /*
+
2 MIT License
+
3 
+
4 Copyright (c) 2022 Brian T. Park
+
5 
+
6 Permission is hereby granted, free of charge, to any person obtaining a copy
+
7 of this software and associated documentation files (the "Software"), to deal
+
8 in the Software without restriction, including without limitation the rights
+
9 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+
10 copies of the Software, and to permit persons to whom the Software is
+
11 furnished to do so, subject to the following conditions:
+
12 
+
13 The above copyright notice and this permission notice shall be included in all
+
14 copies or substantial portions of the Software.
+
15 
+
16 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+
17 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+
18 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+
19 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+
20 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+
21 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+
22 SOFTWARE.
+
23 */
+
24 
+
25 #include "LogBinProfiler.h"
+
26 
+
27 namespace ace_routine {
+
28 namespace internal {
+
29 
+
30 void rollupExteriorBins(
+
31  uint16_t dst[],
+
32  const uint16_t src[],
+
33  uint8_t numBins,
+
34  uint8_t startBin,
+
35  uint8_t endBin
+
36 ) {
+
37  endBin = (endBin > numBins) ? numBins : endBin;
+
38  if (endBin <= startBin) return;
+
39 
+
40  // Rollup all bins at or below startBin into the startBin.
+
41  uint32_t leftRollup = 0;
+
42  for (uint8_t i = 0; i <= startBin; i++) {
+
43  leftRollup += src[i];
+
44  }
+
45  if (leftRollup > UINT16_MAX) leftRollup = UINT16_MAX;
+
46  dst[startBin] = leftRollup;
+
47 
+
48  // Copy the interior bins.
+
49  for (uint8_t i = startBin + 1; i < endBin - 1; i++) {
+
50  dst[i] = src[i];
+
51  }
+
52 
+
53  // Rollup all bins at or above the last bin into the last bin.
+
54  uint32_t rightRollup = (endBin - 1 == startBin) ? leftRollup : 0;
+
55  for (uint8_t i = endBin - 1; i < numBins; i++) {
+
56  rightRollup += src[i];
+
57  }
+
58  if (rightRollup > UINT16_MAX) rightRollup = UINT16_MAX;
+
59  dst[endBin - 1] = rightRollup;
+
60 }
+
61 
+
62 }
+
63 }
+
+ +
+Generated by   +doxygen + 1.8.17 +
+ + diff --git a/docs/html/LogBinProfiler_8h_source.html b/docs/html/LogBinProfiler_8h_source.html new file mode 100644 index 0000000..075080e --- /dev/null +++ b/docs/html/LogBinProfiler_8h_source.html @@ -0,0 +1,206 @@ + + + + + + + +AceRoutine: /home/brian/src/AceRoutine/src/ace_routine/LogBinProfiler.h Source File + + + + + + + + + +
+
+ + + + + + +
+
AceRoutine +  1.5.0 +
+
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
+
+
+ + + + + + + + +
+
+ + +
+ +
+ + +
+
+
+
LogBinProfiler.h
+
+
+
1 /*
+
2 MIT License
+
3 
+
4 Copyright (c) 2022 Brian T. Park
+
5 
+
6 Permission is hereby granted, free of charge, to any person obtaining a copy
+
7 of this software and associated documentation files (the "Software"), to deal
+
8 in the Software without restriction, including without limitation the rights
+
9 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+
10 copies of the Software, and to permit persons to whom the Software is
+
11 furnished to do so, subject to the following conditions:
+
12 
+
13 The above copyright notice and this permission notice shall be included in all
+
14 copies or substantial portions of the Software.
+
15 
+
16 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+
17 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+
18 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+
19 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+
20 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+
21 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+
22 SOFTWARE.
+
23 */
+
24 
+
25 #ifndef ACE_ROUTINE_LOG_BIN_PROFILER_H
+
26 #define ACE_ROUTINE_LOG_BIN_PROFILER_H
+
27 
+
28 #include <stdint.h> // uint8_t, uint32_t
+
29 #include <stdio.h> // memset()
+
30 #include "Coroutine.h"
+
31 #include "CoroutineProfiler.h"
+
32 
+
33 
+
34 namespace ace_routine {
+
35 
+
53 template <typename T_COROUTINE>
+
54 class LogBinProfilerTemplate : public CoroutineProfiler {
+
55  public:
+
57  static const uint8_t kNumBins = 32;
+
58 
+
59  public:
+
61  LogBinProfilerTemplate() {
+
62  clear();
+
63  }
+
64 
+
66  void clear() {
+
67  memset(mBins, 0, sizeof(mBins));
+
68  }
+
69 
+
79  void updateElapsedMicros(uint32_t micros) override {
+
80  uint8_t index = 0; // [0, 31]
+
81 
+
82  while (true) {
+
83  micros >>= 1;
+
84  if (micros == 0) break;
+
85  index++;
+
86  }
+
87  uint16_t count = mBins[index];
+
88  if (count < UINT16_MAX) {
+
89  mBins[index]++;
+
90  }
+
91  }
+
92 
+
106  static void createProfilers() {
+
107  T_COROUTINE** root = T_COROUTINE::getRoot();
+
108  for (T_COROUTINE** p = root; (*p) != nullptr; p = (*p)->getNext()) {
+
109  auto* profiler = new LogBinProfilerTemplate();
+
110  (*p)->setProfiler(profiler);
+
111  }
+
112  }
+
113 
+
115  static void deleteProfilers() {
+
116  T_COROUTINE** root = T_COROUTINE::getRoot();
+
117  for (T_COROUTINE** p = root; (*p) != nullptr; p = (*p)->getNext()) {
+
118  auto* profiler = (LogBinProfilerTemplate*) (*p)->getProfiler();
+
119  if (profiler) {
+
120  delete profiler;
+
121  (*p)->setProfiler(nullptr);
+
122  }
+
123  }
+
124  }
+
125 
+
127  static void clearProfilers() {
+
128  T_COROUTINE** root = T_COROUTINE::getRoot();
+
129  for (T_COROUTINE** p = root; (*p) != nullptr; p = (*p)->getNext()) {
+
130  auto* profiler = (LogBinProfilerTemplate*) (*p)->getProfiler();
+
131  if (profiler) {
+
132  profiler->clear();
+
133  }
+
134  }
+
135  }
+
136 
+
137  public:
+
139  uint16_t mBins[kNumBins];
+
140 };
+
141 
+
142 using LogBinProfiler = LogBinProfilerTemplate<Coroutine>;
+
143 
+
144 namespace internal {
+
145 
+
155 void rollupExteriorBins(
+
156  uint16_t dst[],
+
157  const uint16_t src[],
+
158  uint8_t numBins,
+
159  uint8_t startBin,
+
160  uint8_t endBin
+
161 );
+
162 
+
163 }
+
164 
+
165 }
+
166 
+
167 #endif
+
+
ace_routine::LogBinProfilerTemplate::updateElapsedMicros
void updateElapsedMicros(uint32_t micros) override
Update the count for the calculated elapsed time bin.
Definition: LogBinProfiler.h:79
+
ace_routine::LogBinProfilerTemplate::LogBinProfilerTemplate
LogBinProfilerTemplate()
Constructor.
Definition: LogBinProfiler.h:61
+
ace_routine::CoroutineProfiler
An interface class for profiling classes that can track the elapsed time consumed by Coroutine::runCo...
Definition: CoroutineProfiler.h:36
+
ace_routine::LogBinProfilerTemplate::clearProfilers
static void clearProfilers()
Clear counters for all profilers.
Definition: LogBinProfiler.h:127
+
ace_routine::LogBinProfilerTemplate
Class that maintains the frequency count of the elapsed time of runCoroutine() in an array of bins wh...
Definition: LogBinProfiler.h:54
+
ace_routine::LogBinProfilerTemplate::kNumBins
static const uint8_t kNumBins
Number of event counter bins used by this class.
Definition: LogBinProfiler.h:57
+
ace_routine::LogBinProfilerTemplate::clear
void clear()
Clear the bins.
Definition: LogBinProfiler.h:66
+
ace_routine::LogBinProfilerTemplate::deleteProfilers
static void deleteProfilers()
Delete the profilers created by createProfilers().
Definition: LogBinProfiler.h:115
+
ace_routine::LogBinProfilerTemplate::createProfilers
static void createProfilers()
Create a new profiler on the heap and attach it to each coroutine.
Definition: LogBinProfiler.h:106
+
ace_routine::LogBinProfilerTemplate::mBins
uint16_t mBins[kNumBins]
Event count bins.
Definition: LogBinProfiler.h:139
+ + +
+Generated by   +doxygen + 1.8.17 +
+ + diff --git a/docs/html/LogBinTableRenderer_8cpp_source.html b/docs/html/LogBinTableRenderer_8cpp_source.html new file mode 100644 index 0000000..186b26a --- /dev/null +++ b/docs/html/LogBinTableRenderer_8cpp_source.html @@ -0,0 +1,230 @@ + + + + + + + +AceRoutine: /home/brian/src/AceRoutine/src/ace_routine/LogBinTableRenderer.cpp Source File + + + + + + + + + +
+
+ + + + + + +
+
AceRoutine +  1.5.0 +
+
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
+
+
+ + + + + + + + +
+
+ + +
+ +
+ + +
+
+
+
LogBinTableRenderer.cpp
+
+
+
1 /*
+
2 MIT License
+
3 
+
4 Copyright (c) 2022 Brian T. Park
+
5 
+
6 Permission is hereby granted, free of charge, to any person obtaining a copy
+
7 of this software and associated documentation files (the "Software"), to deal
+
8 in the Software without restriction, including without limitation the rights
+
9 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+
10 copies of the Software, and to permit persons to whom the Software is
+
11 furnished to do so, subject to the following conditions:
+
12 
+
13 The above copyright notice and this permission notice shall be included in all
+
14 copies or substantial portions of the Software.
+
15 
+
16 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+
17 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+
18 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+
19 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+
20 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+
21 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+
22 SOFTWARE.
+
23 */
+
24 
+
25 #include <Arduino.h>
+
26 #include <AceCommon.h> // printPad5To()
+
27 #include "LogBinTableRenderer.h"
+
28 
+
29 namespace ace_routine {
+
30 namespace internal {
+
31 
+
32 // The numbers for higher duration values deviate from powers of 2 because 2^10
+
33 // = 1024, which is not exactly 1000. The length of each string should be 6 or
+
34 // smaller, otherwise it will be truncated by
+
35 // LogBinTableRenderer::printHeaderTo().
+
36 static const char kBinLabel00[] PROGMEM = "<2us";
+
37 static const char kBinLabel01[] PROGMEM = "<4us";
+
38 static const char kBinLabel02[] PROGMEM = "<8us";
+
39 static const char kBinLabel03[] PROGMEM = "<16us";
+
40 static const char kBinLabel04[] PROGMEM = "<32us";
+
41 static const char kBinLabel05[] PROGMEM = "<64us";
+
42 static const char kBinLabel06[] PROGMEM = "<128us";
+
43 static const char kBinLabel07[] PROGMEM = "<256us";
+
44 static const char kBinLabel08[] PROGMEM = "<512us";
+
45 static const char kBinLabel09[] PROGMEM = "<1ms";
+
46 static const char kBinLabel10[] PROGMEM = "<2ms";
+
47 static const char kBinLabel11[] PROGMEM = "<4ms";
+
48 static const char kBinLabel12[] PROGMEM = "<8ms";
+
49 static const char kBinLabel13[] PROGMEM = "<16ms";
+
50 static const char kBinLabel14[] PROGMEM = "<33ms";
+
51 static const char kBinLabel15[] PROGMEM = "<66ms";
+
52 static const char kBinLabel16[] PROGMEM = "<131ms";
+
53 static const char kBinLabel17[] PROGMEM = "<262ms";
+
54 static const char kBinLabel18[] PROGMEM = "<524ms";
+
55 static const char kBinLabel19[] PROGMEM = "<1s";
+
56 static const char kBinLabel20[] PROGMEM = "<2s";
+
57 static const char kBinLabel21[] PROGMEM = "<4s";
+
58 static const char kBinLabel22[] PROGMEM = "<8s";
+
59 static const char kBinLabel23[] PROGMEM = "<17s";
+
60 static const char kBinLabel24[] PROGMEM = "<34s";
+
61 static const char kBinLabel25[] PROGMEM = "<67s";
+
62 static const char kBinLabel26[] PROGMEM = "<134s";
+
63 static const char kBinLabel27[] PROGMEM = "<268s";
+
64 static const char kBinLabel28[] PROGMEM = "<537s";
+
65 static const char kBinLabel29[] PROGMEM = "<1074s";
+
66 static const char kBinLabel30[] PROGMEM = "<2147s";
+
67 static const char kBinLabel31[] PROGMEM = "<4295s";
+
68 
+
69 const char* const kBinLabels[kNumBinLabels] PROGMEM = {
+
70  kBinLabel00,
+
71  kBinLabel01,
+
72  kBinLabel02,
+
73  kBinLabel03,
+
74  kBinLabel04,
+
75  kBinLabel05,
+
76  kBinLabel06,
+
77  kBinLabel07,
+
78  kBinLabel08,
+
79  kBinLabel09,
+
80  kBinLabel10,
+
81  kBinLabel11,
+
82  kBinLabel12,
+
83  kBinLabel13,
+
84  kBinLabel14,
+
85  kBinLabel15,
+
86  kBinLabel16,
+
87  kBinLabel17,
+
88  kBinLabel18,
+
89  kBinLabel19,
+
90  kBinLabel20,
+
91  kBinLabel21,
+
92  kBinLabel22,
+
93  kBinLabel23,
+
94  kBinLabel24,
+
95  kBinLabel25,
+
96  kBinLabel26,
+
97  kBinLabel27,
+
98  kBinLabel28,
+
99  kBinLabel29,
+
100  kBinLabel30,
+
101  kBinLabel31,
+
102 };
+
103 
+
104 void printHeaderTo(Print& printer, uint8_t startBin, uint8_t endBin) {
+
105  endBin = (endBin > kNumBinLabels) ? kNumBinLabels : endBin;
+
106  if (endBin <= startBin) return; // needed if startBin = endBin = 0
+
107 
+
108  for (uint8_t i = startBin; i < endBin - 1; i++) {
+
109  auto* label = (const char*) pgm_read_ptr(&internal::kBinLabels[i]);
+
110  printPStringTo(printer, label, 6);
+
111  }
+
112  printer.print(F(" >>"));
+
113 }
+
114 
+
115 void printPStringTo(Print& printer, const char* s, uint8_t boxSize) {
+
116  uint8_t length = strlen_P(s);
+
117  uint8_t printLength;
+
118  if (length < boxSize) {
+
119  for (uint8_t i = 0; i < (boxSize - length); i++) {
+
120  printer.print(' ');
+
121  }
+
122  printLength = length;
+
123  } else {
+
124  printLength = boxSize;
+
125  }
+
126 
+
127  for (uint8_t i = 0; i < printLength; i++) {
+
128  printer.print((char) pgm_read_byte(&s[i]));
+
129  }
+
130 }
+
131 
+
132 void printBinsTo(
+
133  Print& printer,
+
134  const uint16_t bins[],
+
135  uint8_t numBins,
+
136  uint8_t startBin,
+
137  uint8_t endBin) {
+
138 
+
139  endBin = (endBin > numBins) ? numBins : endBin;
+
140  for (uint8_t i = startBin; i < endBin; i++) {
+
141  uint16_t count = bins[i];
+
142  printer.print(' ');
+
143  ace_common::printPad5To(printer, count);
+
144  }
+
145 }
+
146 
+
147 }
+
148 }
+
+ +
+Generated by   +doxygen + 1.8.17 +
+ + diff --git a/docs/html/LogBinTableRenderer_8h_source.html b/docs/html/LogBinTableRenderer_8h_source.html new file mode 100644 index 0000000..e0c9101 --- /dev/null +++ b/docs/html/LogBinTableRenderer_8h_source.html @@ -0,0 +1,204 @@ + + + + + + + +AceRoutine: /home/brian/src/AceRoutine/src/ace_routine/LogBinTableRenderer.h Source File + + + + + + + + + +
+
+ + + + + + +
+
AceRoutine +  1.5.0 +
+
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
+
+
+ + + + + + + + +
+
+ + +
+ +
+ + +
+
+
+
LogBinTableRenderer.h
+
+
+
1 /*
+
2 MIT License
+
3 
+
4 Copyright (c) 2022 Brian T. Park
+
5 
+
6 Permission is hereby granted, free of charge, to any person obtaining a copy
+
7 of this software and associated documentation files (the "Software"), to deal
+
8 in the Software without restriction, including without limitation the rights
+
9 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+
10 copies of the Software, and to permit persons to whom the Software is
+
11 furnished to do so, subject to the following conditions:
+
12 
+
13 The above copyright notice and this permission notice shall be included in all
+
14 copies or substantial portions of the Software.
+
15 
+
16 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+
17 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+
18 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+
19 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+
20 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+
21 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+
22 SOFTWARE.
+
23 */
+
24 
+
25 #ifndef ACE_ROUTINE_LOG_BIN_TABLE_RENDERER_H
+
26 #define ACE_ROUTINE_LOG_BIN_TABLE_RENDERER_H
+
27 
+
28 #include <stdint.h> // uint8_t, uint32_t
+
29 #include <Arduino.h> // Print
+
30 #include "Coroutine.h" // Coroutine
+
31 #include "LogBinProfiler.h" // rollupExteriorBins()
+
32 
+
33 namespace ace_routine {
+
34 
+
35 namespace internal {
+
36 
+
38 const uint8_t kNumBinLabels = 32;
+
39 
+
41 extern const char* const kBinLabels[kNumBinLabels] PROGMEM;
+
42 
+
50 void printHeaderTo( Print& printer, uint8_t startBin, uint8_t endBin);
+
51 
+
57 void printPStringTo(Print& printer, const char* s, uint8_t boxSize);
+
58 
+
70 void printBinsTo(
+
71  Print& printer,
+
72  const uint16_t bins[],
+
73  uint8_t numBins,
+
74  uint8_t startBin,
+
75  uint8_t endBin);
+
76 
+
77 } // namespace internal
+
78 
+
104 template <typename T_COROUTINE>
+
105 class LogBinTableRendererTemplate {
+
106  public:
+
108  using Profiler = LogBinProfilerTemplate<T_COROUTINE>;
+
109 
+
124  static void printTo(
+
125  Print& printer,
+
126  uint8_t startBin,
+
127  uint8_t endBin,
+
128  bool clear = true,
+
129  bool rollup = true
+
130  ) {
+
131  if (endBin <= startBin) return;
+
132 
+
133  uint16_t bufBins[Profiler::kNumBins];
+
134 
+
135  bool isHeaderPrinted = false;
+
136  T_COROUTINE** root = T_COROUTINE::getRoot();
+
137  for (T_COROUTINE** p = root; (*p) != nullptr; p = (*p)->getNext()) {
+
138  auto* profiler = (Profiler*) (*p)->getProfiler();
+
139  if (! profiler) continue;
+
140 
+
141  // Print header if needed.
+
142  if (! isHeaderPrinted) {
+
143  printer.print(F("name "));
+
144  internal::printHeaderTo(printer, startBin, endBin);
+
145  printer.println();
+
146  isHeaderPrinted = true;
+
147  }
+
148 
+
149  // Print the coroutine name, truncated to 12 characters. The next column
+
150  // is a 5-digit number formatted into a 6-character block, so there will
+
151  // always be a space between the coroutine name and the next number.
+
152  (*p)->printNameTo(printer, 12);
+
153 
+
154  // Roll up the exterior bins in to the first and last bins if requested.
+
155  const uint16_t* bins;
+
156  if (rollup) {
+
157  internal::rollupExteriorBins(
+
158  bufBins, profiler->mBins, Profiler::kNumBins, startBin, endBin);
+
159  bins = bufBins;
+
160  } else {
+
161  bins = profiler->mBins;
+
162  }
+
163 
+
164  // Print the bins. The number of digits is automatically a log10() of
+
165  // the counts, so we should be able to visually scan the table and see
+
166  // which coroutine is taking too long.
+
167  internal::printBinsTo(
+
168  printer, bins, Profiler::kNumBins, startBin, endBin);
+
169  printer.println();
+
170 
+
171  if (clear) {
+
172  profiler->clear();
+
173  }
+
174  }
+
175  }
+
176 };
+
177 
+
178 using LogBinTableRenderer = LogBinTableRendererTemplate<Coroutine>;
+
179 
+
180 } // namespace ace_routine
+
181 
+
182 #endif
+
+
ace_routine::LogBinTableRendererTemplate
Print the information in the LogBinProfiler for each Coroutine in a human-readable table.
Definition: LogBinTableRenderer.h:105
+
ace_routine::LogBinProfilerTemplate
Class that maintains the frequency count of the elapsed time of runCoroutine() in an array of bins wh...
Definition: LogBinProfiler.h:54
+
ace_routine::LogBinTableRendererTemplate::printTo
static void printTo(Print &printer, uint8_t startBin, uint8_t endBin, bool clear=true, bool rollup=true)
Loop over all coroutines and print the ASCII version of the frequency distribution.
Definition: LogBinTableRenderer.h:124
+
ace_routine::LogBinProfilerTemplate::kNumBins
static const uint8_t kNumBins
Number of event counter bins used by this class.
Definition: LogBinProfiler.h:57
+ + +
+Generated by   +doxygen + 1.8.17 +
+ + diff --git a/docs/html/annotated.html b/docs/html/annotated.html index fadadee..5b205ea 100644 --- a/docs/html/annotated.html +++ b/docs/html/annotated.html @@ -22,7 +22,7 @@
AceRoutine -  1.4.2 +  1.5.0
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
@@ -72,8 +72,12 @@  ▼Nace_routine  CChannelAn unbuffered synchronized channel  CClockInterfaceA utility class (all methods are static) that provides a layer of indirection to Arduino clock functions (millis() and micros()) - CCoroutineSchedulerTemplateClass that manages instances of the Coroutine class, and executes them in a round-robin fashion - CCoroutineTemplateBase class of all coroutines + CCoroutineProfilerAn interface class for profiling classes that can track the elapsed time consumed by Coroutine::runCoroutine() + CCoroutineSchedulerTemplateClass that manages instances of the Coroutine class, and executes them in a round-robin fashion + CCoroutineTemplateBase class of all coroutines + CLogBinJsonRendererTemplatePrint the LogBinProfiler bins as a JSON array + CLogBinProfilerTemplateClass that maintains the frequency count of the elapsed time of runCoroutine() in an array of bins where each bin is a log2() logarithm of the elapsed time in microseconds + CLogBinTableRendererTemplatePrint the information in the LogBinProfiler for each Coroutine in a human-readable table diff --git a/docs/html/classace__routine_1_1Channel-members.html b/docs/html/classace__routine_1_1Channel-members.html index 2daf5b3..67afaf3 100644 --- a/docs/html/classace__routine_1_1Channel-members.html +++ b/docs/html/classace__routine_1_1Channel-members.html @@ -22,7 +22,7 @@
AceRoutine -  1.4.2 +  1.5.0
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
diff --git a/docs/html/classace__routine_1_1Channel.html b/docs/html/classace__routine_1_1Channel.html index add4be0..19308be 100644 --- a/docs/html/classace__routine_1_1Channel.html +++ b/docs/html/classace__routine_1_1Channel.html @@ -22,7 +22,7 @@
AceRoutine -  1.4.2 +  1.5.0
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
diff --git a/docs/html/classace__routine_1_1ClockInterface-members.html b/docs/html/classace__routine_1_1ClockInterface-members.html index f7ba4c0..4cf0729 100644 --- a/docs/html/classace__routine_1_1ClockInterface-members.html +++ b/docs/html/classace__routine_1_1ClockInterface-members.html @@ -22,7 +22,7 @@
AceRoutine -  1.4.2 +  1.5.0
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
diff --git a/docs/html/classace__routine_1_1ClockInterface.html b/docs/html/classace__routine_1_1ClockInterface.html index a0bcb64..099a545 100644 --- a/docs/html/classace__routine_1_1ClockInterface.html +++ b/docs/html/classace__routine_1_1ClockInterface.html @@ -22,7 +22,7 @@
AceRoutine -  1.4.2 +  1.5.0
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
diff --git a/docs/html/classace__routine_1_1CoroutineProfiler-members.html b/docs/html/classace__routine_1_1CoroutineProfiler-members.html new file mode 100644 index 0000000..54b3acc --- /dev/null +++ b/docs/html/classace__routine_1_1CoroutineProfiler-members.html @@ -0,0 +1,88 @@ + + + + + + + +AceRoutine: Member List + + + + + + + + + +
+
+ + + + + + +
+
AceRoutine +  1.5.0 +
+
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
+
+
+ + + + + + + + +
+
+ + +
+ +
+ + +
+
+
+
ace_routine::CoroutineProfiler Member List
+
+
+ +

This is the complete list of members for ace_routine::CoroutineProfiler, including all inherited members.

+ + + + +
CoroutineProfiler()=defaultace_routine::CoroutineProfiler
updateElapsedMicros(uint32_t micros)=0ace_routine::CoroutineProfilerpure virtual
~CoroutineProfiler()=defaultace_routine::CoroutineProfilervirtual
+ +
+Generated by   +doxygen + 1.8.17 +
+ + diff --git a/docs/html/classace__routine_1_1CoroutineProfiler.html b/docs/html/classace__routine_1_1CoroutineProfiler.html new file mode 100644 index 0000000..618f4f3 --- /dev/null +++ b/docs/html/classace__routine_1_1CoroutineProfiler.html @@ -0,0 +1,151 @@ + + + + + + + +AceRoutine: ace_routine::CoroutineProfiler Class Reference + + + + + + + + + +
+
+ + + + + + +
+
AceRoutine +  1.5.0 +
+
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
+
+
+ + + + + + + + +
+
+ + +
+ +
+ + +
+
+
+Public Member Functions | +List of all members
+
+
ace_routine::CoroutineProfiler Class Referenceabstract
+
+
+ +

An interface class for profiling classes that can track the elapsed time consumed by Coroutine::runCoroutine(). + More...

+ +

#include <CoroutineProfiler.h>

+
+Inheritance diagram for ace_routine::CoroutineProfiler:
+
+
Inheritance graph
+ + + + +
[legend]
+ + + + + + + + + + + +

+Public Member Functions

+ CoroutineProfiler ()=default
 Use default constructor.
 
virtual ~CoroutineProfiler ()=default
 The destructor is NON-virtual on AVR processors because adding a virtual destructor causes flash consumption to increase by 600 bytes, even if the profiler is never used. More...
 
+virtual void updateElapsedMicros (uint32_t micros)=0
 Process the completion of the runCoroutine() method which took micros microseconds.
 
+

Detailed Description

+

An interface class for profiling classes that can track the elapsed time consumed by Coroutine::runCoroutine().

+ +

Definition at line 36 of file CoroutineProfiler.h.

+

Constructor & Destructor Documentation

+ +

◆ ~CoroutineProfiler()

+ +
+
+ + + + + +
+ + + + + + + +
virtual ace_routine::CoroutineProfiler::~CoroutineProfiler ()
+ 		+virtualdefault
+
+ +

The destructor is NON-virtual on AVR processors because adding a virtual destructor causes flash consumption to increase by 600 bytes, even if the profiler is never used.

+

If profiling is enabled on 8-bit processors, I expect the number of coroutines in the system to be relatively small, so it seems reasonable to create instances of the CoroutineProfiler statically at the global scope, and attach them to the Coroutines using the Coroutine::setProfiler() method. This means that this destructor will never be called polymorphically.

+

On 32-bit processors, the destructor is virtual because I expect that the application will use a larger number of coroutines, so it will be much easier to use to the LogBinProfiler::createProfilers() and LogBinProfiler::deleteProfilers() helper methods to create the profilers on the heap. This means that the destructor may be called polymorphically and a virtual destructor is needed for correctness. It is expected that 32-bit processors will have far more flash memory and static RAM than 8-bit processors, so the additional resource consumption will hopefully not be too burdensome. If it is, then 32-bit processors have the option of using the same technique as 8-bit processors, and use the Coroutine::setProfiler() to attach statically created instances instead.

+ +
+
+
The documentation for this class was generated from the following file: +
+ +
+Generated by   +doxygen + 1.8.17 +
+ + diff --git a/docs/html/classace__routine_1_1CoroutineProfiler__inherit__graph.map b/docs/html/classace__routine_1_1CoroutineProfiler__inherit__graph.map new file mode 100644 index 0000000..5c62a6a --- /dev/null +++ b/docs/html/classace__routine_1_1CoroutineProfiler__inherit__graph.map @@ -0,0 +1,4 @@ + + + + diff --git a/docs/html/classace__routine_1_1CoroutineProfiler__inherit__graph.md5 b/docs/html/classace__routine_1_1CoroutineProfiler__inherit__graph.md5 new file mode 100644 index 0000000..f67c5c6 --- /dev/null +++ b/docs/html/classace__routine_1_1CoroutineProfiler__inherit__graph.md5 @@ -0,0 +1 @@ +2be2422c382cd2a500356505e7f9f2a3 \ No newline at end of file diff --git a/docs/html/classace__routine_1_1CoroutineProfiler__inherit__graph.png b/docs/html/classace__routine_1_1CoroutineProfiler__inherit__graph.png new file mode 100644 index 0000000000000000000000000000000000000000..9e98f4ae76134e7abdb7f0035f260172c4f10507 GIT binary patch literal 6308 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 E03_;snE(I) literal 0 HcmV?d00001 diff --git a/docs/html/classace__routine_1_1CoroutineSchedulerTemplate-members.html b/docs/html/classace__routine_1_1CoroutineSchedulerTemplate-members.html index 7897e66..bfe94d9 100644 --- a/docs/html/classace__routine_1_1CoroutineSchedulerTemplate-members.html +++ b/docs/html/classace__routine_1_1CoroutineSchedulerTemplate-members.html @@ -22,7 +22,7 @@
AceRoutine -  1.4.2 +  1.5.0
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
@@ -76,8 +76,9 @@ - - + + +
list(Print &printer)ace_routine::CoroutineSchedulerTemplate< T_COROUTINE >inlinestatic
loop()ace_routine::CoroutineSchedulerTemplate< T_COROUTINE >inlinestatic
setup()ace_routine::CoroutineSchedulerTemplate< T_COROUTINE >inlinestatic
setupCoroutines()ace_routine::CoroutineSchedulerTemplate< T_COROUTINE >inlinestatic
loopWithProfiler()ace_routine::CoroutineSchedulerTemplate< T_COROUTINE >inlinestatic
setup()ace_routine::CoroutineSchedulerTemplate< T_COROUTINE >inlinestatic
setupCoroutines()ace_routine::CoroutineSchedulerTemplate< T_COROUTINE >inlinestatic
diff --git a/docs/html/classace__routine_1_1CoroutineSchedulerTemplate.html b/docs/html/classace__routine_1_1CoroutineSchedulerTemplate.html index 2e0e0cc..62f8d0d 100644 --- a/docs/html/classace__routine_1_1CoroutineSchedulerTemplate.html +++ b/docs/html/classace__routine_1_1CoroutineSchedulerTemplate.html @@ -22,7 +22,7 @@
AceRoutine -  1.4.2 +  1.5.0
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
@@ -92,6 +92,9 @@ static void loop ()  Run the current coroutine using the current scheduler. More...
  +static void loopWithProfiler () + Run the current coroutine using the current scheduler with the coroutine profiler enabled. More...
+  static void list (Print &printer)  Print out the known coroutines to the printer (usually Serial). More...
  @@ -109,7 +112,7 @@

With its current functionality, the CoroutineSchedule does not need to be a singleton because the information that stores the singly-linked list of Coroutines is actually stored in the Coroutine class, not the CoroutineScheduler class. Because it does not need to be singleton, the getScheduler() method is not really required, and we could have just allowed the end-user to explicitly create an instance of CoroutineScheduler and use it like a normal object.

However, once the API of CoroutineScheduler with its static wrapper methods was released to the public, backwards compatibility meant that I could not remove this extra layer of indirection. Fortunately, the none of these methods are virtual, so the extra level of indirection consumes very little overhead, even on 8-bit AVR processors.

-

Definition at line 270 of file Coroutine.h.

+

Definition at line 274 of file Coroutine.h.

Member Function Documentation

◆ list()

@@ -140,7 +143,7 @@

setup(), then this method causes no additional flash memory consumption.

-

Definition at line 105 of file CoroutineScheduler.h.

+

Definition at line 116 of file CoroutineScheduler.h.

@@ -170,9 +173,41 @@

Run the current coroutine using the current scheduler.

-

This method returns when the underlying Coroutine suspends execution, which allows the system loop() to return to do systems processing, such as WiFi. Everyone must cooperate to make the whole thing work.

+

This method returns when the underlying Coroutine suspends execution, which allows the system loop() to return to do systems processing. Everyone must cooperate to make the whole thing work.

-

Definition at line 97 of file CoroutineScheduler.h.

+

Definition at line 98 of file CoroutineScheduler.h.

+ + + + +

◆ loopWithProfiler()

+ +
+
+
+template<typename T_COROUTINE >
+ + + + + +
+ + + + + + + +
static void ace_routine::CoroutineSchedulerTemplate< T_COROUTINE >::loopWithProfiler ()
+ 		+inlinestatic
+
+ +

Run the current coroutine using the current scheduler with the coroutine profiler enabled.

+

This method returns when the underlying Coroutine suspends execution, which allows the system loop() to return to do systems processing. Everyone must cooperate to make the whole thing work.

+ +

Definition at line 106 of file CoroutineScheduler.h.

@@ -204,7 +239,7 @@

setup().

-

Definition at line 84 of file CoroutineScheduler.h.

+

Definition at line 85 of file CoroutineScheduler.h.

diff --git a/docs/html/classace__routine_1_1CoroutineTemplate-members.html b/docs/html/classace__routine_1_1CoroutineTemplate-members.html index e52ea59..b77737f 100644 --- a/docs/html/classace__routine_1_1CoroutineTemplate-members.html +++ b/docs/html/classace__routine_1_1CoroutineTemplate-members.html @@ -22,7 +22,7 @@
AceRoutine -  1.4.2 +  1.5.0
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
@@ -68,61 +68,77 @@
-
ace_routine::CoroutineTemplate< T_CLOCK > Member List
+
ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY > Member List
-

This is the complete list of members for ace_routine::CoroutineTemplate< T_CLOCK >, including all inherited members.

+

This is the complete list of members for ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >, including all inherited members.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
::AceRoutineTest_statusStrings (defined in ace_routine::CoroutineTemplate< T_CLOCK >)ace_routine::CoroutineTemplate< T_CLOCK >friend
::SuspendTest_suspendAndResume (defined in ace_routine::CoroutineTemplate< T_CLOCK >)ace_routine::CoroutineTemplate< T_CLOCK >friend
coroutineMicros()ace_routine::CoroutineTemplate< T_CLOCK >inlineprotectedstatic
coroutineMillis()ace_routine::CoroutineTemplate< T_CLOCK >inlineprotectedstatic
CoroutineSchedulerTemplate< CoroutineTemplate< T_CLOCK > > (defined in ace_routine::CoroutineTemplate< T_CLOCK >)ace_routine::CoroutineTemplate< T_CLOCK >friend
coroutineSeconds()ace_routine::CoroutineTemplate< T_CLOCK >inlineprotectedstatic
CoroutineTemplate()ace_routine::CoroutineTemplate< T_CLOCK >inlineprotected
getJump() constace_routine::CoroutineTemplate< T_CLOCK >inlineprotected
getStatus() constace_routine::CoroutineTemplate< T_CLOCK >inlineprotected
isDelayExpired() constace_routine::CoroutineTemplate< T_CLOCK >inline
isDelaying() constace_routine::CoroutineTemplate< T_CLOCK >inline
isDelayMicrosExpired() constace_routine::CoroutineTemplate< T_CLOCK >inline
isDelaySecondsExpired() constace_routine::CoroutineTemplate< T_CLOCK >inline
isDone() constace_routine::CoroutineTemplate< T_CLOCK >inline
isEnding() constace_routine::CoroutineTemplate< T_CLOCK >inline
isRunning() constace_routine::CoroutineTemplate< T_CLOCK >inline
isSuspended() constace_routine::CoroutineTemplate< T_CLOCK >inline
isTerminated() constace_routine::CoroutineTemplate< T_CLOCK >inline
isYielding() constace_routine::CoroutineTemplate< T_CLOCK >inline
kStatusDelayingace_routine::CoroutineTemplate< T_CLOCK >protectedstatic
kStatusEndingace_routine::CoroutineTemplate< T_CLOCK >protectedstatic
kStatusRunningace_routine::CoroutineTemplate< T_CLOCK >protectedstatic
kStatusSuspendedace_routine::CoroutineTemplate< T_CLOCK >protectedstatic
kStatusTerminatedace_routine::CoroutineTemplate< T_CLOCK >protectedstatic
kStatusYieldingace_routine::CoroutineTemplate< T_CLOCK >protectedstatic
mDelayDurationace_routine::CoroutineTemplate< T_CLOCK >protected
mDelayStartace_routine::CoroutineTemplate< T_CLOCK >protected
mJumpPointace_routine::CoroutineTemplate< T_CLOCK >protected
mNextace_routine::CoroutineTemplate< T_CLOCK >protected
mStatusace_routine::CoroutineTemplate< T_CLOCK >protected
reset()ace_routine::CoroutineTemplate< T_CLOCK >inline
resume()ace_routine::CoroutineTemplate< T_CLOCK >inline
runCoroutine()=0ace_routine::CoroutineTemplate< T_CLOCK >pure virtual
setDelaying()ace_routine::CoroutineTemplate< T_CLOCK >inlineprotected
setDelayMicros(uint16_t delayMicros)ace_routine::CoroutineTemplate< T_CLOCK >inlineprotected
setDelayMillis(uint16_t delayMillis)ace_routine::CoroutineTemplate< T_CLOCK >inlineprotected
setDelaySeconds(uint16_t delaySeconds)ace_routine::CoroutineTemplate< T_CLOCK >inlineprotected
setEnding()ace_routine::CoroutineTemplate< T_CLOCK >inlineprotected
setJump(void *jumpPoint)ace_routine::CoroutineTemplate< T_CLOCK >inlineprotected
setRunning()ace_routine::CoroutineTemplate< T_CLOCK >inlineprotected
setTerminated()ace_routine::CoroutineTemplate< T_CLOCK >inlineprotected
setupCoroutine()ace_routine::CoroutineTemplate< T_CLOCK >inlinevirtual
setupCoroutine(const char *) ACE_ROUTINE_DEPRECATEDace_routine::CoroutineTemplate< T_CLOCK >inline
setupCoroutine(const __FlashStringHelper *) ACE_ROUTINE_DEPRECATEDace_routine::CoroutineTemplate< T_CLOCK >inline
setYielding()ace_routine::CoroutineTemplate< T_CLOCK >inlineprotected
Status typedeface_routine::CoroutineTemplate< T_CLOCK >protected
statusPrintTo(Print &printer)ace_routine::CoroutineTemplate< T_CLOCK >inlineprotected
suspend()ace_routine::CoroutineTemplate< T_CLOCK >inline
~CoroutineTemplate()=defaultace_routine::CoroutineTemplate< T_CLOCK >protected
::AceRoutineTest_statusStrings (defined in ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >)ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >friend
::SuspendTest_suspendAndResume (defined in ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >)ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >friend
coroutineMicros()ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inlineprotectedstatic
coroutineMillis()ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inlineprotectedstatic
CoroutineSchedulerTemplate< CoroutineTemplate< T_CLOCK, T_DELAY > > (defined in ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >)ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >friend
coroutineSeconds()ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inlineprotectedstatic
CoroutineTemplate()ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inlineprotected
getCName() constace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inline
getFName() constace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inline
getJump() constace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inlineprotected
getNameType() constace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inline
getNext()ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inline
getProfiler() constace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inline
getRoot()ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inlinestatic
getStatus() constace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inlineprotected
isDelayExpired() constace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inline
isDelaying() constace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inline
isDelayMicrosExpired() constace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inline
isDelaySecondsExpired() constace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inline
isDone() constace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inline
isEnding() constace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inline
isRunning() constace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inline
isSuspended() constace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inline
isTerminated() constace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inline
isYielding() constace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inline
kNameTypeCStringace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >static
kNameTypeFStringace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >static
kStatusDelayingace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >protectedstatic
kStatusEndingace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >protectedstatic
kStatusRunningace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >protectedstatic
kStatusSuspendedace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >protectedstatic
kStatusTerminatedace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >protectedstatic
kStatusYieldingace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >protectedstatic
mDelayDurationace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >protected
mDelayStartace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >protected
mJumpPointace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >protected
mNameace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >protected
mNameTypeace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >protected
mNextace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >protected
mProfilerace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >protected
mStatusace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >protected
printNameTo(Print &printer, uint8_t maxLen=0) constace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inline
reset()ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inline
resume()ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inline
runCoroutine()=0ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >pure virtual
runCoroutineWithProfiler()ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inline
setDelaying()ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inlineprotected
setDelayMicros(T_DELAY delayMicros)ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inlineprotected
setDelayMillis(T_DELAY delayMillis)ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inlineprotected
setDelaySeconds(T_DELAY delaySeconds)ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inlineprotected
setEnding()ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inlineprotected
setJump(void *jumpPoint)ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inlineprotected
setName(const char *name)ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inline
setName(const __FlashStringHelper *name)ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inline
setProfiler(CoroutineProfiler *profiler)ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inline
setRunning()ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inlineprotected
setTerminated()ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inlineprotected
setupCoroutine()ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inlinevirtual
setupCoroutine(const char *) ACE_ROUTINE_DEPRECATEDace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inline
setupCoroutine(const __FlashStringHelper *) ACE_ROUTINE_DEPRECATEDace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inline
setYielding()ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inlineprotected
Status typedeface_routine::CoroutineTemplate< T_CLOCK, T_DELAY >protected
statusPrintTo(Print &printer)ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inlineprotected
suspend()ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >inline
~CoroutineTemplate()=defaultace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >protected
diff --git a/docs/html/classace__routine_1_1CoroutineTemplate.html b/docs/html/classace__routine_1_1CoroutineTemplate.html index a03e3ef..9065b77 100644 --- a/docs/html/classace__routine_1_1CoroutineTemplate.html +++ b/docs/html/classace__routine_1_1CoroutineTemplate.html @@ -5,7 +5,7 @@ -AceRoutine: ace_routine::CoroutineTemplate< T_CLOCK > Class Template Reference +AceRoutine: ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY > Class Template Reference @@ -22,7 +22,7 @@
AceRoutine -  1.4.2 +  1.5.0
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
@@ -69,6 +69,8 @@
Public Member Functions | +Static Public Member Functions | +Static Public Attributes | Protected Types | Protected Member Functions | Static Protected Member Functions | @@ -77,7 +79,7 @@ Friends | List of all members
-
ace_routine::CoroutineTemplate< T_CLOCK > Class Template Referenceabstract
+
ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY > Class Template Referenceabstract
@@ -86,195 +88,258 @@

#include <Coroutine.h>

-Collaboration diagram for ace_routine::CoroutineTemplate< T_CLOCK >:
+Collaboration diagram for ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >:
-
Collaboration graph
- - +
Collaboration graph
+ + +
[legend]
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Public Member Functions

virtual int runCoroutine ()=0
 The body of the coroutine. More...
 
virtual void setupCoroutine ()
 Perform coroutine initialization. More...
 
void suspend ()
 Suspend the coroutine at the next scheduler iteration. More...
 
void resume ()
 Add a Suspended coroutine into the head of the scheduler linked list, and change the state to Yielding. More...
 
void reset ()
 Reset the coroutine to its initial state. More...
 
-bool isDelayExpired () const
 Check if delay millis time is over.
 
-bool isDelayMicrosExpired () const
 Check if delay micros time is over.
 
-bool isDelaySecondsExpired () const
 Check if delay seconds time is over.
 
-bool isSuspended () const
 The coroutine was suspended with a call to suspend().
 
-bool isYielding () const
 The coroutine returned using COROUTINE_YIELD().
 
-bool isDelaying () const
 The coroutine returned using COROUTINE_DELAY().
 
bool isRunning () const
 The coroutine is currently running. More...
 
bool isEnding () const
 The coroutine returned using COROUTINE_END(). More...
 
bool isTerminated () const
 The coroutine was terminated by the scheduler with a call to setTerminated(). More...
 
bool isDone () const
 The coroutine is either Ending or Terminated. More...
 
void setupCoroutine (const char *) ACE_ROUTINE_DEPRECATED
 Deprecated method that does nothing. More...
 
void setupCoroutine (const __FlashStringHelper *) ACE_ROUTINE_DEPRECATED
 Deprecated method that does nothing. More...
 
virtual int runCoroutine ()=0
 The body of the coroutine. More...
 
virtual void setupCoroutine ()
 Perform coroutine initialization. More...
 
int runCoroutineWithProfiler ()
 This is a variant of runCoroutine() which measures the execution time of runCoroutine() and updates the attached profiler if it exists. More...
 
+uint8_t getNameType () const
 Return the type of the name string, either kNameTypeCString or kNameTypeFString.
 
+void setName (const char *name)
 Set the name of the coroutine to the given c-string.
 
+void setName (const __FlashStringHelper *name)
 Set the name of the coroutine to the given f-string.
 
const char * getCName () const
 Get name of the coroutine assuming it's a c-string. More...
 
const __FlashStringHelper * getFName () const
 Get name of the coroutine assuming it's an f-string. More...
 
void printNameTo (Print &printer, uint8_t maxLen=0) const
 Print name to the given Printer. More...
 
void suspend ()
 Suspend the coroutine at the next scheduler iteration. More...
 
void resume ()
 Add a Suspended coroutine into the head of the scheduler linked list, and change the state to Yielding. More...
 
void reset ()
 Reset the coroutine to its initial state. More...
 
+bool isDelayExpired () const
 Check if delay millis time is over.
 
+bool isDelayMicrosExpired () const
 Check if delay micros time is over.
 
+bool isDelaySecondsExpired () const
 Check if delay seconds time is over.
 
+bool isSuspended () const
 The coroutine was suspended with a call to suspend().
 
+bool isYielding () const
 The coroutine returned using COROUTINE_YIELD().
 
+bool isDelaying () const
 The coroutine returned using COROUTINE_DELAY().
 
bool isRunning () const
 The coroutine is currently running. More...
 
bool isEnding () const
 The coroutine returned using COROUTINE_END(). More...
 
bool isTerminated () const
 The coroutine was terminated by the scheduler with a call to setTerminated(). More...
 
bool isDone () const
 The coroutine is either Ending or Terminated. More...
 
void setupCoroutine (const char *) ACE_ROUTINE_DEPRECATED
 Deprecated method that does nothing. More...
 
void setupCoroutine (const __FlashStringHelper *) ACE_ROUTINE_DEPRECATED
 Deprecated method that does nothing. More...
 
+void setProfiler (CoroutineProfiler *profiler)
 Set the profiler.
 
CoroutineProfiler * getProfiler () const
 Get the profiler. More...
 
CoroutineTemplate ** getNext ()
 Return the next pointer as a pointer to the pointer, similar to getRoot(). More...
 
+ + + + +

+Static Public Member Functions

static CoroutineTemplate ** getRoot ()
 Get the pointer to the root pointer. More...
 
+ + + + + + +

+Static Public Attributes

+static const uint8_t kNameTypeCString = 0
 Coroutine name is a const char* c-string.
 
+static const uint8_t kNameTypeFString = 1
 Coroutine name is a const __FlashStringHelper* f-string.
 
- - - + + +

Protected Types

typedef uint8_t Status
 The execution status of the coroutine, corresponding to the COROUTINE_YIELD(), COROUTINE_DELAY(), COROUTINE_AWAIT() and COROUTINE_END() macros. More...
 
typedef uint8_t Status
 The execution status of the coroutine, corresponding to the COROUTINE_YIELD(), COROUTINE_DELAY(), COROUTINE_AWAIT() and COROUTINE_END() macros. More...
 
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Protected Member Functions

 CoroutineTemplate ()
 Constructor. More...
 
 ~CoroutineTemplate ()=default
 Destructor. More...
 
Status getStatus () const
 Return the status of the coroutine. More...
 
-void statusPrintTo (Print &printer)
 Print the human-readable string of the Status.
 
-void setJump (void *jumpPoint)
 Pointer to label where execute will start on the next call to runCoroutine().
 
-void * getJump () const
 Pointer to label where execute will start on the next call to runCoroutine().
 
-void setRunning ()
 Set the kStatusRunning state.
 
-void setYielding ()
 Set the kStatusDelaying state.
 
-void setDelaying ()
 Set the kStatusDelaying state.
 
-void setEnding ()
 Set the kStatusEnding state.
 
void setTerminated ()
 Set status to indicate that the Coroutine has been removed from the Scheduler queue. More...
 
void setDelayMillis (uint16_t delayMillis)
 Configure the delay timer for delayMillis. More...
 
void setDelayMicros (uint16_t delayMicros)
 Configure the delay timer for delayMicros. More...
 
void setDelaySeconds (uint16_t delaySeconds)
 Configure the delay timer for delaySeconds. More...
 
 CoroutineTemplate ()
 Constructor. More...
 
 ~CoroutineTemplate ()=default
 Destructor. More...
 
Status getStatus () const
 Return the status of the coroutine. More...
 
+void statusPrintTo (Print &printer)
 Print the human-readable string of the Status.
 
+void setJump (void *jumpPoint)
 Pointer to label where execute will start on the next call to runCoroutine().
 
+void * getJump () const
 Pointer to label where execute will start on the next call to runCoroutine().
 
+void setRunning ()
 Set the kStatusRunning state.
 
+void setYielding ()
 Set the kStatusDelaying state.
 
+void setDelaying ()
 Set the kStatusDelaying state.
 
+void setEnding ()
 Set the kStatusEnding state.
 
void setTerminated ()
 Set status to indicate that the Coroutine has been removed from the Scheduler queue. More...
 
void setDelayMillis (T_DELAY delayMillis)
 Configure the delay timer for delayMillis. More...
 
void setDelayMicros (T_DELAY delayMicros)
 Configure the delay timer for delayMicros. More...
 
void setDelaySeconds (T_DELAY delaySeconds)
 Configure the delay timer for delaySeconds. More...
 
- - - - - - - - - + + + + + + + + +

Static Protected Member Functions

static unsigned long coroutineMillis ()
 Returns the current millisecond clock. More...
 
static unsigned long coroutineMicros ()
 Returns the current microseconds clock. More...
 
static unsigned long coroutineSeconds ()
 Returns the current clock in unit of seconds, truncated to the lower 16-bits. More...
 
static unsigned long coroutineMillis ()
 Returns the current millisecond clock. More...
 
static unsigned long coroutineMicros ()
 Returns the current microseconds clock. More...
 
static unsigned long coroutineSeconds ()
 Returns the current clock in unit of seconds, truncated to the lower 16-bits. More...
 
- - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + +

Protected Attributes

-CoroutineTemplate * mNext = nullptr
 Pointer to the next coroutine in a singly-linked list.
 
-void * mJumpPoint = nullptr
 Address of the label used by the computed-goto.
 
-Status mStatus = kStatusYielding
 Run-state of the coroutine.
 
uint16_t mDelayStart
 Start time provided by COROUTINE_DELAY(), COROUTINE_DELAY_MICROS(), or COROUTINE_DELAY_SECONDS(). More...
 
uint16_t mDelayDuration
 Delay time specified by COROUTINE_DELAY(), COROUTINE_DELAY_MICROS() or, COROUTINE_DELAY_SECONDS(). More...
 
+CoroutineTemplate * mNext = nullptr
 Pointer to the next coroutine in a singly-linked list.
 
+void * mJumpPoint = nullptr
 Address of the label used by the computed-goto.
 
const void * mName = nullptr
 Name of the coroutine, either (const char*) or (const __FlashStringHelper*). More...
 
+uint8_t mNameType = kNameTypeCString
 String type of the coroutine mName.
 
+Status mStatus = kStatusYielding
 Run-state of the coroutine.
 
T_DELAY mDelayStart
 Start time provided by COROUTINE_DELAY(), COROUTINE_DELAY_MICROS(), or COROUTINE_DELAY_SECONDS(). More...
 
T_DELAY mDelayDuration
 Delay time specified by COROUTINE_DELAY(), COROUTINE_DELAY_MICROS() or, COROUTINE_DELAY_SECONDS(). More...
 
+CoroutineProfiler * mProfiler = nullptr
 Pointer to a profiler instance, either static or on the heap.
 
- - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + +

Static Protected Attributes

static const Status kStatusSuspended = 0
 Coroutine has been suspended using suspend() and the scheduler should remove it from the queue upon the next iteration. More...
 
-static const Status kStatusYielding = 1
 Coroutine returned using the COROUTINE_YIELD() statement.
 
-static const Status kStatusDelaying = 2
 Coroutine returned using the COROUTINE_DELAY() statement.
 
static const Status kStatusRunning = 3
 Coroutine is currenly running. More...
 
-static const Status kStatusEnding = 4
 Coroutine executed the COROUTINE_END() statement.
 
-static const Status kStatusTerminated = 5
 Coroutine has ended and no longer in the scheduler queue.
 
static const Status kStatusSuspended = 0
 Coroutine has been suspended using suspend() and the scheduler should remove it from the queue upon the next iteration. More...
 
+static const Status kStatusYielding = 1
 Coroutine returned using the COROUTINE_YIELD() statement.
 
+static const Status kStatusDelaying = 2
 Coroutine returned using the COROUTINE_DELAY() statement.
 
static const Status kStatusRunning = 3
 Coroutine is currenly running. More...
 
+static const Status kStatusEnding = 4
 Coroutine executed the COROUTINE_END() statement.
 
+static const Status kStatusTerminated = 5
 Coroutine has ended and no longer in the scheduler queue.
 
- - + + @@ -283,27 +348,34 @@

Friends

-class CoroutineSchedulerTemplate< CoroutineTemplate< T_CLOCK > >
 
+class CoroutineSchedulerTemplate< CoroutineTemplate< T_CLOCK, T_DELAY > >
 
class ::AceRoutineTest_statusStrings
 
 

Detailed Description

-

template<typename T_CLOCK>
-class ace_routine::CoroutineTemplate< T_CLOCK >

+

template<typename T_CLOCK, typename T_DELAY>
+class ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >

Base class of all coroutines.

-

The actual coroutine code is an implementation of the virtual runCoroutine() method.

- -

Definition at line 277 of file Coroutine.h.

+

The actual coroutine code is an implementation of the virtual runCoroutine() method.

+
Template Parameters
+ + + +
T_CLOCKclass that provides micros(), millis() and seconds() functions, usually ClockInterface but can be something else for testing purposes.
T_DELAYtype used to store the mDelayStart and mDelayDuration, usually uint16_t. It may be possible to create a variant set of Coroutine32 and CoroutineScheduler32 classes which use a uint32_t instead of a uint16_t. This would probably allow the COROUTINE_DELAY(), COROUTINE_DELAY_MICROS() and COROUTINE_DELAY_SECONDS() macros to accept 32-bit integers instead of 16-bits. I have not tested this possibility at all.
+
+
+ +

Definition at line 292 of file Coroutine.h.

Member Typedef Documentation

- -

◆ Status

+ +

◆ Status

-template<typename T_CLOCK >
+template<typename T_CLOCK , typename T_DELAY >
@@ -336,24 +408,24 @@

Definition at line 466 of file Coroutine.h.

+

Definition at line 603 of file Coroutine.h.

Constructor & Destructor Documentation

- -

◆ CoroutineTemplate()

+ +

◆ CoroutineTemplate()

-template<typename T_CLOCK >
+template<typename T_CLOCK , typename T_DELAY >

- +
typedef uint8_t ace_routine::CoroutineTemplate< T_CLOCK >::Statustypedef uint8_t ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >::Status
- + @@ -369,23 +441,23 @@

Definition at line 492 of file Coroutine.h.

+

Definition at line 629 of file Coroutine.h.

- -

◆ ~CoroutineTemplate()

+ +

◆ ~CoroutineTemplate()

-template<typename T_CLOCK >
+template<typename T_CLOCK , typename T_DELAY >

ace_routine::CoroutineTemplate< T_CLOCK >::CoroutineTemplate ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >::CoroutineTemplate ( )
- + @@ -406,19 +478,19 @@

Member Function Documentation

- -

◆ coroutineMicros()

+ +

◆ coroutineMicros()

-template<typename T_CLOCK >
+template<typename T_CLOCK , typename T_DELAY >
ace_routine::CoroutineTemplate< T_CLOCK >::~CoroutineTemplate ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >::~CoroutineTemplate ( )
- + @@ -434,23 +506,23 @@

Definition at line 613 of file Coroutine.h.

+

Definition at line 751 of file Coroutine.h.

- -

◆ coroutineMillis()

+ +

◆ coroutineMillis()

-template<typename T_CLOCK >
+template<typename T_CLOCK , typename T_DELAY >

static unsigned long ace_routine::CoroutineTemplate< T_CLOCK >::coroutineMicros static unsigned long ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >::coroutineMicros ( )
- + @@ -466,23 +538,23 @@

Definition at line 604 of file Coroutine.h.

+

Definition at line 742 of file Coroutine.h.

- -

◆ coroutineSeconds()

+ +

◆ coroutineSeconds()

-template<typename T_CLOCK >
+template<typename T_CLOCK , typename T_DELAY >

static unsigned long ace_routine::CoroutineTemplate< T_CLOCK >::coroutineMillis static unsigned long ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >::coroutineMillis ( )
- + @@ -498,23 +570,183 @@

COROUTINE_DELAY_SECONDS() is not guaranteed to be precise.

-

Definition at line 623 of file Coroutine.h.

+

Definition at line 761 of file Coroutine.h.

+ + + + +

◆ getCName()

+ +
+
+
+template<typename T_CLOCK , typename T_DELAY >
+

static unsigned long ace_routine::CoroutineTemplate< T_CLOCK >::coroutineSeconds static unsigned long ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >::coroutineSeconds ( )
+ + + + +
+ + + + + + + +
const char* ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >::getCName () const
+ 		+inline
+
+ +

Get name of the coroutine assuming it's a c-string.

+

Nullable.

+ +

Definition at line 375 of file Coroutine.h.

- -

◆ getStatus()

+ +

◆ getFName()

-template<typename T_CLOCK >
+template<typename T_CLOCK , typename T_DELAY >
+ + +
- + + + + + +
Status ace_routine::CoroutineTemplate< T_CLOCK >::getStatus const __FlashStringHelper* ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >::getFName () const
+ 		+inline
+
+ +

Get name of the coroutine assuming it's an f-string.

+

Nullable.

+ +

Definition at line 378 of file Coroutine.h.

+ +
+ + +

◆ getNext()

+ +
+
+
+template<typename T_CLOCK , typename T_DELAY >
+ + + + + +
+ + + + + + + +
CoroutineTemplate** ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >::getNext ()
+ 		+inline
+
+ +

Return the next pointer as a pointer to the pointer, similar to getRoot().

+

This makes it much easier to manipulate a singly-linked list. Also makes setNext() method unnecessary. Should be used only by CoroutineScheduler.

+ +

Definition at line 570 of file Coroutine.h.

+ +
+
+ +

◆ getProfiler()

+ +
+
+
+template<typename T_CLOCK , typename T_DELAY >
+ + + + + +
+ + + + + + + +
CoroutineProfiler* ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >::getProfiler () const
+ 		+inline
+
+ +

Get the profiler.

+

Nullable.

+ +

Definition at line 550 of file Coroutine.h.

+ +
+
+ +

◆ getRoot()

+ +
+
+
+template<typename T_CLOCK , typename T_DELAY >
+ + + + + +
+ + + + + + + +
static CoroutineTemplate** ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >::getRoot ()
+ 		+inlinestatic
+
+ +

Get the pointer to the root pointer.

+

Implemented as a function static to fix the C++ static initialization problem, making it safe to use this in other static contexts.

+ +

Definition at line 557 of file Coroutine.h.

+ +
+
+ +

◆ getStatus()

+ +
+
+
+template<typename T_CLOCK , typename T_DELAY >
+ + +
+ + + @@ -530,23 +762,23 @@

Definition at line 511 of file Coroutine.h.

+

Definition at line 648 of file Coroutine.h.

- -

◆ isDone()

+ +

◆ isDone()

-template<typename T_CLOCK >
+template<typename T_CLOCK , typename T_DELAY >

Status ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >::getStatus ( ) const
- + @@ -560,25 +792,25 @@

The coroutine is either Ending or Terminated.

-

This method is recommended over isEnding() or isTerminated() because it works when the coroutine is executed either manually or through the CoroutineScheduler.

+

This method is recommended over isEnding() or isTerminated() because it works when the coroutine is executed either manually or through the CoroutineScheduler.

-

Definition at line 414 of file Coroutine.h.

+

Definition at line 525 of file Coroutine.h.

- -

◆ isEnding()

+ +

◆ isEnding()

-template<typename T_CLOCK >
+template<typename T_CLOCK , typename T_DELAY >

bool ace_routine::CoroutineTemplate< T_CLOCK >::isDone bool ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >::isDone ( ) const
- + @@ -592,25 +824,25 @@

The coroutine returned using COROUTINE_END().

-

In most cases, isDone() is recommended instead because it works when coroutines are executed manually or through the CoroutineScheduler.

+

In most cases, isDone() is recommended instead because it works when coroutines are executed manually or through the CoroutineScheduler.

-

Definition at line 399 of file Coroutine.h.

+

Definition at line 510 of file Coroutine.h.

- -

◆ isRunning()

+ +

◆ isRunning()

-template<typename T_CLOCK >
+template<typename T_CLOCK , typename T_DELAY >

bool ace_routine::CoroutineTemplate< T_CLOCK >::isEnding bool ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >::isEnding ( ) const
- + @@ -626,23 +858,23 @@

Definition at line 392 of file Coroutine.h.

+

Definition at line 503 of file Coroutine.h.

- -

◆ isTerminated()

+ +

◆ isTerminated()

-template<typename T_CLOCK >
+template<typename T_CLOCK , typename T_DELAY >

bool ace_routine::CoroutineTemplate< T_CLOCK >::isRunning bool ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >::isRunning ( ) const
- + @@ -655,26 +887,76 @@

-

The coroutine was terminated by the scheduler with a call to setTerminated().

-

In most cases, isDone() should be used instead because it works when coroutines are executed manually or through the CoroutineScheudler.

+

The coroutine was terminated by the scheduler with a call to setTerminated().

+

In most cases, isDone() should be used instead because it works when coroutines are executed manually or through the CoroutineScheudler.

+ +

Definition at line 518 of file Coroutine.h.

+ + + + +

◆ printNameTo()

+ +
+
+
+template<typename T_CLOCK , typename T_DELAY >
+

bool ace_routine::CoroutineTemplate< T_CLOCK >::isTerminated bool ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >::isTerminated ( ) const
+ + + + +
+ + + + + + + + + + + + + + + + + + +
void ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >::printNameTo (Print & printer,
uint8_t maxLen = 0 
) const
+ 		+inline
+
+ +

Print name to the given Printer.

+

If the name is null, then print the hexadecimal representation of the pointer to the coroutine.

+
Parameters
+ + + +
printerdestination of output, usually Serial
maxLentruncate or pad to maxLen if given
+
+
-

Definition at line 407 of file Coroutine.h.

+

Definition at line 389 of file Coroutine.h.

- -

◆ reset()

+ +

◆ reset()

-template<typename T_CLOCK >
+template<typename T_CLOCK , typename T_DELAY >
- + @@ -688,26 +970,26 @@

Reset the coroutine to its initial state.

-

Only the Coroutine base-class state is reset to the original state. If the subclass runCoroutine() uses any static variables (for example, a loop counter), you must reset those variables manually as well, since this library does not have any knowledge about them.

-

It is expected that this method will be called from outside the runCoroutine() method. If it is called within the method, I'm not sure what will happen. I think the coroutine will abandon the current continuation point, and start executing from the beginning of the Coroutine upon the next iteration.

+

Only the Coroutine base-class state is reset to the original state. If the subclass runCoroutine() uses any static variables (for example, a loop counter), you must reset those variables manually as well, since this library does not have any knowledge about them.

+

It is expected that this method will be called from outside the runCoroutine() method. If it is called within the method, I'm not sure what will happen. I think the coroutine will abandon the current continuation point, and start executing from the beginning of the Coroutine upon the next iteration.

-

Definition at line 356 of file Coroutine.h.

+

Definition at line 467 of file Coroutine.h.

- -

◆ resume()

+ +

◆ resume()

-template<typename T_CLOCK >
+template<typename T_CLOCK , typename T_DELAY >

void ace_routine::CoroutineTemplate< T_CLOCK >::reset void ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >::reset ( )
- + @@ -723,23 +1005,23 @@

CoroutineScheduler::loop() is used.

-

Definition at line 332 of file Coroutine.h.

+

Definition at line 443 of file Coroutine.h.

- -

◆ runCoroutine()

+ +

◆ runCoroutine()

-template<typename T_CLOCK >
+template<typename T_CLOCK , typename T_DELAY >

void ace_routine::CoroutineTemplate< T_CLOCK >::resume void ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >::resume ( )
- + @@ -758,21 +1040,53 @@

-

◆ setDelayMicros()

+ +

◆ runCoroutineWithProfiler()

-template<typename T_CLOCK >
+template<typename T_CLOCK , typename T_DELAY >

virtual int ace_routine::CoroutineTemplate< T_CLOCK >::runCoroutine virtual int ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >::runCoroutine ( )
+ + +
- + - + + + +
void ace_routine::CoroutineTemplate< T_CLOCK >::setDelayMicros int ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >::runCoroutineWithProfiler (uint16_t )
+ 		+inline
+
+ +

This is a variant of runCoroutine() which measures the execution time of runCoroutine() and updates the attached profiler if it exists.

+

On 8-bit processors, memory consumption can be reduced by calling the Coroutine::runCoroutine() method directly in the global loop() function, instead of using the CoroutineScheduler. In such an environment, the end-user can enable profiling by manually changing the calls to Coroutine::runCoroutine() to Coroutine::runCoroutineWithProfiler(), and recompiling the program.

+ +

Definition at line 344 of file Coroutine.h.

+ +
+ + +

◆ setDelayMicros()

+ +
+
+
+template<typename T_CLOCK , typename T_DELAY >
+ + +
+ + + + + @@ -787,25 +1101,25 @@

Definition at line 575 of file Coroutine.h.

+

Definition at line 713 of file Coroutine.h.

- -

◆ setDelayMillis()

+ +

◆ setDelayMillis()

-template<typename T_CLOCK >
+template<typename T_CLOCK , typename T_DELAY >

void ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >::setDelayMicros (T_DELAY  delayMicros)
- + - + @@ -818,27 +1132,27 @@

Configure the delay timer for delayMillis.

-

The maximum duration is set to (UINT16_MAX / 2) (i.e. 32767 milliseconds) if given a larger value. This makes the longest allowable time between two successive calls to isDelayExpired() for a given coroutine to be 32767 (UINT16_MAX - UINT16_MAX / 2 - 1) milliseconds, which should be long enough for all practical use-cases. (The '- 1' comes from an edge case where isDelayExpired() evaluates to be true in the CoroutineScheduler::runCoroutine() but becomes to be false in the COROUTINE_DELAY() macro inside Coroutine::runCoroutine()) because the clock increments by 1 millisecond.)

+

The maximum duration is set to (UINT16_MAX / 2) (i.e. 32767 milliseconds) if given a larger value. This makes the longest allowable time between two successive calls to isDelayExpired() for a given coroutine to be 32767 (UINT16_MAX - UINT16_MAX / 2 - 1) milliseconds, which should be long enough for all practical use-cases. (The '- 1' comes from an edge case where isDelayExpired() evaluates to be true in the CoroutineScheduler::runCoroutine() but becomes to be false in the COROUTINE_DELAY() macro inside Coroutine::runCoroutine()) because the clock increments by 1 millisecond.)

-

Definition at line 561 of file Coroutine.h.

+

Definition at line 699 of file Coroutine.h.

- -

◆ setDelaySeconds()

+ +

◆ setDelaySeconds()

-template<typename T_CLOCK >
+template<typename T_CLOCK , typename T_DELAY >

void ace_routine::CoroutineTemplate< T_CLOCK >::setDelayMillis void ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >::setDelayMillis (uint16_t T_DELAY  delayMillis)
- + - + @@ -853,23 +1167,23 @@

Definition at line 589 of file Coroutine.h.

+

Definition at line 727 of file Coroutine.h.

- -

◆ setTerminated()

+ +

◆ setTerminated()

-template<typename T_CLOCK >
+template<typename T_CLOCK , typename T_DELAY >

void ace_routine::CoroutineTemplate< T_CLOCK >::setDelaySeconds void ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >::setDelaySeconds (uint16_t T_DELAY  delaySeconds)
- + @@ -885,23 +1199,23 @@

Definition at line 546 of file Coroutine.h.

+

Definition at line 684 of file Coroutine.h.

- -

◆ setupCoroutine() [1/3]

+ +

◆ setupCoroutine() [1/3]

-template<typename T_CLOCK >
+template<typename T_CLOCK , typename T_DELAY >

void ace_routine::CoroutineTemplate< T_CLOCK >::setTerminated void ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >::setTerminated ( )
diff --git a/docs/html/inherit_graph_0.map b/docs/html/inherit_graph_0.map new file mode 100644 index 0000000..07ba214 --- /dev/null +++ b/docs/html/inherit_graph_0.map @@ -0,0 +1,3 @@ + + + diff --git a/docs/html/inherit_graph_0.md5 b/docs/html/inherit_graph_0.md5 new file mode 100644 index 0000000..37f8dfe --- /dev/null +++ b/docs/html/inherit_graph_0.md5 @@ -0,0 +1 @@ +a5b1fb6b38e2c1fc18f2b2d0167ded87 \ No newline at end of file diff --git a/docs/html/inherit_graph_0.png b/docs/html/inherit_graph_0.png new file mode 100644 index 0000000000000000000000000000000000000000..ad97f7939d74898da43d70753b1ef69a04e6b235 GIT binary patch literal 1846 zcmV-62g&$}P)}k+uPe|mxNffw70igtyXeLQ54S_(=($YeIyF#Jx`t|Gdw;LXd*>L}_JF!GqREFEUdGn1M zH+(;I7>gs~!f#hAfbSW(@ZC08fh>D5|xmm|0m_t5>gn`t+&W?Is9f`}XYx1qF7y-D0ui=jRs`6u@d64(Gvx z2QUo}vL_}c2!hDT$!Th8@su2d)#Po6v>Yw!zsh6{w- z?e6UCJb3V6Y;0_9Zf-+E103-G1OTAd>whaDXDAsCa`o!f($Z3bAm9UMGMUJ~LO0m$ zc9`{eJS-M#U|=9nw5+TwI0p~}@$utF0Ko9@FwDMr^9BI$>C-17T*KAY*1|NLDQz|z zRe6seKL!9;ES5mx=Qc5`j&Hbv)Tb(y+)b%e3ILGFWZ%Ah3)G8Qgkm@!U%!4WEGz^7 zsMYFF>d!S?I7@0Fl{T9V0AMzoBO)SFQ&Y(`hlhs&02~en?nxse zBBrLM%w}_t;9M>jCahL#WMm|t&xcvKsLlE?M+r8Y4HHZz69C|Hxv0upwQ3arz;3sP z-UJ9RTtVvpiBye7Q&(5l-`~&U@hU1RdU|?@`S?e-$K&bh>XJ&OIF65xk6*iX?Zk-_ z;f11XxG!J6NF+hVc6?1v8@U?Bj2$z=NO&Dhx3ug);2b%(0F4I4J_`Fu);ZGnc1Dj`ZuOiVm} z{P^qFue-auSu9prSs9Mwr%#^_{*VV@aBxtiQY9xRS5{WyINsmi-_z5hP$=T#EnG%j@;V#l+axRxE7K`O_`P;W|old7tr@MFW9+%54Dk_r6Wbfa< zpP89?`SN9Paq-WeKSOB<$ML+pyvoYT(a}+>)q3pMF_B1=l#~Pj5C{ZKO-+-NlOrP| zr%s*nU6PcPG%zp_`W+1-&+khEhGF&f^^J{<)z#G|lWAsV#%MIE)#}#PR;t5A6{;hd zk&&U%Xe<_sPN%b4t#Gpx291r4E|=@>-Mc1}>D;+jSyWV1h;8Zh z`k0uQ%*@Q3oE#2^)7;z)%QYH}!{Oj?IAXDwEa2qHllSl6XEK@aEj1LV%Gs#wd>~1o8-rm61BCp_4W1JwrvaV^0{E- zHNLgA6>e$gD>`C{gJGCnuO}bMpo3oott^1y%x3f4k18^mjD95u`uXeM&gR1B^Uw~>5VV2}hoBW?I0UWud1(l8ZjM0wA$|;3T3SlK4#W}xLnjmnIzf9l1g#*$ kA!r2|4nZr(a0puY2a6D9rS!}RCIA2c07*qoM6N<$f~#?pt^fc4 literal 0 HcmV?d00001 diff --git a/docs/html/inherit_graph_1.map b/docs/html/inherit_graph_1.map new file mode 100644 index 0000000..5baaf25 --- /dev/null +++ b/docs/html/inherit_graph_1.map @@ -0,0 +1,3 @@ + + + diff --git a/docs/html/inherit_graph_1.md5 b/docs/html/inherit_graph_1.md5 new file mode 100644 index 0000000..eb817cd --- /dev/null +++ b/docs/html/inherit_graph_1.md5 @@ -0,0 +1 @@ +29805635278e23a763419a18c6d8458b \ No newline at end of file diff --git a/docs/html/inherit_graph_1.png b/docs/html/inherit_graph_1.png new file mode 100644 index 0000000000000000000000000000000000000000..c5133fbcca512716acca2c6f5f7f5ec83ae17b83 GIT binary patch literal 1916 zcmV-?2ZQ*DP)^Nvjr?mRY7oP#G01vQ0`>h+TwC9Gx*WES)Y6q0aMP^q+&y_1K)B zqrcztfq^;aJ#*god7tz6I#+>+2#m2nwS)wF1dRP#a4|8a5H2Rh6vD;Cm_ou_ceJ;+ zp3o;a{-HRwgG;mB-kBU2}6Yii(On zw()Z&#uUQE#F#?3m>5$C7t<1zo}P{?SFR{>u1%XZp`oEck#i|&YHA95_wGexWF(T3 zl7c-PzqpuWQ1ZfM^4+_451pNzuv)En_wHS=hvOF)lZ!1|w&2>eYjgH>baY_<{{0I& zj+ZZAV&~4Ch>ng%L_`EqQc_S=RRz1(|c<|ssu!px`Y&IK~FJB()VaP`= znwpx(!)~AQ^704(34%bPDAJiTXUO4jNbNS8jmpZ(NEAg{xpE~PIB@iW(amX>@dy^m;wT#Kcf+Y%CcJ z2KxH-tMnL+Mng}ZK9#mD77GEO@$qpgDk>rX(k(45jfjZS($c7=re;pRr%s)stgI}G zjEtlW8#d6BCr_kye=(gqca9Pg5(?(TC@7%q+qX;Y+1c4tUS2LMes6Q=Z%$luIr|&{sG_2Rh=O;mIr*rMW<^$}*49=K z5vHc5aQE(AT)%!Djg5^`dvS3w-n@B(hYug3zrP@aokoSS%J47Z=Mq*X`T4 zq0{M5S62rjLPtl3*JJDJ>tQmPFfuX%gTa8};$qPMzZw=uOg%k4Fq_RV7!0z;?Bp+Q zUpa6Z85u!lW+qmxT7~=f?_A{dQEl$Mr)h)`Ks2_U%FnqTv% zJlQT?xsJFM*?KtPEFf=qI?VFjIp{S@R>hA9L+fQn0DpgiiO51&X zeFT8|`}?JRZ{NNp0QC9uXCm^wG7%B!bULc5tDDo0rea@87?}Y&Og4TdUPd_bnC+!otEJilVe{-MV#Bo04K~)xR^#qN1@m2 zar*RW3=a>(;c%e3x*F5d(*OWb6frY1gTB5#x5utovj!m{As8DQ0};)+?bxwHR{w$^ zNcUH-UXAJLX$%eyO8Y*2`Xsdhe-b}C>0iElnRC97kie!S(3m!E+z3$==k>mizqozn zz{zAXAvrl2+qP}P`1rW&zCCfBL%DM@JC~jW`&#oS;9|1d?Ql38P^;Bgwrm+XIyz8Y zT`je1wOZuo=VRZ#edy`wfz4(^O-&72TU(*kYEe*7fRd6DeEj$klarI^?CeBgVIhA1 z{yp!p#K*@YBO?PwqY=Zy!?0K^C@U*NZf-8(;^F}Od4sa9t_~9u6Brm6z_DY;=A0ug zE)Lz@-BN<)OHNEClSx`RT(<>5z~#%AarNp|96x>>y}iAdoSek__wP|rQGw>>=6T2M zD+f+tVPUv=^Cps#l8}{^<@QHrK3wNesXQ;HYt55@i%AqkoIigadc7V|QBgQ@V2%p+hJsDf#P{M4OtL zpi-%jl9B?QP6v%fgZlb(Qe}@#xVbgolSCJw5%e#t>*s zIXO9a{`@&UeE5L$^mIf=M?ZSz`8-hLa5 zG3J@uCm5$C7ZYO&;bLM;A^!vK_hf}}b8O@Q0000 + + + diff --git a/docs/html/inherit_graph_2.md5 b/docs/html/inherit_graph_2.md5 new file mode 100644 index 0000000..ae95d4a --- /dev/null +++ b/docs/html/inherit_graph_2.md5 @@ -0,0 +1 @@ +d6c64c9e72af64ba79cddac163d5cd61 \ No newline at end of file diff --git a/docs/html/inherit_graph_2.png b/docs/html/inherit_graph_2.png new file mode 100644 index 0000000000000000000000000000000000000000..46113ae5133121a29109963ae81098f4e79b62f0 GIT binary patch literal 5216 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 R8W + + diff --git a/docs/html/inherit_graph_3.md5 b/docs/html/inherit_graph_3.md5 new file mode 100644 index 0000000..18c9dd4 --- /dev/null +++ b/docs/html/inherit_graph_3.md5 @@ -0,0 +1 @@ +18497eb7a9ffc92675c384fbc26fcff5 \ No newline at end of file diff --git a/docs/html/inherit_graph_3.png b/docs/html/inherit_graph_3.png new file mode 100644 index 0000000000000000000000000000000000000000..59ec3093aeda9e1667e783c2be43ed43a24137b5 GIT binary patch literal 3496 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 UTfc%>aP)!wH>4W7kqlzv;Y7A literal 0 HcmV?d00001 diff --git a/docs/html/inherit_graph_4.map b/docs/html/inherit_graph_4.map new file mode 100644 index 0000000..c49ab89 --- /dev/null +++ b/docs/html/inherit_graph_4.map @@ -0,0 +1,3 @@ + + + diff --git a/docs/html/inherit_graph_4.md5 b/docs/html/inherit_graph_4.md5 new file mode 100644 index 0000000..e2178c4 --- /dev/null +++ b/docs/html/inherit_graph_4.md5 @@ -0,0 +1 @@ +71dd01be1a38544706010f27da5c3a8d \ No newline at end of file diff --git a/docs/html/inherit_graph_4.png b/docs/html/inherit_graph_4.png new file mode 100644 index 0000000000000000000000000000000000000000..3d714aedb736ecf075fb43be0d6c402975f66203 GIT binary patch literal 3144 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 CY#Y`9 literal 0 HcmV?d00001 diff --git a/docs/html/inherit_graph_5.map b/docs/html/inherit_graph_5.map new file mode 100644 index 0000000..4b7732c --- /dev/null +++ b/docs/html/inherit_graph_5.map @@ -0,0 +1,3 @@ + + + diff --git a/docs/html/inherit_graph_5.md5 b/docs/html/inherit_graph_5.md5 new file mode 100644 index 0000000..4243d1d --- /dev/null +++ b/docs/html/inherit_graph_5.md5 @@ -0,0 +1 @@ +70e9f4510d2fd57b08c146a92c6cb095 \ No newline at end of file diff --git a/docs/html/inherit_graph_5.png b/docs/html/inherit_graph_5.png new file mode 100644 index 0000000000000000000000000000000000000000..598b15db6d11955a2a72ca6eb6540fc9fe43f9ac GIT binary patch literal 4044 zcmYjU2{e>#`yWGy(F{onF-Rz+*AinLWS3+~#=hjWWSDH(*DPra8G9(}tFgV2HCxEO zB++E2>{-e-jPLgS&;Ok7%$a%4Gw0mTb6?l}+pbtc15FmD%S;dmghg9R-3VOwz*mZq z9{ieamT7|vy`8S6I^^W^liO6341vJIwAEFO{j%1x0}Nk&;p%FZ;Ny2=E}U~DL}~O` z=(Nx|CHh|)C0>53B1#yNLJOX47wo$(AT$?sN9ZP7qN|gDjgWlDb3rRLx@$I1(qx92%;MLD2&kqtXWMn8hkCW>_C}N!^3Vn&w z+3UXW9VY$9OdVQz-THZ)B2G=r1KFr&iUGT@XbE;E4bAPH9g`m8f$v5o?9(A9$IWwy zDD*HqU9V8m+GOB6(XM>tlwJPNLZRVv_KffBaRhX7CVDxd zv-8ePSOk$sZ1pLy9$NSjT2yq+=>B~MazaSL$$P(q3mM;=u)e-szSBWP#-^sG(J9x> zsIE#kFtv!B!0qnP2`5f^SbIxf9}Jy`sI079+SqU+|CXH!`)y`v&2%CrCMId$3FDUY zTCiTGG}G&EoT%~h^Q$nn&UfJnDJfCMl)d?(Jhg~*jz{d&_wU}#w8NFv4Gj^Z*RL~> zNyulaNftLaB5XO+($ZRnhgr$*Jv8rLT?VUISy^c`H8r1e%dwT3m3Ov3gVR8Gcz9xB zVnPjtBNGx>KH5pHtgg!aS)H2;PfO$MOaF^uP+iIl+puh;Y&29PAr5t?8{i3;+Fxtz% zF825J-3-`uYy3T;tJ6I^?HBNG$Vu>RdHJ@U9wsX*t6Hx`rbj1~.kSKHd!z$?ov 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 b)IFgsEx?YbV=mnT<2giI!$7?ZZ4>? + + diff --git a/docs/html/inherit_graph_6.md5 b/docs/html/inherit_graph_6.md5 new file mode 100644 index 0000000..a7f2bdd --- /dev/null +++ b/docs/html/inherit_graph_6.md5 @@ -0,0 +1 @@ +9874a537022576ec617819004752f5bd \ No newline at end of file diff --git a/docs/html/inherit_graph_6.png b/docs/html/inherit_graph_6.png new file mode 100644 index 0000000000000000000000000000000000000000..74bdd640e2cc4cb99fdebe84377b6ecb2240b223 GIT binary patch literal 3936 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 Lil`z9ec%59H + + + + + + +AceRoutine: Class Hierarchy + + + + + + + + + +

+
+
- + @@ -916,25 +1230,25 @@

CoroutineScheduler::setupCoroutines() method which should also be called from the global setup() function.

-

If your coroutines do not override this method, hence do not need to perform any setup, then you should not call CoroutineScheduler::setupCoroutines() to avoid consuming unnecessary flash memory. On AVR processors, each Coroutine::setupCoroutine() seems to consume at least 50-60 bytes of flash memory overhead per coroutine. On 32-bit processors, the overhead seems to be only about 30-40 bytes per coroutine.

+

If your coroutines do not override this method, hence do not need to perform any setup, then you should not call CoroutineScheduler::setupCoroutines() to avoid consuming unnecessary flash memory. On AVR processors, each Coroutine::setupCoroutine() seems to consume at least 50-60 bytes of flash memory overhead per coroutine. On 32-bit processors, the overhead seems to be only about 30-40 bytes per coroutine.

-

Definition at line 309 of file Coroutine.h.

+

Definition at line 331 of file Coroutine.h.

- -

◆ setupCoroutine() [2/3]

+ +

◆ setupCoroutine() [2/3]

-template<typename T_CLOCK >
+template<typename T_CLOCK , typename T_DELAY >

virtual void ace_routine::CoroutineTemplate< T_CLOCK >::setupCoroutine virtual void ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >::setupCoroutine ( )
@@ -69,83 +69,129 @@

- c -

+ + +

- d -

- g -

- i -

- k -

@@ -154,18 +200,27 @@

- l -

- m -

@@ -69,61 +69,98 @@

- c -

+ + +

- d -

- g -

- i -

@@ -132,9 +169,15 @@

- l -

@@ -148,18 +191,32 @@

- m -

+

- p -

+ +

- r -

@@ -169,34 +226,40 @@

- s -

@@ -64,8 +64,12 @@
 
diff --git a/docs/html/functions_vars.html b/docs/html/functions_vars.html index bd7dada..3e336ad 100644 --- a/docs/html/functions_vars.html +++ b/docs/html/functions_vars.html @@ -22,7 +22,7 @@ @@ -64,38 +64,59 @@
 
diff --git a/docs/html/globals.html b/docs/html/globals.html index b2e2030..34ee215 100644 --- a/docs/html/globals.html +++ b/docs/html/globals.html @@ -22,7 +22,7 @@ diff --git a/docs/html/globals_defs.html b/docs/html/globals_defs.html index f2ffd87..5240763 100644 --- a/docs/html/globals_defs.html +++ b/docs/html/globals_defs.html @@ -22,7 +22,7 @@ diff --git a/docs/html/graph_legend.html b/docs/html/graph_legend.html index b24a842..5fdbcc5 100644 --- a/docs/html/graph_legend.html +++ b/docs/html/graph_legend.html @@ -22,7 +22,7 @@ diff --git a/docs/html/hierarchy.html b/docs/html/hierarchy.html new file mode 100644 index 0000000..65dd0d8 --- /dev/null +++ b/docs/html/hierarchy.html @@ -0,0 +1,92 @@ + + + + + + + +AceRoutine: Class Hierarchy + + + + + + + + + +
+
+
- + @@ -951,23 +1265,23 @@

Definition at line 432 of file Coroutine.h.

+

Definition at line 543 of file Coroutine.h.

- -

◆ setupCoroutine() [3/3]

+ +

◆ setupCoroutine() [3/3]

-template<typename T_CLOCK >
+template<typename T_CLOCK , typename T_DELAY >

void ace_routine::CoroutineTemplate< T_CLOCK >::setupCoroutine void ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >::setupCoroutine ( const __FlashStringHelper *  )
@@ -88,8 +88,17 @@
- - + + + + + + + + + + +
diff --git a/docs/html/compat_8h__dep__incl.map b/docs/html/compat_8h__dep__incl.map index 4961019..559e259 100644 --- a/docs/html/compat_8h__dep__incl.map +++ b/docs/html/compat_8h__dep__incl.map @@ -1,4 +1,13 @@ - - + + + + + + + + + + + diff --git a/docs/html/compat_8h__dep__incl.md5 b/docs/html/compat_8h__dep__incl.md5 index ab30b57..13aa89c 100644 --- a/docs/html/compat_8h__dep__incl.md5 +++ b/docs/html/compat_8h__dep__incl.md5 @@ -1 +1 @@ -4d6dbea1150cf25718228f867cf590dc \ No newline at end of file +c4a9ecf04b212348f0d6a78f994e694a \ No newline at end of file diff --git a/docs/html/compat_8h__dep__incl.png b/docs/html/compat_8h__dep__incl.png index 5521ecca925107c4c13b7cffc9cc0eda445dbec9..5fa8f774d3510e26834e419bf926ba6bed00a50c 100644 GIT binary patch literal 62175 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 literal 6226 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 diff --git a/docs/html/compat_8h_source.html b/docs/html/compat_8h_source.html index a7444ab..bfa854f 100644 --- a/docs/html/compat_8h_source.html +++ b/docs/html/compat_8h_source.html @@ -22,7 +22,7 @@ diff --git a/docs/html/dir_000000_000001.html b/docs/html/dir_000000_000001.html index 8ce8ab9..4382b63 100644 --- a/docs/html/dir_000000_000001.html +++ b/docs/html/dir_000000_000001.html @@ -22,7 +22,7 @@ diff --git a/docs/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html b/docs/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html index 4ead0b0..33b2fe7 100644 --- a/docs/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html +++ b/docs/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html @@ -22,7 +22,7 @@ diff --git a/docs/html/dir_bbf1ec131ffa96b8d365d81f56025723.html b/docs/html/dir_bbf1ec131ffa96b8d365d81f56025723.html index 4db1f77..9dab594 100644 --- a/docs/html/dir_bbf1ec131ffa96b8d365d81f56025723.html +++ b/docs/html/dir_bbf1ec131ffa96b8d365d81f56025723.html @@ -22,7 +22,7 @@ diff --git a/docs/html/files.html b/docs/html/files.html index df1ecb8..caccbda 100644 --- a/docs/html/files.html +++ b/docs/html/files.html @@ -22,7 +22,7 @@ @@ -76,7 +76,13 @@ - + + + + + + +
- + @@ -984,23 +1298,23 @@

Definition at line 424 of file Coroutine.h.

+

Definition at line 535 of file Coroutine.h.

- -

◆ suspend()

+ +

◆ suspend()

-template<typename T_CLOCK >
+template<typename T_CLOCK , typename T_DELAY >

void ace_routine::CoroutineTemplate< T_CLOCK >::setupCoroutine void ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >::setupCoroutine ( const char *  )
@@ -67,20 +67,27 @@
Class Index
-
c
+
c | l
- + @@ -1014,26 +1328,26 @@

Suspend the coroutine at the next scheduler iteration.

-

If the coroutine is already in the process of ending or is already terminated, then this method does nothing. A coroutine cannot use this method to suspend itself, it can only suspend some other coroutine. Currently, there is no ability for a coroutine to suspend itself, that would require the addition of a COROUTINE_SUSPEND() macro. Also, this method works only if the CoroutineScheduler::loop() is used because the suspend functionality is implemented by the CoroutineScheduler.

+

If the coroutine is already in the process of ending or is already terminated, then this method does nothing. A coroutine cannot use this method to suspend itself, it can only suspend some other coroutine. Currently, there is no ability for a coroutine to suspend itself. I think that would require the addition of a COROUTINE_SUSPEND() macro. Also, this method works only if the CoroutineScheduler::loop() is used because the suspend functionality is implemented by the CoroutineScheduler.

-

Definition at line 321 of file Coroutine.h.

+

Definition at line 432 of file Coroutine.h.

Member Data Documentation

- -

◆ kStatusRunning

+ +

◆ kStatusRunning

-template<typename T_CLOCK >
+template<typename T_CLOCK , typename T_DELAY >

void ace_routine::CoroutineTemplate< T_CLOCK >::suspend void ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >::suspend ( )
@@ -1046,23 +1360,23 @@

Definition at line 483 of file Coroutine.h.

+

Definition at line 620 of file Coroutine.h.

- -

◆ kStatusSuspended

+ +

◆ kStatusSuspended

-template<typename T_CLOCK >
+template<typename T_CLOCK , typename T_DELAY >

- +
const Status ace_routine::CoroutineTemplate< T_CLOCK >::kStatusRunning = 3const Status ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >::kStatusRunning = 3
@@ -1072,26 +1386,26 @@

-

Coroutine has been suspended using suspend() and the scheduler should remove it from the queue upon the next iteration.

+

Coroutine has been suspended using suspend() and the scheduler should remove it from the queue upon the next iteration.

We don't distinguish whether the coroutine is still in the queue or not with this status. We can add that later if we need to.

-

Definition at line 474 of file Coroutine.h.

+

Definition at line 611 of file Coroutine.h.

- -

◆ mDelayDuration

+ +

◆ mDelayDuration

-template<typename T_CLOCK >
+template<typename T_CLOCK , typename T_DELAY >

- +
const Status ace_routine::CoroutineTemplate< T_CLOCK >::kStatusSuspended = 0const Status ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >::kStatusSuspended = 0
@@ -1104,23 +1418,23 @@

COROUTINE_DELAY(), COROUTINE_DELAY_MICROS() or, COROUTINE_DELAY_SECONDS().

The unit of this number is context dependent, milliseconds, microseconds, or seconds.

-

Definition at line 686 of file Coroutine.h.

+

Definition at line 813 of file Coroutine.h.

- -

◆ mDelayStart

+ +

◆ mDelayStart

-template<typename T_CLOCK >
+template<typename T_CLOCK , typename T_DELAY >

- +
uint16_t ace_routine::CoroutineTemplate< T_CLOCK >::mDelayDurationT_DELAY ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >::mDelayDuration
@@ -1133,7 +1447,36 @@

COROUTINE_DELAY(), COROUTINE_DELAY_MICROS(), or COROUTINE_DELAY_SECONDS().

The unit of this number is context dependent, milliseconds, microseconds, or seconds.

-

Definition at line 679 of file Coroutine.h.

+

Definition at line 806 of file Coroutine.h.

+ + + + +

◆ mName

+ +
+
+
+template<typename T_CLOCK , typename T_DELAY >
+

- +
uint16_t ace_routine::CoroutineTemplate< T_CLOCK >::mDelayStartT_DELAY ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >::mDelayStart
+ + + + +
+ + + + +
const void* ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >::mName = nullptr
+ 		+protected
+
+ +

Name of the coroutine, either (const char*) or (const __FlashStringHelper*).

+

(Optional)

+ +

Definition at line 793 of file Coroutine.h.

diff --git a/docs/html/classace__routine_1_1CoroutineTemplate__coll__graph.map b/docs/html/classace__routine_1_1CoroutineTemplate__coll__graph.map index f3f1497..56344e0 100644 --- a/docs/html/classace__routine_1_1CoroutineTemplate__coll__graph.map +++ b/docs/html/classace__routine_1_1CoroutineTemplate__coll__graph.map @@ -1,3 +1,4 @@ - - + + + diff --git a/docs/html/classace__routine_1_1CoroutineTemplate__coll__graph.md5 b/docs/html/classace__routine_1_1CoroutineTemplate__coll__graph.md5 index 66e1d5b..359ff3f 100644 --- a/docs/html/classace__routine_1_1CoroutineTemplate__coll__graph.md5 +++ b/docs/html/classace__routine_1_1CoroutineTemplate__coll__graph.md5 @@ -1 +1 @@ -2bc927ca37bb0c8712cc658eb0ee2226 \ No newline at end of file +32adcb85b45d222ee20dee707d56883a \ No newline at end of file diff --git a/docs/html/classace__routine_1_1CoroutineTemplate__coll__graph.png b/docs/html/classace__routine_1_1CoroutineTemplate__coll__graph.png index 0cab5bce313ee808c8e0ff4c4c958ca4dd1fed11..8c49f1417dc7a0ff6b0d2fc7e6c454999e32284d 100644 GIT binary patch literal 7671 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 + + + + + + +AceRoutine: Member List + + + + + + + + + +
+
+ + + + + + +
+
AceRoutine +  1.5.0 +
+
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
+
+
+ + + + + + + + +
+
+ + +
+ +
+ + +
+
+
+
ace_routine::LogBinJsonRendererTemplate< T_COROUTINE > Member List
+
+
+ +

This is the complete list of members for ace_routine::LogBinJsonRendererTemplate< T_COROUTINE >, including all inherited members.

+ + + +
printTo(Print &printer, uint8_t startBin, uint8_t endBin, bool clear=true, bool rollup=true)ace_routine::LogBinJsonRendererTemplate< T_COROUTINE >inlinestatic
Profiler typedeface_routine::LogBinJsonRendererTemplate< T_COROUTINE >
+ +
+Generated by   +doxygen + 1.8.17 +
+ + diff --git a/docs/html/classace__routine_1_1LogBinJsonRendererTemplate.html b/docs/html/classace__routine_1_1LogBinJsonRendererTemplate.html new file mode 100644 index 0000000..921afd5 --- /dev/null +++ b/docs/html/classace__routine_1_1LogBinJsonRendererTemplate.html @@ -0,0 +1,191 @@ + + + + + + + +AceRoutine: ace_routine::LogBinJsonRendererTemplate< T_COROUTINE > Class Template Reference + + + + + + + + + +
+
+ + + + + + +
+
AceRoutine +  1.5.0 +
+
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
+
+
+ + + + + + + + +
+
+ + +
+ +
+ + +
+
+
+Public Types | +Static Public Member Functions | +List of all members
+
+
ace_routine::LogBinJsonRendererTemplate< T_COROUTINE > Class Template Reference
+
+
+ +

Print the LogBinProfiler bins as a JSON array. + More...

+ +

#include <LogBinJsonRenderer.h>

+ + + + + +

+Public Types

+using Profiler = LogBinProfilerTemplate< T_COROUTINE >
 Typedef of the LogBinProfiler supported by this class.
 
+ + + + +

+Static Public Member Functions

static void printTo (Print &printer, uint8_t startBin, uint8_t endBin, bool clear=true, bool rollup=true)
 Loop over all coroutines and print the bin counts as JSON. More...
 
+

Detailed Description

+

template<typename T_COROUTINE>
+class ace_routine::LogBinJsonRendererTemplate< T_COROUTINE >

+ +

Print the LogBinProfiler bins as a JSON array.

+

For example, here is the output from examples/SoundManager:

+
* {
+* "soundManager":[1411,0,2,0,0,0,0,0,0,0],
+* "soundRoutine":[1411,0,1,1,0,0,0,0,0,0]
+* }
+*
+

Definition at line 48 of file LogBinJsonRenderer.h.

+

Member Function Documentation

+ +

◆ printTo()

+ +
+
+
+template<typename T_COROUTINE >
+ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
static void ace_routine::LogBinJsonRendererTemplate< T_COROUTINE >::printTo (Print & printer,
uint8_t startBin,
uint8_t endBin,
bool clear = true,
bool rollup = true 
)
+ 		+inlinestatic
+
+ +

Loop over all coroutines and print the bin counts as JSON.

+
Parameters
+ + + + + + +
printerdestination of output, usually Serial
startBinstart index of the bins (0-31)
endBinend index (exclusive) of the bins (0-32)
clearcall LogBinProfiler::clear() after printing (default true)
rolluproll-up exterior bins into the first and last bins (default true)
+
+
+ +

Definition at line 64 of file LogBinJsonRenderer.h.

+ +
+
+
The documentation for this class was generated from the following file: +
+ +
+Generated by   +doxygen + 1.8.17 +
+ + diff --git a/docs/html/classace__routine_1_1LogBinProfilerTemplate-members.html b/docs/html/classace__routine_1_1LogBinProfilerTemplate-members.html new file mode 100644 index 0000000..9e56510 --- /dev/null +++ b/docs/html/classace__routine_1_1LogBinProfilerTemplate-members.html @@ -0,0 +1,95 @@ + + + + + + + +AceRoutine: Member List + + + + + + + + + +
+
+ + + + + + +
+
AceRoutine +  1.5.0 +
+
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
+
+
+ + + + + + + + +
+
+ + +
+ +
+ + +
+
+
+
ace_routine::LogBinProfilerTemplate< T_COROUTINE > Member List
+
+
+ +

This is the complete list of members for ace_routine::LogBinProfilerTemplate< T_COROUTINE >, including all inherited members.

+ + + + + + + + + + + +
clear()ace_routine::LogBinProfilerTemplate< T_COROUTINE >inline
clearProfilers()ace_routine::LogBinProfilerTemplate< T_COROUTINE >inlinestatic
CoroutineProfiler()=defaultace_routine::CoroutineProfiler
createProfilers()ace_routine::LogBinProfilerTemplate< T_COROUTINE >inlinestatic
deleteProfilers()ace_routine::LogBinProfilerTemplate< T_COROUTINE >inlinestatic
kNumBinsace_routine::LogBinProfilerTemplate< T_COROUTINE >static
LogBinProfilerTemplate()ace_routine::LogBinProfilerTemplate< T_COROUTINE >inline
mBinsace_routine::LogBinProfilerTemplate< T_COROUTINE >
updateElapsedMicros(uint32_t micros) overrideace_routine::LogBinProfilerTemplate< T_COROUTINE >inlinevirtual
~CoroutineProfiler()=defaultace_routine::CoroutineProfilervirtual
+ +
+Generated by   +doxygen + 1.8.17 +
+ + diff --git a/docs/html/classace__routine_1_1LogBinProfilerTemplate.html b/docs/html/classace__routine_1_1LogBinProfilerTemplate.html new file mode 100644 index 0000000..55230b5 --- /dev/null +++ b/docs/html/classace__routine_1_1LogBinProfilerTemplate.html @@ -0,0 +1,253 @@ + + + + + + + +AceRoutine: ace_routine::LogBinProfilerTemplate< T_COROUTINE > Class Template Reference + + + + + + + + + +
+
+ + + + + + +
+
AceRoutine +  1.5.0 +
+
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
+
+
+ + + + + + + + +
+
+ + +
+ +
+ + +
+
+
+Public Member Functions | +Static Public Member Functions | +Public Attributes | +Static Public Attributes | +List of all members
+
+
ace_routine::LogBinProfilerTemplate< T_COROUTINE > Class Template Reference
+
+
+ +

Class that maintains the frequency count of the elapsed time of runCoroutine() in an array of bins where each bin is a log2() logarithm of the elapsed time in microseconds. + More...

+ +

#include <LogBinProfiler.h>

+
+Inheritance diagram for ace_routine::LogBinProfilerTemplate< T_COROUTINE >:
+
+
Inheritance graph
+ + + + +
[legend]
+
+Collaboration diagram for ace_routine::LogBinProfilerTemplate< T_COROUTINE >:
+
+
Collaboration graph
+ + + + +
[legend]
+ + + + + + + + + + + + + + + + + + +

+Public Member Functions

+ LogBinProfilerTemplate ()
 Constructor.
 
+void clear ()
 Clear the bins.
 
void updateElapsedMicros (uint32_t micros) override
 Update the count for the calculated elapsed time bin. More...
 
- Public Member Functions inherited from ace_routine::CoroutineProfiler
+ CoroutineProfiler ()=default
 Use default constructor.
 
virtual ~CoroutineProfiler ()=default
 The destructor is NON-virtual on AVR processors because adding a virtual destructor causes flash consumption to increase by 600 bytes, even if the profiler is never used. More...
 
+ + + + + + + + + + +

+Static Public Member Functions

static void createProfilers ()
 Create a new profiler on the heap and attach it to each coroutine. More...
 
+static void deleteProfilers ()
 Delete the profilers created by createProfilers().
 
+static void clearProfilers ()
 Clear counters for all profilers.
 
+ + + + +

+Public Attributes

+uint16_t mBins [kNumBins]
 Event count bins.
 
+ + + + +

+Static Public Attributes

+static const uint8_t kNumBins = 32
 Number of event counter bins used by this class.
 
+

Detailed Description

+

template<typename T_COROUTINE>
+class ace_routine::LogBinProfilerTemplate< T_COROUTINE >

+ +

Class that maintains the frequency count of the elapsed time of runCoroutine() in an array of bins where each bin is a log2() logarithm of the elapsed time in microseconds.

+

An instance of this class can be attached to a given coroutine through the Coroutine::setProfiler() method.

+

After sufficient number of samples are collected, the frequency distribution of all profilers for all coroutines can be printed by a renderer. Two renderer are provided:

+
    +
  • LogBinTableRenderer which prints the frequency distribution as a formatted table.
    • +
  • LogBinJsonRenderer which prints the info as a JSON object
    • +
+
Template Parameters
+ + +
T_COROUTINEclass of the specific CoroutineTemplate instantiation, usually Coroutine
+
+
+ +

Definition at line 54 of file LogBinProfiler.h.

+

Member Function Documentation

+ +

◆ createProfilers()

+ +
+
+
+template<typename T_COROUTINE >
+ + + + + +
+ + + + + + + +
static void ace_routine::LogBinProfilerTemplate< T_COROUTINE >::createProfilers ()
+ 		+inlinestatic
+
+ +

Create a new profiler on the heap and attach it to each coroutine.

+

If the coroutine has an existing profiler attached to it, the previous profiler is simply replaced, but not deleted. The reason is that the previous profiler could have been created statically, instead of on the heap, and we would crash the program if we tried to call delete on that pointer.

+

If createProfilers() is called twice within the same application, (which should rarely happen), the program must ensure that deleteProfilers() is called before the second call to createProfilers(). Otherwise, heap memory will be leaked.

+ +

Definition at line 106 of file LogBinProfiler.h.

+ +
+
+ +

◆ updateElapsedMicros()

+ +
+
+
+template<typename T_COROUTINE >
+ + + + + +
+ + + + + + + + +
void ace_routine::LogBinProfilerTemplate< T_COROUTINE >::updateElapsedMicros (uint32_t micros)
+ 		+inlineoverridevirtual
+
+ +

Update the count for the calculated elapsed time bin.

+

The bin index is the bit number (0-31) of the most significant bit. So each bin contains the number of samples whose elapsed micros is between 2^i and 2^(i+1). Example, for Bin 3, and this bin contains the number of samples which satsify (8us <= elapsed < 16us). The exception is Bin 0 because it includes samples where elapsed is 0 as well, so the sample interval for Bin 0 is (0 <= elapsed < 2), instead of (1 <= elapsed < 2).

+ +

Implements ace_routine::CoroutineProfiler.

+ +

Definition at line 79 of file LogBinProfiler.h.

+ +
+
+
The documentation for this class was generated from the following file: +
+ +
+Generated by   +doxygen + 1.8.17 +
+ + diff --git a/docs/html/classace__routine_1_1LogBinProfilerTemplate__coll__graph.map b/docs/html/classace__routine_1_1LogBinProfilerTemplate__coll__graph.map new file mode 100644 index 0000000..b6dc05a --- /dev/null +++ b/docs/html/classace__routine_1_1LogBinProfilerTemplate__coll__graph.map @@ -0,0 +1,4 @@ + + + + diff --git a/docs/html/classace__routine_1_1LogBinProfilerTemplate__coll__graph.md5 b/docs/html/classace__routine_1_1LogBinProfilerTemplate__coll__graph.md5 new file mode 100644 index 0000000..4b672d5 --- /dev/null +++ b/docs/html/classace__routine_1_1LogBinProfilerTemplate__coll__graph.md5 @@ -0,0 +1 @@ +0becd4b973732009b650aeee8012d6f8 \ No newline at end of file diff --git a/docs/html/classace__routine_1_1LogBinProfilerTemplate__coll__graph.png b/docs/html/classace__routine_1_1LogBinProfilerTemplate__coll__graph.png new file mode 100644 index 0000000000000000000000000000000000000000..2a60203c5e95b2262dd1407db634b1fb49c7fd7a GIT binary patch literal 6280 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 + + + diff --git a/docs/html/classace__routine_1_1LogBinProfilerTemplate__inherit__graph.md5 b/docs/html/classace__routine_1_1LogBinProfilerTemplate__inherit__graph.md5 new file mode 100644 index 0000000..4b672d5 --- /dev/null +++ b/docs/html/classace__routine_1_1LogBinProfilerTemplate__inherit__graph.md5 @@ -0,0 +1 @@ +0becd4b973732009b650aeee8012d6f8 \ No newline at end of file diff --git a/docs/html/classace__routine_1_1LogBinProfilerTemplate__inherit__graph.png b/docs/html/classace__routine_1_1LogBinProfilerTemplate__inherit__graph.png new file mode 100644 index 0000000000000000000000000000000000000000..2a60203c5e95b2262dd1407db634b1fb49c7fd7a GIT binary patch literal 6280 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 + + + + + + +AceRoutine: Member List + + + + + + + + + +
+
+ + + + + + +
+
AceRoutine +  1.5.0 +
+
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
+
+
+ + + + + + + + +
+
+ + +
+ +
+ + +
+
+
+
ace_routine::LogBinTableRendererTemplate< T_COROUTINE > Member List
+
+
+ +

This is the complete list of members for ace_routine::LogBinTableRendererTemplate< T_COROUTINE >, including all inherited members.

+ + + +
printTo(Print &printer, uint8_t startBin, uint8_t endBin, bool clear=true, bool rollup=true)ace_routine::LogBinTableRendererTemplate< T_COROUTINE >inlinestatic
Profiler typedeface_routine::LogBinTableRendererTemplate< T_COROUTINE >
+ +
+Generated by   +doxygen + 1.8.17 +
+ + diff --git a/docs/html/classace__routine_1_1LogBinTableRendererTemplate.html b/docs/html/classace__routine_1_1LogBinTableRendererTemplate.html new file mode 100644 index 0000000..46de381 --- /dev/null +++ b/docs/html/classace__routine_1_1LogBinTableRendererTemplate.html @@ -0,0 +1,199 @@ + + + + + + + +AceRoutine: ace_routine::LogBinTableRendererTemplate< T_COROUTINE > Class Template Reference + + + + + + + + + +
+
+ + + + + + +
+
AceRoutine +  1.5.0 +
+
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
+
+
+ + + + + + + + +
+
+ + +
+ +
+ + +
+
+
+Public Types | +Static Public Member Functions | +List of all members
+
+
ace_routine::LogBinTableRendererTemplate< T_COROUTINE > Class Template Reference
+
+
+ +

Print the information in the LogBinProfiler for each Coroutine in a human-readable table. + More...

+ +

#include <LogBinTableRenderer.h>

+ + + + + +

+Public Types

+using Profiler = LogBinProfilerTemplate< T_COROUTINE >
 Typedef of the LogBinProfiler supported by this class.
 
+ + + + +

+Static Public Member Functions

static void printTo (Print &printer, uint8_t startBin, uint8_t endBin, bool clear=true, bool rollup=true)
 Loop over all coroutines and print the ASCII version of the frequency distribution. More...
 
+

Detailed Description

+

template<typename T_COROUTINE>
+class ace_routine::LogBinTableRendererTemplate< T_COROUTINE >

+ +

Print the information in the LogBinProfiler for each Coroutine in a human-readable table.

+

Each bin is printed as a 5-digit number, since the bins use a uint16_t integer for the count. The number of digits in the printed number is equivalent to the log10() of the frequency count. To see why that's true, imagine if each digit of the bin count was replaced by a '*' character. Therefore the table is a rough ASCII version of a log-log graph of the frequency count.

+

For example, the output of printTo(Serial, 2, 10) for examples/SoundManager looks like this:

+
* name          <8us <16us <32us <64us<128us<256us<512us  <1ms  <2ms    >>
+* soundManager  1418     0     0     1     0     0     0     0     1     0
+* soundRoutine  1417     0     0     1     1     1     0     0     0     0
+*

The bins below the first bin (at startBin) are rolled into the first bin. The bins above the last bin (at endBin-1) are rolled into the last bin and printed with the label >>.

+
Template Parameters
+ + +
T_COROUTINEclass of the specific CoroutineTemplate instantiation, usually Coroutine
+
+
+ +

Definition at line 105 of file LogBinTableRenderer.h.

+

Member Function Documentation

+ +

◆ printTo()

+ +
+
+
+template<typename T_COROUTINE >
+ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
static void ace_routine::LogBinTableRendererTemplate< T_COROUTINE >::printTo (Print & printer,
uint8_t startBin,
uint8_t endBin,
bool clear = true,
bool rollup = true 
)
+ 		+inlinestatic
+
+ +

Loop over all coroutines and print the ASCII version of the frequency distribution.

+

This assumes that all the coroutines are using the same CoroutineProfiler class, so we can use any of the profilers to print the header, and the numbers will be lined up properly.

+
Parameters
+ + + + + + +
printerdestination of output, usually Serial
startBinstart index of the bins (0-31)
endBinend index (exclusive) of the bins (0-32)
clearcall LogBinProfiler::clear() after printing (default true)
rolluproll-up exterior bins into the first and last bins (default true)
+
+
+ +

Definition at line 124 of file LogBinTableRenderer.h.

+ +
+
+
The documentation for this class was generated from the following file: +
+ +
+Generated by   +doxygen + 1.8.17 +
+ + diff --git a/docs/html/classes.html b/docs/html/classes.html index 39b849d..6eaaa1e 100644 --- a/docs/html/classes.html +++ b/docs/html/classes.html @@ -22,7 +22,7 @@
AceRoutine -  1.4.2 +  1.5.0
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
+ + + + + - - - - + + + + +
  c  
 ClockInterface (ace_routine)    CoroutineTemplate (ace_routine)   LogBinProfilerTemplate (ace_routine)   
CoroutineProfiler (ace_routine)   
  l  
+		LogBinTableRendererTemplate (ace_routine)   
CoroutineSchedulerTemplate (ace_routine)   
Channel (ace_routine)   
CoroutineSchedulerTemplate (ace_routine)   
LogBinJsonRendererTemplate (ace_routine)   
-
c
+
c | l
diff --git a/docs/html/compat_8h.html b/docs/html/compat_8h.html index c4c260a..ed6bc1f 100644 --- a/docs/html/compat_8h.html +++ b/docs/html/compat_8h.html @@ -22,7 +22,7 @@
AceRoutine -  1.4.2 +  1.5.0
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
AceRoutine -  1.4.2 +  1.5.0
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
AceRoutine -  1.4.2 +  1.5.0
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
AceRoutine -  1.4.2 +  1.5.0
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
AceRoutine -  1.4.2 +  1.5.0
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
AceRoutine -  1.4.2 +  1.5.0
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
 compat.h
 Coroutine.cpp
 Coroutine.h
 CoroutineScheduler.h
 CoroutineProfiler.h
 CoroutineScheduler.h
 LogBinJsonRenderer.h
 LogBinProfiler.cpp
 LogBinProfiler.h
 LogBinTableRenderer.cpp
 LogBinTableRenderer.h
 AceRoutine.h
diff --git a/docs/html/functions.html b/docs/html/functions.html index 0460093..08cf90f 100644 --- a/docs/html/functions.html +++ b/docs/html/functions.html @@ -22,7 +22,7 @@
AceRoutine -  1.4.2 +  1.5.0
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
AceRoutine -  1.4.2 +  1.5.0
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
AceRoutine -  1.4.2 +  1.5.0
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
AceRoutine -  1.4.2 +  1.5.0
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
AceRoutine -  1.4.2 +  1.5.0
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
AceRoutine -  1.4.2 +  1.5.0
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
AceRoutine -  1.4.2 +  1.5.0
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
+ + + + + +
+
AceRoutine +  1.5.0 +
+
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
+
+ + + + + + + + + + +
+
+ + +
+ +
+ +
+
+
Class Hierarchy
+
+
+
+

Go to the graphical class hierarchy

+This inheritance list is sorted roughly, but not completely, alphabetically:
+
[detail level 12]
+ + + + + + + + +
 Cace_routine::Channel< T >An unbuffered synchronized channel
 Cace_routine::ClockInterfaceA utility class (all methods are static) that provides a layer of indirection to Arduino clock functions (millis() and micros())
 ▼Cace_routine::CoroutineProfilerAn interface class for profiling classes that can track the elapsed time consumed by Coroutine::runCoroutine()
 Cace_routine::LogBinProfilerTemplate< T_COROUTINE >Class that maintains the frequency count of the elapsed time of runCoroutine() in an array of bins where each bin is a log2() logarithm of the elapsed time in microseconds
 Cace_routine::CoroutineSchedulerTemplate< T_COROUTINE >Class that manages instances of the Coroutine class, and executes them in a round-robin fashion
 Cace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >Base class of all coroutines
 Cace_routine::LogBinJsonRendererTemplate< T_COROUTINE >Print the LogBinProfiler bins as a JSON array
 Cace_routine::LogBinTableRendererTemplate< T_COROUTINE >Print the information in the LogBinProfiler for each Coroutine in a human-readable table
+
+
+ +
+Generated by   +doxygen + 1.8.17 +
+ + diff --git a/docs/html/index.html b/docs/html/index.html index aae22e8..fffb8ec 100644 --- a/docs/html/index.html +++ b/docs/html/index.html @@ -22,7 +22,7 @@
AceRoutine -  1.4.2 +  1.5.0
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
+ + + + + +
+
AceRoutine +  1.5.0 +
+
A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.
+
+ + + + + + + + + + +
+
+ + +
+ +
+ +
+
+
Class Hierarchy
+
+
+
+

Go to the textual class hierarchy

+
+ + + + + + + +
+ + + +
+ + + +
+ + + + +
+ + + +
+ + + +
+ + + +
+ + + +
+
+ +
+Generated by   +doxygen + 1.8.17 +
+ + diff --git a/docs/html/menudata.js b/docs/html/menudata.js index 63afcfc..af4f475 100644 --- a/docs/html/menudata.js +++ b/docs/html/menudata.js @@ -25,26 +25,33 @@ var menudata={children:[ {text:"Classes",url:"annotated.html",children:[ {text:"Class List",url:"annotated.html"}, {text:"Class Index",url:"classes.html"}, +{text:"Class Hierarchy",url:"inherits.html"}, {text:"Class Members",url:"functions.html",children:[ {text:"All",url:"functions.html",children:[ {text:"c",url:"functions.html#index_c"}, +{text:"d",url:"functions.html#index_d"}, {text:"g",url:"functions.html#index_g"}, {text:"i",url:"functions.html#index_i"}, {text:"k",url:"functions.html#index_k"}, {text:"l",url:"functions.html#index_l"}, {text:"m",url:"functions.html#index_m"}, +{text:"p",url:"functions.html#index_p"}, {text:"r",url:"functions.html#index_r"}, {text:"s",url:"functions.html#index_s"}, +{text:"u",url:"functions.html#index_u"}, {text:"w",url:"functions.html#index_w"}, {text:"~",url:"functions.html#index__7E"}]}, {text:"Functions",url:"functions_func.html",children:[ {text:"c",url:"functions_func.html#index_c"}, +{text:"d",url:"functions_func.html#index_d"}, {text:"g",url:"functions_func.html#index_g"}, {text:"i",url:"functions_func.html#index_i"}, {text:"l",url:"functions_func.html#index_l"}, {text:"m",url:"functions_func.html#index_m"}, +{text:"p",url:"functions_func.html#index_p"}, {text:"r",url:"functions_func.html#index_r"}, {text:"s",url:"functions_func.html#index_s"}, +{text:"u",url:"functions_func.html#index_u"}, {text:"w",url:"functions_func.html#index_w"}, {text:"~",url:"functions_func.html#index__7E"}]}, {text:"Variables",url:"functions_vars.html"}, diff --git a/docs/html/search/all_1.js b/docs/html/search/all_1.js index c091d19..86e4b47 100644 --- a/docs/html/search/all_1.js +++ b/docs/html/search/all_1.js @@ -1,24 +1,28 @@ var searchData= [ ['channel_2',['Channel',['../classace__routine_1_1Channel.html',1,'ace_routine::Channel< T >'],['../classace__routine_1_1Channel.html#ae004356c45d9017d0e375d4468b094e2',1,'ace_routine::Channel::Channel()']]], - ['clockinterface_3',['ClockInterface',['../classace__routine_1_1ClockInterface.html',1,'ace_routine']]], - ['compat_2eh_4',['compat.h',['../compat_8h.html',1,'']]], - ['coroutine_5',['COROUTINE',['../Coroutine_8h.html#ab22e58ab24b1908a7280f13603248ce3',1,'COROUTINE(): Coroutine.h'],['../Coroutine_8h.html#a9971a0ed5c7ba49921d0aa2dbc8f83b0',1,'ace_routine::Coroutine()']]], - ['coroutine_2eh_6',['Coroutine.h',['../Coroutine_8h.html',1,'']]], - ['coroutine1_7',['COROUTINE1',['../Coroutine_8h.html#a8d8219c8fc07650dfcdffbf83d800574',1,'Coroutine.h']]], - ['coroutine2_8',['COROUTINE2',['../Coroutine_8h.html#a04a0fdcb7293e51ddda298e237264c51',1,'Coroutine.h']]], - ['coroutine_5fawait_9',['COROUTINE_AWAIT',['../Coroutine_8h.html#a9f6714d9752740b6173b6afc4d108fa8',1,'Coroutine.h']]], - ['coroutine_5fbegin_10',['COROUTINE_BEGIN',['../Coroutine_8h.html#a7b7dc05639a37cb3f51bf348c68db283',1,'Coroutine.h']]], - ['coroutine_5fdelay_11',['COROUTINE_DELAY',['../Coroutine_8h.html#a1391503960a4b0c48f8200f1ffa0e305',1,'Coroutine.h']]], - ['coroutine_5fdelay_5fmicros_12',['COROUTINE_DELAY_MICROS',['../Coroutine_8h.html#a4b620a90274d05b92509c1c5eb4666f2',1,'Coroutine.h']]], - ['coroutine_5fdelay_5fseconds_13',['COROUTINE_DELAY_SECONDS',['../Coroutine_8h.html#a80fbf69742a91980a58f719edc8920db',1,'Coroutine.h']]], - ['coroutine_5fend_14',['COROUTINE_END',['../Coroutine_8h.html#a7e326a8df652c46c42a8d713ddc67bd7',1,'Coroutine.h']]], - ['coroutine_5floop_15',['COROUTINE_LOOP',['../Coroutine_8h.html#adad73df0853c1d3040b88b3cd0a04c0e',1,'Coroutine.h']]], - ['coroutine_5fyield_16',['COROUTINE_YIELD',['../Coroutine_8h.html#a682abe1669f9fe28af63d11da5421cbf',1,'Coroutine.h']]], - ['coroutine_5fyield_5finternal_17',['COROUTINE_YIELD_INTERNAL',['../Coroutine_8h.html#a53efafb6fd212ea352f5ad52ea9bc393',1,'Coroutine.h']]], - ['coroutinemicros_18',['coroutineMicros',['../classace__routine_1_1CoroutineTemplate.html#ad4ac87c4afab0e2e676a3e197dc74c72',1,'ace_routine::CoroutineTemplate']]], - ['coroutinemillis_19',['coroutineMillis',['../classace__routine_1_1CoroutineTemplate.html#a658e30e034968b53105f00e1f94d9ed8',1,'ace_routine::CoroutineTemplate']]], - ['coroutineschedulertemplate_20',['CoroutineSchedulerTemplate',['../classace__routine_1_1CoroutineSchedulerTemplate.html',1,'ace_routine']]], - ['coroutineseconds_21',['coroutineSeconds',['../classace__routine_1_1CoroutineTemplate.html#a40865b82184d0e0ff93fd9971ef8afed',1,'ace_routine::CoroutineTemplate']]], - ['coroutinetemplate_22',['CoroutineTemplate',['../classace__routine_1_1CoroutineTemplate.html',1,'ace_routine::CoroutineTemplate< T_CLOCK >'],['../classace__routine_1_1CoroutineTemplate.html#a5bd84b037fb04d15d3842cd59caf3a22',1,'ace_routine::CoroutineTemplate::CoroutineTemplate()']]] + ['clear_3',['clear',['../classace__routine_1_1LogBinProfilerTemplate.html#a2f2cf3f7602ff62ffd813650f5711673',1,'ace_routine::LogBinProfilerTemplate']]], + ['clearprofilers_4',['clearProfilers',['../classace__routine_1_1LogBinProfilerTemplate.html#a383e87c1dededb9205a5357001d832e9',1,'ace_routine::LogBinProfilerTemplate']]], + ['clockinterface_5',['ClockInterface',['../classace__routine_1_1ClockInterface.html',1,'ace_routine']]], + ['compat_2eh_6',['compat.h',['../compat_8h.html',1,'']]], + ['coroutine_7',['COROUTINE',['../Coroutine_8h.html#ab22e58ab24b1908a7280f13603248ce3',1,'COROUTINE(): Coroutine.h'],['../Coroutine_8h.html#a25a42d39c252ea6377c0845010a38c2b',1,'ace_routine::Coroutine()']]], + ['coroutine_2eh_8',['Coroutine.h',['../Coroutine_8h.html',1,'']]], + ['coroutine1_9',['COROUTINE1',['../Coroutine_8h.html#a8d8219c8fc07650dfcdffbf83d800574',1,'Coroutine.h']]], + ['coroutine2_10',['COROUTINE2',['../Coroutine_8h.html#a04a0fdcb7293e51ddda298e237264c51',1,'Coroutine.h']]], + ['coroutine_5fawait_11',['COROUTINE_AWAIT',['../Coroutine_8h.html#a9f6714d9752740b6173b6afc4d108fa8',1,'Coroutine.h']]], + ['coroutine_5fbegin_12',['COROUTINE_BEGIN',['../Coroutine_8h.html#a7b7dc05639a37cb3f51bf348c68db283',1,'Coroutine.h']]], + ['coroutine_5fdelay_13',['COROUTINE_DELAY',['../Coroutine_8h.html#a1391503960a4b0c48f8200f1ffa0e305',1,'Coroutine.h']]], + ['coroutine_5fdelay_5fmicros_14',['COROUTINE_DELAY_MICROS',['../Coroutine_8h.html#a4b620a90274d05b92509c1c5eb4666f2',1,'Coroutine.h']]], + ['coroutine_5fdelay_5fseconds_15',['COROUTINE_DELAY_SECONDS',['../Coroutine_8h.html#a80fbf69742a91980a58f719edc8920db',1,'Coroutine.h']]], + ['coroutine_5fend_16',['COROUTINE_END',['../Coroutine_8h.html#a7e326a8df652c46c42a8d713ddc67bd7',1,'Coroutine.h']]], + ['coroutine_5floop_17',['COROUTINE_LOOP',['../Coroutine_8h.html#adad73df0853c1d3040b88b3cd0a04c0e',1,'Coroutine.h']]], + ['coroutine_5fyield_18',['COROUTINE_YIELD',['../Coroutine_8h.html#a682abe1669f9fe28af63d11da5421cbf',1,'Coroutine.h']]], + ['coroutine_5fyield_5finternal_19',['COROUTINE_YIELD_INTERNAL',['../Coroutine_8h.html#a53efafb6fd212ea352f5ad52ea9bc393',1,'Coroutine.h']]], + ['coroutinemicros_20',['coroutineMicros',['../classace__routine_1_1CoroutineTemplate.html#a41acb66b780bc0153117915024811949',1,'ace_routine::CoroutineTemplate']]], + ['coroutinemillis_21',['coroutineMillis',['../classace__routine_1_1CoroutineTemplate.html#ad679cad7fc488bc15145d484b6e61364',1,'ace_routine::CoroutineTemplate']]], + ['coroutineprofiler_22',['CoroutineProfiler',['../classace__routine_1_1CoroutineProfiler.html',1,'ace_routine::CoroutineProfiler'],['../classace__routine_1_1CoroutineProfiler.html#a91a16875699abfda9383b9f29e4f040f',1,'ace_routine::CoroutineProfiler::CoroutineProfiler()']]], + ['coroutineschedulertemplate_23',['CoroutineSchedulerTemplate',['../classace__routine_1_1CoroutineSchedulerTemplate.html',1,'ace_routine']]], + ['coroutineseconds_24',['coroutineSeconds',['../classace__routine_1_1CoroutineTemplate.html#af25c1de1f753912444725f899dfffcb3',1,'ace_routine::CoroutineTemplate']]], + ['coroutinetemplate_25',['CoroutineTemplate',['../classace__routine_1_1CoroutineTemplate.html',1,'ace_routine::CoroutineTemplate< T_CLOCK, T_DELAY >'],['../classace__routine_1_1CoroutineTemplate.html#aebb72dfa544cba3ebcdd5d7647ca8255',1,'ace_routine::CoroutineTemplate::CoroutineTemplate()']]], + ['createprofilers_26',['createProfilers',['../classace__routine_1_1LogBinProfilerTemplate.html#ae8a4228ae33f977c6fe3584eee71beec',1,'ace_routine::LogBinProfilerTemplate']]] ]; diff --git a/docs/html/search/all_2.js b/docs/html/search/all_2.js index cef8d0a..93b9a46 100644 --- a/docs/html/search/all_2.js +++ b/docs/html/search/all_2.js @@ -1,6 +1,4 @@ var searchData= [ - ['extern_5fcoroutine_23',['EXTERN_COROUTINE',['../Coroutine_8h.html#a79f1cf897012bbc4df5565f61adc3028',1,'Coroutine.h']]], - ['extern_5fcoroutine1_24',['EXTERN_COROUTINE1',['../Coroutine_8h.html#ab92199c3991124cbb6e5e48e27827dae',1,'Coroutine.h']]], - ['extern_5fcoroutine2_25',['EXTERN_COROUTINE2',['../Coroutine_8h.html#af52549e71d4a6f7bd18c4688042776b6',1,'Coroutine.h']]] + ['deleteprofilers_27',['deleteProfilers',['../classace__routine_1_1LogBinProfilerTemplate.html#aa17d5b61420362896fb96e03ed5195aa',1,'ace_routine::LogBinProfilerTemplate']]] ]; diff --git a/docs/html/search/all_3.js b/docs/html/search/all_3.js index 99e3573..bd1956d 100644 --- a/docs/html/search/all_3.js +++ b/docs/html/search/all_3.js @@ -1,4 +1,6 @@ var searchData= [ - ['fpstr_26',['FPSTR',['../compat_8h.html#aaa60649c7ffe7ed1fbe16dc20ed7e8c3',1,'compat.h']]] + ['extern_5fcoroutine_28',['EXTERN_COROUTINE',['../Coroutine_8h.html#a79f1cf897012bbc4df5565f61adc3028',1,'Coroutine.h']]], + ['extern_5fcoroutine1_29',['EXTERN_COROUTINE1',['../Coroutine_8h.html#ab92199c3991124cbb6e5e48e27827dae',1,'Coroutine.h']]], + ['extern_5fcoroutine2_30',['EXTERN_COROUTINE2',['../Coroutine_8h.html#af52549e71d4a6f7bd18c4688042776b6',1,'Coroutine.h']]] ]; diff --git a/docs/html/search/all_4.js b/docs/html/search/all_4.js index ce248b6..78bef2f 100644 --- a/docs/html/search/all_4.js +++ b/docs/html/search/all_4.js @@ -1,7 +1,4 @@ var searchData= [ - ['get_5fcoroutine_27',['GET_COROUTINE',['../Coroutine_8h.html#a29e8a48695c9c365bdd589c061afba99',1,'Coroutine.h']]], - ['get_5fextern_5fcoroutine_28',['GET_EXTERN_COROUTINE',['../Coroutine_8h.html#ab7a5384c8d2a434781a52a7e9b45c24d',1,'Coroutine.h']]], - ['getjump_29',['getJump',['../classace__routine_1_1CoroutineTemplate.html#a84d4aaee5d3ba3750e78574908f2ba11',1,'ace_routine::CoroutineTemplate']]], - ['getstatus_30',['getStatus',['../classace__routine_1_1CoroutineTemplate.html#ae849b9399fefd59231c31c96c3ee19cf',1,'ace_routine::CoroutineTemplate']]] + ['fpstr_31',['FPSTR',['../compat_8h.html#aaa60649c7ffe7ed1fbe16dc20ed7e8c3',1,'compat.h']]] ]; diff --git a/docs/html/search/all_5.js b/docs/html/search/all_5.js index 82d9cb0..07ef6d4 100644 --- a/docs/html/search/all_5.js +++ b/docs/html/search/all_5.js @@ -1,13 +1,13 @@ var searchData= [ - ['isdelayexpired_31',['isDelayExpired',['../classace__routine_1_1CoroutineTemplate.html#ad15b0516f7b42cc474dabe3d0b88a915',1,'ace_routine::CoroutineTemplate']]], - ['isdelaying_32',['isDelaying',['../classace__routine_1_1CoroutineTemplate.html#a2de3c2efa47957f2469d184a34e4a556',1,'ace_routine::CoroutineTemplate']]], - ['isdelaymicrosexpired_33',['isDelayMicrosExpired',['../classace__routine_1_1CoroutineTemplate.html#a00ff722b862ca616a2087863168490d9',1,'ace_routine::CoroutineTemplate']]], - ['isdelaysecondsexpired_34',['isDelaySecondsExpired',['../classace__routine_1_1CoroutineTemplate.html#acf0ea8d7d5c9f55babbb4fae0b0c248a',1,'ace_routine::CoroutineTemplate']]], - ['isdone_35',['isDone',['../classace__routine_1_1CoroutineTemplate.html#a0177f1eeefed11453be1b9b430758e3e',1,'ace_routine::CoroutineTemplate']]], - ['isending_36',['isEnding',['../classace__routine_1_1CoroutineTemplate.html#a4dc9028316c13412ebfdac759884e655',1,'ace_routine::CoroutineTemplate']]], - ['isrunning_37',['isRunning',['../classace__routine_1_1CoroutineTemplate.html#a915596d8e91ddd07bdb4ec818e202d67',1,'ace_routine::CoroutineTemplate']]], - ['issuspended_38',['isSuspended',['../classace__routine_1_1CoroutineTemplate.html#ad6ff5882296706b62ac4dc85e3340289',1,'ace_routine::CoroutineTemplate']]], - ['isterminated_39',['isTerminated',['../classace__routine_1_1CoroutineTemplate.html#aabd5d936ff77f359acd33939d06773b1',1,'ace_routine::CoroutineTemplate']]], - ['isyielding_40',['isYielding',['../classace__routine_1_1CoroutineTemplate.html#a6aef0e3bdf4c003653a67ff97f866d55',1,'ace_routine::CoroutineTemplate']]] + ['get_5fcoroutine_32',['GET_COROUTINE',['../Coroutine_8h.html#a29e8a48695c9c365bdd589c061afba99',1,'Coroutine.h']]], + ['get_5fextern_5fcoroutine_33',['GET_EXTERN_COROUTINE',['../Coroutine_8h.html#ab7a5384c8d2a434781a52a7e9b45c24d',1,'Coroutine.h']]], + ['getcname_34',['getCName',['../classace__routine_1_1CoroutineTemplate.html#a537cd72830607b0d920fe11d5116ebee',1,'ace_routine::CoroutineTemplate']]], + ['getfname_35',['getFName',['../classace__routine_1_1CoroutineTemplate.html#aea353e510c0371ca5fe1d69da7a330af',1,'ace_routine::CoroutineTemplate']]], + ['getjump_36',['getJump',['../classace__routine_1_1CoroutineTemplate.html#a1e0862b2dd17cdf735e17af33dd1dfca',1,'ace_routine::CoroutineTemplate']]], + ['getnametype_37',['getNameType',['../classace__routine_1_1CoroutineTemplate.html#a4ec22d153b80d295de875cd75b641d20',1,'ace_routine::CoroutineTemplate']]], + ['getnext_38',['getNext',['../classace__routine_1_1CoroutineTemplate.html#a06d1cd713b79b1992cb8dff54f3c7f34',1,'ace_routine::CoroutineTemplate']]], + ['getprofiler_39',['getProfiler',['../classace__routine_1_1CoroutineTemplate.html#ac630c28cd2eb9c02b35747507e55838f',1,'ace_routine::CoroutineTemplate']]], + ['getroot_40',['getRoot',['../classace__routine_1_1CoroutineTemplate.html#aa920e51de2d6c1b7f070bb332f0cd2ba',1,'ace_routine::CoroutineTemplate']]], + ['getstatus_41',['getStatus',['../classace__routine_1_1CoroutineTemplate.html#a96117a7d8ef04593eff65a0df19ac5a4',1,'ace_routine::CoroutineTemplate']]] ]; diff --git a/docs/html/search/all_6.js b/docs/html/search/all_6.js index 793d830..8bac89d 100644 --- a/docs/html/search/all_6.js +++ b/docs/html/search/all_6.js @@ -1,9 +1,13 @@ var searchData= [ - ['kstatusdelaying_41',['kStatusDelaying',['../classace__routine_1_1CoroutineTemplate.html#a673ca8db9f3bf62a2f3be8d394358e6a',1,'ace_routine::CoroutineTemplate']]], - ['kstatusending_42',['kStatusEnding',['../classace__routine_1_1CoroutineTemplate.html#a14912dd5c52d2a3963a377aae4059dc1',1,'ace_routine::CoroutineTemplate']]], - ['kstatusrunning_43',['kStatusRunning',['../classace__routine_1_1CoroutineTemplate.html#a2b05fc95e0d6765be90955655f64cfd4',1,'ace_routine::CoroutineTemplate']]], - ['kstatussuspended_44',['kStatusSuspended',['../classace__routine_1_1CoroutineTemplate.html#a51ea72999f8fe2d32f753f9bbb436234',1,'ace_routine::CoroutineTemplate']]], - ['kstatusterminated_45',['kStatusTerminated',['../classace__routine_1_1CoroutineTemplate.html#ac0980cd59e49683d0f649687010e38f4',1,'ace_routine::CoroutineTemplate']]], - ['kstatusyielding_46',['kStatusYielding',['../classace__routine_1_1CoroutineTemplate.html#aaa2157d08593c9f88f1b0698528573bd',1,'ace_routine::CoroutineTemplate']]] + ['isdelayexpired_42',['isDelayExpired',['../classace__routine_1_1CoroutineTemplate.html#adab02ac8807017d168b0ba1c5cec3920',1,'ace_routine::CoroutineTemplate']]], + ['isdelaying_43',['isDelaying',['../classace__routine_1_1CoroutineTemplate.html#a731663b0141022c126e9368e1dfe3e17',1,'ace_routine::CoroutineTemplate']]], + ['isdelaymicrosexpired_44',['isDelayMicrosExpired',['../classace__routine_1_1CoroutineTemplate.html#acd7d7d1d81f507a04e7a9db8b8820381',1,'ace_routine::CoroutineTemplate']]], + ['isdelaysecondsexpired_45',['isDelaySecondsExpired',['../classace__routine_1_1CoroutineTemplate.html#a122e9d35f313975df73ac49afaaa3015',1,'ace_routine::CoroutineTemplate']]], + ['isdone_46',['isDone',['../classace__routine_1_1CoroutineTemplate.html#ad753c3b474c659fa6684bde0bd20919c',1,'ace_routine::CoroutineTemplate']]], + ['isending_47',['isEnding',['../classace__routine_1_1CoroutineTemplate.html#ad7d690556138014c63be958b0a125516',1,'ace_routine::CoroutineTemplate']]], + ['isrunning_48',['isRunning',['../classace__routine_1_1CoroutineTemplate.html#a733385866face30c4fc4223780c1b47e',1,'ace_routine::CoroutineTemplate']]], + ['issuspended_49',['isSuspended',['../classace__routine_1_1CoroutineTemplate.html#aa0f33aa5a6197aa143e86708d7f6fb15',1,'ace_routine::CoroutineTemplate']]], + ['isterminated_50',['isTerminated',['../classace__routine_1_1CoroutineTemplate.html#a5c74778815c76301895765e7485b4bf8',1,'ace_routine::CoroutineTemplate']]], + ['isyielding_51',['isYielding',['../classace__routine_1_1CoroutineTemplate.html#a9c07ae01d589335fa5728210de000755',1,'ace_routine::CoroutineTemplate']]] ]; diff --git a/docs/html/search/all_7.js b/docs/html/search/all_7.js index 65ab618..d2f989d 100644 --- a/docs/html/search/all_7.js +++ b/docs/html/search/all_7.js @@ -1,5 +1,12 @@ var searchData= [ - ['list_47',['list',['../classace__routine_1_1CoroutineSchedulerTemplate.html#adfe184942d2691e1b4c8774623722d8e',1,'ace_routine::CoroutineSchedulerTemplate']]], - ['loop_48',['loop',['../classace__routine_1_1CoroutineSchedulerTemplate.html#abf192f6066f9a7cc80219461966cba2f',1,'ace_routine::CoroutineSchedulerTemplate']]] + ['knametypecstring_52',['kNameTypeCString',['../classace__routine_1_1CoroutineTemplate.html#ac2c0bed6845b265a15d047f5fb9e1f2a',1,'ace_routine::CoroutineTemplate']]], + ['knametypefstring_53',['kNameTypeFString',['../classace__routine_1_1CoroutineTemplate.html#af5edcad4909c75a7dfe85f5b59135d1b',1,'ace_routine::CoroutineTemplate']]], + ['knumbins_54',['kNumBins',['../classace__routine_1_1LogBinProfilerTemplate.html#af25fa69ddc686411422f38a2e7a461ee',1,'ace_routine::LogBinProfilerTemplate']]], + ['kstatusdelaying_55',['kStatusDelaying',['../classace__routine_1_1CoroutineTemplate.html#affeba86cf0732cd88588732cc29e3fb3',1,'ace_routine::CoroutineTemplate']]], + ['kstatusending_56',['kStatusEnding',['../classace__routine_1_1CoroutineTemplate.html#a300f41394630bc6324b7749afbb8e583',1,'ace_routine::CoroutineTemplate']]], + ['kstatusrunning_57',['kStatusRunning',['../classace__routine_1_1CoroutineTemplate.html#af35a3db36cc75dce8aa9196ff3d4068b',1,'ace_routine::CoroutineTemplate']]], + ['kstatussuspended_58',['kStatusSuspended',['../classace__routine_1_1CoroutineTemplate.html#af9b629c958610313eb1c0dc2d63cf047',1,'ace_routine::CoroutineTemplate']]], + ['kstatusterminated_59',['kStatusTerminated',['../classace__routine_1_1CoroutineTemplate.html#aee76b758eb2c683b1823f05433bc13ee',1,'ace_routine::CoroutineTemplate']]], + ['kstatusyielding_60',['kStatusYielding',['../classace__routine_1_1CoroutineTemplate.html#a803df9549b871e9071eb48b5a896cea7',1,'ace_routine::CoroutineTemplate']]] ]; diff --git a/docs/html/search/all_8.js b/docs/html/search/all_8.js index 2012f98..281fb6f 100644 --- a/docs/html/search/all_8.js +++ b/docs/html/search/all_8.js @@ -1,10 +1,9 @@ var searchData= [ - ['mdelayduration_49',['mDelayDuration',['../classace__routine_1_1CoroutineTemplate.html#ac1180a32fdf2953c758f864ce775301f',1,'ace_routine::CoroutineTemplate']]], - ['mdelaystart_50',['mDelayStart',['../classace__routine_1_1CoroutineTemplate.html#a1b61128fe005b2f4bbeb7f647c367dfa',1,'ace_routine::CoroutineTemplate']]], - ['micros_51',['micros',['../classace__routine_1_1ClockInterface.html#ab8963dc53edb04d3ab800eac7c3b358e',1,'ace_routine::ClockInterface']]], - ['millis_52',['millis',['../classace__routine_1_1ClockInterface.html#aeb6701bd63ee8fb7dbb81efaf0ac02bf',1,'ace_routine::ClockInterface']]], - ['mjumppoint_53',['mJumpPoint',['../classace__routine_1_1CoroutineTemplate.html#acfd2bb74feb52ea24de73339a9c97b4d',1,'ace_routine::CoroutineTemplate']]], - ['mnext_54',['mNext',['../classace__routine_1_1CoroutineTemplate.html#a3a7f50c509463e57ac5ece39992a8ae5',1,'ace_routine::CoroutineTemplate']]], - ['mstatus_55',['mStatus',['../classace__routine_1_1CoroutineTemplate.html#a9e60528d72bf9887c7d9102028b46665',1,'ace_routine::CoroutineTemplate']]] + ['list_61',['list',['../classace__routine_1_1CoroutineSchedulerTemplate.html#adfe184942d2691e1b4c8774623722d8e',1,'ace_routine::CoroutineSchedulerTemplate']]], + ['logbinjsonrenderertemplate_62',['LogBinJsonRendererTemplate',['../classace__routine_1_1LogBinJsonRendererTemplate.html',1,'ace_routine']]], + ['logbinprofilertemplate_63',['LogBinProfilerTemplate',['../classace__routine_1_1LogBinProfilerTemplate.html',1,'ace_routine::LogBinProfilerTemplate< T_COROUTINE >'],['../classace__routine_1_1LogBinProfilerTemplate.html#a761a35277eac30dcd74c5ba5957df7df',1,'ace_routine::LogBinProfilerTemplate::LogBinProfilerTemplate()']]], + ['logbintablerenderertemplate_64',['LogBinTableRendererTemplate',['../classace__routine_1_1LogBinTableRendererTemplate.html',1,'ace_routine']]], + ['loop_65',['loop',['../classace__routine_1_1CoroutineSchedulerTemplate.html#abf192f6066f9a7cc80219461966cba2f',1,'ace_routine::CoroutineSchedulerTemplate']]], + ['loopwithprofiler_66',['loopWithProfiler',['../classace__routine_1_1CoroutineSchedulerTemplate.html#a63c906ac67be3feb9cf6b64efef1c866',1,'ace_routine::CoroutineSchedulerTemplate']]] ]; diff --git a/docs/html/search/all_9.js b/docs/html/search/all_9.js index 94b0eb9..b2db4df 100644 --- a/docs/html/search/all_9.js +++ b/docs/html/search/all_9.js @@ -1,7 +1,14 @@ var searchData= [ - ['read_56',['read',['../classace__routine_1_1Channel.html#a931ce2344667a4b36e76bb4f8f3b70a0',1,'ace_routine::Channel']]], - ['reset_57',['reset',['../classace__routine_1_1CoroutineTemplate.html#aac6c42a690d4f64942c7603b9890de9b',1,'ace_routine::CoroutineTemplate']]], - ['resume_58',['resume',['../classace__routine_1_1CoroutineTemplate.html#aab8a1eba56fb3d10273ce3c62263718b',1,'ace_routine::CoroutineTemplate']]], - ['runcoroutine_59',['runCoroutine',['../classace__routine_1_1CoroutineTemplate.html#a3da6aa3220b54203f050dc97d51b7070',1,'ace_routine::CoroutineTemplate']]] + ['mbins_67',['mBins',['../classace__routine_1_1LogBinProfilerTemplate.html#a9872d0ca3028086423c2014352394f68',1,'ace_routine::LogBinProfilerTemplate']]], + ['mdelayduration_68',['mDelayDuration',['../classace__routine_1_1CoroutineTemplate.html#a5648aae7d2c2d922a4719e5d7eeddd8a',1,'ace_routine::CoroutineTemplate']]], + ['mdelaystart_69',['mDelayStart',['../classace__routine_1_1CoroutineTemplate.html#a7c48e60b623fa01ed6b45efe95822fd0',1,'ace_routine::CoroutineTemplate']]], + ['micros_70',['micros',['../classace__routine_1_1ClockInterface.html#ab8963dc53edb04d3ab800eac7c3b358e',1,'ace_routine::ClockInterface']]], + ['millis_71',['millis',['../classace__routine_1_1ClockInterface.html#aeb6701bd63ee8fb7dbb81efaf0ac02bf',1,'ace_routine::ClockInterface']]], + ['mjumppoint_72',['mJumpPoint',['../classace__routine_1_1CoroutineTemplate.html#aaebc2fa42fd65b6dbf87d305fd57595a',1,'ace_routine::CoroutineTemplate']]], + ['mname_73',['mName',['../classace__routine_1_1CoroutineTemplate.html#a8008de77ec60f569fff0a392317b1a22',1,'ace_routine::CoroutineTemplate']]], + ['mnametype_74',['mNameType',['../classace__routine_1_1CoroutineTemplate.html#aaf7ab2306cfb11e2e99b1027233ce706',1,'ace_routine::CoroutineTemplate']]], + ['mnext_75',['mNext',['../classace__routine_1_1CoroutineTemplate.html#ae91d27950ff42e3aac63e47c5889caeb',1,'ace_routine::CoroutineTemplate']]], + ['mprofiler_76',['mProfiler',['../classace__routine_1_1CoroutineTemplate.html#a541efc6473dd13e1174a683ba0173cce',1,'ace_routine::CoroutineTemplate']]], + ['mstatus_77',['mStatus',['../classace__routine_1_1CoroutineTemplate.html#a989fa3e73aef42e475a7f034d9407bd2',1,'ace_routine::CoroutineTemplate']]] ]; diff --git a/docs/html/search/all_a.js b/docs/html/search/all_a.js index 7b19467..12e8212 100644 --- a/docs/html/search/all_a.js +++ b/docs/html/search/all_a.js @@ -1,20 +1,6 @@ var searchData= [ - ['seconds_60',['seconds',['../classace__routine_1_1ClockInterface.html#a03c0d39e0167f8a8e7c41f09d19d2861',1,'ace_routine::ClockInterface']]], - ['setdelaying_61',['setDelaying',['../classace__routine_1_1CoroutineTemplate.html#a7a8d70181ccc338b1290d42515fd38df',1,'ace_routine::CoroutineTemplate']]], - ['setdelaymicros_62',['setDelayMicros',['../classace__routine_1_1CoroutineTemplate.html#ab74b193e9633878d90bd6702323f7f7b',1,'ace_routine::CoroutineTemplate']]], - ['setdelaymillis_63',['setDelayMillis',['../classace__routine_1_1CoroutineTemplate.html#a93165b1090754d1d62f8816dfdfe05b4',1,'ace_routine::CoroutineTemplate']]], - ['setdelayseconds_64',['setDelaySeconds',['../classace__routine_1_1CoroutineTemplate.html#a12984cedb7d5183a69d21fc49e7d637b',1,'ace_routine::CoroutineTemplate']]], - ['setending_65',['setEnding',['../classace__routine_1_1CoroutineTemplate.html#aa62660adbbd4dd79b1534c98b997f11f',1,'ace_routine::CoroutineTemplate']]], - ['setjump_66',['setJump',['../classace__routine_1_1CoroutineTemplate.html#ad2f9173ec47abb7bc44356376b84310b',1,'ace_routine::CoroutineTemplate']]], - ['setrunning_67',['setRunning',['../classace__routine_1_1CoroutineTemplate.html#a4e4cf5b9c25b340e040578a57382a70c',1,'ace_routine::CoroutineTemplate']]], - ['setterminated_68',['setTerminated',['../classace__routine_1_1CoroutineTemplate.html#a76bbbd068a1a8a4e762e7834d28f38ed',1,'ace_routine::CoroutineTemplate']]], - ['setup_69',['setup',['../classace__routine_1_1CoroutineSchedulerTemplate.html#ac792080cdec6db9f6539a446d7af587c',1,'ace_routine::CoroutineSchedulerTemplate']]], - ['setupcoroutine_70',['setupCoroutine',['../classace__routine_1_1CoroutineTemplate.html#adcc2990d5ab0c53b33ddedc9c6cee579',1,'ace_routine::CoroutineTemplate::setupCoroutine()'],['../classace__routine_1_1CoroutineTemplate.html#ab386f5cb35ee03f927c72c281fe3518b',1,'ace_routine::CoroutineTemplate::setupCoroutine(const char *) ACE_ROUTINE_DEPRECATED'],['../classace__routine_1_1CoroutineTemplate.html#ab24d05e1a1c581a40cce8d4a85695aee',1,'ace_routine::CoroutineTemplate::setupCoroutine(const __FlashStringHelper *) ACE_ROUTINE_DEPRECATED']]], - ['setupcoroutines_71',['setupCoroutines',['../classace__routine_1_1CoroutineSchedulerTemplate.html#a86ebd507e675b913301f92af0a34abde',1,'ace_routine::CoroutineSchedulerTemplate']]], - ['setvalue_72',['setValue',['../classace__routine_1_1Channel.html#ab950ccdf77fdfaeea67ac19031733229',1,'ace_routine::Channel']]], - ['setyielding_73',['setYielding',['../classace__routine_1_1CoroutineTemplate.html#adf41ef1dfedfb5bb2fcd3ff1285bc100',1,'ace_routine::CoroutineTemplate']]], - ['status_74',['Status',['../classace__routine_1_1CoroutineTemplate.html#ac63ae27c5f03a0cf85c6be2718626f25',1,'ace_routine::CoroutineTemplate']]], - ['statusprintto_75',['statusPrintTo',['../classace__routine_1_1CoroutineTemplate.html#a4429565a460dd3fe53a61ecf60557a76',1,'ace_routine::CoroutineTemplate']]], - ['suspend_76',['suspend',['../classace__routine_1_1CoroutineTemplate.html#af106a49c67a4c2920bdc1ac527bad7d5',1,'ace_routine::CoroutineTemplate']]] + ['printnameto_78',['printNameTo',['../classace__routine_1_1CoroutineTemplate.html#a62cbb1e87f55ffb06a5ecbc60b3cf361',1,'ace_routine::CoroutineTemplate']]], + ['printto_79',['printTo',['../classace__routine_1_1LogBinJsonRendererTemplate.html#aec5865839acf21c5460042b4d2c4aa1e',1,'ace_routine::LogBinJsonRendererTemplate::printTo()'],['../classace__routine_1_1LogBinTableRendererTemplate.html#a1e047b82a91c015425ef4453a863b5c3',1,'ace_routine::LogBinTableRendererTemplate::printTo()']]], + ['profiler_80',['Profiler',['../classace__routine_1_1LogBinJsonRendererTemplate.html#ab5d0a981189b55dbc175adc487570283',1,'ace_routine::LogBinJsonRendererTemplate::Profiler()'],['../classace__routine_1_1LogBinTableRendererTemplate.html#a0db94e7cfc0b34dd12f012b7b7959e35',1,'ace_routine::LogBinTableRendererTemplate::Profiler()']]] ]; diff --git a/docs/html/search/all_b.js b/docs/html/search/all_b.js index 8fac223..42255b6 100644 --- a/docs/html/search/all_b.js +++ b/docs/html/search/all_b.js @@ -1,4 +1,8 @@ var searchData= [ - ['write_77',['write',['../classace__routine_1_1Channel.html#ad7fa46d27162b4ec9ffa257f3881931d',1,'ace_routine::Channel::write()'],['../classace__routine_1_1Channel.html#a1134e9c905c7c0bb7255f208534355d8',1,'ace_routine::Channel::write(const T &value)']]] + ['read_81',['read',['../classace__routine_1_1Channel.html#a931ce2344667a4b36e76bb4f8f3b70a0',1,'ace_routine::Channel']]], + ['reset_82',['reset',['../classace__routine_1_1CoroutineTemplate.html#a1adcb8c720aa9c452fcbd10274325380',1,'ace_routine::CoroutineTemplate']]], + ['resume_83',['resume',['../classace__routine_1_1CoroutineTemplate.html#a148bb40a4b373e322ea1ed5bad0fadc1',1,'ace_routine::CoroutineTemplate']]], + ['runcoroutine_84',['runCoroutine',['../classace__routine_1_1CoroutineTemplate.html#a6c03c8f778f5cf38f25a07de8186ea1e',1,'ace_routine::CoroutineTemplate']]], + ['runcoroutinewithprofiler_85',['runCoroutineWithProfiler',['../classace__routine_1_1CoroutineTemplate.html#a544e4c65d0e309eb18eb4a60cb5c069f',1,'ace_routine::CoroutineTemplate']]] ]; diff --git a/docs/html/search/all_c.js b/docs/html/search/all_c.js index b6ec040..0d2f558 100644 --- a/docs/html/search/all_c.js +++ b/docs/html/search/all_c.js @@ -1,4 +1,22 @@ var searchData= [ - ['_7ecoroutinetemplate_78',['~CoroutineTemplate',['../classace__routine_1_1CoroutineTemplate.html#a47cd05a5a9c1f63fb8b44d756aad4e7b',1,'ace_routine::CoroutineTemplate']]] + ['seconds_86',['seconds',['../classace__routine_1_1ClockInterface.html#a03c0d39e0167f8a8e7c41f09d19d2861',1,'ace_routine::ClockInterface']]], + ['setdelaying_87',['setDelaying',['../classace__routine_1_1CoroutineTemplate.html#a8385fb083c393f7a75519e044e34c24e',1,'ace_routine::CoroutineTemplate']]], + ['setdelaymicros_88',['setDelayMicros',['../classace__routine_1_1CoroutineTemplate.html#a1d86ec7546a240864dda1246a71e769f',1,'ace_routine::CoroutineTemplate']]], + ['setdelaymillis_89',['setDelayMillis',['../classace__routine_1_1CoroutineTemplate.html#a1e529439de0abbeebec6e435718dc11d',1,'ace_routine::CoroutineTemplate']]], + ['setdelayseconds_90',['setDelaySeconds',['../classace__routine_1_1CoroutineTemplate.html#ab9e8a2e33791b28bec4ebfd77da11964',1,'ace_routine::CoroutineTemplate']]], + ['setending_91',['setEnding',['../classace__routine_1_1CoroutineTemplate.html#abab3b941fcc45839a5bf293668be9f98',1,'ace_routine::CoroutineTemplate']]], + ['setjump_92',['setJump',['../classace__routine_1_1CoroutineTemplate.html#a4b38c16e0c2452257b3e4214877012e8',1,'ace_routine::CoroutineTemplate']]], + ['setname_93',['setName',['../classace__routine_1_1CoroutineTemplate.html#a0f7388cc07f020d22a83b35eb40ec683',1,'ace_routine::CoroutineTemplate::setName(const char *name)'],['../classace__routine_1_1CoroutineTemplate.html#a712fee99519863c145630f9d218402f8',1,'ace_routine::CoroutineTemplate::setName(const __FlashStringHelper *name)']]], + ['setprofiler_94',['setProfiler',['../classace__routine_1_1CoroutineTemplate.html#ad8c240de1ddbf42bdf4a8f4501b82b23',1,'ace_routine::CoroutineTemplate']]], + ['setrunning_95',['setRunning',['../classace__routine_1_1CoroutineTemplate.html#a99f1300b9bee0e72d05498b26141a352',1,'ace_routine::CoroutineTemplate']]], + ['setterminated_96',['setTerminated',['../classace__routine_1_1CoroutineTemplate.html#ac85d1306aa5a7e5f5650102e452807b3',1,'ace_routine::CoroutineTemplate']]], + ['setup_97',['setup',['../classace__routine_1_1CoroutineSchedulerTemplate.html#ac792080cdec6db9f6539a446d7af587c',1,'ace_routine::CoroutineSchedulerTemplate']]], + ['setupcoroutine_98',['setupCoroutine',['../classace__routine_1_1CoroutineTemplate.html#ac58fe49c8cad0803c88862210b0f033d',1,'ace_routine::CoroutineTemplate::setupCoroutine()'],['../classace__routine_1_1CoroutineTemplate.html#a4ea28bb329a82952991efbcfd10d1d0f',1,'ace_routine::CoroutineTemplate::setupCoroutine(const char *) ACE_ROUTINE_DEPRECATED'],['../classace__routine_1_1CoroutineTemplate.html#aae5a4ce06c6590690b5ae94be777f451',1,'ace_routine::CoroutineTemplate::setupCoroutine(const __FlashStringHelper *) ACE_ROUTINE_DEPRECATED']]], + ['setupcoroutines_99',['setupCoroutines',['../classace__routine_1_1CoroutineSchedulerTemplate.html#a86ebd507e675b913301f92af0a34abde',1,'ace_routine::CoroutineSchedulerTemplate']]], + ['setvalue_100',['setValue',['../classace__routine_1_1Channel.html#ab950ccdf77fdfaeea67ac19031733229',1,'ace_routine::Channel']]], + ['setyielding_101',['setYielding',['../classace__routine_1_1CoroutineTemplate.html#aae7d3ddffa9fcc843984808ac3664dac',1,'ace_routine::CoroutineTemplate']]], + ['status_102',['Status',['../classace__routine_1_1CoroutineTemplate.html#a8dab8bf9ee0a90bf3cb89714d09509a5',1,'ace_routine::CoroutineTemplate']]], + ['statusprintto_103',['statusPrintTo',['../classace__routine_1_1CoroutineTemplate.html#afff00a9882832e76485982560262f441',1,'ace_routine::CoroutineTemplate']]], + ['suspend_104',['suspend',['../classace__routine_1_1CoroutineTemplate.html#a546f751274bbd9658a9106399dec1a00',1,'ace_routine::CoroutineTemplate']]] ]; diff --git a/docs/html/search/all_d.html b/docs/html/search/all_d.html new file mode 100644 index 0000000..bc376fe --- /dev/null +++ b/docs/html/search/all_d.html @@ -0,0 +1,30 @@ + + + + + + + + + +
+
Loading...
+
+ +
Searching...
+
No Matches
+ +
+ + diff --git a/docs/html/search/all_d.js b/docs/html/search/all_d.js new file mode 100644 index 0000000..0cc3742 --- /dev/null +++ b/docs/html/search/all_d.js @@ -0,0 +1,4 @@ +var searchData= +[ + ['updateelapsedmicros_105',['updateElapsedMicros',['../classace__routine_1_1CoroutineProfiler.html#a914fde78366e0572b9b307020e3729c9',1,'ace_routine::CoroutineProfiler::updateElapsedMicros()'],['../classace__routine_1_1LogBinProfilerTemplate.html#abc696834db7c1c9dcee2c9b070d0a13a',1,'ace_routine::LogBinProfilerTemplate::updateElapsedMicros()']]] +]; diff --git a/docs/html/search/all_e.html b/docs/html/search/all_e.html new file mode 100644 index 0000000..2e3c74d --- /dev/null +++ b/docs/html/search/all_e.html @@ -0,0 +1,30 @@ + + + + + + + + + +
+
Loading...
+
+ +
Searching...
+
No Matches
+ +
+ + diff --git a/docs/html/search/all_e.js b/docs/html/search/all_e.js new file mode 100644 index 0000000..3fec57a --- /dev/null +++ b/docs/html/search/all_e.js @@ -0,0 +1,4 @@ +var searchData= +[ + ['write_106',['write',['../classace__routine_1_1Channel.html#ad7fa46d27162b4ec9ffa257f3881931d',1,'ace_routine::Channel::write()'],['../classace__routine_1_1Channel.html#a1134e9c905c7c0bb7255f208534355d8',1,'ace_routine::Channel::write(const T &value)']]] +]; diff --git a/docs/html/search/all_f.html b/docs/html/search/all_f.html new file mode 100644 index 0000000..246f8ab --- /dev/null +++ b/docs/html/search/all_f.html @@ -0,0 +1,30 @@ + + + + + + + + + +
+
Loading...
+
+ +
Searching...
+
No Matches
+ +
+ + diff --git a/docs/html/search/all_f.js b/docs/html/search/all_f.js new file mode 100644 index 0000000..c63c6d6 --- /dev/null +++ b/docs/html/search/all_f.js @@ -0,0 +1,5 @@ +var searchData= +[ + ['_7ecoroutineprofiler_107',['~CoroutineProfiler',['../classace__routine_1_1CoroutineProfiler.html#a8c8284bebc06998787f99cc48d7036b3',1,'ace_routine::CoroutineProfiler']]], + ['_7ecoroutinetemplate_108',['~CoroutineTemplate',['../classace__routine_1_1CoroutineTemplate.html#a8a568b194cd7748b1ea40dfaf6a8fde4',1,'ace_routine::CoroutineTemplate']]] +]; diff --git a/docs/html/search/classes_0.js b/docs/html/search/classes_0.js index 4200448..a1ecf33 100644 --- a/docs/html/search/classes_0.js +++ b/docs/html/search/classes_0.js @@ -1,7 +1,8 @@ var searchData= [ - ['channel_79',['Channel',['../classace__routine_1_1Channel.html',1,'ace_routine']]], - ['clockinterface_80',['ClockInterface',['../classace__routine_1_1ClockInterface.html',1,'ace_routine']]], - ['coroutineschedulertemplate_81',['CoroutineSchedulerTemplate',['../classace__routine_1_1CoroutineSchedulerTemplate.html',1,'ace_routine']]], - ['coroutinetemplate_82',['CoroutineTemplate',['../classace__routine_1_1CoroutineTemplate.html',1,'ace_routine']]] + ['channel_109',['Channel',['../classace__routine_1_1Channel.html',1,'ace_routine']]], + ['clockinterface_110',['ClockInterface',['../classace__routine_1_1ClockInterface.html',1,'ace_routine']]], + ['coroutineprofiler_111',['CoroutineProfiler',['../classace__routine_1_1CoroutineProfiler.html',1,'ace_routine']]], + ['coroutineschedulertemplate_112',['CoroutineSchedulerTemplate',['../classace__routine_1_1CoroutineSchedulerTemplate.html',1,'ace_routine']]], + ['coroutinetemplate_113',['CoroutineTemplate',['../classace__routine_1_1CoroutineTemplate.html',1,'ace_routine']]] ]; diff --git a/docs/html/search/classes_1.html b/docs/html/search/classes_1.html new file mode 100644 index 0000000..c7ff4b3 --- /dev/null +++ b/docs/html/search/classes_1.html @@ -0,0 +1,30 @@ + + + + + + + + + +
+
Loading...
+
+ +
Searching...
+
No Matches
+ +
+ + diff --git a/docs/html/search/classes_1.js b/docs/html/search/classes_1.js new file mode 100644 index 0000000..66c6524 --- /dev/null +++ b/docs/html/search/classes_1.js @@ -0,0 +1,6 @@ +var searchData= +[ + ['logbinjsonrenderertemplate_114',['LogBinJsonRendererTemplate',['../classace__routine_1_1LogBinJsonRendererTemplate.html',1,'ace_routine']]], + ['logbinprofilertemplate_115',['LogBinProfilerTemplate',['../classace__routine_1_1LogBinProfilerTemplate.html',1,'ace_routine']]], + ['logbintablerenderertemplate_116',['LogBinTableRendererTemplate',['../classace__routine_1_1LogBinTableRendererTemplate.html',1,'ace_routine']]] +]; diff --git a/docs/html/search/defines_0.js b/docs/html/search/defines_0.js index b0e9b6e..f48b6d4 100644 --- a/docs/html/search/defines_0.js +++ b/docs/html/search/defines_0.js @@ -1,4 +1,4 @@ var searchData= [ - ['ace_5froutine_5fdeprecated_141',['ACE_ROUTINE_DEPRECATED',['../Coroutine_8h.html#aa4ab589f43432a7c08a770e4c6f9b239',1,'Coroutine.h']]] + ['ace_5froutine_5fdeprecated_203',['ACE_ROUTINE_DEPRECATED',['../Coroutine_8h.html#aa4ab589f43432a7c08a770e4c6f9b239',1,'Coroutine.h']]] ]; diff --git a/docs/html/search/defines_1.js b/docs/html/search/defines_1.js index b2192d4..b7b6bba 100644 --- a/docs/html/search/defines_1.js +++ b/docs/html/search/defines_1.js @@ -1,15 +1,15 @@ var searchData= [ - ['coroutine_142',['COROUTINE',['../Coroutine_8h.html#ab22e58ab24b1908a7280f13603248ce3',1,'Coroutine.h']]], - ['coroutine1_143',['COROUTINE1',['../Coroutine_8h.html#a8d8219c8fc07650dfcdffbf83d800574',1,'Coroutine.h']]], - ['coroutine2_144',['COROUTINE2',['../Coroutine_8h.html#a04a0fdcb7293e51ddda298e237264c51',1,'Coroutine.h']]], - ['coroutine_5fawait_145',['COROUTINE_AWAIT',['../Coroutine_8h.html#a9f6714d9752740b6173b6afc4d108fa8',1,'Coroutine.h']]], - ['coroutine_5fbegin_146',['COROUTINE_BEGIN',['../Coroutine_8h.html#a7b7dc05639a37cb3f51bf348c68db283',1,'Coroutine.h']]], - ['coroutine_5fdelay_147',['COROUTINE_DELAY',['../Coroutine_8h.html#a1391503960a4b0c48f8200f1ffa0e305',1,'Coroutine.h']]], - ['coroutine_5fdelay_5fmicros_148',['COROUTINE_DELAY_MICROS',['../Coroutine_8h.html#a4b620a90274d05b92509c1c5eb4666f2',1,'Coroutine.h']]], - ['coroutine_5fdelay_5fseconds_149',['COROUTINE_DELAY_SECONDS',['../Coroutine_8h.html#a80fbf69742a91980a58f719edc8920db',1,'Coroutine.h']]], - ['coroutine_5fend_150',['COROUTINE_END',['../Coroutine_8h.html#a7e326a8df652c46c42a8d713ddc67bd7',1,'Coroutine.h']]], - ['coroutine_5floop_151',['COROUTINE_LOOP',['../Coroutine_8h.html#adad73df0853c1d3040b88b3cd0a04c0e',1,'Coroutine.h']]], - ['coroutine_5fyield_152',['COROUTINE_YIELD',['../Coroutine_8h.html#a682abe1669f9fe28af63d11da5421cbf',1,'Coroutine.h']]], - ['coroutine_5fyield_5finternal_153',['COROUTINE_YIELD_INTERNAL',['../Coroutine_8h.html#a53efafb6fd212ea352f5ad52ea9bc393',1,'Coroutine.h']]] + ['coroutine_204',['COROUTINE',['../Coroutine_8h.html#ab22e58ab24b1908a7280f13603248ce3',1,'Coroutine.h']]], + ['coroutine1_205',['COROUTINE1',['../Coroutine_8h.html#a8d8219c8fc07650dfcdffbf83d800574',1,'Coroutine.h']]], + ['coroutine2_206',['COROUTINE2',['../Coroutine_8h.html#a04a0fdcb7293e51ddda298e237264c51',1,'Coroutine.h']]], + ['coroutine_5fawait_207',['COROUTINE_AWAIT',['../Coroutine_8h.html#a9f6714d9752740b6173b6afc4d108fa8',1,'Coroutine.h']]], + ['coroutine_5fbegin_208',['COROUTINE_BEGIN',['../Coroutine_8h.html#a7b7dc05639a37cb3f51bf348c68db283',1,'Coroutine.h']]], + ['coroutine_5fdelay_209',['COROUTINE_DELAY',['../Coroutine_8h.html#a1391503960a4b0c48f8200f1ffa0e305',1,'Coroutine.h']]], + ['coroutine_5fdelay_5fmicros_210',['COROUTINE_DELAY_MICROS',['../Coroutine_8h.html#a4b620a90274d05b92509c1c5eb4666f2',1,'Coroutine.h']]], + ['coroutine_5fdelay_5fseconds_211',['COROUTINE_DELAY_SECONDS',['../Coroutine_8h.html#a80fbf69742a91980a58f719edc8920db',1,'Coroutine.h']]], + ['coroutine_5fend_212',['COROUTINE_END',['../Coroutine_8h.html#a7e326a8df652c46c42a8d713ddc67bd7',1,'Coroutine.h']]], + ['coroutine_5floop_213',['COROUTINE_LOOP',['../Coroutine_8h.html#adad73df0853c1d3040b88b3cd0a04c0e',1,'Coroutine.h']]], + ['coroutine_5fyield_214',['COROUTINE_YIELD',['../Coroutine_8h.html#a682abe1669f9fe28af63d11da5421cbf',1,'Coroutine.h']]], + ['coroutine_5fyield_5finternal_215',['COROUTINE_YIELD_INTERNAL',['../Coroutine_8h.html#a53efafb6fd212ea352f5ad52ea9bc393',1,'Coroutine.h']]] ]; diff --git a/docs/html/search/defines_2.js b/docs/html/search/defines_2.js index 75ba1da..b54c3c9 100644 --- a/docs/html/search/defines_2.js +++ b/docs/html/search/defines_2.js @@ -1,6 +1,6 @@ var searchData= [ - ['extern_5fcoroutine_154',['EXTERN_COROUTINE',['../Coroutine_8h.html#a79f1cf897012bbc4df5565f61adc3028',1,'Coroutine.h']]], - ['extern_5fcoroutine1_155',['EXTERN_COROUTINE1',['../Coroutine_8h.html#ab92199c3991124cbb6e5e48e27827dae',1,'Coroutine.h']]], - ['extern_5fcoroutine2_156',['EXTERN_COROUTINE2',['../Coroutine_8h.html#af52549e71d4a6f7bd18c4688042776b6',1,'Coroutine.h']]] + ['extern_5fcoroutine_216',['EXTERN_COROUTINE',['../Coroutine_8h.html#a79f1cf897012bbc4df5565f61adc3028',1,'Coroutine.h']]], + ['extern_5fcoroutine1_217',['EXTERN_COROUTINE1',['../Coroutine_8h.html#ab92199c3991124cbb6e5e48e27827dae',1,'Coroutine.h']]], + ['extern_5fcoroutine2_218',['EXTERN_COROUTINE2',['../Coroutine_8h.html#af52549e71d4a6f7bd18c4688042776b6',1,'Coroutine.h']]] ]; diff --git a/docs/html/search/defines_3.js b/docs/html/search/defines_3.js index ffc7393..21990fa 100644 --- a/docs/html/search/defines_3.js +++ b/docs/html/search/defines_3.js @@ -1,4 +1,4 @@ var searchData= [ - ['fpstr_157',['FPSTR',['../compat_8h.html#aaa60649c7ffe7ed1fbe16dc20ed7e8c3',1,'compat.h']]] + ['fpstr_219',['FPSTR',['../compat_8h.html#aaa60649c7ffe7ed1fbe16dc20ed7e8c3',1,'compat.h']]] ]; diff --git a/docs/html/search/defines_4.js b/docs/html/search/defines_4.js index d38a403..e4d39e2 100644 --- a/docs/html/search/defines_4.js +++ b/docs/html/search/defines_4.js @@ -1,5 +1,5 @@ var searchData= [ - ['get_5fcoroutine_158',['GET_COROUTINE',['../Coroutine_8h.html#a29e8a48695c9c365bdd589c061afba99',1,'Coroutine.h']]], - ['get_5fextern_5fcoroutine_159',['GET_EXTERN_COROUTINE',['../Coroutine_8h.html#ab7a5384c8d2a434781a52a7e9b45c24d',1,'Coroutine.h']]] + ['get_5fcoroutine_220',['GET_COROUTINE',['../Coroutine_8h.html#a29e8a48695c9c365bdd589c061afba99',1,'Coroutine.h']]], + ['get_5fextern_5fcoroutine_221',['GET_EXTERN_COROUTINE',['../Coroutine_8h.html#ab7a5384c8d2a434781a52a7e9b45c24d',1,'Coroutine.h']]] ]; diff --git a/docs/html/search/files_0.js b/docs/html/search/files_0.js index 5ad1e6d..cf64d8e 100644 --- a/docs/html/search/files_0.js +++ b/docs/html/search/files_0.js @@ -1,5 +1,5 @@ var searchData= [ - ['compat_2eh_83',['compat.h',['../compat_8h.html',1,'']]], - ['coroutine_2eh_84',['Coroutine.h',['../Coroutine_8h.html',1,'']]] + ['compat_2eh_117',['compat.h',['../compat_8h.html',1,'']]], + ['coroutine_2eh_118',['Coroutine.h',['../Coroutine_8h.html',1,'']]] ]; diff --git a/docs/html/search/functions_0.js b/docs/html/search/functions_0.js index c6c4298..740c61c 100644 --- a/docs/html/search/functions_0.js +++ b/docs/html/search/functions_0.js @@ -1,8 +1,12 @@ var searchData= [ - ['channel_85',['Channel',['../classace__routine_1_1Channel.html#ae004356c45d9017d0e375d4468b094e2',1,'ace_routine::Channel']]], - ['coroutinemicros_86',['coroutineMicros',['../classace__routine_1_1CoroutineTemplate.html#ad4ac87c4afab0e2e676a3e197dc74c72',1,'ace_routine::CoroutineTemplate']]], - ['coroutinemillis_87',['coroutineMillis',['../classace__routine_1_1CoroutineTemplate.html#a658e30e034968b53105f00e1f94d9ed8',1,'ace_routine::CoroutineTemplate']]], - ['coroutineseconds_88',['coroutineSeconds',['../classace__routine_1_1CoroutineTemplate.html#a40865b82184d0e0ff93fd9971ef8afed',1,'ace_routine::CoroutineTemplate']]], - ['coroutinetemplate_89',['CoroutineTemplate',['../classace__routine_1_1CoroutineTemplate.html#a5bd84b037fb04d15d3842cd59caf3a22',1,'ace_routine::CoroutineTemplate']]] + ['channel_119',['Channel',['../classace__routine_1_1Channel.html#ae004356c45d9017d0e375d4468b094e2',1,'ace_routine::Channel']]], + ['clear_120',['clear',['../classace__routine_1_1LogBinProfilerTemplate.html#a2f2cf3f7602ff62ffd813650f5711673',1,'ace_routine::LogBinProfilerTemplate']]], + ['clearprofilers_121',['clearProfilers',['../classace__routine_1_1LogBinProfilerTemplate.html#a383e87c1dededb9205a5357001d832e9',1,'ace_routine::LogBinProfilerTemplate']]], + ['coroutinemicros_122',['coroutineMicros',['../classace__routine_1_1CoroutineTemplate.html#a41acb66b780bc0153117915024811949',1,'ace_routine::CoroutineTemplate']]], + ['coroutinemillis_123',['coroutineMillis',['../classace__routine_1_1CoroutineTemplate.html#ad679cad7fc488bc15145d484b6e61364',1,'ace_routine::CoroutineTemplate']]], + ['coroutineprofiler_124',['CoroutineProfiler',['../classace__routine_1_1CoroutineProfiler.html#a91a16875699abfda9383b9f29e4f040f',1,'ace_routine::CoroutineProfiler']]], + ['coroutineseconds_125',['coroutineSeconds',['../classace__routine_1_1CoroutineTemplate.html#af25c1de1f753912444725f899dfffcb3',1,'ace_routine::CoroutineTemplate']]], + ['coroutinetemplate_126',['CoroutineTemplate',['../classace__routine_1_1CoroutineTemplate.html#aebb72dfa544cba3ebcdd5d7647ca8255',1,'ace_routine::CoroutineTemplate']]], + ['createprofilers_127',['createProfilers',['../classace__routine_1_1LogBinProfilerTemplate.html#ae8a4228ae33f977c6fe3584eee71beec',1,'ace_routine::LogBinProfilerTemplate']]] ]; diff --git a/docs/html/search/functions_1.js b/docs/html/search/functions_1.js index 49b18cc..e1d4dbc 100644 --- a/docs/html/search/functions_1.js +++ b/docs/html/search/functions_1.js @@ -1,5 +1,4 @@ var searchData= [ - ['getjump_90',['getJump',['../classace__routine_1_1CoroutineTemplate.html#a84d4aaee5d3ba3750e78574908f2ba11',1,'ace_routine::CoroutineTemplate']]], - ['getstatus_91',['getStatus',['../classace__routine_1_1CoroutineTemplate.html#ae849b9399fefd59231c31c96c3ee19cf',1,'ace_routine::CoroutineTemplate']]] + ['deleteprofilers_128',['deleteProfilers',['../classace__routine_1_1LogBinProfilerTemplate.html#aa17d5b61420362896fb96e03ed5195aa',1,'ace_routine::LogBinProfilerTemplate']]] ]; diff --git a/docs/html/search/functions_2.js b/docs/html/search/functions_2.js index 30754b2..51cbe9e 100644 --- a/docs/html/search/functions_2.js +++ b/docs/html/search/functions_2.js @@ -1,13 +1,11 @@ var searchData= [ - ['isdelayexpired_92',['isDelayExpired',['../classace__routine_1_1CoroutineTemplate.html#ad15b0516f7b42cc474dabe3d0b88a915',1,'ace_routine::CoroutineTemplate']]], - ['isdelaying_93',['isDelaying',['../classace__routine_1_1CoroutineTemplate.html#a2de3c2efa47957f2469d184a34e4a556',1,'ace_routine::CoroutineTemplate']]], - ['isdelaymicrosexpired_94',['isDelayMicrosExpired',['../classace__routine_1_1CoroutineTemplate.html#a00ff722b862ca616a2087863168490d9',1,'ace_routine::CoroutineTemplate']]], - ['isdelaysecondsexpired_95',['isDelaySecondsExpired',['../classace__routine_1_1CoroutineTemplate.html#acf0ea8d7d5c9f55babbb4fae0b0c248a',1,'ace_routine::CoroutineTemplate']]], - ['isdone_96',['isDone',['../classace__routine_1_1CoroutineTemplate.html#a0177f1eeefed11453be1b9b430758e3e',1,'ace_routine::CoroutineTemplate']]], - ['isending_97',['isEnding',['../classace__routine_1_1CoroutineTemplate.html#a4dc9028316c13412ebfdac759884e655',1,'ace_routine::CoroutineTemplate']]], - ['isrunning_98',['isRunning',['../classace__routine_1_1CoroutineTemplate.html#a915596d8e91ddd07bdb4ec818e202d67',1,'ace_routine::CoroutineTemplate']]], - ['issuspended_99',['isSuspended',['../classace__routine_1_1CoroutineTemplate.html#ad6ff5882296706b62ac4dc85e3340289',1,'ace_routine::CoroutineTemplate']]], - ['isterminated_100',['isTerminated',['../classace__routine_1_1CoroutineTemplate.html#aabd5d936ff77f359acd33939d06773b1',1,'ace_routine::CoroutineTemplate']]], - ['isyielding_101',['isYielding',['../classace__routine_1_1CoroutineTemplate.html#a6aef0e3bdf4c003653a67ff97f866d55',1,'ace_routine::CoroutineTemplate']]] + ['getcname_129',['getCName',['../classace__routine_1_1CoroutineTemplate.html#a537cd72830607b0d920fe11d5116ebee',1,'ace_routine::CoroutineTemplate']]], + ['getfname_130',['getFName',['../classace__routine_1_1CoroutineTemplate.html#aea353e510c0371ca5fe1d69da7a330af',1,'ace_routine::CoroutineTemplate']]], + ['getjump_131',['getJump',['../classace__routine_1_1CoroutineTemplate.html#a1e0862b2dd17cdf735e17af33dd1dfca',1,'ace_routine::CoroutineTemplate']]], + ['getnametype_132',['getNameType',['../classace__routine_1_1CoroutineTemplate.html#a4ec22d153b80d295de875cd75b641d20',1,'ace_routine::CoroutineTemplate']]], + ['getnext_133',['getNext',['../classace__routine_1_1CoroutineTemplate.html#a06d1cd713b79b1992cb8dff54f3c7f34',1,'ace_routine::CoroutineTemplate']]], + ['getprofiler_134',['getProfiler',['../classace__routine_1_1CoroutineTemplate.html#ac630c28cd2eb9c02b35747507e55838f',1,'ace_routine::CoroutineTemplate']]], + ['getroot_135',['getRoot',['../classace__routine_1_1CoroutineTemplate.html#aa920e51de2d6c1b7f070bb332f0cd2ba',1,'ace_routine::CoroutineTemplate']]], + ['getstatus_136',['getStatus',['../classace__routine_1_1CoroutineTemplate.html#a96117a7d8ef04593eff65a0df19ac5a4',1,'ace_routine::CoroutineTemplate']]] ]; diff --git a/docs/html/search/functions_3.js b/docs/html/search/functions_3.js index 9636453..ddf8f09 100644 --- a/docs/html/search/functions_3.js +++ b/docs/html/search/functions_3.js @@ -1,5 +1,13 @@ var searchData= [ - ['list_102',['list',['../classace__routine_1_1CoroutineSchedulerTemplate.html#adfe184942d2691e1b4c8774623722d8e',1,'ace_routine::CoroutineSchedulerTemplate']]], - ['loop_103',['loop',['../classace__routine_1_1CoroutineSchedulerTemplate.html#abf192f6066f9a7cc80219461966cba2f',1,'ace_routine::CoroutineSchedulerTemplate']]] + ['isdelayexpired_137',['isDelayExpired',['../classace__routine_1_1CoroutineTemplate.html#adab02ac8807017d168b0ba1c5cec3920',1,'ace_routine::CoroutineTemplate']]], + ['isdelaying_138',['isDelaying',['../classace__routine_1_1CoroutineTemplate.html#a731663b0141022c126e9368e1dfe3e17',1,'ace_routine::CoroutineTemplate']]], + ['isdelaymicrosexpired_139',['isDelayMicrosExpired',['../classace__routine_1_1CoroutineTemplate.html#acd7d7d1d81f507a04e7a9db8b8820381',1,'ace_routine::CoroutineTemplate']]], + ['isdelaysecondsexpired_140',['isDelaySecondsExpired',['../classace__routine_1_1CoroutineTemplate.html#a122e9d35f313975df73ac49afaaa3015',1,'ace_routine::CoroutineTemplate']]], + ['isdone_141',['isDone',['../classace__routine_1_1CoroutineTemplate.html#ad753c3b474c659fa6684bde0bd20919c',1,'ace_routine::CoroutineTemplate']]], + ['isending_142',['isEnding',['../classace__routine_1_1CoroutineTemplate.html#ad7d690556138014c63be958b0a125516',1,'ace_routine::CoroutineTemplate']]], + ['isrunning_143',['isRunning',['../classace__routine_1_1CoroutineTemplate.html#a733385866face30c4fc4223780c1b47e',1,'ace_routine::CoroutineTemplate']]], + ['issuspended_144',['isSuspended',['../classace__routine_1_1CoroutineTemplate.html#aa0f33aa5a6197aa143e86708d7f6fb15',1,'ace_routine::CoroutineTemplate']]], + ['isterminated_145',['isTerminated',['../classace__routine_1_1CoroutineTemplate.html#a5c74778815c76301895765e7485b4bf8',1,'ace_routine::CoroutineTemplate']]], + ['isyielding_146',['isYielding',['../classace__routine_1_1CoroutineTemplate.html#a9c07ae01d589335fa5728210de000755',1,'ace_routine::CoroutineTemplate']]] ]; diff --git a/docs/html/search/functions_4.js b/docs/html/search/functions_4.js index 46da367..5c2de71 100644 --- a/docs/html/search/functions_4.js +++ b/docs/html/search/functions_4.js @@ -1,5 +1,7 @@ var searchData= [ - ['micros_104',['micros',['../classace__routine_1_1ClockInterface.html#ab8963dc53edb04d3ab800eac7c3b358e',1,'ace_routine::ClockInterface']]], - ['millis_105',['millis',['../classace__routine_1_1ClockInterface.html#aeb6701bd63ee8fb7dbb81efaf0ac02bf',1,'ace_routine::ClockInterface']]] + ['list_147',['list',['../classace__routine_1_1CoroutineSchedulerTemplate.html#adfe184942d2691e1b4c8774623722d8e',1,'ace_routine::CoroutineSchedulerTemplate']]], + ['logbinprofilertemplate_148',['LogBinProfilerTemplate',['../classace__routine_1_1LogBinProfilerTemplate.html#a761a35277eac30dcd74c5ba5957df7df',1,'ace_routine::LogBinProfilerTemplate']]], + ['loop_149',['loop',['../classace__routine_1_1CoroutineSchedulerTemplate.html#abf192f6066f9a7cc80219461966cba2f',1,'ace_routine::CoroutineSchedulerTemplate']]], + ['loopwithprofiler_150',['loopWithProfiler',['../classace__routine_1_1CoroutineSchedulerTemplate.html#a63c906ac67be3feb9cf6b64efef1c866',1,'ace_routine::CoroutineSchedulerTemplate']]] ]; diff --git a/docs/html/search/functions_5.js b/docs/html/search/functions_5.js index 5665805..a443244 100644 --- a/docs/html/search/functions_5.js +++ b/docs/html/search/functions_5.js @@ -1,7 +1,5 @@ var searchData= [ - ['read_106',['read',['../classace__routine_1_1Channel.html#a931ce2344667a4b36e76bb4f8f3b70a0',1,'ace_routine::Channel']]], - ['reset_107',['reset',['../classace__routine_1_1CoroutineTemplate.html#aac6c42a690d4f64942c7603b9890de9b',1,'ace_routine::CoroutineTemplate']]], - ['resume_108',['resume',['../classace__routine_1_1CoroutineTemplate.html#aab8a1eba56fb3d10273ce3c62263718b',1,'ace_routine::CoroutineTemplate']]], - ['runcoroutine_109',['runCoroutine',['../classace__routine_1_1CoroutineTemplate.html#a3da6aa3220b54203f050dc97d51b7070',1,'ace_routine::CoroutineTemplate']]] + ['micros_151',['micros',['../classace__routine_1_1ClockInterface.html#ab8963dc53edb04d3ab800eac7c3b358e',1,'ace_routine::ClockInterface']]], + ['millis_152',['millis',['../classace__routine_1_1ClockInterface.html#aeb6701bd63ee8fb7dbb81efaf0ac02bf',1,'ace_routine::ClockInterface']]] ]; diff --git a/docs/html/search/functions_6.js b/docs/html/search/functions_6.js index fb0a09c..fb51879 100644 --- a/docs/html/search/functions_6.js +++ b/docs/html/search/functions_6.js @@ -1,19 +1,5 @@ var searchData= [ - ['seconds_110',['seconds',['../classace__routine_1_1ClockInterface.html#a03c0d39e0167f8a8e7c41f09d19d2861',1,'ace_routine::ClockInterface']]], - ['setdelaying_111',['setDelaying',['../classace__routine_1_1CoroutineTemplate.html#a7a8d70181ccc338b1290d42515fd38df',1,'ace_routine::CoroutineTemplate']]], - ['setdelaymicros_112',['setDelayMicros',['../classace__routine_1_1CoroutineTemplate.html#ab74b193e9633878d90bd6702323f7f7b',1,'ace_routine::CoroutineTemplate']]], - ['setdelaymillis_113',['setDelayMillis',['../classace__routine_1_1CoroutineTemplate.html#a93165b1090754d1d62f8816dfdfe05b4',1,'ace_routine::CoroutineTemplate']]], - ['setdelayseconds_114',['setDelaySeconds',['../classace__routine_1_1CoroutineTemplate.html#a12984cedb7d5183a69d21fc49e7d637b',1,'ace_routine::CoroutineTemplate']]], - ['setending_115',['setEnding',['../classace__routine_1_1CoroutineTemplate.html#aa62660adbbd4dd79b1534c98b997f11f',1,'ace_routine::CoroutineTemplate']]], - ['setjump_116',['setJump',['../classace__routine_1_1CoroutineTemplate.html#ad2f9173ec47abb7bc44356376b84310b',1,'ace_routine::CoroutineTemplate']]], - ['setrunning_117',['setRunning',['../classace__routine_1_1CoroutineTemplate.html#a4e4cf5b9c25b340e040578a57382a70c',1,'ace_routine::CoroutineTemplate']]], - ['setterminated_118',['setTerminated',['../classace__routine_1_1CoroutineTemplate.html#a76bbbd068a1a8a4e762e7834d28f38ed',1,'ace_routine::CoroutineTemplate']]], - ['setup_119',['setup',['../classace__routine_1_1CoroutineSchedulerTemplate.html#ac792080cdec6db9f6539a446d7af587c',1,'ace_routine::CoroutineSchedulerTemplate']]], - ['setupcoroutine_120',['setupCoroutine',['../classace__routine_1_1CoroutineTemplate.html#adcc2990d5ab0c53b33ddedc9c6cee579',1,'ace_routine::CoroutineTemplate::setupCoroutine()'],['../classace__routine_1_1CoroutineTemplate.html#ab386f5cb35ee03f927c72c281fe3518b',1,'ace_routine::CoroutineTemplate::setupCoroutine(const char *) ACE_ROUTINE_DEPRECATED'],['../classace__routine_1_1CoroutineTemplate.html#ab24d05e1a1c581a40cce8d4a85695aee',1,'ace_routine::CoroutineTemplate::setupCoroutine(const __FlashStringHelper *) ACE_ROUTINE_DEPRECATED']]], - ['setupcoroutines_121',['setupCoroutines',['../classace__routine_1_1CoroutineSchedulerTemplate.html#a86ebd507e675b913301f92af0a34abde',1,'ace_routine::CoroutineSchedulerTemplate']]], - ['setvalue_122',['setValue',['../classace__routine_1_1Channel.html#ab950ccdf77fdfaeea67ac19031733229',1,'ace_routine::Channel']]], - ['setyielding_123',['setYielding',['../classace__routine_1_1CoroutineTemplate.html#adf41ef1dfedfb5bb2fcd3ff1285bc100',1,'ace_routine::CoroutineTemplate']]], - ['statusprintto_124',['statusPrintTo',['../classace__routine_1_1CoroutineTemplate.html#a4429565a460dd3fe53a61ecf60557a76',1,'ace_routine::CoroutineTemplate']]], - ['suspend_125',['suspend',['../classace__routine_1_1CoroutineTemplate.html#af106a49c67a4c2920bdc1ac527bad7d5',1,'ace_routine::CoroutineTemplate']]] + ['printnameto_153',['printNameTo',['../classace__routine_1_1CoroutineTemplate.html#a62cbb1e87f55ffb06a5ecbc60b3cf361',1,'ace_routine::CoroutineTemplate']]], + ['printto_154',['printTo',['../classace__routine_1_1LogBinJsonRendererTemplate.html#aec5865839acf21c5460042b4d2c4aa1e',1,'ace_routine::LogBinJsonRendererTemplate::printTo()'],['../classace__routine_1_1LogBinTableRendererTemplate.html#a1e047b82a91c015425ef4453a863b5c3',1,'ace_routine::LogBinTableRendererTemplate::printTo()']]] ]; diff --git a/docs/html/search/functions_7.js b/docs/html/search/functions_7.js index 9b0a370..516be5e 100644 --- a/docs/html/search/functions_7.js +++ b/docs/html/search/functions_7.js @@ -1,4 +1,8 @@ var searchData= [ - ['write_126',['write',['../classace__routine_1_1Channel.html#ad7fa46d27162b4ec9ffa257f3881931d',1,'ace_routine::Channel::write()'],['../classace__routine_1_1Channel.html#a1134e9c905c7c0bb7255f208534355d8',1,'ace_routine::Channel::write(const T &value)']]] + ['read_155',['read',['../classace__routine_1_1Channel.html#a931ce2344667a4b36e76bb4f8f3b70a0',1,'ace_routine::Channel']]], + ['reset_156',['reset',['../classace__routine_1_1CoroutineTemplate.html#a1adcb8c720aa9c452fcbd10274325380',1,'ace_routine::CoroutineTemplate']]], + ['resume_157',['resume',['../classace__routine_1_1CoroutineTemplate.html#a148bb40a4b373e322ea1ed5bad0fadc1',1,'ace_routine::CoroutineTemplate']]], + ['runcoroutine_158',['runCoroutine',['../classace__routine_1_1CoroutineTemplate.html#a6c03c8f778f5cf38f25a07de8186ea1e',1,'ace_routine::CoroutineTemplate']]], + ['runcoroutinewithprofiler_159',['runCoroutineWithProfiler',['../classace__routine_1_1CoroutineTemplate.html#a544e4c65d0e309eb18eb4a60cb5c069f',1,'ace_routine::CoroutineTemplate']]] ]; diff --git a/docs/html/search/functions_8.js b/docs/html/search/functions_8.js index d1c1f73..988fb95 100644 --- a/docs/html/search/functions_8.js +++ b/docs/html/search/functions_8.js @@ -1,4 +1,21 @@ var searchData= [ - ['_7ecoroutinetemplate_127',['~CoroutineTemplate',['../classace__routine_1_1CoroutineTemplate.html#a47cd05a5a9c1f63fb8b44d756aad4e7b',1,'ace_routine::CoroutineTemplate']]] + ['seconds_160',['seconds',['../classace__routine_1_1ClockInterface.html#a03c0d39e0167f8a8e7c41f09d19d2861',1,'ace_routine::ClockInterface']]], + ['setdelaying_161',['setDelaying',['../classace__routine_1_1CoroutineTemplate.html#a8385fb083c393f7a75519e044e34c24e',1,'ace_routine::CoroutineTemplate']]], + ['setdelaymicros_162',['setDelayMicros',['../classace__routine_1_1CoroutineTemplate.html#a1d86ec7546a240864dda1246a71e769f',1,'ace_routine::CoroutineTemplate']]], + ['setdelaymillis_163',['setDelayMillis',['../classace__routine_1_1CoroutineTemplate.html#a1e529439de0abbeebec6e435718dc11d',1,'ace_routine::CoroutineTemplate']]], + ['setdelayseconds_164',['setDelaySeconds',['../classace__routine_1_1CoroutineTemplate.html#ab9e8a2e33791b28bec4ebfd77da11964',1,'ace_routine::CoroutineTemplate']]], + ['setending_165',['setEnding',['../classace__routine_1_1CoroutineTemplate.html#abab3b941fcc45839a5bf293668be9f98',1,'ace_routine::CoroutineTemplate']]], + ['setjump_166',['setJump',['../classace__routine_1_1CoroutineTemplate.html#a4b38c16e0c2452257b3e4214877012e8',1,'ace_routine::CoroutineTemplate']]], + ['setname_167',['setName',['../classace__routine_1_1CoroutineTemplate.html#a0f7388cc07f020d22a83b35eb40ec683',1,'ace_routine::CoroutineTemplate::setName(const char *name)'],['../classace__routine_1_1CoroutineTemplate.html#a712fee99519863c145630f9d218402f8',1,'ace_routine::CoroutineTemplate::setName(const __FlashStringHelper *name)']]], + ['setprofiler_168',['setProfiler',['../classace__routine_1_1CoroutineTemplate.html#ad8c240de1ddbf42bdf4a8f4501b82b23',1,'ace_routine::CoroutineTemplate']]], + ['setrunning_169',['setRunning',['../classace__routine_1_1CoroutineTemplate.html#a99f1300b9bee0e72d05498b26141a352',1,'ace_routine::CoroutineTemplate']]], + ['setterminated_170',['setTerminated',['../classace__routine_1_1CoroutineTemplate.html#ac85d1306aa5a7e5f5650102e452807b3',1,'ace_routine::CoroutineTemplate']]], + ['setup_171',['setup',['../classace__routine_1_1CoroutineSchedulerTemplate.html#ac792080cdec6db9f6539a446d7af587c',1,'ace_routine::CoroutineSchedulerTemplate']]], + ['setupcoroutine_172',['setupCoroutine',['../classace__routine_1_1CoroutineTemplate.html#ac58fe49c8cad0803c88862210b0f033d',1,'ace_routine::CoroutineTemplate::setupCoroutine()'],['../classace__routine_1_1CoroutineTemplate.html#a4ea28bb329a82952991efbcfd10d1d0f',1,'ace_routine::CoroutineTemplate::setupCoroutine(const char *) ACE_ROUTINE_DEPRECATED'],['../classace__routine_1_1CoroutineTemplate.html#aae5a4ce06c6590690b5ae94be777f451',1,'ace_routine::CoroutineTemplate::setupCoroutine(const __FlashStringHelper *) ACE_ROUTINE_DEPRECATED']]], + ['setupcoroutines_173',['setupCoroutines',['../classace__routine_1_1CoroutineSchedulerTemplate.html#a86ebd507e675b913301f92af0a34abde',1,'ace_routine::CoroutineSchedulerTemplate']]], + ['setvalue_174',['setValue',['../classace__routine_1_1Channel.html#ab950ccdf77fdfaeea67ac19031733229',1,'ace_routine::Channel']]], + ['setyielding_175',['setYielding',['../classace__routine_1_1CoroutineTemplate.html#aae7d3ddffa9fcc843984808ac3664dac',1,'ace_routine::CoroutineTemplate']]], + ['statusprintto_176',['statusPrintTo',['../classace__routine_1_1CoroutineTemplate.html#afff00a9882832e76485982560262f441',1,'ace_routine::CoroutineTemplate']]], + ['suspend_177',['suspend',['../classace__routine_1_1CoroutineTemplate.html#a546f751274bbd9658a9106399dec1a00',1,'ace_routine::CoroutineTemplate']]] ]; diff --git a/docs/html/search/functions_9.html b/docs/html/search/functions_9.html new file mode 100644 index 0000000..befd4fa --- /dev/null +++ b/docs/html/search/functions_9.html @@ -0,0 +1,30 @@ + + + + + + + + + +
+
Loading...
+
+ +
Searching...
+
No Matches
+ +
+ + diff --git a/docs/html/search/functions_9.js b/docs/html/search/functions_9.js new file mode 100644 index 0000000..21b98ce --- /dev/null +++ b/docs/html/search/functions_9.js @@ -0,0 +1,4 @@ +var searchData= +[ + ['updateelapsedmicros_178',['updateElapsedMicros',['../classace__routine_1_1CoroutineProfiler.html#a914fde78366e0572b9b307020e3729c9',1,'ace_routine::CoroutineProfiler::updateElapsedMicros()'],['../classace__routine_1_1LogBinProfilerTemplate.html#abc696834db7c1c9dcee2c9b070d0a13a',1,'ace_routine::LogBinProfilerTemplate::updateElapsedMicros()']]] +]; diff --git a/docs/html/search/functions_a.html b/docs/html/search/functions_a.html new file mode 100644 index 0000000..a81e963 --- /dev/null +++ b/docs/html/search/functions_a.html @@ -0,0 +1,30 @@ + + + + + + + + + +
+
Loading...
+
+ +
Searching...
+
No Matches
+ +
+ + diff --git a/docs/html/search/functions_a.js b/docs/html/search/functions_a.js new file mode 100644 index 0000000..0a6ef07 --- /dev/null +++ b/docs/html/search/functions_a.js @@ -0,0 +1,4 @@ +var searchData= +[ + ['write_179',['write',['../classace__routine_1_1Channel.html#ad7fa46d27162b4ec9ffa257f3881931d',1,'ace_routine::Channel::write()'],['../classace__routine_1_1Channel.html#a1134e9c905c7c0bb7255f208534355d8',1,'ace_routine::Channel::write(const T &value)']]] +]; diff --git a/docs/html/search/functions_b.html b/docs/html/search/functions_b.html new file mode 100644 index 0000000..345265d --- /dev/null +++ b/docs/html/search/functions_b.html @@ -0,0 +1,30 @@ + + + + + + + + + +
+
Loading...
+
+ +
Searching...
+
No Matches
+ +
+ + diff --git a/docs/html/search/functions_b.js b/docs/html/search/functions_b.js new file mode 100644 index 0000000..3143c78 --- /dev/null +++ b/docs/html/search/functions_b.js @@ -0,0 +1,5 @@ +var searchData= +[ + ['_7ecoroutineprofiler_180',['~CoroutineProfiler',['../classace__routine_1_1CoroutineProfiler.html#a8c8284bebc06998787f99cc48d7036b3',1,'ace_routine::CoroutineProfiler']]], + ['_7ecoroutinetemplate_181',['~CoroutineTemplate',['../classace__routine_1_1CoroutineTemplate.html#a8a568b194cd7748b1ea40dfaf6a8fde4',1,'ace_routine::CoroutineTemplate']]] +]; diff --git a/docs/html/search/pages_0.js b/docs/html/search/pages_0.js index c416f13..0d642a8 100644 --- a/docs/html/search/pages_0.js +++ b/docs/html/search/pages_0.js @@ -1,4 +1,4 @@ var searchData= [ - ['aceroutine_20library_160',['AceRoutine Library',['../index.html',1,'']]] + ['aceroutine_20library_222',['AceRoutine Library',['../index.html',1,'']]] ]; diff --git a/docs/html/search/searchdata.js b/docs/html/search/searchdata.js index 2b14eda..898d276 100644 --- a/docs/html/search/searchdata.js +++ b/docs/html/search/searchdata.js @@ -1,11 +1,11 @@ var indexSectionsWithContent = { - 0: "acefgiklmrsw~", - 1: "c", + 0: "acdefgiklmprsuw~", + 1: "cl", 2: "c", - 3: "cgilmrsw~", + 3: "cdgilmprsuw~", 4: "km", - 5: "cs", + 5: "cps", 6: "acefg", 7: "a" }; diff --git a/docs/html/search/typedefs_0.js b/docs/html/search/typedefs_0.js index 8c160d0..9a532ea 100644 --- a/docs/html/search/typedefs_0.js +++ b/docs/html/search/typedefs_0.js @@ -1,4 +1,4 @@ var searchData= [ - ['coroutine_139',['Coroutine',['../Coroutine_8h.html#a9971a0ed5c7ba49921d0aa2dbc8f83b0',1,'ace_routine']]] + ['coroutine_200',['Coroutine',['../Coroutine_8h.html#a25a42d39c252ea6377c0845010a38c2b',1,'ace_routine']]] ]; diff --git a/docs/html/search/typedefs_1.js b/docs/html/search/typedefs_1.js index 7b5c13a..dc9b97f 100644 --- a/docs/html/search/typedefs_1.js +++ b/docs/html/search/typedefs_1.js @@ -1,4 +1,4 @@ var searchData= [ - ['status_140',['Status',['../classace__routine_1_1CoroutineTemplate.html#ac63ae27c5f03a0cf85c6be2718626f25',1,'ace_routine::CoroutineTemplate']]] + ['profiler_201',['Profiler',['../classace__routine_1_1LogBinJsonRendererTemplate.html#ab5d0a981189b55dbc175adc487570283',1,'ace_routine::LogBinJsonRendererTemplate::Profiler()'],['../classace__routine_1_1LogBinTableRendererTemplate.html#a0db94e7cfc0b34dd12f012b7b7959e35',1,'ace_routine::LogBinTableRendererTemplate::Profiler()']]] ]; diff --git a/docs/html/search/typedefs_2.html b/docs/html/search/typedefs_2.html new file mode 100644 index 0000000..d18982f --- /dev/null +++ b/docs/html/search/typedefs_2.html @@ -0,0 +1,30 @@ + + + + + + + + + +
+
Loading...
+
+ +
Searching...
+
No Matches
+ +
+ + diff --git a/docs/html/search/typedefs_2.js b/docs/html/search/typedefs_2.js new file mode 100644 index 0000000..36cba7b --- /dev/null +++ b/docs/html/search/typedefs_2.js @@ -0,0 +1,4 @@ +var searchData= +[ + ['status_202',['Status',['../classace__routine_1_1CoroutineTemplate.html#a8dab8bf9ee0a90bf3cb89714d09509a5',1,'ace_routine::CoroutineTemplate']]] +]; diff --git a/docs/html/search/variables_0.js b/docs/html/search/variables_0.js index 4eb211f..234e1e9 100644 --- a/docs/html/search/variables_0.js +++ b/docs/html/search/variables_0.js @@ -1,9 +1,12 @@ var searchData= [ - ['kstatusdelaying_128',['kStatusDelaying',['../classace__routine_1_1CoroutineTemplate.html#a673ca8db9f3bf62a2f3be8d394358e6a',1,'ace_routine::CoroutineTemplate']]], - ['kstatusending_129',['kStatusEnding',['../classace__routine_1_1CoroutineTemplate.html#a14912dd5c52d2a3963a377aae4059dc1',1,'ace_routine::CoroutineTemplate']]], - ['kstatusrunning_130',['kStatusRunning',['../classace__routine_1_1CoroutineTemplate.html#a2b05fc95e0d6765be90955655f64cfd4',1,'ace_routine::CoroutineTemplate']]], - ['kstatussuspended_131',['kStatusSuspended',['../classace__routine_1_1CoroutineTemplate.html#a51ea72999f8fe2d32f753f9bbb436234',1,'ace_routine::CoroutineTemplate']]], - ['kstatusterminated_132',['kStatusTerminated',['../classace__routine_1_1CoroutineTemplate.html#ac0980cd59e49683d0f649687010e38f4',1,'ace_routine::CoroutineTemplate']]], - ['kstatusyielding_133',['kStatusYielding',['../classace__routine_1_1CoroutineTemplate.html#aaa2157d08593c9f88f1b0698528573bd',1,'ace_routine::CoroutineTemplate']]] + ['knametypecstring_182',['kNameTypeCString',['../classace__routine_1_1CoroutineTemplate.html#ac2c0bed6845b265a15d047f5fb9e1f2a',1,'ace_routine::CoroutineTemplate']]], + ['knametypefstring_183',['kNameTypeFString',['../classace__routine_1_1CoroutineTemplate.html#af5edcad4909c75a7dfe85f5b59135d1b',1,'ace_routine::CoroutineTemplate']]], + ['knumbins_184',['kNumBins',['../classace__routine_1_1LogBinProfilerTemplate.html#af25fa69ddc686411422f38a2e7a461ee',1,'ace_routine::LogBinProfilerTemplate']]], + ['kstatusdelaying_185',['kStatusDelaying',['../classace__routine_1_1CoroutineTemplate.html#affeba86cf0732cd88588732cc29e3fb3',1,'ace_routine::CoroutineTemplate']]], + ['kstatusending_186',['kStatusEnding',['../classace__routine_1_1CoroutineTemplate.html#a300f41394630bc6324b7749afbb8e583',1,'ace_routine::CoroutineTemplate']]], + ['kstatusrunning_187',['kStatusRunning',['../classace__routine_1_1CoroutineTemplate.html#af35a3db36cc75dce8aa9196ff3d4068b',1,'ace_routine::CoroutineTemplate']]], + ['kstatussuspended_188',['kStatusSuspended',['../classace__routine_1_1CoroutineTemplate.html#af9b629c958610313eb1c0dc2d63cf047',1,'ace_routine::CoroutineTemplate']]], + ['kstatusterminated_189',['kStatusTerminated',['../classace__routine_1_1CoroutineTemplate.html#aee76b758eb2c683b1823f05433bc13ee',1,'ace_routine::CoroutineTemplate']]], + ['kstatusyielding_190',['kStatusYielding',['../classace__routine_1_1CoroutineTemplate.html#a803df9549b871e9071eb48b5a896cea7',1,'ace_routine::CoroutineTemplate']]] ]; diff --git a/docs/html/search/variables_1.js b/docs/html/search/variables_1.js index df87a59..e0f5e55 100644 --- a/docs/html/search/variables_1.js +++ b/docs/html/search/variables_1.js @@ -1,8 +1,12 @@ var searchData= [ - ['mdelayduration_134',['mDelayDuration',['../classace__routine_1_1CoroutineTemplate.html#ac1180a32fdf2953c758f864ce775301f',1,'ace_routine::CoroutineTemplate']]], - ['mdelaystart_135',['mDelayStart',['../classace__routine_1_1CoroutineTemplate.html#a1b61128fe005b2f4bbeb7f647c367dfa',1,'ace_routine::CoroutineTemplate']]], - ['mjumppoint_136',['mJumpPoint',['../classace__routine_1_1CoroutineTemplate.html#acfd2bb74feb52ea24de73339a9c97b4d',1,'ace_routine::CoroutineTemplate']]], - ['mnext_137',['mNext',['../classace__routine_1_1CoroutineTemplate.html#a3a7f50c509463e57ac5ece39992a8ae5',1,'ace_routine::CoroutineTemplate']]], - ['mstatus_138',['mStatus',['../classace__routine_1_1CoroutineTemplate.html#a9e60528d72bf9887c7d9102028b46665',1,'ace_routine::CoroutineTemplate']]] + ['mbins_191',['mBins',['../classace__routine_1_1LogBinProfilerTemplate.html#a9872d0ca3028086423c2014352394f68',1,'ace_routine::LogBinProfilerTemplate']]], + ['mdelayduration_192',['mDelayDuration',['../classace__routine_1_1CoroutineTemplate.html#a5648aae7d2c2d922a4719e5d7eeddd8a',1,'ace_routine::CoroutineTemplate']]], + ['mdelaystart_193',['mDelayStart',['../classace__routine_1_1CoroutineTemplate.html#a7c48e60b623fa01ed6b45efe95822fd0',1,'ace_routine::CoroutineTemplate']]], + ['mjumppoint_194',['mJumpPoint',['../classace__routine_1_1CoroutineTemplate.html#aaebc2fa42fd65b6dbf87d305fd57595a',1,'ace_routine::CoroutineTemplate']]], + ['mname_195',['mName',['../classace__routine_1_1CoroutineTemplate.html#a8008de77ec60f569fff0a392317b1a22',1,'ace_routine::CoroutineTemplate']]], + ['mnametype_196',['mNameType',['../classace__routine_1_1CoroutineTemplate.html#aaf7ab2306cfb11e2e99b1027233ce706',1,'ace_routine::CoroutineTemplate']]], + ['mnext_197',['mNext',['../classace__routine_1_1CoroutineTemplate.html#ae91d27950ff42e3aac63e47c5889caeb',1,'ace_routine::CoroutineTemplate']]], + ['mprofiler_198',['mProfiler',['../classace__routine_1_1CoroutineTemplate.html#a541efc6473dd13e1174a683ba0173cce',1,'ace_routine::CoroutineTemplate']]], + ['mstatus_199',['mStatus',['../classace__routine_1_1CoroutineTemplate.html#a989fa3e73aef42e475a7f034d9407bd2',1,'ace_routine::CoroutineTemplate']]] ]; From 8dfaf2295adf2f21b3b9d2437a346104028fc53a Mon Sep 17 00:00:00 2001 From: Brian Park Date: Sat, 19 Mar 2022 16:32:41 -0700 Subject: [PATCH 57/59] CHANGELOG.md: Note increase of Coroutine size (i.e. static RAM) due to setName() and setProfiler() --- CHANGELOG.md | 9 ++++++++- README.md | 8 ++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cdd1503..9a69c15 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ * Resource consumption * Increases flash usage by 6-10 bytes per coroutine. * Increases static ram usage by 3 bytes (AVR) or 4 bytes (32-bit) - per coroutine, plus the additional storage for string itself. + per coroutine, plus the additional storage for the string itself. * Support profiling of `Coroutine::runCoroutine()` execution time. * See [Coroutine Profiling](USER_GUIDE.md#CoroutineProfiling) in the `USER_GUIDE.md`. @@ -40,6 +40,13 @@ and [HelloSchedulerWithProfiler](examples/HelloSchedulerWithProfiler). * Thanks to peufeu2@ who provided the ideas and proof of concept in [Discussion#50](https://github.com/bxparks/AceRoutine/discussions/50). + * Coroutine consumes more static RAM + * due to extra pointers to support `setName()` and `setProfiler()` + * 8-bits: increases from 11 bytes to 16 bytes per coroutine + * 32-bits: increases from 20 bytes to 28 bytes per coroutine + * Move `Coroutine::sStatusStrings` to `PROGMEM` + * Saves 12 bytes of static RAM on AVR and 24 bytes on ESP8266, if + `CoroutineScheduler::list()` is used. * 1.4.2 (2022-02-04) * Remove dependency to AceCommon library in `libraries.properties`. * AceRoutine core no longer depends on AceCommon. diff --git a/README.md b/README.md index a78207b..6dd160e 100644 --- a/README.md +++ b/README.md @@ -26,9 +26,9 @@ The following classes are used for profiling: * `CoroutineProfiler` interface * `LogBinProfiler` provides an implementation that tracks the execution time - in 32 logarithmic bins between 1us to 4295s. + in 32 logarithmic bins from 1us to 4295s. * `LogBinTableRenderer` prints the histogram as a table -* `LogBinJsonRenderer` prints the history as a JSON object +* `LogBinJsonRenderer` prints the histogram as a JSON object The following is an experimental feature: @@ -63,13 +63,13 @@ others (in my opinion of course): * 8-bit (e.g. AVR) processors: * the first `Coroutine` consumes about 230 bytes of flash * each additional `Coroutine` consumes 170 bytes of flash - * each `Coroutine` consumes 11 bytes of static RAM + * each `Coroutine` consumes 16 bytes of static RAM * `CoroutineScheduler` consumes only about 40 bytes of flash and 2 bytes of RAM independent of the number of coroutines * 32-bit (e.g. STM32, ESP8266, ESP32) processors * the first `Coroutine` consumes between 120-450 bytes of flash * each additional `Coroutine` consumes about 130-160 bytes of flash, - * each `Coroutine` consumes 20 bytes of static RAM + * each `Coroutine` consumes 28 bytes of static RAM * `CoroutineScheduler` consumes only about 40-60 bytes of flash and 4 bytes of static RAM independent of the number of coroutines * extremely fast context switching From 9f0fcde9ae6344c00fcd58ecb1b4e7946b26f18d Mon Sep 17 00:00:00 2001 From: Brian Park Date: Sat, 19 Mar 2022 16:35:08 -0700 Subject: [PATCH 58/59] README.md: Small tweaks for readability --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 6dd160e..3d57389 100644 --- a/README.md +++ b/README.md @@ -30,11 +30,10 @@ The following classes are used for profiling: * `LogBinTableRenderer` prints the histogram as a table * `LogBinJsonRenderer` prints the histogram as a JSON object -The following is an experimental feature: +The following is an experimental feature whose API and functionality may change +considerably in the future: -* `Channel` class allows coroutines to send messages to each other. This is - an experimental feature whose API and feature may change considerably - in the future. +* `Channel` class allows coroutines to send messages to each other The library provides a number of macros to help create coroutines and manage their life cycle: @@ -89,7 +88,8 @@ others (in my opinion of course): * ~0.3 microseconds on a 240 MHz ESP32 * ~0.4 microseconds on 96 MHz Teensy 3.2 (depending on compiler settings) -* uses the [computed goto](https://gcc.gnu.org/onlinedocs/gcc/Labels-as-Values.html) +* uses the + [computed goto](https://gcc.gnu.org/onlinedocs/gcc/Labels-as-Values.html) feature of the GCC compiler (also supported by Clang) to avoid the [Duff's Device](https://en.wikipedia.org/wiki/Duff%27s_device) hack * allows `switch` statements in the coroutines From 9ca3553904c1ee5f629e231cb5ea4588a2d060a9 Mon Sep 17 00:00:00 2001 From: Brian Park Date: Sat, 19 Mar 2022 16:37:10 -0700 Subject: [PATCH 59/59] USER_GUIDE.md: Fix markdown typo --- USER_GUIDE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/USER_GUIDE.md b/USER_GUIDE.md index f792228..3ebbc2e 100644 --- a/USER_GUIDE.md +++ b/USER_GUIDE.md @@ -279,7 +279,7 @@ class Coroutine { uint8_t getNameType() const; void printNameTo(Print& printer) const; }; -`` +``` It is expected that the `setName()` will be called in the global `setup()` function.