summaryrefslogtreecommitdiffstatshomepage
path: root/lib/utils/stdout_helpers.c
diff options
context:
space:
mode:
authorDamien George <damien@micropython.org>2021-07-06 11:23:21 +1000
committerDamien George <damien@micropython.org>2021-07-08 12:59:31 +1000
commit20a6044952281a4f55a5ee83bcaca88ec1b870f9 (patch)
treec618f19ea0ec7857fcc0ef8ad26d00502ad69dc7 /lib/utils/stdout_helpers.c
parent3d9af877215c9f904a7d64c3fa4da79e5780a818 (diff)
downloadmicropython-20a6044952281a4f55a5ee83bcaca88ec1b870f9.tar.gz
micropython-20a6044952281a4f55a5ee83bcaca88ec1b870f9.zip
lib/utils/stdout_helpers: Make mp_hal_stdout_tx_strn_cooked efficient.
To reduce the number of calls to mp_hal_stdout_tx_strn and improve the overall throughput of printing data. This implementation is taken from ports/stm32/mphalport.c. Signed-off-by: Damien George <damien@micropython.org>
Diffstat (limited to 'lib/utils/stdout_helpers.c')
-rw-r--r--lib/utils/stdout_helpers.c46
1 files changed, 41 insertions, 5 deletions
diff --git a/lib/utils/stdout_helpers.c b/lib/utils/stdout_helpers.c
index 3de1197571..6a24cc2eba 100644
--- a/lib/utils/stdout_helpers.c
+++ b/lib/utils/stdout_helpers.c
@@ -1,6 +1,30 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Damien P. George
+ *
+ * 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 <string.h>
-#include <unistd.h>
-#include "py/mpconfig.h"
#include "py/mphal.h"
/*
@@ -10,13 +34,25 @@
*/
// Send "cooked" string of given length, where every occurrence of
-// LF character is replaced with CR LF.
+// LF character is replaced with CR LF ("\n" is converted to "\r\n").
+// This is an optimised version to reduce the number of calls made
+// to mp_hal_stdout_tx_strn.
void mp_hal_stdout_tx_strn_cooked(const char *str, size_t len) {
+ const char *last = str;
while (len--) {
if (*str == '\n') {
- mp_hal_stdout_tx_strn("\r", 1);
+ if (str > last) {
+ mp_hal_stdout_tx_strn(last, str - last);
+ }
+ mp_hal_stdout_tx_strn("\r\n", 2);
+ ++str;
+ last = str;
+ } else {
+ ++str;
}
- mp_hal_stdout_tx_strn(str++, 1);
+ }
+ if (str > last) {
+ mp_hal_stdout_tx_strn(last, str - last);
}
}