hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reindented server/core/memlog.c

Browse Source
This commit is contained in:
Johan Wikman
2015-11-30 14:15:15 +02:00
parent 60fb05ea40
commit 72dd159f98
2 changed files with 196 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
server/core/memlog.c
View File

@ -48,7 +48,7 @@ static SPINLOCK memlock = SPINLOCK_INIT;
MEMLOG *
memlog_create(char *name, MEMLOGTYPE type, int size)
{
MEMLOG *log;
MEMLOG *log;
if ((log = (MEMLOG *)malloc(sizeof(MEMLOG))) == NULL)
{
@ -97,23 +97,31 @@ MEMLOG *log;
void
memlog_destroy(MEMLOG *log)
{
MEMLOG *ptr;
MEMLOG *ptr;
if ((log->flags & MLNOAUTOFLUSH) == 0)
{
memlog_flush(log);
}
free(log->values);
spinlock_acquire(&memlock);
if (memlogs == log)
{
memlogs = log->next;
}
else
{
ptr = memlogs;
while (ptr && ptr->next != log)
{
ptr = ptr->next;
}
if (ptr)
{
ptr->next = log->next;
}
}
spinlock_release(&memlock);
free(log->name);
free(log);
@ -129,7 +137,9 @@ void
memlog_log(MEMLOG *log, void *value)
{
if (!log)
{
return;
}
spinlock_acquire(&log->lock);
switch (log->type)
{
@ -150,7 +160,9 @@ memlog_log(MEMLOG *log, void *value)
if (log->offset == log->size)
{
if ((log->flags & MLNOAUTOFLUSH) == 0)
{
memlog_flush(log);
}
log->offset = 0;
log->iflags = MLWRAPPED;
}
@ -164,7 +176,7 @@ memlog_log(MEMLOG *log, void *value)
void
memlog_flush_all()
{
MEMLOG *log;
MEMLOG *log;
spinlock_acquire(&memlock);
log = memlogs;
@ -200,11 +212,13 @@ memlog_set(MEMLOG *log, unsigned int flags)
void
memlog_flush(MEMLOG *log)
{
FILE *fp;
int i;
FILE *fp;
int i;
if ((fp = fopen(log->name, "a")) == NULL)
{
return;
}
if ((log->flags & MLNOAUTOFLUSH) && (log->iflags & MLWRAPPED))
{
for (i = 0; i < log->size; i++)

4
server/include/memlog.h
View File

@ -33,7 +33,8 @@
typedef enum { ML_INT, ML_LONG, ML_LONGLONG, ML_STRING } MEMLOGTYPE;
typedef struct memlog {
typedef struct memlog
{
char *name;
SPINLOCK lock;
void *values;
@ -62,4 +63,5 @@ extern void memlog_set(MEMLOG *, unsigned int);
extern void memlog_log(MEMLOG *, void *);
extern void memlog_flush_all();
extern void memlog_flush(MEMLOG *);
#endif