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

Compile queuemanager.c as C++

Browse Source
This commit is contained in:
Johan Wikman
2017-03-23 22:36:02 +02:00
parent 6acd58e86c
commit 83fd79e280
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/core/CMakeLists.txt
View File

@ -20,7 +20,8 @@ add_library(maxscale-common SHARED
mlist.cc mlist.cc
modutil.cc modutil.cc
monitor.cc monitor.cc
queuemanager.c query_classifier.cc poll.c random_jkiss.c resultset.c router.cc secrets.c server.c service.c session.c spinlock.c thread.c users.c utils.c skygw_utils.cc statistics.c listener.c ssl.c mysql_utils.c mysql_binlog.c modulecmd.c) queuemanager.cc
query_classifier.cc poll.c random_jkiss.c resultset.c router.cc secrets.c server.c service.c session.c spinlock.c thread.c users.c utils.c skygw_utils.cc statistics.c listener.c ssl.c mysql_utils.c mysql_binlog.c modulecmd.c)
if(WITH_JEMALLOC) if(WITH_JEMALLOC)
target_link_libraries(maxscale-common ${JEMALLOC_LIBRARIES}) target_link_libraries(maxscale-common ${JEMALLOC_LIBRARIES})

4
server/core/queuemanager.c → server/core/queuemanager.cc
View File

@ -60,7 +60,7 @@ QUEUE_CONFIG
QUEUE_CONFIG *new_queue = (QUEUE_CONFIG *)MXS_CALLOC(1, sizeof(QUEUE_CONFIG)); QUEUE_CONFIG *new_queue = (QUEUE_CONFIG *)MXS_CALLOC(1, sizeof(QUEUE_CONFIG));
if (new_queue) if (new_queue)
{ {
new_queue->queue_array = MXS_CALLOC(limit + 1, sizeof(QUEUE_ENTRY)); new_queue->queue_array = (QUEUE_ENTRY*)MXS_CALLOC(limit + 1, sizeof(QUEUE_ENTRY));
if (new_queue->queue_array) if (new_queue->queue_array)
{ {
new_queue->queue_limit = limit; new_queue->queue_limit = limit;
@ -226,4 +226,4 @@ static inline int mxs_queue_count(QUEUE_CONFIG *queue_config)
{ {
int count = queue_config->end - queue_config->start; int count = queue_config->end - queue_config->start;
return count < 0 ? (count + queue_config->queue_limit + 1) : count; return count < 0 ? (count + queue_config->queue_limit + 1) : count;
} }