log: implemented extensible loggin engine with per-session logging support

log: implemented log_file logging target with per-user/per-session support

8 files changed, 26 insertions, 16 deletions

diff --git a/accel-pptpd/triton/CMakeLists.txt b/accel-pptpd/triton/CMakeLists.txt
index 41339d97..95ab4160 100644
--- a/accel-pptpd/triton/CMakeLists.txt
+++ b/accel-pptpd/triton/CMakeLists.txt
@@ -10,7 +10,6 @@ SET(sources_c
 	event.c
 )
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-ADD_DEFINITIONS("-DUSE_SPINLOCK")
 
 ADD_LIBRARY(${target} SHARED ${sources_c})
 
diff --git a/accel-pptpd/triton/mempool.c b/accel-pptpd/triton/mempool.c
index dacb6118..6d9172a1 100644
--- a/accel-pptpd/triton/mempool.c
+++ b/accel-pptpd/triton/mempool.c
@@ -20,7 +20,7 @@ struct _item_t
 	char ptr[0];
 };
 
-mempool_t *mempool_create(int size)
+__export mempool_t *mempool_create(int size)
 {
 	struct _mempool_t *p = malloc(sizeof(*p));
 
@@ -33,7 +33,7 @@ mempool_t *mempool_create(int size)
 	return (mempool_t *)p;
 }
 
-void *mempool_alloc(mempool_t *pool)
+__export void *mempool_alloc(mempool_t *pool)
 {
 	struct _mempool_t *p = (struct _mempool_t *)pool;
 	struct _item_t *it;
@@ -48,7 +48,7 @@ void *mempool_alloc(mempool_t *pool)
 	spin_unlock(&p->lock);
 	it = malloc(sizeof(*it) + p->size);
 	if (!it) {
-		triton_log_error("out of memory\n");
+		triton_log_error("mempool: out of memory\n");
 		return NULL;
 	}
 	it->owner = p;
@@ -56,7 +56,7 @@ void *mempool_alloc(mempool_t *pool)
 	return it->ptr;
 }
 
-void mempool_free(void *ptr)
+__export void mempool_free(void *ptr)
 {
 	struct _item_t *it = container_of(ptr, typeof(*it), ptr);
 
diff --git a/accel-pptpd/triton/mempool.h b/accel-pptpd/triton/mempool.h
new file mode 100644
index 00000000..e8bcaf6a
--- /dev/null
+++ b/accel-pptpd/triton/mempool.h
@@ -0,0 +1,10 @@
+#ifndef __TRITON_MEMPOOL_H
+#define __TRITON_MEMPOOL_H
+
+typedef void * mempool_t;
+mempool_t *mempool_create(int size);
+void *mempool_alloc(mempool_t*);
+void mempool_free(void*);
+
+#endif
+
diff --git a/accel-pptpd/triton/spinlock.h b/accel-pptpd/triton/spinlock.h
index b6d1656a..5ef9c488 100644
--- a/accel-pptpd/triton/spinlock.h
+++ b/accel-pptpd/triton/spinlock.h
@@ -1,7 +1,7 @@
 #ifndef __TRITON_SPINLOCK_H
 #define __TRITON_SPINLOCK_H
 
-#ifdef USE_SPINLOCK
+#ifdef GCC_SPINLOCK
 typedef unsigned char spinlock_t;
 #define spin_lock(l) {while(__sync_lock_test_and_set(l,1));}
 #define spin_unlock(l) __sync_lock_release(l)
diff --git a/accel-pptpd/triton/timer.c b/accel-pptpd/triton/timer.c
index e9fd66a0..d2249786 100644
--- a/accel-pptpd/triton/timer.c
+++ b/accel-pptpd/triton/timer.c
@@ -164,5 +164,6 @@ void __export triton_timer_del(struct triton_timer_t *ud)
 	spin_unlock(&t->ctx->lock);
 	sched_yield();
 	mempool_free(t);
+	ud->tpd = NULL;
 }
 
