update socketThreadpool.cpp

callJvmThreadpool/.idea/workspace.xml

@@ -14,12 +14,17 @@
     <list default="true" id="599c0760-bab6-4b6f-b494-132266cf439a" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/CMakeLists.txt" beforeDir="false" afterPath="$PROJECT_DIR$/CMakeLists.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/main.dir/CXX.includecache" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/main.dir/CXX.includecache" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/main.dir/DependInfo.cmake" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/main.dir/DependInfo.cmake" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/main.dir/build.make" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/main.dir/build.make" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/main.dir/cmake_clean.cmake" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/main.dir/cmake_clean.cmake" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/main.dir/depend.internal" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/main.dir/depend.internal" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/main.dir/depend.make" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/main.dir/depend.make" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/main.dir/link.txt" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/main.dir/link.txt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/cmake-build-debug/Makefile" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/Makefile" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/cmake-build-debug/callJvmThreadpool.cbp" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/callJvmThreadpool.cbp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/cmake-build-debug/main" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/main" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/socketThreadpool.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/socketThreadpool.cpp" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -40,7 +45,7 @@
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../CallJvm2" />
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -73,7 +78,7 @@
       <updated>1570793342779</updated>
       <workItem from="1570793344392" duration="1218000" />
       <workItem from="1570848279077" duration="10800000" />
-      <workItem from="1572923636254" duration="1250000" />
+      <workItem from="1572923636254" duration="2032000" />
     </task>
     <servers />
   </component>

callJvmThreadpool/CMakeLists.txt

