test/acl
1
0
Fork 0
mirror of https://gitee.com/acl-dev/acl.git synced 2024-11-29 18:37:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge https://github.com/acl-dev/acl into HEAD

Browse Source
This commit is contained in:
郑树新 2019-09-06 13:36:34 +08:00
commit 3df62914b6
9 changed files with 29 additions and 312 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

291
android/acl/acl.iml
View File

@ -1,291 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="acl" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
<option name="GRADLE_PROJECT_PATH" value=":" />
<option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.3.1" />
<option name="LAST_KNOWN_AGP_VERSION" value="3.3.1" />
</configuration>
</facet>
<facet type="native-android-gradle" name="Native-Android-Gradle">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="debug-x86" />
</configuration>
</facet>
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="debug" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
<afterSyncTasks>
<task>generateDebugSources</task>
</afterSyncTasks>
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/rs/debug;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
<option name="PROJECT_TYPE" value="1" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
<output url="file://$MODULE_DIR$/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
<output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/.cxx" />
<excludeFolder url="file://$MODULE_DIR$/.externalNativeBuild" />
<excludeFolder url="file://$MODULE_DIR$/build" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl/src">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl/src" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl/src/aio">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl/src/aio" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl/src/code">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl/src/code" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl/src/db">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl/src/db" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl/src/db/memdb">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl/src/db/memdb" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl/src/db/mysql">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl/src/db/mysql" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl/src/db/null">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl/src/db/null" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl/src/db/zdb">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl/src/db/zdb" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl/src/event">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl/src/event" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl/src/init">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl/src/init" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl/src/ioctl">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl/src/ioctl" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl/src/json">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl/src/json" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl/src/master">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl/src/master" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl/src/master/template">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl/src/master/template" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl/src/msg">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl/src/msg" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl/src/net">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl/src/net" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl/src/net/connect">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl/src/net/connect" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl/src/net/dns">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl/src/net/dns" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl/src/net/listen">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl/src/net/listen" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl/src/private">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl/src/private" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl/src/stdlib">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl/src/stdlib" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl/src/stdlib/common">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl/src/stdlib/common" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl/src/stdlib/configure">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl/src/stdlib/configure" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl/src/stdlib/debug">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl/src/stdlib/debug" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl/src/stdlib/filedir">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl/src/stdlib/filedir" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl/src/stdlib/iostuff">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl/src/stdlib/iostuff" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl/src/stdlib/memory">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl/src/stdlib/memory" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl/src/stdlib/string">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl/src/stdlib/string" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl/src/stdlib/sys">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl/src/stdlib/sys" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl/src/stdlib/sys/unix">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl/src/stdlib/sys/unix" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl/src/thread">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl/src/thread" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl/src/unit_test">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl/src/unit_test" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl/src/xml">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl/src/xml" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl_cpp/src">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl_cpp/src" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl_cpp/src/beanstalk">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl_cpp/src/beanstalk" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl_cpp/src/connpool">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl_cpp/src/connpool" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl_cpp/src/db">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl_cpp/src/db" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl_cpp/src/disque">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl_cpp/src/disque" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl_cpp/src/event">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl_cpp/src/event" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl_cpp/src/hsocket">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl_cpp/src/hsocket" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl_cpp/src/http">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl_cpp/src/http" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl_cpp/src/ipc">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl_cpp/src/ipc" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl_cpp/src/master">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl_cpp/src/master" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl_cpp/src/memcache">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl_cpp/src/memcache" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl_cpp/src/mime">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl_cpp/src/mime" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl_cpp/src/mime/internal">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl_cpp/src/mime/internal" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl_cpp/src/queue">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl_cpp/src/queue" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl_cpp/src/redis">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl_cpp/src/redis" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl_cpp/src/serialize">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl_cpp/src/serialize" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl_cpp/src/session">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl_cpp/src/session" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl_cpp/src/smtp">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl_cpp/src/smtp" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl_cpp/src/stdlib">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl_cpp/src/stdlib" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_acl_cpp/src/stream">
<sourceFolder url="file://$MODULE_DIR$/../../lib_acl_cpp/src/stream" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_protocol/src">
<sourceFolder url="file://$MODULE_DIR$/../../lib_protocol/src" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_protocol/src/http">
<sourceFolder url="file://$MODULE_DIR$/../../lib_protocol/src/http" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_protocol/src/icmp">
<sourceFolder url="file://$MODULE_DIR$/../../lib_protocol/src/icmp" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../lib_protocol/src/smtp">
<sourceFolder url="file://$MODULE_DIR$/../../lib_protocol/src/smtp" isTestSource="false" />
</content>
<orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1@jar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1@jar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3@jar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: javax.annotation:javax.annotation-api:1.2@jar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-core:2.2.2@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:rules:0.5@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner:0.5@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource:2.2.2@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:exposed-instrumentation-api-publish:0.5@aar" level="project" />
</component>
</module>

