Use dedicated thread for running the event loop to avoid deadlocks

storj-archived · Mar 1, 2018 · f7bc42d · f7bc42d
1 parent c4fe402
commit f7bc42d
Show file tree

Hide file tree

Showing 6 changed files with 127 additions and 88 deletions.
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ For building Android applications it is recommended to use the [android-libstorj
 
 ```Gradle
 dependencies {
-    compile 'io.storj:libstorj-java:0.7.2'
+    compile 'io.storj:libstorj-java:0.7.3'
 }
 ```
 
@@ -24,6 +24,6 @@ dependencies {
 <dependency>
   <groupId>io.storj</groupId>
   <artifactId>libstorj-java</artifactId>
-  <version>0.7.2</version>
+  <version>0.7.3</version>
 </dependency>
 ```
diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ apply plugin: 'maven'
 apply plugin: 'maven-publish'
 
 group = 'io.storj'
-version = '0.7.2'
+version = '0.7.3'
 
 description = """Java bindings for libstorj"""
 

diff --git a/src/main/cpp/storj-java.cpp b/src/main/cpp/storj-java.cpp
@@ -226,7 +226,7 @@ Java_io_storj_libstorj_Storj__1runEventLoop(
         jlong storjEnv)
 {
     storj_env_t *storj_env = (storj_env_t *) storjEnv;
-    uv_run(storj_env->loop, UV_RUN_DEFAULT);
+    while (uv_run(storj_env->loop, UV_RUN_ONCE));
 }
 
 static void get_buckets_callback(uv_work_t *work_req, int status)
@@ -296,8 +296,6 @@ Java_io_storj_libstorj_Storj__1getBuckets(
     storj_bridge_get_buckets(storj_env,
                              env->NewGlobalRef(callbackObject),
                              get_buckets_callback);
-
-    uv_run(storj_env->loop, UV_RUN_DEFAULT);
 }
 
 static void get_bucket_callback(uv_work_t *work_req, int status)
@@ -359,8 +357,6 @@ Java_io_storj_libstorj_Storj__1getBucket(
                             env->NewGlobalRef(callbackObject),
                             get_bucket_callback);
 
-    uv_run(storj_env->loop, UV_RUN_DEFAULT);
-
     env->ReleaseStringUTFChars(bucketId, bucket_id);
 }
 
@@ -392,6 +388,7 @@ static void get_bucket_id_callback(uv_work_t *work_req, int status)
     }
 
     json_object_put(req->response);
+    free((char *)req->bucket_name);
     free(req);
     free(work_req);
 }
@@ -409,12 +406,10 @@ Java_io_storj_libstorj_Storj__1getBucketId(
     const char *bucket_name = env->GetStringUTFChars(bucketName, NULL);
 
     storj_bridge_get_bucket_id(storj_env,
-                               bucket_name,
+                               strdup(bucket_name),
                                env->NewGlobalRef(callbackObject),
                                get_bucket_id_callback);
 
-    uv_run(storj_env->loop, UV_RUN_DEFAULT);
-
     env->ReleaseStringUTFChars(bucketName, bucket_name);
 }
 
@@ -457,6 +452,7 @@ static void create_bucket_callback(uv_work_t *work_req, int status)
     }
 
     json_object_put(req->response);
+    free((char *)req->bucket_name);
     free((char *)req->encrypted_bucket_name);
     free(req->bucket);
     free(req);
@@ -476,12 +472,10 @@ Java_io_storj_libstorj_Storj__1createBucket(
     const char *bucket_name = env->GetStringUTFChars(bucketName, NULL);
 
     storj_bridge_create_bucket(storj_env,
-                               bucket_name,
+                               strdup(bucket_name),
                                env->NewGlobalRef(callbackObject),
                                create_bucket_callback);
 
-    uv_run(storj_env->loop, UV_RUN_DEFAULT);
-
     env->ReleaseStringUTFChars(bucketName, bucket_name);
 }
 
@@ -567,6 +561,7 @@ static void list_files_callback(uv_work_t *work_req, int status)
         }
     }
 
+    free((char *) req->bucket_id);
     storj_free_list_files_request(req);
     free(work_req);
 }
@@ -584,12 +579,10 @@ Java_io_storj_libstorj_Storj__1listFiles(
     const char *bucket_id = env->GetStringUTFChars(bucketId, NULL);
 
     storj_bridge_list_files(storj_env,
-                            bucket_id,
+                            strdup(bucket_id),
                             env->NewGlobalRef(callbackObject),
                             list_files_callback);
 
-    uv_run(storj_env->loop, UV_RUN_DEFAULT);
-
     env->ReleaseStringUTFChars(bucketId, bucket_id);
 }
 
@@ -646,6 +639,7 @@ static void get_file_callback(uv_work_t *work_req, int status)
         }
     }
 
+    free((char *)req->bucket_id);
     storj_free_get_file_info_request(req);
     free(work_req);
 }
@@ -665,13 +659,11 @@ Java_io_storj_libstorj_Storj__1getFile(
     const char *file_id = env->GetStringUTFChars(fileId, NULL);
 
     storj_bridge_get_file_info(storj_env,
-                               bucket_id,
+                               strdup(bucket_id),
                                file_id,
                                env->NewGlobalRef(callbackObject),
                                get_file_callback);
 
-    uv_run(storj_env->loop, UV_RUN_DEFAULT);
-
     env->ReleaseStringUTFChars(bucketId, bucket_id);
     env->ReleaseStringUTFChars(fileId, file_id);
 }
@@ -704,6 +696,8 @@ static void get_file_id_callback(uv_work_t *work_req, int status)
     }
 
     json_object_put(req->response);
+    free((char *)req->bucket_id);
+    free((char *)req->file_name);
     free(req);
     free(work_req);
 }
@@ -723,13 +717,11 @@ Java_io_storj_libstorj_Storj__1getFileId(
     const char *file_name = env->GetStringUTFChars(fileName, NULL);
 
     storj_bridge_get_file_id(storj_env,
-                             bucket_id,
-                             file_name,
+                             strdup(bucket_id),
+                             strdup(file_name),
                              env->NewGlobalRef(callbackObject),
                              get_file_id_callback);
 
-    uv_run(storj_env->loop, UV_RUN_DEFAULT);
-
     env->ReleaseStringUTFChars(bucketId, bucket_id);
     env->ReleaseStringUTFChars(fileName, file_name);
 }
@@ -1071,8 +1063,6 @@ Java_io_storj_libstorj_Storj__1deleteBucket(
                                env->NewGlobalRef(callbackObject),
                                delete_bucket_callback);
 
-    uv_run(storj_env->loop, UV_RUN_DEFAULT);
-
     env->ReleaseStringUTFChars(bucketId, bucket_id);
 }
 
@@ -1124,8 +1114,6 @@ Java_io_storj_libstorj_Storj__1deleteFile(
                              env->NewGlobalRef(callbackObject),
                              delete_file_callback);
 
-    uv_run(storj_env->loop, UV_RUN_DEFAULT);
-
     env->ReleaseStringUTFChars(bucketId, bucket_id);
     env->ReleaseStringUTFChars(fileId, file_id);
 }
@@ -1179,8 +1167,6 @@ Java_io_storj_libstorj_Storj__1register(
                           storj_env->bridge_options->pass,
                           env->NewGlobalRef(callbackObject),
                           register_callback);
-
-    uv_run(storj_env->loop, UV_RUN_DEFAULT);
 }
 
 static void get_info_callback(uv_work_t *work_req, int status)
@@ -1240,8 +1226,6 @@ Java_io_storj_libstorj_Storj__1getInfo(
     storj_bridge_get_info(storj_env,
                           env->NewGlobalRef(callbackObject),
                           get_info_callback);
-
-    uv_run(storj_env->loop, UV_RUN_DEFAULT);
 }
 
 extern "C"