10000 uart: BW improvements by d-a-v · Pull Request #4620 · esp8266/Arduino · GitHub
[go: up one dir, main page]
Skip to content

uart: BW improvements #4620

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 37 commits into from
Dec 10, 2018
Merged

uart: BW improvements #4620

Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
e5c2fea
uart fixes and BW improvements
d-a-v Apr 4, 2018
f79bc90
uart: read_char straightly use hw buffer
d-a-v Apr 5, 2018
45e2bd5
+attributes for functions called by ISR
d-a-v Apr 5, 2018
974b758
uart: BW improvements
d-a-v Apr 4, 2018
3eb8c95
Merge branch 'master' into serialagain
devyte Apr 9, 2018
0aefb09
Merge branch 'master' into serialagain
devyte Jun 7, 2018
4c6bab4
Merge branch 'master' into serialagain
devyte Jul 3, 2018
3c1e312
Merge branch 'master' into serialagain
d-a-v Nov 30, 2018
132f7f3
Merge branch 'serialagain' of github.com:d-a-v/Arduino into serialagain
d-a-v Nov 30, 2018
6560ab8
fix merge
d-a-v Nov 30, 2018
ebdf57a
Merge branch 'master' into serialagain
d-a-v Dec 5, 2018
c68d474
fix buffer overflow
d-a-v Dec 5, 2018
ff63718
serial stress test sketch
d-a-v Dec 5, 2018 8000
40f237f
astyle
d-a-v Dec 5, 2018
d6316aa
Merge branch 'serialagain' of github.com:d-a-v/Arduino into serialagain
d-a-v Dec 5, 2018
3428144
serial stress example: interactive keyboard, stop reading, overrun
d-a-v Dec 5, 2018
684879d
Merge branch 'master' into serialagain
d-a-v Dec 6, 2018
882989e
serial device test: bandwidth & overrun
d-a-v Dec 6, 2018
3ec2a60
update + HardwareSerial::hasError()
d-a-v Dec 6, 2018
a38f9d8
interactive overrun in example
d-a-v Dec 6, 2018
6b77715
astyle
d-a-v Dec 6, 2018
b639261
Test using @plerup's SoftwareSerial as submodule (tag 3.4.1)
d-a-v Dec 6, 2018
40d1237
update upstream ref (fix warning)
d-a-v Dec 6, 2018
64f7ac1
Merge branch 'master' into serialagain
d-a-v Dec 6, 2018
c48b54f
host mock uart/read(buf,size)
d-a-v Dec 6, 2018
18a189f
reset style changes in submodules before style diff
d-a-v Dec 7, 2018
ddcd908
Merge branch 'serialagain' of github.com:d-a-v/Arduino into serialagain
d-a-v Dec 7, 2018
48ad6bc
Merge branch 'master' into serialagain
earlephilhower Dec 7, 2018
0a7322f
Merge branch 'master' into serialagain
devyte Dec 8, 2018
fb25c8d
update build_boards_manager_package.sh for submodules
d-a-v Dec 8, 2018
8785e3a
Merge branch 'master' into serialagain
d-a-v Dec 8, 2018
e83316f
Merge branch 'master' into serialagain
devyte Dec 9, 2018
62ead27
Merge branch 'master' into serialagain
devyte Dec 9, 2018
c7eba46
Merge branch 'master' into serialagain
devyte Dec 10, 2018
cbd8b44
trigger CI (removing space)
d-a-v Dec 10, 2018
99fcfda
cannot reproduce locally the CI issue, setting bash -x option to get …
d-a-v Dec 10, 2018
6234fe0
remove previously added (in this PR) 'set -e' in package builder (pas…
d-a-v Dec 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
serial stress example: interactive keyboard, stop reading, overrun
  • Loading branch information
@d-a-v
d-a-v committed Dec 5, 2018
commit 3428144634a0d797709c8fa9c25db049b880a2c7
82 changes: 46 additions & 36 deletions libraries/esp8266/examples/serialStress/serialStress.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

uint8_t buf [BUFFER_SIZE];
uint8_t temp [BUFFER_SIZE];
bool reading = true;

static size_t out_idx = 0, in_idx = 0;
static size_t local_receive_size = 0;
Expand All @@ -33,20 +34,20 @@ static uint64_t timeout;
Stream* logger;

void error(const char* what) {
logger->printf("\r\nerror: %s after %ld minutes\r\nread idx: %d\r\nwrite idx: %d\r\ntotal: %ld\r\nlast read: %d\r\nmaxavail: %d\r\n",
logger->printf("\nerror: %s after %ld minutes\nread idx: %d\nwrite idx: %d\ntotal: %ld\nlast read: %d\nmaxavail: %d\n",
what, (long)((millis() - start_ms) / 60000), in_idx, out_idx, (long)in_total, (int)local_receive_size, maxavail);
if (Serial.hasOverrun()) {
logger->printf("overrun!\r\n");
logger->printf("overrun!\n");
}
logger->printf("should be (size=%d idx=%d..%d):\r\n ", BUFFER_SIZE, in_idx, in_idx + local_receive_size - 1);
logger->printf("should be (size=%d idx=%d..%d):\n ", BUFFER_SIZE, in_idx, in_idx + local_receive_size - 1);
for (size_t i = in_idx; i < in_idx + local_receive_size; i++) {
logger->printf("%02x(%c) ", buf[i], (unsigned char)((buf[i] > 31 && buf[i] < 128) ? buf[i] : '.'));
}
logger->print("\r\n\r\nis: ");
logger->print("\n\nis: ");
for (size_t i = 0; i < local_receive_size; i++) {
logger->printf("%02x(%c) ", temp[i], (unsigned char)((temp[i] > 31 && temp[i] < 128) ? temp[i] : '.'));
}
logger->println("\r\n\r\n");
logger->println("\n\n");

while (true) {
delay(1000);
Expand All @@ -72,15 +73,15 @@ void setup() {
ss->begin(SSBAUD);
logger = ss;
logger->println();
logger->printf("\r\n\r\nOn Software Serial for logging\r\n");
logger->printf("\n\nOn Software Serial for logging\n");

int baud = Serial.baudRate();
logger->printf(ESP.getFullVersion().c_str());
logger->printf("\r\n\r\nBAUD: %d - CoreRxBuffer: %d bytes - TestBuffer: %d bytes\r\n",
logger->printf("\n\nBAUD: %d - CoreRxBuffer: %d bytes - TestBuffer: %d bytes\n",
baud, SERIAL_SIZE_RX, BUFFER_SIZE);

size_for_1sec = baud / 10; // 8n1=10baudFor8bits
logger->printf("led changes state every %zd bytes (= 1 second)\r\n", size_for_1sec);
logger->printf("led changes state every %zd bytes (= 1 second)\n", size_for_1sec);

// prepare send/compare buffer
for (size_t i = 0; i < sizeof buf; i++) {
Expand All @@ -92,7 +93,7 @@ void setup() {

while (Serial.read() == -1);
if (Serial.hasOverrun()) {
logger->print("overrun?\r\n");
logger->print("overrun?\n");
}

timeout = (start_ms = last_ms = millis()) + TIMEOUT;
Expand All @@ -114,7 +115,7 @@ void loop() {
}
DEBUG(logger->printf("(aw%i/w%i", Serial.availableForWrite(), maxlen));
size_t local_written_size = Serial.write(buf + out_idx, maxlen);
DEBUG(logger->printf(":w%i/aw%i/ar%i)\r\n", local_written_size, Serial.availableForWrite(), Serial.available()));
DEBUG(logger->printf(":w%i/aw%i/ar%i)\n", local_written_size, Serial.availableForWrite(), Serial.available()));
if (local_written_size > maxlen) {
error("bad write");
}
Expand All @@ -123,53 +124,62 @@ void loop() {
}
delay(0);

DEBUG(logger->printf("----------\r\n"));
DEBUG(logger->printf("----------\n"));

if (Serial.hasOverrun()) {
logger->printf("overrun!\r\n");
logger->printf("overrun!\n");
}

// receive data
maxlen = Serial.available();
if (maxlen > maxavail) {
maxavail = maxlen;
}
// check space in temp receive buffer
if (maxlen > BUFFER_SIZE - in_idx) {
maxlen = BUFFER_SIZE - in_idx;
}
DEBUG(logger->printf("(ar%i/r%i", Serial.available(), maxlen));
local_receive_size = Serial.readBytes(temp, maxlen);
DEBUG(logger->printf(":r%i/ar%i)\r\n", local_receive_size, Serial.available()));
if (local_receive_size > maxlen) {
error("bad read");
}
if (local_receive_size) {
if (memcmp(buf + in_idx, temp, local_receive_size) != 0) {
error("fail");
if (reading)
{
// receive data
maxlen = Serial.available();
if (maxlen > maxavail) {
maxavail = maxlen;
}
// check space in temp receive buffer
if (maxlen > BUFFER_SIZE - in_idx) {
maxlen = BUFFER_SIZE - in_idx;
}
if ((in_idx += local_receive_size) == BUFFER_SIZE) {
in_idx = 0;
DEBUG(logger->printf("(ar%i/r%i", Serial.available(), maxlen));
local_receive_size = Serial.readBytes(temp, maxlen);
DEBUG(logger->printf(":r%i/ar%i)\n", local_receive_size, Serial.available()));
if (local_receive_size > maxlen) {
error("bad read");
}
in_total += local_receive_size;
if (local_receive_size) {
if (memcmp(buf + in_idx, temp, local_receive_size) != 0) {
error("fail");
}
if ((in_idx += local_receive_size) == BUFFER_SIZE) {
in_idx = 0;
}
in_total += local_receive_size;
}
DEBUG(logger->printf("r(%d) ok\n", local_receive_size));
}
DEBUG(logger->printf("r(%d) ok\r\n", local_receive_size));

// say something on data every second
if ((size_for_led += local_written_size) >= size_for_1sec || millis() > timeout) {
digitalWrite(LED_BUILTIN, !digitalRead(LED_BUILTIN));
size_for_led = 0;

if (in_prev == in_total) {
error("receiving nothing?\r\n");
error("receiving nothing?\n");
}

unsigned long now_ms = millis();
int bwkbps_avg = ((((uint64_t)in_total) * 8000) / (now_ms - start_ms)) >> 10;
int bwkbps_now = (((in_total - in_prev) * 8000) / (now_ms - last_ms)) >> 10 ;
logger->printf("bwavg=%d bwnow=%d kbps maxavail=%i\r\n", bwkbps_avg, bwkbps_now, maxavail);
logger->printf("bwavg=%d bwnow=%d kbps maxavail=%i\n", bwkbps_avg, bwkbps_now, maxavail);

in_prev = in_total;
timeout = (last_ms = now_ms) + TIMEOUT;
}

if (logger->read() == 's')
{
logger->println("now stopping reading, keeping writing");
reading = false;
}
}
0