Fix Containerfile.

anmaped · Apr 23, 2024 · 19e45c3 · 19e45c3
1 parent 8c95bc3
commit 19e45c3
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 17 deletions.
diff --git a/Containerfile b/Containerfile
@@ -99,6 +99,18 @@ COPY examples /rtmlib/examples
 COPY src /rtmlib/src
 COPY tests /rtmlib/tests
 
+
+# install extra dependencies to build NuttX (examples included)
+RUN apt install -y \
+    kconfig-frontends \
+    genromfs \
+    xxd
+
+#
+# make examples
+#
+RUN cd /rtmlib/examples && make
+
 #
 # make and run rtmlib tests (x86)
 #
@@ -157,12 +169,6 @@ RUN qemu-system-riscv64 -M virt -cpu rv64 -m 512M -smp 2 -monitor none -nographi
 
 # with NuttX
 
-# install extra dependencies to build NuttX
-RUN apt install -y \
-    kconfig-frontends \
-    genromfs \
-    xxd
-
 # configure and build config.h
 RUN cd /rtmlib/thirdparty/nuttx \
     && ./tools/configure.sh -a ../nuttx-apps rv-virt:nsh64 \
@@ -192,8 +198,3 @@ RUN cd /rtmlib/thirdparty/nuttx \
        EXTRA_OBJS="/rtmlib/tests/build/riscv-nuttx/rtmlib_unittests.o"
 
 RUN qemu-system-riscv64 -semihosting -M virt -cpu rv64 -bios none -kernel /rtmlib/thirdparty/nuttx/nuttx -nographic
-
-#
-# make examples
-#
-RUN cd /rtmlib/examples && make
diff --git a/TODO.md b/TODO.md
@@ -5,7 +5,7 @@ rtmlib2:
 - [ ] implement riscv clockgettime macro (without OS)
 - [x] implement and automate riscv NuttX unittests (included in Containerfile)
 - [x] implement automated NuttX unit tests for QEMU environment
-- [ ] find the bug in rtmlib (see debug files; perf also provoque it, and not just qemu; sounds that the problem is with syncronization)
+- [x] find the bug in rtmlib (see debug files; perf also provoque it, and not just qemu; sounds that the problem is with syncronization)
 - [ ] test a trace with repetitive values (current unittests formulas fail)
 - [ ] test a trace that overlaps (current unittests formulas fail)
 - [x] remove travis-ci and replace it with github actions

diff --git a/src/circularbuffer.h b/src/circularbuffer.h
@@ -29,7 +29,7 @@
 #include <cstring>
 #define MEMCPY(x, y, z) std::memcpy(x, y, z)
 #else
-#error "There is not memcpy implementation!"
+#warning "There is not memcpy implementation!"
 #endif
 
 /**

diff --git a/src/reader.h b/src/reader.h
@@ -267,7 +267,7 @@ typename RTML_reader<B>::gap_error_t RTML_reader<B>::synchronize() {
       return GAP; // INIT SYNC
     } else {
       // this case should not happen anymore
-      DEBUGV("## unknown gap ## t == b && !(top == 0 && bottom == 0)\n");
+      DEBUGV_ERROR("## unknown gap ## t == b && !(top == 0 && bottom == 0)\n");
       return UNKNOWN_GAP;
     }
   }

diff --git a/src/writer.h b/src/writer.h
@@ -111,10 +111,10 @@ typename B::error_t RTML_writer<B>::push(typename B::event_t &event) {
       increment_writer_bottom(stateref->bottom);
 
     err = (p) ? buffer.BUFFER_OVERFLOW : buffer.OK;
-
-    buffer.write(event, top);
   });
 
+  buffer.write(event, top);
+
 #endif
 
   return err;

diff --git a/tests/Makefile b/tests/Makefile
@@ -35,7 +35,7 @@ MAIN_EPILOGUE:=
 EPILOGUE:=
 
 # Debug Flags
-DEBUGFLAGS= -DRTMLIB_ENABLE_DEBUG_RMTLD3 -DRTMLIB_ENABLE_DEBUGV_RMTLD3 -DRTMLIB_DEBUG=3
+#DEBUGFLAGS= -DRTMLIB_ENABLE_DEBUG_RMTLD3 -DRTMLIB_ENABLE_DEBUGV_RMTLD3 #-DRTMLIB_DEBUG=3
 
 ifneq (,$(filter x$(ARCH),x xx86 xx86_64))