DeforaNetworks/deepstate
3
0
Fork 0
Code Releases Activity

Hooked __assert_fail into the logging system.

Browse Source
This commit is contained in:
Peter Goodman 2017-12-13 12:43:34 -05:00
parent 5a84f665b6
commit 308fe70eb6
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib/DeepState.c
View File

@ -373,4 +373,16 @@ int DeepState_CatchAbandoned(void) {
return DeepState_TestAbandoned != NULL;
}
/* Overwrite libc's abort. */
void abort(void) {
DeepState_Fail();
}
void __assert_fail(const char * assertion, const char * file,
unsigned int line, const char * function) {
DeepState_LogFormat(DeepState_LogFatal,
"%s(%u): Assertion %s failed in function %s",
file, line, assertion, function);
}
DEEPSTATE_END_EXTERN_C

15
src/lib/Stream.c
View File

@ -89,7 +89,7 @@ static void DeepState_StreamUnpack(struct DeepState_Stream *stream, char type) {
/* Fill in the format for when we want to stream an integer. */
static void DeepState_StreamIntFormat(struct DeepState_Stream *stream,
size_t val_size, int is_unsigned) {
size_t val_size, int is_unsigned) {
char *format = stream->format;
int i = 0;
@ -196,6 +196,17 @@ void _DeepState_StreamString(enum DeepState_LogLevel level, const char *format,
stream->size += size;
}
void DeepState_StreamPointer(enum DeepState_LogLevel level, void * val) {
struct DeepState_Stream *stream = &(DeepState_Streams[level]);
stream->format[0] = '%';
stream->format[1] = 'p';
stream->format[2] = '\0';
DeepState_StreamUnpack(stream, (sizeof(void *) == 8 ? 'Q' : 'I'));
stream->value.as_uint64 = (uint64_t) val;
_DeepState_StreamInt(level, stream->format, stream->unpack,
&(stream->value.as_uint64));
}
#define MAKE_INT_STREAMER(Type, type, is_unsigned, pack_kind) \
void DeepState_Stream ## Type(enum DeepState_LogLevel level, type val) { \
struct DeepState_Stream *stream = &(DeepState_Streams[level]); \
@ -206,8 +217,6 @@ void _DeepState_StreamString(enum DeepState_LogLevel level, const char *format,
&(stream->value.as_uint64)); \
}
MAKE_INT_STREAMER(Pointer, void *, 1, (sizeof(void *) == 8 ? 'Q' : 'I'))
MAKE_INT_STREAMER(UInt64, uint64_t, 1, 'Q')
MAKE_INT_STREAMER(Int64, int64_t, 0, 'q')