merge alpha to master for async

gfxcc · Dec 16, 2016 · a2088cf · a2088cf
2 parents 54be097 + ad740be
commit a2088cf
Show file tree

Hide file tree

Showing 39 changed files with 181,696 additions and 335 deletions.
diff --git a/CMakeFiles/CMakeOutput.log b/CMakeFiles/CMakeOutput.log
diff --git a/CMakeFiles/Makefile2 b/CMakeFiles/Makefile2
@@ -59,7 +59,7 @@ CMAKE_BINARY_DIR = /home/ubuntu/iShare_new
 CMakeFiles/iShare.dir/all:
 	$(MAKE) -f CMakeFiles/iShare.dir/build.make CMakeFiles/iShare.dir/depend
 	$(MAKE) -f CMakeFiles/iShare.dir/build.make CMakeFiles/iShare.dir/build
-	$(CMAKE_COMMAND) -E cmake_progress_report /home/ubuntu/iShare_new/CMakeFiles  1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17
+	$(CMAKE_COMMAND) -E cmake_progress_report /home/ubuntu/iShare_new/CMakeFiles  1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
 	@echo "Built target iShare"
 .PHONY : CMakeFiles/iShare.dir/all
 
@@ -69,7 +69,7 @@ all: CMakeFiles/iShare.dir/all
 
 # Build rule for subdir invocation for target.
 CMakeFiles/iShare.dir/rule: cmake_check_build_system
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/ubuntu/iShare_new/CMakeFiles 17
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/ubuntu/iShare_new/CMakeFiles 19
 	$(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/iShare.dir/all
 	$(CMAKE_COMMAND) -E cmake_progress_start /home/ubuntu/iShare_new/CMakeFiles 0
 .PHONY : CMakeFiles/iShare.dir/rule

diff --git a/CMakeFiles/iShare.dir/CXX.includecache b/CMakeFiles/iShare.dir/CXX.includecache
@@ -363,6 +363,20 @@ string
 -
 sstream
 -
+thread
+-
+iostream
+-
+vector
+-
+unordered_map
+-
+unordered_set
+-
+grpc++/grpc++.h
+-
+grpc/support/log.h
+-
 grpc++/support/async_stream.h
 -
 grpc++/impl/rpc_method.h
@@ -432,6 +446,26 @@ vector
 cstdlib
 -
 
+/home/ubuntu/iShare_new/iShare_source/iShare_synchronism.cc
+memory
+-
+iostream
+-
+string
+-
+pthread.h
+-
+grpc++/grpc++.h
+-
+grpc/support/log.h
+-
+iShare.grpc.pb.h
+/home/ubuntu/iShare_new/iShare_source/iShare.grpc.pb.h
+iShare_server.h
+/home/ubuntu/iShare_new/iShare_source/iShare_server.h
+mysql_pool.h
+/home/ubuntu/iShare_new/iShare_source/mysql_pool.h
+
 /home/ubuntu/iShare_new/iShare_source/iShare_tools.cc
 stdio.h
 -
@@ -506,3 +540,5 @@ stdio.h
 string.h
 -
 
+/home/ubuntu/iShare_new/iShare_source/syn.cc
+
diff --git a/CMakeFiles/iShare.dir/DependInfo.cmake b/CMakeFiles/iShare.dir/DependInfo.cmake
@@ -18,9 +18,11 @@ set(CMAKE_DEPENDS_CHECK_CXX
   "/home/ubuntu/iShare_new/iShare_source/iShare_request.cc" "/home/ubuntu/iShare_new/CMakeFiles/iShare.dir/iShare_source/iShare_request.cc.o"
   "/home/ubuntu/iShare_new/iShare_source/iShare_server.cc" "/home/ubuntu/iShare_new/CMakeFiles/iShare.dir/iShare_source/iShare_server.cc.o"
   "/home/ubuntu/iShare_new/iShare_source/iShare_setting.cc" "/home/ubuntu/iShare_new/CMakeFiles/iShare.dir/iShare_source/iShare_setting.cc.o"
+  "/home/ubuntu/iShare_new/iShare_source/iShare_synchronism.cc" "/home/ubuntu/iShare_new/CMakeFiles/iShare.dir/iShare_source/iShare_synchronism.cc.o"
   "/home/ubuntu/iShare_new/iShare_source/iShare_tools.cc" "/home/ubuntu/iShare_new/CMakeFiles/iShare.dir/iShare_source/iShare_tools.cc.o"
   "/home/ubuntu/iShare_new/iShare_source/iShare_user.cc" "/home/ubuntu/iShare_new/CMakeFiles/iShare.dir/iShare_source/iShare_user.cc.o"
   "/home/ubuntu/iShare_new/iShare_source/mysql_pool.cc" "/home/ubuntu/iShare_new/CMakeFiles/iShare.dir/iShare_source/mysql_pool.cc.o"
+  "/home/ubuntu/iShare_new/iShare_source/syn.cc" "/home/ubuntu/iShare_new/CMakeFiles/iShare.dir/iShare_source/syn.cc.o"
   )
 set(CMAKE_CXX_COMPILER_ID "GNU")
 

diff --git a/CMakeFiles/iShare.dir/build.make b/CMakeFiles/iShare.dir/build.make
diff --git a/CMakeFiles/iShare.dir/cmake_clean.cmake b/CMakeFiles/iShare.dir/cmake_clean.cmake
@@ -1,6 +1,8 @@
 file(REMOVE_RECURSE
   "CMakeFiles/iShare.dir/iShare_source/iShare_user.cc.o"
+  "CMakeFiles/iShare.dir/iShare_source/iShare_synchronism.cc.o"
   "CMakeFiles/iShare.dir/iShare_source/iShare.grpc.pb.cc.o"
+  "CMakeFiles/iShare.dir/iShare_source/syn.cc.o"
   "CMakeFiles/iShare.dir/iShare_source/iShare_setting.cc.o"
   "CMakeFiles/iShare.dir/iShare_source/mysql_pool.cc.o"
   "CMakeFiles/iShare.dir/iShare_source/iShare.pb.cc.o"

diff --git a/CMakeFiles/iShare.dir/depend.internal b/CMakeFiles/iShare.dir/depend.internal
@@ -98,6 +98,12 @@ CMakeFiles/iShare.dir/iShare_source/iShare_setting.cc.o
  /home/ubuntu/iShare_new/iShare_source/iShare_server.h
  /home/ubuntu/iShare_new/iShare_source/iShare_setting.cc
  /home/ubuntu/iShare_new/iShare_source/mysql_pool.h
+CMakeFiles/iShare.dir/iShare_source/iShare_synchronism.cc.o
+ /home/ubuntu/iShare_new/iShare_source/iShare.grpc.pb.h
+ /home/ubuntu/iShare_new/iShare_source/iShare.pb.h
+ /home/ubuntu/iShare_new/iShare_source/iShare_server.h
+ /home/ubuntu/iShare_new/iShare_source/iShare_synchronism.cc
+ /home/ubuntu/iShare_new/iShare_source/mysql_pool.h
 CMakeFiles/iShare.dir/iShare_source/iShare_tools.cc.o
  /home/ubuntu/iShare_new/iShare_source/iShare.grpc.pb.h
  /home/ubuntu/iShare_new/iShare_source/iShare.pb.h
@@ -119,3 +125,5 @@ CMakeFiles/iShare.dir/iShare_source/iShare_user.cc.o
 CMakeFiles/iShare.dir/iShare_source/mysql_pool.cc.o
  /home/ubuntu/iShare_new/iShare_source/mysql_pool.cc
  /home/ubuntu/iShare_new/iShare_source/mysql_pool.h
+CMakeFiles/iShare.dir/iShare_source/syn.cc.o
+ /home/ubuntu/iShare_new/iShare_source/syn.cc
diff --git a/CMakeFiles/iShare.dir/depend.make b/CMakeFiles/iShare.dir/depend.make
@@ -98,6 +98,12 @@ CMakeFiles/iShare.dir/iShare_source/iShare_setting.cc.o: iShare_source/iShare_se
 CMakeFiles/iShare.dir/iShare_source/iShare_setting.cc.o: iShare_source/iShare_setting.cc
 CMakeFiles/iShare.dir/iShare_source/iShare_setting.cc.o: iShare_source/mysql_pool.h
 
+CMakeFiles/iShare.dir/iShare_source/iShare_synchronism.cc.o: iShare_source/iShare.grpc.pb.h
+CMakeFiles/iShare.dir/iShare_source/iShare_synchronism.cc.o: iShare_source/iShare.pb.h
+CMakeFiles/iShare.dir/iShare_source/iShare_synchronism.cc.o: iShare_source/iShare_server.h
+CMakeFiles/iShare.dir/iShare_source/iShare_synchronism.cc.o: iShare_source/iShare_synchronism.cc
+CMakeFiles/iShare.dir/iShare_source/iShare_synchronism.cc.o: iShare_source/mysql_pool.h
+
 CMakeFiles/iShare.dir/iShare_source/iShare_tools.cc.o: iShare_source/iShare.grpc.pb.h
 CMakeFiles/iShare.dir/iShare_source/iShare_tools.cc.o: iShare_source/iShare.pb.h
 CMakeFiles/iShare.dir/iShare_source/iShare_tools.cc.o: iShare_source/iShare_server.h
@@ -119,3 +125,5 @@ CMakeFiles/iShare.dir/iShare_source/iShare_user.cc.o: iShare_source/mysql_pool.h
 CMakeFiles/iShare.dir/iShare_source/mysql_pool.cc.o: iShare_source/mysql_pool.cc
 CMakeFiles/iShare.dir/iShare_source/mysql_pool.cc.o: iShare_source/mysql_pool.h
 
+CMakeFiles/iShare.dir/iShare_source/syn.cc.o: iShare_source/syn.cc
+
diff --git a/CMakeFiles/iShare.dir/iShare_source/iShare_synchronism.cc.o b/CMakeFiles/iShare.dir/iShare_source/iShare_synchronism.cc.o
diff --git a/CMakeFiles/iShare.dir/iShare_source/syn.cc.o b/CMakeFiles/iShare.dir/iShare_source/syn.cc.o
diff --git a/CMakeFiles/iShare.dir/link.txt b/CMakeFiles/iShare.dir/link.txt
@@ -1 +1 @@
-/usr/bin/c++   -std=c++11  -O0 -Wall -g -ggdb   CMakeFiles/iShare.dir/iShare_source/iShare_user.cc.o CMakeFiles/iShare.dir/iShare_source/iShare.grpc.pb.cc.o CMakeFiles/iShare.dir/iShare_source/iShare_setting.cc.o CMakeFiles/iShare.dir/iShare_source/mysql_pool.cc.o CMakeFiles/iShare.dir/iShare_source/iShare.pb.cc.o CMakeFiles/iShare.dir/iShare_source/iShare_request.cc.o CMakeFiles/iShare.dir/iShare_source/iShare_tools.cc.o CMakeFiles/iShare.dir/iShare_source/iShare_bill.cc.o CMakeFiles/iShare.dir/iShare_source/iShare_server.cc.o CMakeFiles/iShare.dir/MMGAPN/MMGSafariPayload.cpp.o CMakeFiles/iShare.dir/MMGAPN/MMGAPNSConnection.cpp.o CMakeFiles/iShare.dir/MMGAPN/MMGSSLConnection.cpp.o CMakeFiles/iShare.dir/MMGAPN/MMGFeedbackConnection.cpp.o CMakeFiles/iShare.dir/MMGAPN/MMGTools.cpp.o CMakeFiles/iShare.dir/MMGAPN/MMGDevice.cpp.o CMakeFiles/iShare.dir/MMGAPN/MMGPayload.cpp.o CMakeFiles/iShare.dir/MMGAPN/MMGIOSPayload.cpp.o  -o iShare -rdynamic -lgrpc++_reflection -lprotobuf -lgrpc++ -lgrpc -lpthread -Wl,-Bstatic -lmysqlclient -Wl,-Bdynamic -ldl -lz -lssl -lcrypto 
+/usr/bin/c++   -std=c++11  -O0 -Wall -g -ggdb   CMakeFiles/iShare.dir/iShare_source/iShare_user.cc.o CMakeFiles/iShare.dir/iShare_source/iShare_synchronism.cc.o CMakeFiles/iShare.dir/iShare_source/iShare.grpc.pb.cc.o CMakeFiles/iShare.dir/iShare_source/syn.cc.o CMakeFiles/iShare.dir/iShare_source/iShare_setting.cc.o CMakeFiles/iShare.dir/iShare_source/mysql_pool.cc.o CMakeFiles/iShare.dir/iShare_source/iShare.pb.cc.o CMakeFiles/iShare.dir/iShare_source/iShare_request.cc.o CMakeFiles/iShare.dir/iShare_source/iShare_tools.cc.o CMakeFiles/iShare.dir/iShare_source/iShare_bill.cc.o CMakeFiles/iShare.dir/iShare_source/iShare_server.cc.o CMakeFiles/iShare.dir/MMGAPN/MMGSafariPayload.cpp.o CMakeFiles/iShare.dir/MMGAPN/MMGAPNSConnection.cpp.o CMakeFiles/iShare.dir/MMGAPN/MMGSSLConnection.cpp.o CMakeFiles/iShare.dir/MMGAPN/MMGFeedbackConnection.cpp.o CMakeFiles/iShare.dir/MMGAPN/MMGTools.cpp.o CMakeFiles/iShare.dir/MMGAPN/MMGDevice.cpp.o CMakeFiles/iShare.dir/MMGAPN/MMGPayload.cpp.o CMakeFiles/iShare.dir/MMGAPN/MMGIOSPayload.cpp.o  -o iShare -rdynamic -lgrpc++_reflection -lprotobuf -lgrpc++ -lgrpc -lpthread -Wl,-Bstatic -lmysqlclient -Wl,-Bdynamic -ldl -lz -lssl -lcrypto 
diff --git a/CMakeFiles/iShare.dir/progress.make b/CMakeFiles/iShare.dir/progress.make
@@ -15,4 +15,6 @@ CMAKE_PROGRESS_14 = 14
 CMAKE_PROGRESS_15 = 15
 CMAKE_PROGRESS_16 = 16
 CMAKE_PROGRESS_17 = 17
+CMAKE_PROGRESS_18 = 18
+CMAKE_PROGRESS_19 = 19
 
diff --git a/CMakeFiles/iShare.dir/test_client/greeter_client.cc.o b/CMakeFiles/iShare.dir/test_client/greeter_client.cc.o
diff --git a/CMakeFiles/progress.marks b/CMakeFiles/progress.marks
@@ -1 +1 @@
-17
+19
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,9 +9,9 @@ MESSAGE(STATUS "Project: ${PROJECT_NAME}")
 MESSAGE(STATUS "Project Directory: ${PORJECT_SOURCE_DIR}")
 message(status ${source})
 
-file(GLOB_RECURSE header ${iShare_SOURCE_DIR}/*.h ${iShare_SOURCE_DIR}/iShare_source/*.h
+file(GLOB_RECURSE header ${iShare_SOURCE_DIR}/iShare_source/*.h
     ${iShare_SOURCE_DIR}/MMGAPN/*.hpp)
-file(GLOB_RECURSE source ${iShare_SOURCE_DIR}/*.cc ${iShare_SOURCE_DIR}/iShare_source/*.cc
+file(GLOB_RECURSE source ${iShare_SOURCE_DIR}/iShare_source/*.cc
     ${iShare_SOURCE_DIR}/MMGAPN/*.cpp)
 list(REMOVE_ITEM source ${iShare_SOURCE_DIR}/MMGAPN/feedback.cpp ${iShare_SOURCE_DIR}/MMGAPN/main.cpp)
 

diff --git a/Makefile b/Makefile
@@ -450,6 +450,30 @@ iShare_source/iShare_setting.cc.s:
 	$(MAKE) -f CMakeFiles/iShare.dir/build.make CMakeFiles/iShare.dir/iShare_source/iShare_setting.cc.s
 .PHONY : iShare_source/iShare_setting.cc.s
 
+iShare_source/iShare_synchronism.o: iShare_source/iShare_synchronism.cc.o
+.PHONY : iShare_source/iShare_synchronism.o
+
+# target to build an object file
+iShare_source/iShare_synchronism.cc.o:
+	$(MAKE) -f CMakeFiles/iShare.dir/build.make CMakeFiles/iShare.dir/iShare_source/iShare_synchronism.cc.o
+.PHONY : iShare_source/iShare_synchronism.cc.o
+
+iShare_source/iShare_synchronism.i: iShare_source/iShare_synchronism.cc.i
+.PHONY : iShare_source/iShare_synchronism.i
+
+# target to preprocess a source file
+iShare_source/iShare_synchronism.cc.i:
+	$(MAKE) -f CMakeFiles/iShare.dir/build.make CMakeFiles/iShare.dir/iShare_source/iShare_synchronism.cc.i
+.PHONY : iShare_source/iShare_synchronism.cc.i
+
+iShare_source/iShare_synchronism.s: iShare_source/iShare_synchronism.cc.s
+.PHONY : iShare_source/iShare_synchronism.s
+
+# target to generate assembly for a file
+iShare_source/iShare_synchronism.cc.s:
+	$(MAKE) -f CMakeFiles/iShare.dir/build.make CMakeFiles/iShare.dir/iShare_source/iShare_synchronism.cc.s
+.PHONY : iShare_source/iShare_synchronism.cc.s
+
 iShare_source/iShare_tools.o: iShare_source/iShare_tools.cc.o
 .PHONY : iShare_source/iShare_tools.o
 
@@ -522,6 +546,30 @@ iShare_source/mysql_pool.cc.s:
 	$(MAKE) -f CMakeFiles/iShare.dir/build.make CMakeFiles/iShare.dir/iShare_source/mysql_pool.cc.s
 .PHONY : iShare_source/mysql_pool.cc.s
 
+iShare_source/syn.o: iShare_source/syn.cc.o
+.PHONY : iShare_source/syn.o
+
+# target to build an object file
+iShare_source/syn.cc.o:
+	$(MAKE) -f CMakeFiles/iShare.dir/build.make CMakeFiles/iShare.dir/iShare_source/syn.cc.o
+.PHONY : iShare_source/syn.cc.o
+
+iShare_source/syn.i: iShare_source/syn.cc.i
+.PHONY : iShare_source/syn.i
+
+# target to preprocess a source file
+iShare_source/syn.cc.i:
+	$(MAKE) -f CMakeFiles/iShare.dir/build.make CMakeFiles/iShare.dir/iShare_source/syn.cc.i
+.PHONY : iShare_source/syn.cc.i
+
+iShare_source/syn.s: iShare_source/syn.cc.s
+.PHONY : iShare_source/syn.s
+
+# target to generate assembly for a file
+iShare_source/syn.cc.s:
+	$(MAKE) -f CMakeFiles/iShare.dir/build.make CMakeFiles/iShare.dir/iShare_source/syn.cc.s
+.PHONY : iShare_source/syn.cc.s
+
 # Help Target
 help:
 	@echo "The following are some of the valid targets for this Makefile:"
@@ -573,6 +621,9 @@ help:
 	@echo "... iShare_source/iShare_setting.o"
 	@echo "... iShare_source/iShare_setting.i"
 	@echo "... iShare_source/iShare_setting.s"
+	@echo "... iShare_source/iShare_synchronism.o"
+	@echo "... iShare_source/iShare_synchronism.i"
+	@echo "... iShare_source/iShare_synchronism.s"
 	@echo "... iShare_source/iShare_tools.o"
 	@echo "... iShare_source/iShare_tools.i"
 	@echo "... iShare_source/iShare_tools.s"
@@ -582,6 +633,9 @@ help:
 	@echo "... iShare_source/mysql_pool.o"
 	@echo "... iShare_source/mysql_pool.i"
 	@echo "... iShare_source/mysql_pool.s"
+	@echo "... iShare_source/syn.o"
+	@echo "... iShare_source/syn.i"
+	@echo "... iShare_source/syn.s"
 .PHONY : help
 
 

diff --git a/iShare b/iShare