migrate to Android platform OK!

CMakeLists.txt

@@ -1,11 +1,20 @@
 cmake_minimum_required(VERSION 2.8)
 project(acl)
 message(${CMAKE_SYSTEM_NAME})
+
 #set(CMAKE_BUILD_TYPE Release)
-set(CMAKE_BUILD_TYPE Release CACHE STRING "set build type to release")
-add_subdirectory(lib_protocol/src lib_protocol)
-add_subdirectory(lib_acl/src lib_acl)
-add_subdirectory(lib_acl_cpp/src lib_acl_cpp)
-if (CMAKE_SYSTEM_NAME MATCHES "Linuxxx")
-	add_subdirectory(lib_fiber/src lib_fiber)
+#set(CMAKE_BUILD_TYPE Release CACHE STRING "set build type to release")
+
+if (${CMAKE_BINARY_DIR} STREQUAL ${CMAKE_SOURCE_DIR})
+	message(FATAL_ERROR "Please into another dir to build!")
+endif()
+
+add_subdirectory(lib_acl lib_acl)
+add_subdirectory(lib_protocol lib_protocol)
+add_subdirectory(lib_acl_cpp lib_acl_cpp)
+
+#if (CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "Android")
+if (CMAKE_SYSTEM_NAME MATCHES "Linux")
+	add_subdirectory(lib_fiber/c lib_fiber)
+	add_subdirectory(lib_fiber/cpp lib_fiber_cpp)
 endif()

build/.keepme

@@ -0,0 +1 @@
+keepme

lib_acl/CMakeLists.txt