@@ -15,9 +15,9 @@ add_definitions(
 add_executable(main jni.h jni_md.h tpool.cpp tpool.h
 #                test.cpp
 #                main.cpp
-        socketMultithread.cpp
+#        socketMultithread.cpp
 #                server.cpp
-#        socketThreadpool.cpp
+        socketThreadpool.cpp
         )
 
 target_link_libraries(main /usr/local/java/jre/lib/amd64/server/libjvm.so /usr/lib/x86_64-linux-gnu/libpthread.so)

callJvmThreadpool/cmake-build-debug/CMakeFiles/main.dir/CXX.includecache

@@ -6,7 +6,7 @@
 
 #IncludeRegexTransform: 
 
-/home/wanhui/Documents/CallJvm/callJvmThreadpool/socketMultithread.cpp
+/home/wanhui/Documents/CallJvm/callJvmThreadpool/socketThreadpool.cpp
 cstdio
 -
 cstdlib
@@ -27,6 +27,12 @@ jni.h
 -
 pthread.h
 -
+tpool.h
+/home/wanhui/Documents/CallJvm/callJvmThreadpool/tpool.h
+
+/home/wanhui/Documents/CallJvm/callJvmThreadpool/tpool.h
+pthread.h
+-
 
 /usr/local/java/include/jni.h
 stdio.h

callJvmThreadpool/cmake-build-debug/CMakeFiles/main.dir/DependInfo.cmake

@@ -4,7 +4,7 @@ set(CMAKE_DEPENDS_LANGUAGES
   )
 # The set of files for implicit dependencies of each language:
 set(CMAKE_DEPENDS_CHECK_CXX
-  "/home/wanhui/Documents/CallJvm/callJvmThreadpool/socketMultithread.cpp" "/home/wanhui/Documents/CallJvm/callJvmThreadpool/cmake-build-debug/CMakeFiles/main.dir/socketMultithread.cpp.o"
+  "/home/wanhui/Documents/CallJvm/callJvmThreadpool/socketThreadpool.cpp" "/home/wanhui/Documents/CallJvm/callJvmThreadpool/cmake-build-debug/CMakeFiles/main.dir/socketThreadpool.cpp.o"
   "/home/wanhui/Documents/CallJvm/callJvmThreadpool/tpool.cpp" "/home/wanhui/Documents/CallJvm/callJvmThreadpool/cmake-build-debug/CMakeFiles/main.dir/tpool.cpp.o"
   )
 set(CMAKE_CXX_COMPILER_ID "GNU")

callJvmThreadpool/cmake-build-debug/CMakeFiles/main.dir/build.make

@@ -70,29 +70,29 @@ CMakeFiles/main.dir/tpool.cpp.s: cmake_force
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/main.dir/tpool.cpp.s"
 	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/wanhui/Documents/CallJvm/callJvmThreadpool/tpool.cpp -o CMakeFiles/main.dir/tpool.cpp.s
 
-CMakeFiles/main.dir/socketMultithread.cpp.o: CMakeFiles/main.dir/flags.make
-CMakeFiles/main.dir/socketMultithread.cpp.o: ../socketMultithread.cpp
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/wanhui/Documents/CallJvm/callJvmThreadpool/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Building CXX object CMakeFiles/main.dir/socketMultithread.cpp.o"
-	/usr/bin/c++  $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/main.dir/socketMultithread.cpp.o -c /home/wanhui/Documents/CallJvm/callJvmThreadpool/socketMultithread.cpp
+CMakeFiles/main.dir/socketThreadpool.cpp.o: CMakeFiles/main.dir/flags.make
+CMakeFiles/main.dir/socketThreadpool.cpp.o: ../socketThreadpool.cpp
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/wanhui/Documents/CallJvm/callJvmThreadpool/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Building CXX object CMakeFiles/main.dir/socketThreadpool.cpp.o"
+	/usr/bin/c++  $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/main.dir/socketThreadpool.cpp.o -c /home/wanhui/Documents/CallJvm/callJvmThreadpool/socketThreadpool.cpp
 
-CMakeFiles/main.dir/socketMultithread.cpp.i: cmake_force
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/main.dir/socketMultithread.cpp.i"
-	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/wanhui/Documents/CallJvm/callJvmThreadpool/socketMultithread.cpp > CMakeFiles/main.dir/socketMultithread.cpp.i
+CMakeFiles/main.dir/socketThreadpool.cpp.i: cmake_force
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/main.dir/socketThreadpool.cpp.i"
+	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/wanhui/Documents/CallJvm/callJvmThreadpool/socketThreadpool.cpp > CMakeFiles/main.dir/socketThreadpool.cpp.i
 
-CMakeFiles/main.dir/socketMultithread.cpp.s: cmake_force
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/main.dir/socketMultithread.cpp.s"
-	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/wanhui/Documents/CallJvm/callJvmThreadpool/socketMultithread.cpp -o CMakeFiles/main.dir/socketMultithread.cpp.s
+CMakeFiles/main.dir/socketThreadpool.cpp.s: cmake_force
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/main.dir/socketThreadpool.cpp.s"
+	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/wanhui/Documents/CallJvm/callJvmThreadpool/socketThreadpool.cpp -o CMakeFiles/main.dir/socketThreadpool.cpp.s
 
 # Object files for target main
 main_OBJECTS = \
 "CMakeFiles/main.dir/tpool.cpp.o" \
-"CMakeFiles/main.dir/socketMultithread.cpp.o"
+"CMakeFiles/main.dir/socketThreadpool.cpp.o"
 
 # External object files for target main
 main_EXTERNAL_OBJECTS =
 
 main: CMakeFiles/main.dir/tpool.cpp.o
-main: CMakeFiles/main.dir/socketMultithread.cpp.o
+main: CMakeFiles/main.dir/socketThreadpool.cpp.o
 main: CMakeFiles/main.dir/build.make
 main: /usr/local/java/jre/lib/amd64/server/libjvm.so
 main: /usr/lib/x86_64-linux-gnu/libpthread.so

callJvmThreadpool/cmake-build-debug/CMakeFiles/main.dir/cmake_clean.cmake

 file(REMOVE_RECURSE
   "CMakeFiles/main.dir/tpool.cpp.o"
-  "CMakeFiles/main.dir/socketMultithread.cpp.o"
+  "CMakeFiles/main.dir/socketThreadpool.cpp.o"
   "main.pdb"
   "main"
 )

callJvmThreadpool/cmake-build-debug/CMakeFiles/main.dir/depend.internal

 # CMAKE generated file: DO NOT EDIT!
 # Generated by "Unix Makefiles" Generator, CMake Version 3.14
 
-CMakeFiles/main.dir/socketMultithread.cpp.o
- /home/wanhui/Documents/CallJvm/callJvmThreadpool/socketMultithread.cpp
+CMakeFiles/main.dir/socketThreadpool.cpp.o
+ /home/wanhui/Documents/CallJvm/callJvmThreadpool/socketThreadpool.cpp
+ /home/wanhui/Documents/CallJvm/callJvmThreadpool/tpool.h
  /usr/local/java/include/jni.h
  /usr/local/java/include/linux/jni_md.h
 CMakeFiles/main.dir/tpool.cpp.o

callJvmThreadpool/cmake-build-debug/CMakeFiles/main.dir/depend.make

 # CMAKE generated file: DO NOT EDIT!
 # Generated by "Unix Makefiles" Generator, CMake Version 3.14
 
-CMakeFiles/main.dir/socketMultithread.cpp.o: ../socketMultithread.cpp
-CMakeFiles/main.dir/socketMultithread.cpp.o: /usr/local/java/include/jni.h
-CMakeFiles/main.dir/socketMultithread.cpp.o: /usr/local/java/include/linux/jni_md.h
+CMakeFiles/main.dir/socketThreadpool.cpp.o: ../socketThreadpool.cpp
+CMakeFiles/main.dir/socketThreadpool.cpp.o: ../tpool.h
+CMakeFiles/main.dir/socketThreadpool.cpp.o: /usr/local/java/include/jni.h
+CMakeFiles/main.dir/socketThreadpool.cpp.o: /usr/local/java/include/linux/jni_md.h
 
 CMakeFiles/main.dir/tpool.cpp.o: ../tpool.cpp
 CMakeFiles/main.dir/tpool.cpp.o: ../tpool.h

callJvmThreadpool/cmake-build-debug/CMakeFiles/main.dir/link.txt

-/usr/bin/c++  -g   CMakeFiles/main.dir/tpool.cpp.o CMakeFiles/main.dir/socketMultithread.cpp.o  -o main -Wl,-rpath,/usr/local/java/jre/lib/amd64/server /usr/local/java/jre/lib/amd64/server/libjvm.so -lpthread 
+/usr/bin/c++  -g   CMakeFiles/main.dir/tpool.cpp.o CMakeFiles/main.dir/socketThreadpool.cpp.o  -o main -Wl,-rpath,/usr/local/java/jre/lib/amd64/server /usr/local/java/jre/lib/amd64/server/libjvm.so -lpthread 

callJvmThreadpool/cmake-build-debug/Makefile

@@ -123,32 +123,32 @@ main/fast:
 	$(MAKE) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/build
 .PHONY : main/fast
 
-socketMultithread.o: socketMultithread.cpp.o
+socketThreadpool.o: socketThreadpool.cpp.o
 
-.PHONY : socketMultithread.o
+.PHONY : socketThreadpool.o
 
 # target to build an object file
-socketMultithread.cpp.o:
-	$(MAKE) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/socketMultithread.cpp.o
-.PHONY : socketMultithread.cpp.o
+socketThreadpool.cpp.o:
+	$(MAKE) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/socketThreadpool.cpp.o
+.PHONY : socketThreadpool.cpp.o
 
-socketMultithread.i: socketMultithread.cpp.i
+socketThreadpool.i: socketThreadpool.cpp.i
 
-.PHONY : socketMultithread.i
+.PHONY : socketThreadpool.i
 
 # target to preprocess a source file
-socketMultithread.cpp.i:
-	$(MAKE) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/socketMultithread.cpp.i
-.PHONY : socketMultithread.cpp.i
+socketThreadpool.cpp.i:
+	$(MAKE) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/socketThreadpool.cpp.i
+.PHONY : socketThreadpool.cpp.i
 
-socketMultithread.s: socketMultithread.cpp.s
+socketThreadpool.s: socketThreadpool.cpp.s
 
-.PHONY : socketMultithread.s
+.PHONY : socketThreadpool.s
 
 # target to generate assembly for a file
-socketMultithread.cpp.s:
-	$(MAKE) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/socketMultithread.cpp.s
-.PHONY : socketMultithread.cpp.s
+socketThreadpool.cpp.s:
+	$(MAKE) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/socketThreadpool.cpp.s
+.PHONY : socketThreadpool.cpp.s
 
 tpool.o: tpool.cpp.o
 
@@ -186,9 +186,9 @@ help:
 	@echo "... rebuild_cache"
 	@echo "... main"
 	@echo "... edit_cache"
-	@echo "... socketMultithread.o"
-	@echo "... socketMultithread.i"
-	@echo "... socketMultithread.s"
+	@echo "... socketThreadpool.o"
+	@echo "... socketThreadpool.i"
+	@echo "... socketThreadpool.s"
 	@echo "... tpool.o"
 	@echo "... tpool.i"
 	@echo "... tpool.s"

callJvmThreadpool/cmake-build-debug/callJvmThreadpool.cbp

@@ -102,7 +102,7 @@
 		<Unit filename="/home/wanhui/Documents/CallJvm/callJvmThreadpool/jni_md.h">
 			<Option target="main"/>
 		</Unit>
-		<Unit filename="/home/wanhui/Documents/CallJvm/callJvmThreadpool/socketMultithread.cpp">
+		<Unit filename="/home/wanhui/Documents/CallJvm/callJvmThreadpool/socketThreadpool.cpp">
 			<Option target="main"/>
 		</Unit>
 		<Unit filename="/home/wanhui/Documents/CallJvm/callJvmThreadpool/tpool.cpp">

callJvmThreadpool/socketThreadpool.cpp

 //
-// Created by wanhui on 11/5/19.
+// Created by wanhui on 10/12/19.
 //
 
 #include <cstdio>
@@ -11,8 +11,9 @@
 #include <iostream>
 #include <vector>
 #include <jni.h>
-#include "tpool.h"
+#include <pthread.h>
 
+#include "tpool.h"
 
 #define NUM_THREADS 6
 
@@ -75,12 +76,8 @@ int socket_init()
     }
 
     printf("listening...\n");
