Merge branch 'master' into develop

server/core/buffer.c

@@ -298,11 +298,13 @@ int	rval = 0;
 }
 
 /**
- * Trim bytes form the end of a GWBUF structure
+ * Trim bytes form the end of a GWBUF structure. If the
+ * buffer has n_bytes or less then it will be freed and
+ * NULL will be returned.
  *
  * @param buf		The buffer to trim
- * @param nbytes	The number of bytes to trim off
+ * @param n_bytes	The number of bytes to trim off
- * @return 		The buffer chain
+ * @return 		The buffer chain or NULL if buffer has <= n_bytes
  */
 GWBUF *
 gwbuf_trim(GWBUF *buf, unsigned int n_bytes)

server/core/dcb.c

@@ -1706,14 +1706,15 @@ int gw_write(
 /**
  * Add a callback
  *
- * Duplicate registrations are not allowed, therefore an error will be returned if
+ * Duplicate registrations are not allowed, therefore an error will be
- * the specific function, reason and userdata triple are already registered.
+ * returned if the specific function, reason and userdata triple
+ * are already registered.
  * An error will also be returned if the is insufficient memeory available to
  * create the registration.
  *
  * @param dcb		The DCB to add the callback to
  * @param reason	The callback reason
- * @param cb		The callback function to call
+ * @param callback	The callback function to call
  * @param userdata	User data to send in the call
  * @return		Non-zero (true) if the callback was added
  */
@@ -1769,7 +1770,7 @@ int		rval = 1;
  *
  * @param dcb		The DCB to add the callback to
  * @param reason	The callback reason
- * @param cb		The callback function to call
+ * @param callback	The callback function to call
  * @param userdata	User data to send in the call
  * @return		Non-zero (true) if the callback was removed
  */
@@ -1842,7 +1843,7 @@ DCB_CALLBACK	*cb, *nextcb;
 /**
  * Check the passed DCB to ensure it is in the list of allDCBS
  *
- * @param	DCB	The DCB to check
+ * @param	dcb	The DCB to check
  * @return	1 if the DCB is in the list, otherwise 0
  */
 int
@@ -1939,8 +1940,8 @@ void dcb_call_foreach (
  * Null protocol write routine used for cloned dcb's. It merely consumes
  * buffers written on the cloned DCB.
  *
- * @params dcb		The descriptor control block
+ * @param dcb		The descriptor control block
- * @params buf		The buffer beign written
+ * @param buf		The buffer being written
  * @return	Always returns a good write operation result
  */
 static int

server/core/filter.c

@@ -39,8 +39,8 @@
 
 extern int lm_enabled_logfiles_bitmask;
 
-static SPINLOCK	filter_spin = SPINLOCK_INIT;
+static SPINLOCK	filter_spin = SPINLOCK_INIT;	/**< Protects the list of all filters */
-static FILTER_DEF *allFilters = NULL;
+static FILTER_DEF *allFilters = NULL;		/**< The list of all filters */
 
 /**
  * Allocate a new filter within MaxScale
@@ -79,7 +79,7 @@ FILTER_DEF 	*filter;
 /**
  * Deallocate the specified filter
  *
- * @param server	The service to deallocate
+ * @param filter	The filter to deallocate
  * @return	Returns true if the server was freed
  */
 void
@@ -243,7 +243,7 @@ int	i;
 /**
  * Add a router option to a service
  *
- * @param service       The service to add the router option to
+ * @param filter	The filter to add the option to
  * @param option	The option string
  */
 void
@@ -273,7 +273,7 @@ int     i;
 /**
  * Add a router parameter to a service
  *
- * @param service       The service to add the router option to
+ * @param filter	The filter to add the parameter to
  * @param name		The parameter name
  * @param value		The parameter value
  */

server/core/load_utils.c

@@ -281,6 +281,7 @@ MODULES	*mod = registered;
  * @param dlhandle	The handle returned by dlopen
  * @param version	The version string returned by the module
  * @param modobj	The module object
+ * @param mod_info	The module information
  */
 static void
 register_module(const char *module, const char *type, void *dlhandle, char *version, void *modobj, MODULE_INFO *mod_info)

server/core/maxpasswd.c

@@ -34,7 +34,7 @@
  * Encrypt a password for storing in the MaxScale.cnf file
  *
  * @param argc	Argument count
- * @param arv	Argument vector
+ * @param argv	Argument vector
  */
 int
 main(int argc, char **argv)

server/core/monitor.c

@@ -208,6 +208,7 @@ MONITOR	*ptr;
  * Show a single monitor
  *
  * @param dcb		DCB for printing output
+ * @param monitor	The monitor to print information regarding
  */
 void
 monitorShow(DCB *dcb, MONITOR *monitor)
@@ -303,7 +304,7 @@ monitorSetInterval (MONITOR *mon, unsigned long interval)
  * Enable Replication Heartbeat support in monitor.
  *
  * @param mon		The monitor instance
- * @param interval	The sampling interval in milliseconds
+ * @param replication_heartbeat	The replication heartbeat
  */
 void
 monitorSetReplicationHeartbeat(MONITOR *mon, int replication_heartbeat)

server/core/server.c

@@ -148,8 +148,7 @@ server_set_unique_name(SERVER *server, char *name)
  * Find an existing server using the unique section name in
  * configuration file
  *
- * @param	servname	The Server name or address
+ * @param	name	The Server name defined in the header file
- * @param	port		The server port
  * @return	The server or NULL if not found
  */
 SERVER *

server/core/test/makefile

@@ -10,6 +10,19 @@ include ../../../test.inc
 CC=cc
 TESTLOG := $(shell pwd)/testhash.log
 
+LOGPATH := $(ROOT_PATH)/log_manager
+UTILSPATH := $(ROOT_PATH)/utils
+
+LDFLAGS=-rdynamic -L$(LOGPATH) \
+	-Wl,-rpath,$(DEST)/lib \
+	-Wl,-rpath,$(LOGPATH) -Wl,-rpath,$(UTILSPATH) \
+	-Wl,-rpath,$(EMBEDDED_LIB)
+
+LIBS= -lz -lm -lcrypt -lcrypto -ldl -laio -lrt -pthread -llog_manager \
+	-L../../inih/extra -linih -lssl -lstdc++ 
+
+TESTS=testhash testspinlock testfilter
+
 cleantests:
 	- $(DEL) *.o 
 	- $(DEL) testhash
@@ -20,23 +33,33 @@ testall:
 	$(MAKE) DEBUG=Y buildtests
 	$(MAKE) runtests
 
-buildtests : 
+buildtests : $(TESTS)
+
+testhash: testhash.c 
 	$(CC) $(CFLAGS) \
 	-I$(ROOT_PATH)/server/include \
 	-I$(ROOT_PATH)/utils \
 	testhash.c ../hashtable.o ../atomic.o ../spinlock.o -o testhash
+testspinlock: testspinlock.c 
+	$(CC) $(CFLAGS) \
+	-I$(ROOT_PATH)/server/include \
+	-I$(ROOT_PATH)/utils \
+	testspinlock.c ../spinlock.o ../atomic.o ../thread.o -o testspinlock
+testfilter: testfilter.c  libcore.a
+	$(CC) $(CFLAGS) $(LDFLAGS) \
+	-I$(ROOT_PATH)/server/include \
+	-I$(ROOT_PATH)/utils \
+	testfilter.c libcore.a $(UTILSPATH)/skygw_utils.o $(LIBS) -o testfilter
 
-runtests:
+libcore.a: ../*.o
+	ar rv libcore.a ../*.o
+
+runtests: $(TESTS)
 	@echo ""				>  $(TESTLOG)
 	@echo "-------------------------------"	>> $(TESTLOG)
 	@echo $(shell date)			>> $(TESTLOG)
 	@echo "Test MaxScale core"		>> $(TESTLOG)
 	@echo "-------------------------------"	>> $(TESTLOG)
-	@ -./testhash 	 			2>> $(TESTLOG)
+	$(foreach var,$(TESTS),./runtest.sh $(var) $(TESTLOG);)
-ifeq ($?,0)
-	@echo "MaxScale core PASSED"		>> $(TESTLOG)
-else
-	@echo "MaxScale core FAILED" 		>> $(TESTLOG)
-endif
 	@echo ""				>> $(TESTLOG)
 	@cat $(TESTLOG)				>> $(TEST_MAXSCALE_LOG)

server/core/test/runtest.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+test=$1
+log=$2
+echo Running test $test					>> $log
+./$test						       2>> $log
+if [ $? -ne 0 ]; then
+	echo $test "		" FAILED		>> $log
+else
+	echo $test "		" PASSED		>> $log
+fi

server/core/test/testfilter.c

@@ -0,0 +1,153 @@
+/*
+ * This file is distributed as part of MaxScale.  It 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,
+ * version 2.
+ *
+ * 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, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Copyright SkySQL Ab 2014
+ */
+
+/**
+ *
+ * @verbatim
+ * Revision History
+ *
+ * Date		Who			Description
+ * 19-08-2014	Mark Riddoch		Initial implementation
+ *
+ * @endverbatim
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <filter.h>
+
+
+/**
+ * test1 	Filter creation, finding and deletion
+ *
+ */
+static int
+test1()
+{
+FILTER_DEF	*f1, *f2;
+
+	if ((f1 = filter_alloc("test1", "module")) == NULL)
+	{
+		fprintf(stderr, "filter_alloc: test 1 failed.\n");
+		return 1;
+	}
+	if ((f2 = filter_find("test1")) == NULL)
+	{
+		fprintf(stderr, "filter_find: test 2 failed.\n");
+		return 1;
+	}
+	filter_free(f1);
+	if ((f2 = filter_find("test1")) != NULL)
+	{
+		fprintf(stderr, "filter_find: test 3 failed delete.\n");
+		return 1;
+	}
+
+	return 0;
+}
+
+
+/**
+ * Passive tests for filter_add_option and filter_add_parameter
+ *
+ * These tests add options and parameters to a filter, the only failure
+ * is related hard crashes, such as SIGSEGV etc. as there are no good hooks
+ * to check the creation of parameters and options currently.
+ */
+static int
+test2()
+{
+FILTER_DEF	*f1;
+
+	if ((f1 = filter_alloc("test1", "module")) == NULL)
+	{
+		fprintf(stderr, "filter_alloc: test 1 failed.\n");
+		return 1;
+	}
+	filterAddOption(f1, "option1");
+	filterAddOption(f1, "option2");
+	filterAddOption(f1, "option3");
+	filterAddParameter(f1, "name1", "value1");
+	filterAddParameter(f1, "name2", "value2");
+	filterAddParameter(f1, "name3", "value3");
+	return 0;
+}
+
+
+/**
+ * test3 	Filter creation, finding and deletion soak test
+ *
+ */
+static int
+test3()
+{
+FILTER_DEF	*f1;
+char		name[40];
+int		i, n_filters = 1000;
+
+	for (i = 0; i < n_filters; i++)
+	{
+		sprintf(name, "filter%d", i);
+		if ((f1 = filter_alloc(name, "module")) == NULL)
+		{
+			fprintf(stderr,
+				"filter_alloc: test 3 failed with %s.\n", name);
+			return 1;
+		}
+	}
+	for (i = 0; i < n_filters; i++)
+	{
+		sprintf(name, "filter%d", i);
+		if ((f1 = filter_find(name)) == NULL)
+		{
+			fprintf(stderr, "filter_find: test 3 failed.\n");
+			return 1;
+		}
+	}
+	for (i = 0; i < n_filters; i++)
+	{
+		sprintf(name, "filter%d", i);
+		if ((f1 = filter_find(name)) == NULL)
+		{
+			fprintf(stderr, "filter_find: test 3 failed.\n");
+			return 1;
+		}
+		filter_free(f1);
+		if ((f1 = filter_find(name)) != NULL)
+		{
+			fprintf(stderr,
+			"filter_find: test 3 failed - found deleted filter.\n");
+			return 1;
+		}
+	}
+
+	return 0;
+}
+main(int argc, char **argv)
+{
+int	result = 0;
+
+	result += test1();
+	result += test2();
+	result += test3();
+
+	exit(result);
+}
+

server/core/test/testspinlock.c

@@ -0,0 +1,132 @@
+/*
+ * This file is distributed as part of MaxScale.  It 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,
+ * version 2.
+ *
+ * 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, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Copyright SkySQL Ab 2014
+ */
+
+/**
+ *
+ * @verbatim
+ * Revision History
+ *
+ * Date		Who			Description
+ * 18/08-2014	Mark Riddoch		Initial implementation
+ *
+ * @endverbatim
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <spinlock.h>
+#include <thread.h>
+
+
+/**
+ * test1	spinlock_acquire_nowait tests
+ *
+ * Test that spinlock_acquire_nowait returns false if the spinlock
+ * is already taken.
+ *
+ * Test that spinlock_acquire_nowait returns true if the spinlock
+ * is not taken.
+ *
+ * Test that spinlock_acquire_nowait does hold the spinlock.
+ */
+static int
+test1()
+{
+SPINLOCK	lck;
+
+	spinlock_init(&lck);
+	spinlock_acquire(&lck);
+	if (spinlock_acquire_nowait(&lck))
+	{
+		fprintf(stderr, "spinlock_acquire_nowait: test 1 failed.\n");
+		return 1;
+	}
+	spinlock_release(&lck);
+	if (!spinlock_acquire_nowait(&lck))
+	{
+		fprintf(stderr, "spinlock_acquire_nowait: test 2 failed.\n");
+		return 1;
+	}
+	if (spinlock_acquire_nowait(&lck))
+	{
+		fprintf(stderr, "spinlock_acquire_nowait: test 3 failed.\n");
+		return 1;
+	}
+	spinlock_release(&lck);
+
+	return 0;
+}
+
+static int acquire_time;
+
+static void
+test2_helper(void *data)
+{
+SPINLOCK   *lck = (SPINLOCK *)data;
+unsigned long	t1 = time(0);
+
+	spinlock_acquire(lck);
+	acquire_time = time(0) - t1;
+	spinlock_release(lck);
+	return;
+}
+
+/**
+ * Check that spinlock correctly blocks another thread whilst the spinlock
+ * is held.
+ *
+ * Take out a lock.
+ * Start a second thread to take the same lock
+ * sleep for 10 seconds
+ * release lock
+ * verify that second thread took at least 8 seconds to obtain the lock
+ */
+static int
+test2()
+{
+SPINLOCK	lck;
+void		*handle;
+
+	acquire_time = 0;
+	spinlock_init(&lck);
+	spinlock_acquire(&lck);
+	handle = thread_start(test2_helper, (void *)&lck);
+	sleep(10);
+	spinlock_release(&lck);
+	thread_wait(handle);
+
+	if (acquire_time < 8)
+	{
+		fprintf(stderr, "spinlock: test 1 failed.\n");
+		return 1;
+	}
+	return 0;
+}
+
+main(int argc, char **argv)
+{
+int	result = 0;
+
+	result += test1();
+	result += test2();
+
+	exit(result);
+}
+

server/core/utils.c

@@ -204,7 +204,7 @@ void gw_sha1_2_str(const uint8_t *in, int in_len, const uint8_t *in2, int in2_le
 
 
 /** 
- * @node Gets errno corresponding to latest socket error 
+ * node Gets errno corresponding to latest socket error 
  *
  * Parameters:
  * @param fd - in, use

server/include/filter.h

@@ -61,7 +61,7 @@ typedef struct {
  *				filter pipline
  * 	routeQuery		Called on each query that requires
  * 				routing
- *	clientReply
+ *	clientReply		Called for each reply packet
  * 	diagnostics		Called to force the filter to print
  * 				diagnostic output
  *
@@ -88,21 +88,21 @@ typedef struct filter_object {
  */
 #define FILTER_VERSION	{1, 1, 0}
 /**
- * The definition of a filter form the configuration file.
+ * The definition of a filter from the configuration file.
  * This is basically the link between a plugin to load and the
  * optons to pass to that plugin.
  */
 typedef struct filter_def {
-	char		*name;		/*< The Filter name */
+	char		*name;		/**< The Filter name */
-	char		*module;	/*< The module to load */
+	char		*module;	/**< The module to load */
-	char		**options;	/*< The options set for this filter */
+	char		**options;	/**< The options set for this filter */
 	FILTER_PARAMETER
-			**parameters;	/*< The filter parameters */
+			**parameters;	/**< The filter parameters */
-	FILTER		filter;
+	FILTER		filter;		/**< The runtime filter */
-	FILTER_OBJECT	*obj;
+	FILTER_OBJECT	*obj;		/**< The "MODULE_OBJECT" for the filter */
-	SPINLOCK	spin;
+	SPINLOCK	spin;		/**< Spinlock to protect the filter definition */
 	struct	filter_def
-			*next;		/*< Next filter in the chain of all filters */
+			*next;		/**< Next filter in the chain of all filters */
 } FILTER_DEF;
 
 FILTER_DEF	*filter_alloc(char *, char *);

server/modules/filter/qlafilter.c

@@ -17,6 +17,9 @@
  */
 
 /**
+ * @file qlafilter.c - Quary Log All Filter
+ * @verbatim
+ *
  * QLA Filter - Query Log All. A primitive query logging filter, simply
  * used to verify the filter mechanism for downstream filters. All queries
  * that are passed through the filter will be written to file.
@@ -33,6 +36,7 @@
  * 11/06/2014	Mark Riddoch	Addition of source and match parameters
  * 19/06/2014	Mark Riddoch	Addition of user parameter
  *
+ * @endverbatim
  */
 #include <stdio.h>
 #include <fcntl.h>
@@ -154,6 +158,7 @@ GetModuleObject()
  * within MaxScale.
  * 
  * @param options	The options for this filter
+ * @param params	The array of name/value pair parameters for the filter
  *
  * @return The instance data for this new instance
  */

server/modules/filter/regexfilter.c

@@ -27,7 +27,8 @@
 extern int lm_enabled_logfiles_bitmask; 
 
 /**
- * regexfilter.c - a very simple regular expression rewrite filter.
+ * @file regexfilter.c - a very simple regular expression rewrite filter.
+ * @verbatim
  *
  * A simple regular expression query rewrite filter.
  * Two parameters should be defined in the filter configuration
@@ -39,6 +40,7 @@ extern int lm_enabled_logfiles_bitmask;
  *
  * Date		Who		Description
  * 19/06/2014	Mark Riddoch	Addition of source and user parameters
+ * @endverbatim
  */
 
 MODULE_INFO 	info = {
@@ -132,6 +134,7 @@ GetModuleObject()
  * within MaxScale.
  * 
  * @param options	The options for this filter
+ * @param params	The array of name/value pair parameters for the filter
  *
  * @return The instance data for this new instance
  */

server/modules/filter/tee.c

@@ -18,6 +18,7 @@
 
 /**
  * @file tee.c	A filter that splits the processing pipeline in two
+ * @verbatim
  *
  * Conditionally duplicate requests and send the duplicates to another service
  * within MaxScale.
@@ -41,6 +42,7 @@
  * 20/06/2014	Mark Riddoch	Initial implementation
  * 24/06/2014	Mark Riddoch	Addition of support for multi-packet queries
  *
+ * @endverbatim
  */
 #include <stdio.h>
 #include <fcntl.h>
@@ -162,6 +164,7 @@ GetModuleObject()
  * within MaxScale.
  * 
  * @param options	The options for this filter
+ * @param params	The array of name/value pair parameters for the filter
  *
  * @return The instance data for this new instance
  */

server/modules/filter/testfilter.c

@@ -21,13 +21,15 @@
 #include <modutil.h>
 
 /**
- * testfilter.c - a very simple test filter.
+ * @file testfilter.c - a very simple test filter.
+ * @verbatim
  *
  * This filter is a very simple example used to test the filter API,
  * it merely counts the number of statements that flow through the
  * filter pipeline.
  *
  * Reporting is done via the diagnostics print routine.
+ * @endverbatim
  */
 
 MODULE_INFO 	info = {
@@ -114,6 +116,7 @@ GetModuleObject()
  * within MaxScale.
  * 
  * @param options	The options for this filter
+ * @param params	The array of name/value pair parameters for the filter
  *
  * @return The instance data for this new instance
  */

server/modules/filter/topfilter.c

@@ -17,6 +17,9 @@
  */
 
 /**
+ * @file topfilter.c - Top N Longest Running Queries
+ * @verbatim
+ *
  * TOPN Filter - Query Log All. A primitive query logging filter, simply
  * used to verify the filter mechanism for downstream filters. All queries
  * that are passed through the filter will be written to file.
@@ -30,6 +33,8 @@
  *
  * Date		Who		Description
  * 18/06/2014	Mark Riddoch	Addition of source and user filters
+ *
+ * @endverbatim
  */
 #include <stdio.h>
 #include <fcntl.h>
@@ -172,6 +177,7 @@ GetModuleObject()
  * within MaxScale.
  * 
  * @param options	The options for this filter
+ * @param params	The array of name/value pair parameters for the filter
  *
  * @return The instance data for this new instance
  */