Merge branch 'next' into release0.1.5

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.68])
-AC_INIT([taskrambler], [0.1.5], [Georg Hopp <georg@steffers.org>])
+AC_INIT([taskrambler], [0.1.6], [Georg Hopp <georg@steffers.org>])
 LT_INIT
 AM_INIT_AUTOMAKE
 #AM_INIT_AUTOMAKE([subdir-objects])
@@ -19,6 +19,9 @@ AC_SUBST(COVERAGE_CFLAGS)
 AC_SUBST(COVERAGE_CXXFLAGS)
 AC_SUBST(COVERAGE_LDFLAGS)
 
+m4_include([m4/memopt.m4])
+AC_MEM_OPT
+
 PWD=$(/bin/pwd)
 AC_SUBST(PWD)
 

include/utils/memory.h

@@ -25,7 +25,6 @@
 
 #define CSTRA(val)	val, sizeof(val)-1 //!< Const STRing Argument
 
-#define FREE(val)		(ffree((void**)&(val)))
 #define MEM_FREE(seg)	(memFree((void **)&(seg)))
 
 #include <sys/types.h>
@@ -36,8 +35,6 @@ void     memFree(void **);
 size_t   memGetSize(void *);
 void     memCleanup();
 
-void ffree(void **);
-
 #endif // __UTILS_MEMORY_H__
 
 // vim: set ts=4 sw=4:

src/Makefile.am

@@ -32,8 +32,13 @@ AM_CFLAGS = -Wall -I ../include/
 
 bin_PROGRAMS = taskrambler
 
+
 taskrambler_SOURCES = taskrambler.c $(IFACE) $(UTILS)
-taskrambler_CFLAGS  = $(CFLAGS) -Wall -DPWD=\"$(PWD)\" -I../include/ # $(COVERAGE_CFLAGS)
+taskrambler_CFLAGS  = $(CFLAGS) \
+		      -Wall \
+		      -DPWD=\"$(PWD)\" \
+		      $(MEM_OPT_FLAGS) \
+		      -I../include/ # $(COVERAGE_CFLAGS)
 taskrambler_LDADD   = $(LIBS) -lrt -lssl -lldap -lgdbm -luuid
 #taskrambler_LDFLAGS = $(COVERAGE_LDFLAGS)
 

src/application/login.c

@@ -54,6 +54,7 @@ applicationLogin(
 						// this is an ldap user that has not yet set
 						// additional user informations.
 						/* @TODO again...change the keys to id's */
+						session->user->email = NULL;
 						delete(session->user);
 						session->user = new(User,
 								CRED_PWD(credential).user,

src/auth/storage/hash_pw.c

@@ -78,7 +78,7 @@ hash_pw(
 		unsigned char ** salt)
 {
 	if (NULL == *salt) {
-		*salt = memMalloc(SALT_SIZE * sizeof(unsigned char));
+		*salt = memCalloc(SALT_SIZE, sizeof(unsigned char));
 		if (0 > RAND_pseudo_bytes(*salt, SALT_SIZE)) {
 			MEM_FREE(*salt);
 			return FALSE;

src/utils/memory.c

@@ -782,6 +782,7 @@ memNewRef(void * mem)
 void *
 memMalloc(size_t size)
 {
+#ifdef MEM_OPT
 	struct memSegment * seg;
 	//long                psize = sysconf(_SC_PAGESIZE);
 	long                psize = 64;
@@ -801,8 +802,10 @@ memMalloc(size_t size)
 		seg = deleteElement(&segments, seg);
 	}
 
-
 	return seg->ptr;
+#else
+	return malloc(size);
+#endif
 }
 
 /**
@@ -816,17 +819,22 @@ memMalloc(size_t size)
 void *
 memCalloc(size_t nmemb, size_t size)
 {
+#ifdef MEM_OPT
 	size_t   _size = nmemb * size;
 	void   * mem   = memMalloc(_size);
 
 	memset(mem, 0, _size);
 
 	return mem;
+#else
+	return calloc(nmemb, size);
+#endif
 }
 
 void
 memFree(void ** mem)
 {
+#ifdef MEM_OPT
 	if (NULL != *mem) {
 		struct memSegment * seg = (*mem - sizeof(struct memSegment));
 
@@ -838,11 +846,18 @@ memFree(void ** mem)
 
 		*mem = NULL;
 	}
+#else
+	if (NULL != *mem) {
+		free(*mem);
+		*mem = NULL;
+	}
+#endif
 }
 
 size_t
 memGetSize(void * mem)
 {
+#ifdef MEM_OPT
 	struct memSegment * segment;
 
 	if (NULL == mem) {
@@ -851,21 +866,17 @@ memGetSize(void * mem)
 
 	segment = (struct memSegment *)(mem - sizeof(struct memSegment));
 	return segment->size;
+#else
+	return 0;
+#endif
 }
 
 void
 memCleanup()
 {
+#ifdef MEM_OPT
 	post(segments, segmentFree);
+#endif
 }
 
-void
-ffree(void ** data)
-{
-	if (NULL != *data) {
-		free(*data);
-		*data = NULL;
-	}
-}   
-
 // vim: set ts=4 sw=4: