Implemented timed assert definition

kala13x · Aug 8, 2024 · 614ba35 · 614ba35
1 parent e3d45ce
commit 614ba35
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@
 # https://github.com/kala13x/smake #
 ####################################
 
-CFLAGS = -D_XUTILS_USE_SSL -g -O2 -Wall -D_XUTILS_DEBUG -D_XUTILS_USE_GNU
+CFLAGS = -D_XUTILS_USE_SSL -g -O2 -Wall -D_XUTILS_DEBUG -D_XUTILS_USE_GNU -D_ASSERT_TIMED
 CFLAGS += -I./src/crypt -I./src/data -I./src/net -I./src/sys -I./src
 LIBS = -lssl -lcrypto -lpthread
 NAME = libxutils.a

diff --git a/misc/Makefile.tmp b/misc/Makefile.tmp
@@ -3,7 +3,7 @@
 # https://github.com/kala13x/smake #
 ####################################
 
-CFLAGS = _SSL_FLAGS_ -g -O2 -Wall -D_XUTILS_DEBUG -D_XUTILS_USE_GNU
+CFLAGS = _SSL_FLAGS_ -g -O2 -Wall -D_XUTILS_DEBUG -D_XUTILS_USE_GNU -D_ASSERT_TIMED
 CFLAGS += -I./src/crypt -I./src/data -I./src/net -I./src/sys -I./src
 LIBS = _SSL_LIBS_ -lpthread
 NAME = libxutils.a

diff --git a/misc/smake.tmp b/misc/smake.tmp
@@ -2,7 +2,7 @@
  "build": {
  "name": "libxutils.a",
  "outputDir": "./build",
- "flags": "-g -O2 -Wall -D_XUTILS_DEBUG -D_XUTILS_USE_GNU",
+ "flags": "-g -O2 -Wall -D_XUTILS_DEBUG -D_XUTILS_USE_GNU -D_ASSERT_TIMED",
  "libs": "-lpthread",
  "overwrite": true,
  "verbose": 2,

diff --git a/smake.json b/smake.json
@@ -2,7 +2,7 @@
  "build": {
  "name": "libxutils.a",
  "outputDir": "./build",
- "flags": "-g -O2 -Wall -D_XUTILS_DEBUG -D_XUTILS_USE_GNU",
+ "flags": "-g -O2 -Wall -D_XUTILS_DEBUG -D_XUTILS_USE_GNU -D_ASSERT_TIMED",
  "libs": "-lpthread",
  "overwrite": true,
  "verbose": 2,

diff --git a/src/xdef.h b/src/xdef.h
@@ -110,6 +110,25 @@ typedef uint8_t xbool_t;
 #define XLOCATION_LVL2(line) XLOCATION_LVL1(line)
 #define __XLOCATION__ XLOCATION_LVL2(__LINE__)
 
+#ifdef _ASSERT_TIMED
+#include <time.h>
+#define XTROW_LOCATION \
+ { \
+ char timeStr[20]; \
+ time_t now = time(NULL); \
+ struct tm *tmInfo = localtime(&now); \
+ strftime(timeStr, sizeof(timeStr), \
+ "%H:%M:%S.%03d", tmInfo ); \
+ printf("%s %s<error>%s " \
+ "Assert failed: " \
+ "%s:%s():%s\n", \
+ XCLR_RED, XCLR_RES, \
+ timeStr, \
+ __FILE__, \
+ __FUNCTION__, \
+ __XLOCATION__); \
+ }
+#else
 #define XTROW_LOCATION \
  printf("%s<error>%s " \
  "Assert failed: " \
@@ -118,6 +137,7 @@ typedef uint8_t xbool_t;
  __FILE__, \
  __FUNCTION__, \
  __XLOCATION__)
+#endif
 
 #define XASSERT_RET(condition, value) \
  if (!condition) return value