Browse Source

to test it use Best Fit memory management in logger.

release0.1.5
Georg Hopp 12 years ago
parent
commit
b9f88cf05c
  1. 18
      src/logger/interface/i_logger.c
  2. 4
      tests/Makefile.am

18
src/logger/interface/i_logger.c

@ -27,6 +27,8 @@
#include "logger/logger.h" #include "logger/logger.h"
#include "logger/interface/logger.h" #include "logger/interface/logger.h"
#include "utils/memory.h"
const struct interface i_Logger = { const struct interface i_Logger = {
"logger", "logger",
1 1
@ -37,23 +39,23 @@ loggerLog(void * _object, logger_level level, const char * const fmt, ...) {
Logger object = _object; Logger object = _object;
if (level >= object->min_level) { if (level >= object->min_level) {
char * msg = NULL;
size_t msg_size = 0;
va_list params;
struct memSegment * msg = NULL;
size_t msg_size = 0;
va_list params;
va_start(params, fmt); va_start(params, fmt);
msg_size = vsnprintf(msg, msg_size, fmt, params);
msg_size = vsnprintf(NULL, msg_size, fmt, params);
va_end(params); va_end(params);
msg = malloc(msg_size + 1);
msg = memMalloc(msg_size + 1);
va_start(params, fmt); va_start(params, fmt);
vsnprintf(msg, msg_size + 1, fmt, params);
vsnprintf(msg->ptr, msg_size + 1, fmt, params);
va_end(params); va_end(params);
CALL(_object, Logger, log, level, msg);
CALL(_object, Logger, log, level, msg->ptr);
free(msg);
MEM_FREE(msg);
} }
} }

4
tests/Makefile.am

@ -15,6 +15,7 @@ LOGGER = $(CLASS) \
../src/logger/stderr.c \ ../src/logger/stderr.c \
../src/logger/syslog.c \ ../src/logger/syslog.c \
../src/logger/interface/i_logger.c \ ../src/logger/interface/i_logger.c \
../src/utils/memory.c \
mock/mock_logger.c mock/mock_logger.c
SOCKET = $(LOGGER) \ SOCKET = $(LOGGER) \
@ -38,7 +39,6 @@ SERVER = $(SOCKET) \
../src/server/read.c \ ../src/server/read.c \
../src/server/write.c \ ../src/server/write.c \
../src/utils/signalHandling.c \ ../src/utils/signalHandling.c \
../src/utils/memory.c \
mock/mock_worker.c mock/mock_worker.c
classTest_SOURCES = $(CLASS) classTest.c classTest_SOURCES = $(CLASS) classTest.c
@ -55,7 +55,7 @@ socketTest_LDFLAGS = -lgcov -pg
serverTest_SOURCES = $(SERVER) serverTest.c serverTest_SOURCES = $(SERVER) serverTest.c
serverTest_CFLAGS = -Wall -ggdb -O0 -fprofile-arcs -ftest-coverage -pg -I ../include -I .. -I . serverTest_CFLAGS = -Wall -ggdb -O0 -fprofile-arcs -ftest-coverage -pg -I ../include -I .. -I .
serverTest_LDFLAGS = $(STREAM_OBJ) -lgcov -pg
serverTest_LDFLAGS = $(STREAM_OBJ) -lgcov -lcrypto -pg
EXTRA_DIST = runtest.h mock/mock_class.h mock/mock_logger.h EXTRA_DIST = runtest.h mock/mock_class.h mock/mock_logger.h

Loading…
Cancel
Save