made all class and interface basics to a small lib. This is the first one. All other parts will become libs too. Right now these are only static libs but this way its easy to split them out if needed

configure.ac

@@ -38,5 +38,5 @@ AC_TYPE_SIZE_T
 #AC_FUNC_MALLOC
 AC_CHECK_FUNCS([memset])
 
-AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile src/class/Makefile tests/Makefile])
 AC_OUTPUT

include/class.h

@@ -1,124 +1,9 @@
-/**
- * \file
- * My own class implementation for C. It combines a data structure
- * with a set of dynamically linked methods defined by an interface. A
- * dynamically linked method will be called via a selector method which in
- * turn gets the implementation stored in the class.
- *
- * \author	Georg Hopp
- *
- * \copyright
- * Copyright © 2012  Georg Hopp
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 #ifndef __CLASS_H__
 #define __CLASS_H__
 
-#include <stdarg.h>
-#include <sys/types.h>
-#include <string.h>
-#include <assert.h>
-
-#include "interface.h"
-
-#ifndef _ISOC99_SOURCE
-#define _ISOC99_SOURCE
-#endif
-
-#define CLASS_MAGIC    0xFEFE
-
-#define CLASS(name)                      \
-	struct c_##name;                     \
-	typedef struct c_##name * name;      \
-	extern struct class * const _##name; \
-	struct c_##name
-
-#define EXTENDS(parent) \
-	const char _[sizeof(struct c_##parent)]
-
-#define _NULL	NULL
-#define CREATE_CLASS(name,_parent,...)      \
-	static struct class c_##name;           \
-	static class_ptr _classInit_(void) {    \
-		c_##name.parent = _##_parent;       \
-		c_##name.init   = NULL;             \
-		return &c_##name;                   \
-	}                                       \
-	static struct class c_##name = {        \
-		CLASS_MAGIC,                        \
-		NULL,                               \
-		sizeof(struct c_##name),            \
-		_classInit_,                        \
-		INIT_IFACE_IMPL(__VA_ARGS__)        \
-	}; struct class * const _##name = &c_##name
-
-#define INIT_CLASS(class)			((class)->init? (class)->init() : (class))
-#define GET_CLASS(object)			(INIT_CLASS(*(class_ptr *)((object) - sizeof(void*))))
-#define IFACE_GET(class,iface)		(interfaceGet(&((class)->impl),(iface)))
-#define HAS_PARENT(class)			(NULL != ((class)->parent) &&  INIT_CLASS((class)->parent))
-
-/**
- * \todo actually i use gcc feature ## for variadoc... think about
- * a way to make this standard.
- */
-#define _CALL(_class,_iface,method,...)                                         \
-	do {                                                                        \
-		class_ptr class = _class;                                               \
-		iface = (struct i_##_iface *)IFACE_GET(class, &i_##_iface);             \
-		while ((NULL == iface || NULL == iface->method) && HAS_PARENT(class)) { \
-			class = class->parent;                                              \
-			iface = (struct i_##_iface *)IFACE_GET(class, &i_##_iface);         \
-		}                                                                       \
-		assert(NULL != iface->method);                                          \
-	} while(0)
-
-#define CALL(object,_iface,method,...)                           \
-	do {                                                         \
-		struct i_##_iface * iface;                               \
-		_CALL(GET_CLASS(object), _iface, method, ##__VA_ARGS__); \
-		iface->method(object, ##__VA_ARGS__);                    \
-	} while(0)
-
-#define RETCALL(object,_iface,method,ret,...)                    \
-	do {                                                         \
-		struct i_##_iface * iface;                               \
-		_CALL(GET_CLASS(object), _iface, method, ##__VA_ARGS__); \
-		ret = iface->method(object, ##__VA_ARGS__);              \
-	} while(0)
-
-#define PARENTCALL(object,_iface,method,...)                    \
-	do {                                                        \
-		struct i_##_iface * iface;                              \
-		class_ptr pc_class = GET_CLASS((object));               \
-		assert(HAS_PARENT(pc_class));                           \
-		_CALL(pc_class->parent, _iface, method, ##__VA_ARGS__); \
-		iface->method(object, ##__VA_ARGS__);                   \
-	} while(0)
-
-
-struct class;
-typedef struct class * class_ptr;
-typedef class_ptr (* fptr_classInit)(void);
-struct class {
-	const int         magic;
-	class_ptr         parent;
-	size_t            object_size;
-	fptr_classInit    init;
-	struct iface_impl impl;
-};
+#include "class/class.h"
+#include "class/interface.h"
+#include "class/interface/class.h"
 
 #endif // __CLASS_H__
 

include/class/class.h

@@ -0,0 +1,125 @@
+/**
+ * \file
+ * My own class implementation for C. It combines a data structure
+ * with a set of dynamically linked methods defined by an interface. A
+ * dynamically linked method will be called via a selector method which in
+ * turn gets the implementation stored in the class.
+ *
+ * \author	Georg Hopp
+ *
+ * \copyright
+ * Copyright © 2012  Georg Hopp
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __CLASS_CLASS_H__
+#define __CLASS_CLASS_H__
+
+#include <stdarg.h>
+#include <sys/types.h>
+#include <string.h>
+#include <assert.h>
+
+#include "class/interface.h"
+
+#ifndef _ISOC99_SOURCE
+#define _ISOC99_SOURCE
+#endif
+
+#define CLASS_MAGIC    0xFEFE
+
+#define CLASS(name)                      \
+	struct c_##name;                     \
+	typedef struct c_##name * name;      \
+	extern struct class * const _##name; \
+	struct c_##name
+
+#define EXTENDS(parent) \
+	const char _[sizeof(struct c_##parent)]
+
+#define _NULL	NULL
+#define CREATE_CLASS(name,_parent,...)      \
+	static struct class c_##name;           \
+	static class_ptr _classInit_(void) {    \
+		c_##name.parent = _##_parent;       \
+		c_##name.init   = NULL;             \
+		return &c_##name;                   \
+	}                                       \
+	static struct class c_##name = {        \
+		CLASS_MAGIC,                        \
+		NULL,                               \
+		sizeof(struct c_##name),            \
+		_classInit_,                        \
+		INIT_IFACE_IMPL(__VA_ARGS__)        \
+	}; struct class * const _##name = &c_##name
+
+#define INIT_CLASS(class)			((class)->init? (class)->init() : (class))
+#define GET_CLASS(object)			(INIT_CLASS(*(class_ptr *)((object) - sizeof(void*))))
+#define IFACE_GET(class,iface)		(interfaceGet(&((class)->impl),(iface)))
+#define HAS_PARENT(class)			(NULL != ((class)->parent) &&  INIT_CLASS((class)->parent))
+
+/**
+ * \todo actually i use gcc feature ## for variadoc... think about
+ * a way to make this standard.
+ */
+#define _CALL(_class,_iface,method,...)                                         \
+	do {                                                                        \
+		class_ptr class = _class;                                               \
+		iface = (struct i_##_iface *)IFACE_GET(class, &i_##_iface);             \
+		while ((NULL == iface || NULL == iface->method) && HAS_PARENT(class)) { \
+			class = class->parent;                                              \
+			iface = (struct i_##_iface *)IFACE_GET(class, &i_##_iface);         \
+		}                                                                       \
+		assert(NULL != iface->method);                                          \
+	} while(0)
+
+#define CALL(object,_iface,method,...)                           \
+	do {                                                         \
+		struct i_##_iface * iface;                               \
+		_CALL(GET_CLASS(object), _iface, method, ##__VA_ARGS__); \
+		iface->method(object, ##__VA_ARGS__);                    \
+	} while(0)
+
+#define RETCALL(object,_iface,method,ret,...)                    \
+	do {                                                         \
+		struct i_##_iface * iface;                               \
+		_CALL(GET_CLASS(object), _iface, method, ##__VA_ARGS__); \
+		ret = iface->method(object, ##__VA_ARGS__);              \
+	} while(0)
+
+#define PARENTCALL(object,_iface,method,...)                    \
+	do {                                                        \
+		struct i_##_iface * iface;                              \
+		class_ptr pc_class = GET_CLASS((object));               \
+		assert(HAS_PARENT(pc_class));                           \
+		_CALL(pc_class->parent, _iface, method, ##__VA_ARGS__); \
+		iface->method(object, ##__VA_ARGS__);                   \
+	} while(0)
+
+
+struct class;
+typedef struct class * class_ptr;
+typedef class_ptr (* fptr_classInit)(void);
+struct class {
+	const int         magic;
+	class_ptr         parent;
+	size_t            object_size;
+	fptr_classInit    init;
+	struct iface_impl impl;
+};
+
+#endif // __CLASS_CLASS_H__
+
+// vim: set ts=4 sw=4:

include/interface.h → include/class/interface.h

@@ -24,8 +24,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __INTERFACE_H__
-#define __INTERFACE_H__
+#ifndef __CLASS_INTERFACE_H__
+#define __CLASS_INTERFACE_H__
 
 #include <sys/types.h>
 
@@ -54,6 +54,6 @@ typedef struct iface_impl * iface_impl_ptr;
 
 extern iface_ptr interfaceGet(iface_impl_ptr, const iface_ptr);
 
-#endif // __INTERFACE_H__
+#endif // __CLASS_INTERFACE_H__
 
 // vim: set ts=4 sw=4:

include/interface/class.h → include/class/interface/class.h

@@ -23,13 +23,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __INTERFACE_CLASS_H__
-#define __INTERFACE_CLASS_H__
+#ifndef __CLASS_INTERFACE_CLASS_H__
+#define __CLASS_INTERFACE_CLASS_H__
 
 #include <stdarg.h>
 
-#include "class.h"
-#include "interface.h"
+#include "class/class.h"
+#include "class/interface.h"
 
 typedef int  (* fptr_ctor)(void *, va_list *);
 typedef void (* fptr_dtor)(void *);
@@ -52,6 +52,6 @@ extern void * classClone(void *);
 #define delete(object)		classDelete((void **)&(object))
 #define clone(object)		classClone((void *)(object))
 
-#endif // __INTERFACE_CLASS_H__
+#endif // __CLASS_INTERFACE_CLASS_H__
 
 // vim: set ts=4 sw=4:

include/interface/auth.h

@@ -30,7 +30,7 @@
 
 #include <stdarg.h>
 
-#include "interface.h"
+#include "class.h"
 #include "credential.h"
 
 typedef int (* fptr_authenticate)(void *, Credential);

include/interface/hashable.h

@@ -24,7 +24,7 @@
 #ifndef __INTERFACE_HASHABLE_H__
 #define __INTERFACE_HASHABLE_H__
 
-#include "interface.h"
+#include "class.h"
 
 typedef unsigned long (* fptr_hashableGetHash)(void *);
 typedef void          (* fptr_hashableHandleDouble)(void *, void *);

include/interface/logger.h

@@ -26,7 +26,7 @@
 
 #include <stdarg.h>
 
-#include "interface.h"
+#include "class.h"
 #include "logger.h"
 
 typedef void (* fptr_log)(void *, logger_level, const char * const);

src/Makefile.am

@@ -1,8 +1,8 @@
 ACLOCAL_AMFLAGS = -I m4
 
-IFACE   = interface/class.c interface/stream_reader.c interface/logger.c \
+IFACE   = interface/stream_reader.c interface/logger.c \
           interface/stream_writer.c interface/http_intro.c \
-          interface/subject.c interface/observer.c interface.c
+          interface/subject.c interface/observer.c
 SOCKET  = socket.c socket/accept.c socket/connect.c socket/listen.c
 STREAM  = stream.c stream/read.c stream/write.c
 HASH    = hash.c hash/add.c hash/get.c hash/delete.c \
@@ -67,4 +67,6 @@ taskrambler_SOURCES = taskrambler.c \
 			$(WRITER) $(RESP) $(HEADER) $(PARSER) $(WORKER) $(CB) \
 			$(UTILS) $(MSGQ) $(SESSION) $(STREAM) $(HASH) $(AUTH)
 taskrambler_CFLAGS  = -Wall -I ../include/
-taskrambler_LDFLAGS = -lrt -lssl -lldap
+taskrambler_LDFLAGS = -L./class -lclass -lrt -lssl -lldap
+
+SUBDIRS = class

src/auth/ldap.c

@@ -29,7 +29,6 @@
 #include "auth/ldap.h"
 #include "class.h"
 #include "credential.h"
-#include "interface/class.h"
 #include "interface/auth.h"
 
 #include "utils/memory.h"

src/cbuf.c

@@ -34,7 +34,6 @@
 #include <fcntl.h>
 
 #include "class.h"
-#include "interface/class.h"
 #include "utils/memory.h"
 
 #include "cbuf.h"

src/class/Makefile.am

@@ -0,0 +1,8 @@
+ACLOCAL_AMFLAGS = -I m4
+
+AM_CFLAGS = -Wall -I ../include/
+
+noinst_LIBRARIES = libclass.a
+
+libclass_a_SOURCES = interface.c interface/class.c
+libclass_a_CFLAGS  = -Wall -I ../../include/

src/interface.c → src/class/interface.c

@@ -23,7 +23,7 @@
 #include <sys/types.h>
 #include <stdlib.h>
 
-#include "interface.h"
+#include "class/interface.h"
 #include "commons.h"
 
 static

src/interface/class.c → src/class/interface/class.c

@@ -24,8 +24,8 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "class.h"
-#include "interface/class.h"
+#include "class/class.h"
+#include "class/interface/class.h"
 
 const
 struct interface i_Class = {

src/credential.c

@@ -27,7 +27,6 @@
 
 #include "credential.h"
 #include "class.h"
-#include "interface/class.h"
 
 #include "utils/memory.h"
 

src/hash.c

@@ -27,7 +27,6 @@
 
 #include "hash.h"
 #include "class.h"
-#include "interface/class.h"
 
 static
 int

src/hash/add.c

@@ -24,7 +24,7 @@
 
 #include "hash.h"
 #include "interface/hashable.h"
-#include "interface/class.h"
+#include "class.h"
 
 static
 inline

src/hash_value.c

@@ -29,7 +29,7 @@
 #include "utils/hash.h"
 #include "utils/memory.h"
 #include "commons.h"
-#include "interface/class.h"
+#include "class.h"
 #include "interface/hashable.h"
 
 static

src/http/cookie.c

@@ -26,7 +26,7 @@
 #include <sys/types.h>
 
 #include "cookie.h"
-#include "interface/class.h"
+#include "class.h"
 #include "interface/hashable"
 
 #include "utils/hash.h"

src/http/header.c

@@ -25,7 +25,6 @@
 #include <string.h>
 
 #include "class.h"
-#include "interface/class.h"
 #include "http/header.h"
 #include "interface/hashable.h"
 

src/http/message.c

@@ -31,7 +31,6 @@
 #include <unistd.h>
 
 #include "class.h"
-#include "interface/class.h"
 #include "hash.h"
 #include "http/message.h"
 #include "utils/memory.h"

src/http/message/queue.c

@@ -23,7 +23,6 @@
 #include <stdarg.h>
 
 #include "class.h"
-#include "interface/class.h"
 
 #include "http/message/queue.h"
 

src/http/parser.c

@@ -25,7 +25,6 @@
 #include <stdarg.h>
 
 #include "class.h"
-#include "interface/class.h"
 #include "interface/stream_reader.h"
 
 #include "http/parser.h"

src/http/parser/header.c

@@ -25,7 +25,6 @@
 #include <sys/types.h>
 
 #include "class.h"
-#include "interface/class.h"
 #include "http/header.h"
 #include "http/parser.h"
 #include "http/message.h"

src/http/parser/parse.c

@@ -24,7 +24,7 @@
 
 #include "http/parser.h"
 #include "http/header.h"
-#include "interface/class.h"
+#include "class.h"
 #include "interface/http_intro.h"
 #include "cbuf.h"
 #include "stream.h"

src/http/parser/post_vars.c

@@ -27,7 +27,7 @@
 #include "http/request.h"
 #include "hash_value.h"
 #include "hash.h"
-#include "interface/class.h"
+#include "class.h"
 
 /**
  * \todo this is very similar to other pair parsing

src/http/parser/request_vars.c

@@ -28,7 +28,7 @@
 #include "http/request.h"
 #include "hash_value.h"
 #include "hash.h"
-#include "interface/class.h"
+#include "class.h"
 
 void
 httpParserRequestVars(HttpParser this)

src/http/request.c

@@ -26,7 +26,6 @@
 #include <sys/types.h>
 
 #include "class.h"
-#include "interface/class.h"
 #include "interface/http_intro.h"
 
 #include "http/request.h"

src/http/response.c

@@ -27,7 +27,6 @@
 #include <stdio.h>
 
 #include "class.h"
-#include "interface/class.h"
 #include "interface/http_intro.h"
 
 #include "http/response.h"

src/http/response/304.c

@@ -23,7 +23,6 @@
 #include <sys/types.h>
 
 #include "class.h"
-#include "interface/class.h"
 
 #include "http/response.h"
 #include "http/message.h"

src/http/response/403.c

@@ -26,7 +26,6 @@
 #include <sys/types.h>
 
 #include "class.h"
-#include "interface/class.h"
 
 #include "http/response.h"
 #include "http/message.h"

src/http/response/404.c

@@ -26,7 +26,6 @@
 #include <sys/types.h>
 
 #include "class.h"
-#include "interface/class.h"
 
 #include "http/response.h"
 #include "http/message.h"

src/http/response/asset.c

@@ -28,7 +28,6 @@
 #include <sys/types.h>
 
 #include "class.h"
-#include "interface/class.h"
 #include "stream.h"
 
 #include "http/response.h"

src/http/response/login_form.c

@@ -27,7 +27,6 @@
 #include <sys/types.h>
 
 #include "class.h"
-#include "interface/class.h"
 
 #include "http/response.h"
 #include "http/message.h"

src/http/response/randval.c

@@ -27,7 +27,6 @@
 #include <sys/types.h>
 
 #include "class.h"
-#include "interface/class.h"
 
 #include "http/response.h"
 #include "http/message.h"

src/http/response/session.c

@@ -27,7 +27,6 @@
 #include <sys/types.h>
 
 #include "class.h"
-#include "interface/class.h"
 
 #include "http/response.h"
 #include "http/message.h"

src/http/worker.c

@@ -34,7 +34,6 @@
 #include "http/parser.h"
 #include "http/writer.h"
 
-#include "interface/class.h"
 #include "interface/stream_reader.h"
 #include "interface/stream_writer.h"
 

src/http/worker/add_common_header.c

@@ -24,7 +24,6 @@
 #include <sys/types.h>
 
 #include "class.h"
-#include "interface/class.h"
 
 #include "http/message.h"
 #include "http/header.h"

src/http/worker/process.c

@@ -28,7 +28,6 @@
 #include <sys/time.h>
 
 #include "class.h"
-#include "interface/class.h"
 #include "interface/auth.h"
 
 #include "http/worker.h"

src/http/writer.c

@@ -23,7 +23,6 @@
 #include <stdarg.h>
 
 #include "class.h"
-#include "interface/class.h"
 #include "interface/stream_writer.h"
 
 #include "http/message/queue.h"

src/http/writer/write.c

@@ -24,7 +24,6 @@
 #include <sys/stat.h>
 
 #include "class.h"
-#include "interface/class.h"
 #include "http/message.h"
 #include "http/writer.h"
 #include "cbuf.h"

src/logger.c

@@ -23,7 +23,7 @@
 #include <stdarg.h>
 
 #include "logger.h"
-#include "interface/class.h"
+#include "class.h"
 #include "interface/logger.h"
 
 const

src/server.c

@@ -31,7 +31,6 @@
 #include "server.h"
 #include "socket.h"
 #include "logger.h"
-#include "interface/class.h"
 
 #include "utils/memory.h"
 

src/server/close_conn.c

@@ -24,7 +24,7 @@
 #include <string.h>
 
 #include "server.h"
-#include "interface/class.h"
+#include "class.h"
 #include "stream.h"
 
 void

src/server/handle_accept.c

@@ -28,7 +28,7 @@
 
 #include "http/worker.h"
 #include "server.h"
-#include "interface/class.h"
+#include "class.h"
 #include "interface/logger.h"
 #include "stream.h"
 

src/session.c

@@ -29,7 +29,6 @@
 
 #include "session.h"
 #include "class.h"
-#include "interface/class.h"
 
 #include "utils/hash.h"
 #include "utils/memory.h"

src/session/add.c

@@ -23,7 +23,7 @@
 #include <search.h>
 
 #include "session.h"
-#include "interface/class.h"
+#include "class.h"
 
 
 static

src/session/delete.c

@@ -23,7 +23,7 @@
 #include <search.h>
 
 #include "session.h"
-#include "interface/class.h"
+#include "class.h"
 
 
 static

src/socket.c

@@ -26,7 +26,7 @@
 
 #include "socket.h"
 #include "logger.h"
-#include "interface/class.h"
+#include "class.h"
 #include "interface/logger.h"
 
 static

src/socket/accept.c

@@ -24,7 +24,7 @@
 #include <unistd.h>
 
 #include "socket.h"
-#include "interface/class.h"
+#include "class.h"
 #include "interface/logger.h"
 
 Sock

src/socket/connect.c

@@ -24,7 +24,7 @@
 #include <errno.h>      // for errno
 
 #include "socket.h"
-#include "interface/class.h"
+#include "class.h"
 #include "interface/logger.h"
 
 

src/socket/listen.c

@@ -24,7 +24,7 @@
 #include <errno.h>      // for errno
 
 #include "socket.h"
-#include "interface/class.h"
+#include "class.h"
 #include "interface/logger.h"
 
 

src/stream.c

@@ -24,7 +24,6 @@
 #include <openssl/ssl.h>
 
 #include "class.h"
-#include "interface/class.h"
 #include "stream.h"
 
 

src/taskrambler.c

@@ -40,7 +40,7 @@
 #include "http/worker.h"
 #include "auth/ldap.h"
 
-#include "interface/class.h"
+#include "class.h"
 #include "interface/logger.h"
 
 #include "utils/signalHandling.h"

src/utils/http.c

@@ -28,7 +28,7 @@
 #include "http/request.h"
 #include "http/response.h"
 
-#include "interface/class.h"
+#include "class.h"
 
 #include "commons.h"