Merge pull request #2 from shlomos/multi-trigger

Support for multiple event triggers

examples/main.c

@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <unistd.h>
+#include <signal.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdbool.h>
@@ -19,7 +20,7 @@ struct callback_data {
 /*
 * An example black-box callback
 */
-typedef void (*bb_callback_t)(void*, int);
+typedef int (*bb_callback_t)(void*, int);
 
 /*
 * An example loop you cannot change, must use its API
@@ -35,39 +36,54 @@ void black_box_loop(int initial, bb_callback_t cb, void* priv)
 	}
 }
 
-void callback(void* priv, int current)
+int callback(void* priv, int current)
 {
 	struct callback_data cdata = {.current = current};
 	struct callback_args *cargs = (struct callback_args*)priv;
 
-	hooked_callback(cargs->trigger, priv, (void*)&cdata);
+	return handle_callback(cargs->trigger, "default", priv, (void*)&cdata);
 }
 
-void my_loop(void* args)
+int my_loop(void* args)
 {
 	struct callback_args *cargs = (struct callback_args*)args;
 
 	black_box_loop(cargs->initial, callback, args);
+	return 0;
 }
 
-void my_callback(void* args, void* data)
+int my_callback(void* args, void* data)
 {
 	struct callback_args *cargs = (struct callback_args*)args;
 	struct callback_data *cdata = (struct callback_data*)data;
 
 	printf("The number is: %d. We started from: %d\n", cdata->current, cargs->initial);
+	return 0;
+}
+
+void clean_exit(int sig)
+{
+	exit(0);
 }
 
 int main(int argc, char **argv)
 {
+	int ret = -1;
 	struct trigger trigger;
 	struct callback_args cargs = {.initial = 10, .trigger = &trigger};
 
-	if (argc > 1){
-		strncpy(trigger.plugins_dir, argv[1], PATH_MAX);
+	if (init_trigger(&trigger, argc > 1 ? argv[1] : "")) {
+		goto error_init;
+	}
+	if (register_callback(&trigger, "default", my_callback)) {
+		goto error_register_default;
 	}
-	register_callback(&trigger, my_callback);
 	register_loop(&trigger, my_loop);
-	run_trigger(&trigger, (void*)&cargs);
-	return 0;
+	signal(SIGINT, clean_exit);
+	ret = run_trigger(&trigger, (void*)&cargs);
+
+error_register_default:
+	destory_trigger(&trigger);
+error_init:
+	return ret;
 }

examples/plugins/foo.c

@@ -16,26 +16,29 @@ int exit_hook(void* args)
 	return 0;
 }
 
-int pre_hook(void* args, void* data)
+int pre_default_hook(void* args, void* data)
 {
 	struct callback_data *cdata = (struct callback_data*)data;
 
 	printf("pre_foo_%d\n", cdata->current);
 	return 0;
 }
 
-int post_hook(void* args, void* data)
+int post_default_hook(void* args, void* data)
 {
 	struct callback_data *cdata = (struct callback_data*)data;
 
 	printf("post_foo_%d\n", cdata->current);
 	return 0;
 }
 
-struct plugin trigger_plugin_hooks = {
+struct general_hook ptrig_hooks = {
 	.name = "foo",
 	.init_hook = init_hook,
-	.exit_hook = exit_hook,
-	.pre_hook = pre_hook,
-	.post_hook = post_hook
+	.exit_hook = exit_hook
+};
+
+struct module_hook ptrig_default_hooks = { 
+	.pre_hook = pre_default_hook,
+	.post_hook = post_default_hook
 };

examples/plugins/hello.c

@@ -1,5 +1,9 @@
 #include "plugin_manager.h"
 
+struct callback_data {
+	int current;
+};
+
 int init_hook(void* args)
 {
 	printf("hello\n");
@@ -12,25 +16,29 @@ int exit_hook(void* args)
 	return 0;
 }
 
-int pre_hook(u_char* args, int num)
+int pre_default_hook(void* args, void* data)
 {
-	printf("pre_hello_%d\n", num);
-	if (num >= 15){
-		return 1;
-	}
+	struct callback_data *cdata = (struct callback_data*)data;
+
+	printf("pre_hello_%d\n", cdata->current);
 	return 0;
 }
 
-int post_hook(u_char* args, int num)
+int post_default_hook(void* args, void* data)
 {
-	printf("post_hello_%d\n", num);
+	struct callback_data *cdata = (struct callback_data*)data;
+
+	printf("post_hello_%d\n", cdata->current);
 	return 0;
 }
 
-struct plugin trigger_plugin_hooks ={
+struct general_hook ptrig_hooks = {
 	.name = "hello",
 	.init_hook = init_hook,
-	.exit_hook = exit_hook,
-	.pre_hook = pre_hook,
-	.post_hook = post_hook
+	.exit_hook = exit_hook
+};
+
+struct module_hook ptrig_default_hooks = { 
+	.pre_hook = pre_default_hook,
+	.post_hook = post_default_hook
 };

list.h

@@ -1,75 +1,117 @@
-#ifndef _LINUX_LIST_H
-#define _LINUX_LIST_H
-
-#include <stdio.h>
-
-#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
-
-/**
- * container_of - cast a member of a structure out to the containing structure
- * @ptr:	the pointer to the member.
- * @type:	the type of the container struct this is embedded in.
- * @member:	the name of the member within the struct.
- *
- */
-#define container_of(ptr, type, member) ({			\
-	const typeof( ((type *)0)->member ) *__mptr = (ptr);	\
-	(type *)( (char *)__mptr - offsetof(type,member) );})
-
-/**
- * list_entry - get the struct for this entry
- * @ptr:	the &struct list_head pointer.
- * @type:	the type of the struct this is embedded in.
- * @member:	the name of the list_struct within the struct.
- */
-#define list_entry(ptr, type, member) \
-	container_of(ptr, type, member)
-
-struct list_head {
-	struct list_head *next, *prev;
-};
-
-#define LIST_HEAD_INIT(name) { &(name), &(name) }
-
-#define LIST_HEAD(name) \
-	struct list_head name = LIST_HEAD_INIT(name)
-
-static inline void INIT_LIST_HEAD(struct list_head *list)
-{
-	list->next = list;
-	list->prev = list;
-}
-
-#ifndef CONFIG_DEBUG_LIST
-static inline void __list_add(struct list_head *new,
-			      struct list_head *prev,
-			      struct list_head *next)
-{
-	next->prev = new;
-	new->next = next;
-	new->prev = prev;
-	prev->next = new;
-}
-#else
-extern void __list_add(struct list_head *new,
-			      struct list_head *prev,
-			      struct list_head *next);
-#endif
-
-/**
- * list_add - add a new entry
- * @new: new entry to be added
- * @head: list head to add it after
- *
- * Insert a new entry after the specified head.
- * This is good for implementing stacks.
- */
-static inline void list_add(struct list_head *new, struct list_head *head)
-{
-	__list_add(new, head, head->next);
-}
-
-#define list_for_each(pos, head) \
-	for (pos = (head)->next; pos != (head); pos = pos->next)
-
-#endif
+#ifndef _LINUX_LIST_H
+#define _LINUX_LIST_H
+
+#include <stdio.h>
+
+#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
+
+/**
+ * container_of - cast a member of a structure out to the containing structure
+ * @ptr:	the pointer to the member.
+ * @type:	the type of the container struct this is embedded in.
+ * @member:	the name of the member within the struct.
+ *
+ */
+#define container_of(ptr, type, member) ({			\
+	const typeof( ((type *)0)->member ) *__mptr = (ptr);	\
+	(type *)( (char *)__mptr - offsetof(type,member) );})
+
+/**
+ * list_entry - get the struct for this entry
+ * @ptr:	the &struct list_head pointer.
+ * @type:	the type of the struct this is embedded in.
+ * @member:	the name of the list_struct within the struct.
+ */
+#define list_entry(ptr, type, member) \
+	container_of(ptr, type, member)
+
+struct list_head {
+	struct list_head *next, *prev;
+};
+
+#define LIST_HEAD_INIT(name) { &(name), &(name) }
+
+#define LIST_HEAD(name) \
+	struct list_head name = LIST_HEAD_INIT(name)
+
+static inline void INIT_LIST_HEAD(struct list_head *list)
+{
+	list->next = list;
+	list->prev = list;
+}
+
+static inline void __list_add(struct list_head *new,
+			      struct list_head *prev,
+			      struct list_head *next)
+{
+	next->prev = new;
+	new->next = next;
+	new->prev = prev;
+	prev->next = new;
+}
+
+/**
+ * list_add - add a new entry
+ * @new: new entry to be added
+ * @head: list head to add it after
+ *
+ * Insert a new entry after the specified head.
+ * This is good for implementing stacks.
+ */
+static inline void list_add(struct list_head *new, struct list_head *head)
+{
+	__list_add(new, head, head->next);
+}
+
+/**
+ * list_add_tail - add a new entry
+ * @new: new entry to be added
+ * @head: list head to add it before
+ *
+ * Insert a new entry before the specified head.
+ * This is useful for implementing queues.
+ */
+static inline void list_add_tail(struct list_head *new, struct list_head *head)
+{
+	__list_add(new, head->prev, head);
+}
+
+/*
+ * Delete a list entry by making the prev/next entries
+ * point to each other.
+ *
+ * This is only for internal list manipulation where we know
+ * the prev/next entries already!
+ */
+static inline void __list_del(struct list_head * prev, struct list_head * next)
+{
+	next->prev = prev;
+	prev->next = next;
+}
+
+/**
+ * list_del - deletes entry from list.
+ * @entry: the element to delete from the list.
+ * Note: list_empty() on entry does not return true after this, the entry is
+ * in an undefined state.
+ */
+
+static inline void list_del(struct list_head *entry)
+{
+	__list_del(entry->prev, entry->next);
+}
+
+#define list_for_each(pos, head) \
+	for (pos = (head)->next; pos != (head); pos = pos->next)
+
+/**
+ * list_for_each_safe - iterate over a list safe against removal of list entry
+ * @pos:	the &struct list_head to use as a loop cursor.
+ * @n:		another &struct list_head to use as temporary storage
+ * @head:	the head for your list.
+ */
+#define list_for_each_safe(pos, n, head) \
+	for (pos = (head)->next, n = pos->next; pos != (head); \
+		pos = n, n = pos->next)
+
+#endif