@@ -0,0 +1,114 @@
+cmake_minimum_required(VERSION 2.8)
+
+#set(CMAKE_BUILD_TYPE Release)
+#set(CMAKE_BUILD_TYPE Release CACHE STRING "set build type to release")
+
+#message(project_dir=${PROJECT_SOURCE_DIR})
+
+if (${CMAKE_BINARY_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
+	message(FATAL_ERROR "Please into another dir to build!")
+endif()
+
+add_definitions(
+	"-W"
+	"-Wall"
+	"-Werror"
+	"-Wshadow"
+	"-Wpointer-arith"
+	"-Waggregate-return"
+	"-Wmissing-prototypes"
+	"-D_REENTRANT"
+	"-D_USE_FAST_MACRO"
+	"-DACL_WRITEABLE_CHECK"
+	"-Wno-long-long"
+	"-Wuninitialized"
+	"-D_POSIX_PTHREAD_SEMANTICS"
+	"-DACL_PREPARE_COMPILE"
+	"-Wno-invalid-source-encoding"
+	"-fPIC"
+	"-Wstrict-prototypes"
+)
+
+if (CMAKE_BUILD_TYPE STREQUAL "")
+	set(CMAKE_BUILD_TYPE "DEBUG")
+else()
+	string(TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE)
+endif()
+
+if (CMAKE_BUILD_TYPE STREQUAL "RELEASE")
+	add_definitions("-O3")
+else()
+	add_definitions("-g")
+endif()
+
+string(TOUPPER ${CMAKE_SYSTEM_NAME} CMAKE_SYSTEM_NAME)
+if(CMAKE_SYSTEM_NAME MATCHES "ANDROID")
+	add_definitions("-DANDROID")
+elseif(CMAKE_SYSTEM_NAME MATCHES "LINUX")
+else()
+	message(FATAL_ERROR "unknown CMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}")
+endif()
+
+##############################################################################
+
+set(src ${CMAKE_CURRENT_SOURCE_DIR}/src)
+
+include_directories(
+	${CMAKE_CURRENT_SOURCE_DIR}
+	${CMAKE_CURRENT_SOURCE_DIR}/include
+)
+
+set(sources
+	${src}/stdlib
+	${src}/stdlib/debug
+	${src}/stdlib/memory
+	${src}/stdlib/filedir
+	${src}/stdlib/string
+	${src}/stdlib/common
+	${src}/stdlib/sys
+	${src}/stdlib/sys/unix
+	${src}/stdlib/configure
+	${src}/stdlib/iostuff
+	${src}/aio
+	${src}/code
+	${src}/db
+	${src}/db/memdb
+	${src}/db/mysql
+	${src}/db/null
+	${src}/db/zdb
+	${src}/event
+	${src}/init
+	${src}/ioctl
+	${src}/json
+	${src}/master
+	${src}/master/framework
+	${src}/master/framework/trigger
+	${src}/master/template
+	${src}/msg
+	${src}/net
+	${src}/net/dns
+	${src}/net/connect
+	${src}/net/listen
+	${src}/private
+	${src}/thread
+	${src}/unit_test
+	${src}/xml
+)
+
+foreach(iter ${sources})
+	aux_source_directory(${iter} lib_src)
+endforeach()
+
+if(NOT CMAKE_SYSTEM_NAME MATCHES "ANDROID")
+	set(lib_output_path ${PROJECT_BINARY_DIR}/lib)
+
+	set(LIBRARY_OUTPUT_PATH ${lib_output_path})
+	add_library(_acl_static STATIC ${lib_src})
+	SET_TARGET_PROPERTIES(_acl_static PROPERTIES OUTPUT_NAME "_acl")
+
+	set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${lib_output_path})
+endif()
+
+add_library(_acl SHARED ${lib_src})
+
+##############################################################################

lib_acl/Makefile

@@ -92,7 +92,8 @@ endif
 
 # For Linux
 ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
-	CFLAGS += -DLINUX2 -fPIC -Werror
+#	CFLAGS += -DLINUX2 -fPIC -Werror
+	CFLAGS += -fPIC -Werror
 	UNIXTYPE = LINUX
 	ifeq ($(findstring i686, $(OSTYPE)), i686)
 		CFLAGS += -march=i686

lib_acl/changes.txt

@@ -1,5 +1,13 @@
 �޸���ʷ�б���
 
+575) 2017.1.31
+575.1) compile: �� Linux/Android ƽ̨�±���ʱ����ͷ�ļ��Զ�ʶ�����ϵͳ���ͣ�
+������ Makefile �ļ���ר��ָ��
+
+574) 2017.1.28--1.29
+574.1) bugfix: acl_dbuf_pool.c ֧�� ARM LINUX���ڲ��ڷ����ڴ�Ƭʱ��Ӧ���� 4
+�ֽڶ���
+
 573) 2016.12.29
 573.1) bugfix: acl_slice.c ���޸��� SLICE1 ��ʽ�����ڴ��һ�� BUG
 

lib_acl/include/stdlib/acl_define_linux.h

@@ -1,15 +1,19 @@
 #ifndef	ACL_DEFINE_LINUX_INCLUDE_H
 #define	ACL_DEFINE_LINUX_INCLUDE_H
 
-#ifdef ACL_ARM_LINUX
-# ifndef LINUX2
-#  define LINUX2
+#if defined(ANDROID)
+# ifndef ACL_ANDROID
+#  define ACL_ANDROID
 # endif
 #endif
 
-#ifdef LINUX2
-# define ACL_LINUX
-# define ACL_UNIX
+#if defined(LINUX2) || defined(ACL_ANDROID) || defined(__linux__)
+# ifndef ACL_LINUX
+#  define ACL_LINUX
+# endif
+# ifndef ACL_UNIX
+#  define ACL_UNIX
+# endif
 
 #include <stddef.h>	/* just for size_t */
 

lib_acl/samples/Makefile.in

@@ -65,7 +65,7 @@ endif
 
 #Path for Linux
 ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
-	CFLAGS += -DLINUX2
+#	CFLAGS += -DLINUX2
 	SYSLIB += -lcrypt -rdynamic
 endif
 

lib_acl/samples/Makefile_cpp.in

@@ -56,7 +56,8 @@ endif
 
 #Path for Linux
 ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
