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

Cache compiled as C++

Browse Source 
Cache compiled as C++ in order to allow the use of standard
C++ data structures.
This commit is contained in:
Johan Wikman
2016-11-23 15:48:33 +02:00
parent e31afa28e4
commit ff405a4f5f
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/filter/cache/CMakeLists.txt vendored
View File

@ -1,5 +1,5 @@
if (JANSSON_FOUND) if (JANSSON_FOUND)
add_library(cache SHARED cache.c rules.c storage.c) add_library(cache SHARED cache.cc rules.c storage.c)
target_link_libraries(cache maxscale-common jansson) target_link_libraries(cache maxscale-common jansson)
set_target_properties(cache PROPERTIES VERSION "1.0.0") set_target_properties(cache PROPERTIES VERSION "1.0.0")
set_target_properties(cache PROPERTIES LINK_FLAGS -Wl,-z,defs) set_target_properties(cache PROPERTIES LINK_FLAGS -Wl,-z,defs)

14
server/modules/filter/cache/cache.c → server/modules/filter/cache/cache.cc vendored
View File

@ -51,7 +51,7 @@ MODULE_INFO info =
"A caching filter that is capable of caching and returning cached data." "A caching filter that is capable of caching and returning cached data."
}; };
char *version() extern "C" char *version()
{ {
return VERSION_STRING; return VERSION_STRING;
} }
@ -60,7 +60,7 @@ char *version()
* The module initialization functions, called when the module has * The module initialization functions, called when the module has
* been loaded. * been loaded.
*/ */
void ModuleInit() extern "C" void ModuleInit()
{ {
} }
@ -69,7 +69,7 @@ void ModuleInit()
* *
* @return The module object. * @return The module object.
*/ */
FILTER_OBJECT *GetModuleObject() extern "C" FILTER_OBJECT *GetModuleObject()
{ {
static FILTER_OBJECT object = static FILTER_OBJECT object =
{ {
@ -263,7 +263,7 @@ static FILTER *createInstance(const char *name, char **options, FILTER_PARAMETER
if (rules) if (rules)
{ {
cinstance = MXS_CALLOC(1, sizeof(CACHE_INSTANCE)); cinstance = (CACHE_INSTANCE*)MXS_CALLOC(1, sizeof(CACHE_INSTANCE));
HASHTABLE* pending = hashtable_alloc(CACHE_PENDING_ITEMS, hashfn, hashcmp); HASHTABLE* pending = hashtable_alloc(CACHE_PENDING_ITEMS, hashfn, hashcmp);
if (cinstance && pending) if (cinstance && pending)
@ -405,7 +405,7 @@ static int routeQuery(FILTER *instance, void *sdata, GWBUF *packet)
CACHE_INSTANCE *cinstance = (CACHE_INSTANCE*)instance; CACHE_INSTANCE *cinstance = (CACHE_INSTANCE*)instance;
CACHE_SESSION_DATA *csdata = (CACHE_SESSION_DATA*)sdata; CACHE_SESSION_DATA *csdata = (CACHE_SESSION_DATA*)sdata;
uint8_t *data = GWBUF_DATA(packet); uint8_t *data = (uint8_t*)GWBUF_DATA(packet);
// All of these should be guaranteed by RCAP_TYPE_TRANSACTION_TRACKING // All of these should be guaranteed by RCAP_TYPE_TRANSACTION_TRACKING
ss_dassert(GWBUF_IS_CONTIGUOUS(packet)); ss_dassert(GWBUF_IS_CONTIGUOUS(packet));
@ -425,7 +425,7 @@ static int routeQuery(FILTER *instance, void *sdata, GWBUF *packet)
{ {
ss_dassert(!csdata->use_db); ss_dassert(!csdata->use_db);
size_t len = MYSQL_GET_PACKET_LEN(data) - 1; // Remove the command byte. size_t len = MYSQL_GET_PACKET_LEN(data) - 1; // Remove the command byte.
csdata->use_db = MXS_MALLOC(len + 1); csdata->use_db = (char*)MXS_MALLOC(len + 1);
if (csdata->use_db) if (csdata->use_db)
{ {
@ -1087,7 +1087,7 @@ static bool process_params(char **options, FILTER_PARAMETER **params, CACHE_CONF
const char *datadir = get_datadir(); const char *datadir = get_datadir();
size_t len = strlen(datadir) + 1 + strlen(param->value) + 1; size_t len = strlen(datadir) + 1 + strlen(param->value) + 1;
char *rules = MXS_MALLOC(len); char *rules = (char*)MXS_MALLOC(len);
if (rules) if (rules)
{ {