diff --git a/deps/Makefile b/deps/Makefile index 8c93150fb..fc583d5d4 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -1,43 +1,9 @@ -default: memcached libconfig libdaemon jemalloc mariadb_client re2 +default: libconfig libdaemon jemalloc mariadb_client re2 .PHONY: default - -memcached/memcached/libmemcached.a: - cd memcached && rm -rf memcached-1.4.20 - cd memcached && tar -zxf memcached-1.4.20.tar.gz - cd memcached/memcached && patch thread.c ../thread.c.patch - cd memcached/memcached && patch memcached.c ../memcached.c.patch - cd memcached/memcached && ./configure - cd memcached/memcached && sed -i -e 's/-O2 /-O2 -fPIC /' Makefile - cd memcached/memcached && patch Makefile ../Makefile.patch - cd memcached/memcached && make - -memcached: memcached/memcached/libmemcached.a - - -#glib/glib/glib/.libs/libglib-2.0.a: -# cd glib && rm -rf glib-2.40.0 -# cd glib && tar -xf glib-2.40.0.tar.xz -# cd glib/glib && ./configure --enable-static -# cd glib/glib && make -# -#glib: glib/glib/glib/.libs/libglib-2.0.a - - - -#libevent/libevent/.libs/libevent.a: -# cd libevent && rm -rf libevent-2.0.21-stable -# cd libevent && tar -zxf libevent-2.0.21-stable.tar.gz -# cd libevent/libevent && ./configure --disable-malloc-replacement --disable-openssl --disable-debug-mode -# cd libevent/libevent && make -# -#libevent: libevent/libevent/.libs/libevent.a - - - libdaemon/libdaemon/libdaemon/.libs/libdaemon.a: cd libdaemon && rm -rf libdaemon-0.14 cd libdaemon && tar -zxf libdaemon-0.14.tar.gz diff --git a/deps/memcached/COPYING b/deps/memcached/COPYING deleted file mode 100644 index 4746b00c3..000000000 --- a/deps/memcached/COPYING +++ /dev/null @@ -1,30 +0,0 @@ -Copyright (c) 2003, Danga Interactive, Inc. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - - * Neither the name of the Danga Interactive nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/deps/memcached/Makefile.patch b/deps/memcached/Makefile.patch deleted file mode 100644 index 49c0233d7..000000000 --- a/deps/memcached/Makefile.patch +++ /dev/null @@ -1,24 +0,0 @@ -39,40c39,40 -< bin_PROGRAMS = memcached$(EXEEXT) -< noinst_PROGRAMS = memcached-debug$(EXEEXT) sizes$(EXEEXT) \ ---- -> bin_PROGRAMS = libmemcached.a proxymemcached.so -> noinst_PROGRAMS = sizes$(EXEEXT) \ -432,437c432,441 -< memcached$(EXEEXT): $(memcached_OBJECTS) $(memcached_DEPENDENCIES) -< @rm -f memcached$(EXEEXT) -< $(LINK) $(memcached_OBJECTS) $(memcached_LDADD) $(LIBS) -< memcached-debug$(EXEEXT): $(memcached_debug_OBJECTS) $(memcached_debug_DEPENDENCIES) -< @rm -f memcached-debug$(EXEEXT) -< $(memcached_debug_LINK) $(memcached_debug_OBJECTS) $(memcached_debug_LDADD) $(LIBS) ---- -> #memcached$(EXEEXT): $(memcached_OBJECTS) $(memcached_DEPENDENCIES) -> # @rm -f memcached$(EXEEXT) -> # $(LINK) $(memcached_OBJECTS) $(memcached_LDADD) $(LIBS) -> #memcached-debug$(EXEEXT): $(memcached_debug_OBJECTS) $(memcached_debug_DEPENDENCIES) -> # @rm -f memcached-debug$(EXEEXT) -> # $(memcached_debug_LINK) $(memcached_debug_OBJECTS) $(memcached_debug_LDADD) $(LIBS) -> libmemcached.a: $(memcached_OBJECTS) -> ar rcs libmemcached.a $(memcached_OBJECTS) -> proxymemcached.so: $(memcached_OBJECTS) -> $(CC) -shared -fPIC -o $@ $(CFLAGS) $(memcached_OBJECTS) $(LIBS) diff --git a/deps/memcached/memcached b/deps/memcached/memcached deleted file mode 120000 index b82b4b521..000000000 --- a/deps/memcached/memcached +++ /dev/null @@ -1 +0,0 @@ -memcached-1.4.20 \ No newline at end of file diff --git a/deps/memcached/memcached-1.4.20.tar.gz b/deps/memcached/memcached-1.4.20.tar.gz deleted file mode 100644 index 4e7eb4e50..000000000 Binary files a/deps/memcached/memcached-1.4.20.tar.gz and /dev/null differ diff --git a/deps/memcached/memcached.c.patch b/deps/memcached/memcached.c.patch deleted file mode 100644 index 4b409942c..000000000 --- a/deps/memcached/memcached.c.patch +++ /dev/null @@ -1,5 +0,0 @@ -5019c5019,5020 -< int main (int argc, char **argv) { ---- -> int memcached_main (int argc, char **argv); -> int memcached_main (int argc, char **argv) { diff --git a/deps/memcached/thread.c.patch b/deps/memcached/thread.c.patch deleted file mode 100644 index dc6d5df99..000000000 --- a/deps/memcached/thread.c.patch +++ /dev/null @@ -1,4 +0,0 @@ -65c65 -< static pthread_key_t item_lock_type_key; ---- -> __thread pthread_key_t item_lock_type_key; diff --git a/src/main.cpp b/src/main.cpp index b535b7a0c..e41f0d2af 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -34,8 +34,8 @@ create_MySQL_Authentication_t * create_MySQL_Authentication = NULL; create_Query_Processor_t * create_Query_Processor = NULL; create_ProxySQL_Admin_t * create_ProxySQL_Admin = NULL; -void (*__memcached_main)(int,char **); -pthread_t memcached_pthread; +//void (*__memcached_main)(int,char **); +//pthread_t memcached_pthread; @@ -152,7 +152,7 @@ void diagnostic_all() { } } - +/* void * memcached_main_thread(void *arg) { char **argv=(char **)malloc(sizeof(char *)*7); argv[0]=(char *)"proxysql"; @@ -165,6 +165,7 @@ void * memcached_main_thread(void *arg) { // (*__memcached_main)(7,argv); return NULL; } +*/ void * mysql_worker_thread_func(void *arg) { @@ -406,7 +407,7 @@ int main(int argc, const char * argv[]) { dlerror(); char* dlsym_error = NULL; - +/* { void * __memcached = dlopen("../deps/memcached/memcached/proxymemcached.so", RTLD_LAZY); if (!__memcached) { @@ -423,7 +424,7 @@ int main(int argc, const char * argv[]) { pthread_create(&memcached_pthread, NULL, memcached_main_thread , NULL); } } - +*/ create_QC_t* create_QC = NULL;