-	CFLAGS += -DLINUX2 -pedantic
+#	CFLAGS += -DLINUX2 -pedantic
+	CFLAGS += -pedantic
 	SYSLIB += -lcrypt
 endif
 

lib_acl/src/event/events_define.h

@@ -24,7 +24,7 @@ extern "C" {
 # define ACL_EVENTS_STYLE_WMSG		6
 #endif
 
-#if	defined(LINUX2) && !defined(MINGW)
+#if	defined(ACL_LINUX) && !defined(MINGW)
 # define	ACL_EVENTS_KERNEL_STYLE	ACL_EVENTS_STYLE_EPOLL
 #elif	defined(SUNOS5)
 # define	ACL_EVENTS_KERNEL_STYLE	ACL_EVENTS_STYLE_DEVPOLL

lib_acl/src/net/dns/acl_netdb.c

@@ -405,7 +405,7 @@ ACL_DNS_DB *acl_gethostbyname(const char *name, int *h_error)
 
 #elif	defined(ACL_UNIX)
 	memset(&h_buf, 0, sizeof(h_buf));
-# if	defined(LINUX2) || defined(ACL_FREEBSD)
+# if	defined(ACL_LINUX) || defined(ACL_FREEBSD)
 	n = gethostbyname_r(name, &h_buf, buf, sizeof(buf), &h_addrp, &errnum);
 	if (n) {
 		if (h_error)
@@ -473,7 +473,7 @@ typedef struct ACL_DNS_ERROR {
 } ACL_DNS_ERROR;
 
 static ACL_DNS_ERROR __dns_errlist[] = {
-#ifdef	LINUX2
+#ifdef	ACL_LINUX
 	{ HOST_NOT_FOUND, "The specified host is unknown" },
 	{ TRY_AGAIN, "A temporary error occurred on an authoritative name server.  Try again later." },
 	{ NO_RECOVERY, "A non-recoverable name server error occurred" },

lib_acl/src/stdlib/acl_mylog.c

@@ -133,7 +133,7 @@ static int open_file_log(const char *filename, const char *logpre)
 #else
 	int   flag = O_RDWR | O_CREAT | O_APPEND;
 #endif
-#ifdef ACL_ARM_LINUX
+#ifdef ACL_ANDROID
 	int   mode = 0644;
 #else
 	int   mode = S_IREAD | S_IWRITE;
@@ -580,7 +580,7 @@ static void file_vsyslog(ACL_LOG *log, const char *info, const char *fmt, va_lis
 		snprintf(tbuf, sizeof(tbuf), "%s %s (pid=%d, tid=%u)(%s): ",
 			fmtstr, log->logpre, (int) getpid(),
 			(unsigned int) acl_pthread_self(), info);
-#elif defined(LINUX2)
+#elif defined(ACL_LINUX)
 		snprintf(tbuf, sizeof(tbuf), "%s %s (pid=%d, tid=%llu)(%s): ",
 			fmtstr, log->logpre, (int) getpid(),
 			(unsigned long long int) acl_pthread_self(), info);
@@ -637,7 +637,7 @@ static void net_vsyslog(ACL_LOG *log, const char *info, const char *fmt, va_list
 		snprintf(tbuf, sizeof(tbuf), " %s (pid=%d, tid=%u)(%s): ",
 			log->logpre, (int) getpid(),
 			(unsigned int) acl_pthread_self(), info);
-#elif defined(LINUX2)
+#elif defined(ACL_LINUX)
 		snprintf(tbuf, sizeof(tbuf), " %s (pid=%d, tid=%llu)(%s): ",
 			log->logpre, (int) getpid(),
 			(unsigned long long int) acl_pthread_self(), info);

lib_acl/src/stdlib/acl_vstream.c

@@ -2362,7 +2362,7 @@ char *acl_vstream_loadfile2(const char *path, ssize_t *size)
 #else
 	int   oflags = O_RDONLY;
 #endif
-#ifdef ACL_ARM_LINUX
+#ifdef ACL_ANDROID
     int   mode = 0644;
 #else
 	int   mode = S_IREAD;

lib_acl/src/stdlib/common/acl_iplink.c

@@ -159,7 +159,7 @@ static char *__sane_inet_ntoa(unsigned int src, char *dst, size_t size)
 /*	in.s_addr = ntohl(src); */
 	in.s_addr = src;
 	bytes = (unsigned char *) ∈
-#ifdef  LINUX2
+#ifdef  ACL_LINUX
 	snprintf (dst, 18, "%d.%d.%d.%d", bytes[3], bytes[2], bytes[1], bytes[0]);
 #elif defined(SUNOS5)
 	snprintf (dst, 18, "%d.%d.%d.%d", bytes[0], bytes[1], bytes[2], bytes[3]);

lib_acl/src/stdlib/common/avl.c

@@ -902,11 +902,8 @@ avl_create(avl_tree_t *tree, int (*compar) (const void *, const void *),
  */
 /* ARGSUSED */
 void
-avl_destroy(avl_tree_t *tree)
+avl_destroy(avl_tree_t *tree acl_unused)
 {
-#ifdef ACL_ARM_LINUX
-	(void) tree;
-#endif
 	ASSERT(tree);
 	ASSERT(tree->avl_numnodes == 0);
 	ASSERT(tree->avl_root == NULL);

lib_acl/src/stdlib/configure/acl_loadcfg.c

@@ -234,7 +234,7 @@ ACL_CFG_PARSER *acl_cfg_parser_load(const char *pathname, const char *delimiter)
 	}
 
 #ifdef ACL_UNIX
-# ifdef ACL_ARM_LINUX
+# ifdef ACL_ANDROID
 	filefd = acl_file_open(pathname, O_RDWR, 0644);
 # else
 	filefd = acl_file_open(pathname, O_RDWR, S_IREAD | S_IWRITE | S_IRGRP);
@@ -565,7 +565,7 @@ int acl_cfg_parser_dump(const ACL_CFG_PARSER *parser,
 	if (parser == NULL || pathname == NULL || *pathname == 0)
 		return (-1);
 #ifdef ACL_UNIX
-# ifdef ACL_ARM_LINUX
+# ifdef ACL_ANDROID
 	filefd = acl_file_open(pathname,
 			O_CREAT | O_TRUNC | O_APPEND | O_WRONLY, 0644);
 # else

lib_acl/src/stdlib/iostuff/acl_open_limit.c

@@ -34,7 +34,7 @@
 
 #include <stdio.h>
 
-#ifdef ACL_ARM_LINUX
+#ifdef ACL_ANDROID
 int acl_open_limit(int limit)
 {
 	/* xxx: just limit to 1024 */
@@ -99,6 +99,6 @@ int acl_open_limit(int limit)
 #endif
 }
 
-#endif /* !ACL_ARM_LINUX */
+#endif /* !ACL_ANDROID */
 #endif /* !ACL_UNIX */
 

lib_acl/src/stdlib/iostuff/acl_read_wait.c

@@ -22,7 +22,7 @@
 #include "stdlib/acl_iostuff.h"
 #include "../../init/init.h"
 
-#if defined(LINUX2) && !defined(MINGW) && defined(USE_EPOLL)
+#if defined(ACL_LINUX) && !defined(MINGW) && defined(USE_EPOLL)
 
 #include "init/acl_init.h"
 #include "thread/acl_pthread.h"

lib_acl/src/stdlib/memory/acl_dbuf_pool.c

@@ -233,7 +233,7 @@ void *acl_dbuf_pool_alloc(ACL_DBUF_POOL *pool, size_t length)
 	void *ptr;
 	ACL_DBUF *dbuf;
 
-	length += length % 4;
+	length += 4 - length % 4;
 
 	if (length > pool->block_size)
 		dbuf = acl_dbuf_alloc(pool, length);