hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Mark Riddoch
2014-08-20 11:07:55 +01:00
parent 34f6884920 24e16e97ed
commit baa655182c
18 changed files with 385 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/core/buffer.c
View File

@ -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
* @return The buffer chain
* @param n_bytes The number of bytes to trim off
* @return The buffer chain or NULL if buffer has <= n_bytes
*/
GWBUF *
gwbuf_trim(GWBUF *buf, unsigned int n_bytes)

15
server/core/dcb.c
View File

@ -1706,14 +1706,15 @@ int gw_write(
/**
* Add a callback
*
* Duplicate registrations are not allowed, therefore an error will be returned if
* the specific function, reason and userdata triple are already registered.
* Duplicate registrations are not allowed, therefore an error will be
* 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
* @params buf The buffer beign written
* @param dcb The descriptor control block
* @param buf The buffer being written
* @return Always returns a good write operation result
*/
static int

12
server/core/filter.c
View File

@ -39,8 +39,8 @@
extern int lm_enabled_logfiles_bitmask;
static SPINLOCK filter_spin = SPINLOCK_INIT;
static FILTER_DEF *allFilters = NULL;
static SPINLOCK filter_spin = SPINLOCK_INIT; /**< Protects the list of all filters */
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,8 +243,8 @@ int i;
/**
* Add a router option to a service
*
* @param service The service to add the router option to
* @param option The option string
* @param filter The filter to add the option to
* @param option The option string
*/
void
filterAddOption(FILTER_DEF *filter, char *option)
@ -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
*/

1
server/core/load_utils.c
View File

@ -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)

2
server/core/maxpasswd.c
View File

@ -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)

5
server/core/monitor.c
View File

@ -207,7 +207,8 @@ MONITOR *ptr;
/**
* Show a single monitor
*
* @param dcb DCB for printing output
* @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)

3
server/core/server.c
View File

@ -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 port The server port
* @param name The Server name defined in the header file
* @return The server or NULL if not found
*/
SERVER *

41
server/core/test/makefile
View File

@ -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)
ifeq ($?,0)
@echo "MaxScale core PASSED" >> $(TESTLOG)
else
@echo "MaxScale core FAILED" >> $(TESTLOG)
endif
$(foreach var,$(TESTS),./runtest.sh $(var) $(TESTLOG);)
@echo "" >> $(TESTLOG)
@cat $(TESTLOG) >> $(TEST_MAXSCALE_LOG)
@cat $(TESTLOG) >> $(TEST_MAXSCALE_LOG)

10
server/core/test/runtest.sh Executable file
View File

@ -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

153
server/core/test/testfilter.c Normal file
View File

@ -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);
}

132
server/core/test/testspinlock.c Normal file
View File

@ -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);
}

2
server/core/utils.c
View File

@ -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