Diff: common/Stream.cpp

Revision:

144:ef7eb2e8f9f7

Parent:

28:8e1f0b362990

--- a/common/Stream.cpp	Tue Aug 02 14:07:36 2016 +0000
+++ b/common/Stream.cpp	Fri Sep 02 15:07:44 2016 +0100
@@ -1,121 +1,151 @@
-/* mbed Microcontroller Library
- * Copyright (c) 2006-2013 ARM Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include "Stream.h"
-
-namespace mbed {
-
-Stream::Stream(const char *name) : FileLike(name), _file(NULL) {
-    /* open ourselves */
-    char buf[12]; /* :0x12345678 + null byte */
-    std::sprintf(buf, ":%p", this);
-    _file = std::fopen(buf, "w+");
-    mbed_set_unbuffered_stream(_file);
-}
-
-Stream::~Stream() {
-    fclose(_file);
-}
-
-int Stream::putc(int c) {
-    fflush(_file);
-    return std::fputc(c, _file);
-}
-int Stream::puts(const char *s) {
-    fflush(_file);
-    return std::fputs(s, _file);
-}
-int Stream::getc() {
-    fflush(_file);
-    return mbed_getc(_file);   
-}
-char* Stream::gets(char *s, int size) {
-    fflush(_file);
-    return mbed_gets(s,size,_file);
-}
-
-int Stream::close() {
-    return 0;
-}
-
-ssize_t Stream::write(const void* buffer, size_t length) {
-    const char* ptr = (const char*)buffer;
-    const char* end = ptr + length;
-    while (ptr != end) {
-        if (_putc(*ptr++) == EOF) {
-            break;
-        }
-    }
-    return ptr - (const char*)buffer;
-}
-
-ssize_t Stream::read(void* buffer, size_t length) {
-    char* ptr = (char*)buffer;
-    char* end = ptr + length;
-    while (ptr != end) {
-        int c = _getc();
-        if (c==EOF) break;
-        *ptr++ = c;
-    }
-    return ptr - (const char*)buffer;
-}
-
-off_t Stream::lseek(off_t offset, int whence) {
-    return 0;
-}
-
-int Stream::isatty() {
-    return 0;
-}
-
-int Stream::fsync() {
-    return 0;
-}
-
-off_t Stream::flen() {
-    return 0;
-}
-
-int Stream::printf(const char* format, ...) {
-    std::va_list arg;
-    va_start(arg, format);
-    fflush(_file);
-    int r = vfprintf(_file, format, arg);
-    va_end(arg);
-    return r;
-}
-
-int Stream::scanf(const char* format, ...) {
-    std::va_list arg;
-    va_start(arg, format);
-    fflush(_file);
-    int r = vfscanf(_file, format, arg);
-    va_end(arg);
-    return r;
-}
-
-int Stream::vprintf(const char* format, std::va_list args) {
-    fflush(_file);
-    int r = vfprintf(_file, format, args);
-    return r;
-}
-
-int Stream::vscanf(const char* format, std::va_list args) {
-    fflush(_file);
-    int r = vfscanf(_file, format, args);
-    return r;
-}
-
-} // namespace mbed
+/* mbed Microcontroller Library
+ * Copyright (c) 2006-2013 ARM Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "Stream.h"
+
+namespace mbed {
+
+Stream::Stream(const char *name) : FileLike(name), _file(NULL) {
+    // No lock needed in constructor
+    /* open ourselves */
+    char buf[12]; /* :0x12345678 + null byte */
+    std::sprintf(buf, ":%p", this);
+    _file = std::fopen(buf, "w+");
+    mbed_set_unbuffered_stream(_file);
+}
+
+Stream::~Stream() {
+    // No lock can be used in destructor
+    fclose(_file);
+}
+
+int Stream::putc(int c) {
+    lock();
+    fflush(_file);
+    int ret = std::fputc(c, _file);
+    unlock();
+    return ret;
+}
+int Stream::puts(const char *s) {
+    lock();
+    fflush(_file);
+    int ret = std::fputs(s, _file);
+    unlock();
+    return ret;
+}
+int Stream::getc() {
+    lock();
+    fflush(_file);
+    int ret = mbed_getc(_file);
+    unlock();
+    return ret;
+}
+char* Stream::gets(char *s, int size) {
+    lock();
+    fflush(_file);
+    char *ret = mbed_gets(s,size,_file);
+    unlock();
+    return ret;
+}
+
+int Stream::close() {
+    return 0;
+}
+
+ssize_t Stream::write(const void* buffer, size_t length) {
+    const char* ptr = (const char*)buffer;
+    const char* end = ptr + length;
+
+    lock();
+    while (ptr != end) {
+        if (_putc(*ptr++) == EOF) {
+            break;
+        }
+    }
+    unlock();
+
+    return ptr - (const char*)buffer;
+}
+
+ssize_t Stream::read(void* buffer, size_t length) {
+    char* ptr = (char*)buffer;
+    char* end = ptr + length;
+
+    lock();
+    while (ptr != end) {
+        int c = _getc();
+        if (c==EOF) break;
+        *ptr++ = c;
+    }
+    unlock();
+
+    return ptr - (const char*)buffer;
+}
+
+off_t Stream::lseek(off_t offset, int whence) {
+    return 0;
+}
+
+int Stream::isatty() {
+    return 0;
+}
+
+int Stream::fsync() {
+    return 0;
+}
+
+off_t Stream::flen() {
+    return 0;
+}
+
+int Stream::printf(const char* format, ...) {
+    lock();
+    std::va_list arg;
+    va_start(arg, format);
+    fflush(_file);
+    int r = vfprintf(_file, format, arg);
+    va_end(arg);
+    unlock();
+    return r;
+}
+
+int Stream::scanf(const char* format, ...) {
+    lock();
+    std::va_list arg;
+    va_start(arg, format);
+    fflush(_file);
+    int r = vfscanf(_file, format, arg);
+    va_end(arg);
+    unlock();
+    return r;
+}
+
+int Stream::vprintf(const char* format, std::va_list args) {
+    lock();
+    fflush(_file);
+    int r = vfprintf(_file, format, args);
+    unlock();
+    return r;
+}
+
+int Stream::vscanf(const char* format, std::va_list args) {
+    lock();
+    fflush(_file);
+    int r = vfscanf(_file, format, args);
+    unlock();
+    return r;
+}
+
+} // namespace mbed