upgrade Expects/Ensures to use std::format

Author: mazunki

api/expects

@@ -32,28 +32,42 @@
 #endif
 
 #include <os.hpp>
-inline void __expect_fail(const char *expr, const char *file, int line, const char *func){
+inline void __expect_emit_failure(std::string_view msg, std::string_view panic_text) {
 #ifndef UNITTESTS
 #ifdef INCLUDEOS_SMP_ENABLE
   SMP::global_lock();
 #endif
-  fprintf(stderr, "%s:%i:%s %s \n",file, line, func, expr);
+  std::fprintf(stderr, "%.*s\n", int(msg.size()), msg.data());
   fflush(NULL);
 #ifdef INCLUDEOS_SMP_ENABLE
   SMP::global_unlock();
 #endif
-  os::panic(expr);
+  os::panic(std::string(panic_text).c_str());
 #else // TEST
   // throw here to allow tests to capture the error
   #include <stdexcept>
-  #include <format>
-  auto msg = std::format("{}:{}:{} {}",file, line, func, expr);
   throw std::runtime_error(msg);
 #endif
 }
 
-#define Expects(x) ((void)((x) || (__expect_fail("Expects failed: "#x, __FILE__, __LINE__, __func__),0)))
-#define Ensures(x) ((void)((x) || (__expect_fail("Ensures failed: "#x, __FILE__, __LINE__, __func__),0)))
+template <class... Args>
+inline void __expect_failf(const char *err_prefix, const char * /*cond*/, const char *file, int line, const char *func, std::format_string<Args...> fmt, Args&&... args){
+  auto reason_msg = std::format(fmt, std::forward<Args>(args)...);
+  auto error_msg = std::format("{}:{}:{}: {}: {}", file, line, func, err_prefix, reason_msg);
+  __expect_emit_failure(error_msg, reason_msg);
+}
+
+inline void __expect_failf(const char *err_prefix, const char *cond, const char *file, int line, const char *func){
+  auto reason_msg = std::format("{}: {}", err_prefix, cond);
+  auto error_msg = std::format("{}:{}:{}: {}", file, line, func, err_prefix);
+  __expect_emit_failure(error_msg, reason_msg);
+}
+
+#define Expects(cond) ((void)((cond) || (__expect_failf("Expects failed", #cond, __FILE__, __LINE__, __func__),0)))
+#define Ensures(cond) ((void)((cond) || (__expect_failf("Ensures failed", #cond, __FILE__, __LINE__, __func__),0)))
+
+#define Expectsf(cond, fmt, ...) ((void)((cond) || (__expect_failf("Expects failed", #cond, __FILE__, __LINE__, __func__, fmt, ##__VA_ARGS__),0)))
+#define Ensuresf(cond, fmt, ...) ((void)((cond) || (__expect_failf("Ensures failed", #cond, __FILE__, __LINE__, __func__, fmt, ##__VA_ARGS__),0)))
 
 namespace os {
 // parameter for noexcept specifier when bypassing noexcept for testing

src/musl/mmap.cpp

@@ -60,6 +60,11 @@ static void* sys_mmap(void * addr, size_t length, int /*prot*/, int flags,
 
   // TODO: Implement minimal functionality to be POSIX compliant
   // https://pubs.opengroup.org/onlinepubs/009695399/functions/mmap.html
+  if (length <= 0) {
+    Expectsf(false, "Must always allocate at least 1 byte. Got {}", length);
+    errno = EINVAL;
+    return MAP_FAILED;
+  }
 
   if (fd > -1) {
     // None of our file systems support memory mapping at the moment