diff --git a/accel-pptpd/triton/triton.c b/accel-pptpd/triton/triton.c
index 8b25f039..b0aedbc7 100644
--- a/accel-pptpd/triton/triton.c
+++ b/accel-pptpd/triton/triton.c
@@ -43,9 +43,10 @@ static void* triton_thread(struct _triton_thread_t *thread)
 		sigwait(&set, &sig);
 
 cont:
-		if (swapcontext(&thread->uctx, &thread->ctx->uctx)) {
+		if (thread->ctx->ud->before_switch)
+			thread->ctx->ud->before_switch(thread->ctx->ud, thread->ctx->bf_arg);
+		if (swapcontext(&thread->uctx, &thread->ctx->uctx))
 			triton_log_error("swapcontext: %s\n", strerror(errno));
-		}
 	
 		if (thread->ctx->need_free)
 			mempool_free(thread->ctx);
@@ -164,7 +165,7 @@ int triton_queue_ctx(struct _triton_context_t *ctx)
 	return 1;
 }
 
-int __export triton_context_register(struct triton_context_t *ud)
+int __export triton_context_register(struct triton_context_t *ud, void *bf_arg)
 {
 	struct _triton_context_t *ctx = mempool_alloc(ctx_pool);
 
@@ -173,6 +174,7 @@ int __export triton_context_register(struct triton_context_t *ud)
 
 	memset(ctx, 0, sizeof(*ctx));
 	ctx->ud = ud;
+	ctx->bf_arg = bf_arg;
 	spinlock_init(&ctx->lock);
 	INIT_LIST_HEAD(&ctx->handlers);
 	INIT_LIST_HEAD(&ctx->timers);
@@ -299,7 +301,7 @@ int __export triton_init(const char *conf_file, const char *mod_sect)
 		fprintf(stderr,"cann't allocate memory\n");
 		return -1;
 	}
-	triton_context_register(default_ctx);	
+	triton_context_register(default_ctx, NULL);	
 
 	if (conf_load(conf_file))
 		return -1;
diff --git a/accel-pptpd/triton/triton.h b/accel-pptpd/triton/triton.h
index d9baa7da..b1df4971 100644
--- a/accel-pptpd/triton/triton.h
+++ b/accel-pptpd/triton/triton.h
@@ -10,6 +10,7 @@ struct triton_context_t
 	const void *tpd; // triton private data, don't touch!
 	void (*close)(struct triton_context_t*);
 	void (*free)(struct triton_context_t*);
+	void (*before_switch)(struct triton_context_t *ctx, void *arg);
 };
 
 struct triton_md_handler_t
@@ -41,7 +42,7 @@ struct conf_sect_t
 	struct list_head items;
 };
 
-int triton_context_register(struct triton_context_t *);
+int triton_context_register(struct triton_context_t *, void *arg);
 void triton_context_unregister(struct triton_context_t *);
 void triton_context_schedule(struct triton_context_t *);
 void triton_context_wakeup(struct triton_context_t *);
diff --git a/accel-pptpd/triton/triton_p.h b/accel-pptpd/triton/triton_p.h
index 5e498fcd..ec2eb840 100644
--- a/accel-pptpd/triton/triton_p.h
+++ b/accel-pptpd/triton/triton_p.h
@@ -8,6 +8,7 @@
 #include "triton.h"
 #include "list.h"
 #include "spinlock.h"
+#include "mempool.h"
 
 #define CTX_STACK_SIZE 8196
 
@@ -43,6 +44,7 @@ struct _triton_context_t
 	int need_free:1;
 
 	struct triton_context_t *ud;
+	void *bf_arg;
 };
 
 struct _triton_md_handler_t
@@ -80,11 +82,6 @@ struct _triton_ctx_call_t
 	void (*func)(void *);
 };
 
-typedef void * mempool_t;
-mempool_t *mempool_create(int size);
-void *mempool_alloc(mempool_t*);
-void mempool_free(void*);
-
 int log_init(void);
 int md_init();
 int timer_init();