5
android/acl/build.gradle
View File

@ -24,14 +24,17 @@ android {
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
// testIstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
externalNativeBuild {
cmake {
//arguments "-DANDROID_STL=gnustl_shared"
//arguments "-DANDROID_STL=stl_shared"
arguments "-DANDROID_STL=c++_shared"
arguments "-DCMAKE_BUILD_TYPE=RELEASE"
//cppFlags "-fexceptions"
//abiFilters 'armeabi', 'arm64-v8a', 'armeabi-v7a', 'x86'
//abiFilters 'x86', 'arm64-v8a'
//abiFilters 'arm64-v8a'
abiFilters 'arm64-v8a', 'armeabi-v7a', 'x86', 'x86_64'
//abiFilters 'arm64-v8a', 'armeabi-v7a'
//abiFilters 'armeabi-v7a'

10
lib_acl/CMakeLists.txt
View File

@ -75,11 +75,11 @@ endforeach()
##############################################################################
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 "")
# set(CMAKE_BUILD_TYPE "DEBUG")
#else()
# string(TOUPPER CMAKE_BUILD_TYPE CMAKE_BUILD_TYPE)
#endif()
if (${UNIX_OS})
add_definitions(

10
lib_acl_cpp/CMakeLists.txt
View File

@ -108,11 +108,11 @@ if (${UNIX_OS})
)
endif()
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 "")
# set(CMAKE_BUILD_TYPE "DEBUG")
# else()
# string(TOUPPER CMAKE_BUILD_TYPE CMAKE_BUILD_TYPE)
# endif()
if (CMAKE_BUILD_TYPE STREQUAL "RELEASE")
add_definitions("-O2")

2
lib_acl_cpp/samples/aio/http_aclient_ssl/main.cpp
View File

@ -71,7 +71,7 @@ public:
protected:
// @override
bool add_write_callback(void)
bool write_callback(void)
{
return true;
}

4
lib_acl_cpp/src/redis/redis_command.cpp
View File

@ -48,7 +48,7 @@ redis_command::redis_command(redis_client* conn)
, max_conns_(0)
, slot_(-1)
, redirect_max_(15)
, redirect_sleep_(1)
, redirect_sleep_(100)
, slice_req_(false)
, request_buf_(NULL)
, request_obj_(NULL)
@ -90,7 +90,7 @@ redis_command::redis_command(redis_client_cluster* cluster, size_t max_conns)
redirect_sleep_ = cluster->get_redirect_sleep();
} else {
redirect_max_ = 15;
redirect_sleep_ = 1;
redirect_sleep_ = 100;
}
}

8
lib_acl_cpp/src/stdlib/thread_mutex.cpp
View File

@ -97,12 +97,16 @@ bool thread_mutex::unlock(void)
thread_mutex_guard::thread_mutex_guard(thread_mutex& mutex)
: mutex_(mutex)
{
acl_assert(mutex_.lock());
if (!mutex_.lock()) {
logger_fatal("lock error=%s", last_serror());
}
}
thread_mutex_guard::~thread_mutex_guard(void)
{
acl_assert(mutex_.unlock());
if (!mutex_.unlock()) {
logger_fatal("unlock error=%s", last_serror());
}
}
} // namespace acl

1
lib_fiber/c/xmake.lua
View File

@ -19,4 +19,5 @@ target("fiber")
-- add flags
add_cxflags("-std=gnu99")
add_defines("USE_JMP")

10
lib_protocol/CMakeLists.txt
View File

@ -72,11 +72,11 @@ if (${UNIX_OS})
add_definitions("-Wno-invalid-source-encoding")
endif()
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 "")
# set(CMAKE_BUILD_TYPE "DEBUG")
# else()
# string(TOUPPER CMAKE_BUILD_TYPE CMAKE_BUILD_TYPE)
# endif()
if (CMAKE_BUILD_TYPE STREQUAL "RELEASE")
add_definitions("-O3")