-    if ((new_socket = accept(server_fd, (struct sockaddr *) &address, (socklen_t *) &addrlen)) < 0) {
-        perror("accept failed");
-        exit(EXIT_FAILURE);
-    }
 
-    return new_socket;
+    return server_fd;
 }
 
 JNIEnv *create_vm (struct JVM *jvm) {
@@ -135,6 +132,7 @@ void* handle_stream(void* args)
     char hello[] = "Hello send";
     send(client_fd, hello, strlen(hello), 0);
     close(client_fd);
+    pthread_exit(nullptr);
 }
 
 void* jvmThreads(void *myJvm, char* plainsql, char* dbname)
@@ -218,22 +216,29 @@ int main () {
         tpool_add_work(handle_stream, args);
     }
 
+//    if ((new_socket = accept(client_fd, (struct sockaddr *) &address, (socklen_t *) &addrlen)) < 0) {
+//        perror("accept failed");
+//        exit(EXIT_FAILURE);
+//    }
+//
+//    struct ARGS *args;
+//    args = static_cast<ARGS *>(malloc(sizeof(struct args *)));
+//    args->jvm = &myJvm;
+//    args->socket = new_socket;
 
+//    tpool_add_work(handle_stream, args);
 
-
+    // single thread
 //    handle_stream(args);
 
 //    while (1)
 //    {
-//
-//
 //        tpool_add_work(handle_stream, args);
+//        close(new_socket);
 //    }
 
 
 
-    // only 10 tasks
-
 //    int i;
 //    for(i = 0; i < 10; i++)
 //    {
@@ -247,4 +252,4 @@ int main () {
 
 
     return 0;
-}
\ No newline at end of file
+}