You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by mo...@apache.org on 2019/07/12 02:17:01 UTC
[incubator-weex] branch master updated: Change ThreadLocker's
location
This is an automated email from the ASF dual-hosted git repository.
moshen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-weex.git
The following commit(s) were added to refs/heads/master by this push:
new cab9ab7 Change ThreadLocker's location
new 7e59d69 Merge pull request #2692 from Darin726/feature/ChangeThreadLockerLocation
cab9ab7 is described below
commit cab9ab7e07252f0f3461267ed0dcb35f136431d5
Author: Darin <dy...@qq.com>
AuthorDate: Fri Jul 12 09:12:37 2019 +0800
Change ThreadLocker's location
---
weex_core/Source/android/jsengine/task/back_to_weex_core_queue.h | 2 +-
weex_core/Source/android/jsengine/task/timer_queue.h | 2 +-
weex_core/Source/android/jsengine/task/weex_task.h | 2 +-
weex_core/Source/base/CMakeLists.txt | 4 ++--
weex_core/Source/base/{utils => android}/Compatible.cpp | 0
weex_core/Source/base/{utils => android}/ThreadLocker.cpp | 2 +-
weex_core/Source/base/{utils => android}/ThreadLocker.h | 0
weex_core/Source/js_runtime/weex/task/back_to_weex_core_queue.h | 2 +-
weex_core/Source/js_runtime/weex/task/timer_queue.h | 2 +-
weex_core/Source/js_runtime/weex/task/weex_task.h | 2 +-
10 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/weex_core/Source/android/jsengine/task/back_to_weex_core_queue.h b/weex_core/Source/android/jsengine/task/back_to_weex_core_queue.h
index 81269c4..075f5dc 100644
--- a/weex_core/Source/android/jsengine/task/back_to_weex_core_queue.h
+++ b/weex_core/Source/android/jsengine/task/back_to_weex_core_queue.h
@@ -29,7 +29,7 @@
#include <third_party/IPC/IPCResult.h>
#include <third_party/IPC/IPCMessageJS.h>
#include <vector>
-#include "base/utils/ThreadLocker.h"
+#include "base/utils/android/ThreadLocker.h"
#include "base/closure.h"
class BackToWeexCoreQueue {
diff --git a/weex_core/Source/android/jsengine/task/timer_queue.h b/weex_core/Source/android/jsengine/task/timer_queue.h
index c185fd8..ee2bcc8 100644
--- a/weex_core/Source/android/jsengine/task/timer_queue.h
+++ b/weex_core/Source/android/jsengine/task/timer_queue.h
@@ -27,7 +27,7 @@
#include <deque>
#include "android/jsengine/task/timer_task.h"
-#include "base/utils/ThreadLocker.h"
+#include "base/utils/android/ThreadLocker.h"
class TimerTask;
class WeexTaskQueue;
diff --git a/weex_core/Source/android/jsengine/task/weex_task.h b/weex_core/Source/android/jsengine/task/weex_task.h
index 3b0eaaa..de0924b 100644
--- a/weex_core/Source/android/jsengine/task/weex_task.h
+++ b/weex_core/Source/android/jsengine/task/weex_task.h
@@ -25,7 +25,7 @@
#include "base/time_calculator.h"
#include "android/jsengine/weex_runtime.h"
-#include "base/utils/ThreadLocker.h"
+#include "base/utils/android/ThreadLocker.h"
class WeexTask {
diff --git a/weex_core/Source/base/CMakeLists.txt b/weex_core/Source/base/CMakeLists.txt
index d3a3dfe..fceea55 100644
--- a/weex_core/Source/base/CMakeLists.txt
+++ b/weex_core/Source/base/CMakeLists.txt
@@ -64,8 +64,6 @@ set(${BASE_LIBRARY_NAME}_SOURCES
third_party/icu/icu_utf.cpp
utils/log_utils.h
utils/log_utils.cpp
- utils/ThreadLocker.h
- utils/ThreadLocker.cpp
)
if (ANDROID)
@@ -92,6 +90,8 @@ if (ANDROID)
android/jni/jbytearray_ref.cpp
android/jni/scoped_java_ref.h
android/jni/scoped_java_ref.cpp
+ android/ThreadLocker.h
+ android/ThreadLocker.cpp
)
list(APPEND ${BASE_LIBRARY_NAME}_SOURCES
${BASE_ANDROID_SOURCES}
diff --git a/weex_core/Source/base/utils/Compatible.cpp b/weex_core/Source/base/android/Compatible.cpp
similarity index 100%
rename from weex_core/Source/base/utils/Compatible.cpp
rename to weex_core/Source/base/android/Compatible.cpp
diff --git a/weex_core/Source/base/utils/ThreadLocker.cpp b/weex_core/Source/base/android/ThreadLocker.cpp
similarity index 98%
rename from weex_core/Source/base/utils/ThreadLocker.cpp
rename to weex_core/Source/base/android/ThreadLocker.cpp
index 1a04128..5853933 100644
--- a/weex_core/Source/base/utils/ThreadLocker.cpp
+++ b/weex_core/Source/base/android/ThreadLocker.cpp
@@ -20,7 +20,7 @@
// Created by Darin on 14/06/2018.
//
-#include "base/utils/ThreadLocker.h"
+#include "ThreadLocker.h"
int ThreadLocker::lock() {
return pthread_mutex_lock(&mutex_);
diff --git a/weex_core/Source/base/utils/ThreadLocker.h b/weex_core/Source/base/android/ThreadLocker.h
similarity index 100%
rename from weex_core/Source/base/utils/ThreadLocker.h
rename to weex_core/Source/base/android/ThreadLocker.h
diff --git a/weex_core/Source/js_runtime/weex/task/back_to_weex_core_queue.h b/weex_core/Source/js_runtime/weex/task/back_to_weex_core_queue.h
index 81269c4..fb6fc12 100644
--- a/weex_core/Source/js_runtime/weex/task/back_to_weex_core_queue.h
+++ b/weex_core/Source/js_runtime/weex/task/back_to_weex_core_queue.h
@@ -29,7 +29,7 @@
#include <third_party/IPC/IPCResult.h>
#include <third_party/IPC/IPCMessageJS.h>
#include <vector>
-#include "base/utils/ThreadLocker.h"
+#include "base/android/ThreadLocker.h"
#include "base/closure.h"
class BackToWeexCoreQueue {
diff --git a/weex_core/Source/js_runtime/weex/task/timer_queue.h b/weex_core/Source/js_runtime/weex/task/timer_queue.h
index 1f1fd90..3d2903c 100644
--- a/weex_core/Source/js_runtime/weex/task/timer_queue.h
+++ b/weex_core/Source/js_runtime/weex/task/timer_queue.h
@@ -28,7 +28,7 @@
//#include "android/jsengine/task/timer_task.h"
#include "js_runtime/weex/task/timer_task.h"
-#include "base/utils/ThreadLocker.h"
+#include "base/android/ThreadLocker.h"
class TimerTask;
class WeexTaskQueue;
diff --git a/weex_core/Source/js_runtime/weex/task/weex_task.h b/weex_core/Source/js_runtime/weex/task/weex_task.h
index 3057668..8b5cfef 100644
--- a/weex_core/Source/js_runtime/weex/task/weex_task.h
+++ b/weex_core/Source/js_runtime/weex/task/weex_task.h
@@ -24,7 +24,7 @@
#define WEEXV8_WEEXTASK_H
#include "base/time_calculator.h"
-#include "base/utils/ThreadLocker.h"
+#include "base/android/ThreadLocker.h"
#include "js_runtime/weex/utils/weex_jsc_utils.h"
#include "js_runtime/weex/object/weex_runtime_v2.h"
//#include "android/jsengine/weex_runtime.h"