From 7b0d85a6525a48c9951d8483dc01c46f42c2067b Mon Sep 17 00:00:00 2001 From: kastenalexey Date: Fri, 16 May 2025 17:54:45 +0300 Subject: [PATCH] Use Function interface in Stdlib.launch Issue: https://gitee.com/openharmony/arkcompiler_runtime_core/issues/IC8FGJ Signed-off-by: kastenalexey --- .../plugins/ets/stdlib/escompat/taskpool.ets | 4 +- .../ets/stdlib/std/concurrency/AsyncLock.ets | 2 +- .../std/concurrency/ConcurrencyHelpers.ets | 2 +- .../ets/stdlib/std/concurrency/Launch.ets | 9 ++- .../plugins/ets/stdlib/std/core/EAWorker.ets | 2 +- .../ets/tests/checked/ets_promise_launch.ets | 2 +- .../atomics/concurrent_compare_exchange.ets | 4 +- .../atomics/concurrent_countdownlatch.ets | 4 +- .../atomics/concurrent_increment.ets | 4 +- .../atomics/concurrent_store_load.ets | 2 +- .../atomics/concurrent_wait_store_notify.ets | 2 +- .../atomics/skipped_cyclic_barrier.ets | 2 +- .../atomics/skipped_rendezvous_channel.ets | 4 +- .../intrinsics/to_string_cache.ets | 2 +- .../taskpool/common_tasks.ets | 2 +- .../ets-common-tests/taskpool/group_tasks.ets | 2 +- .../ets-common-tests/taskpool/long_task.ets | 2 +- .../taskpool/seqrunner_tasks.ets | 2 +- .../ets_func_tests/escompat/WeakMapGCTest.ets | 2 +- .../ets_func_tests/escompat/WeakSetGCTest.ets | 2 +- .../ArrayBlockingQueue_AddTest.ets | 12 ++-- .../ArrayBlockingQueue_GetEndTest.ets | 20 +++--- .../ArrayBlockingQueue_GetFirstTest.ets | 18 +++--- .../ArrayBlockingQueue_GetSizeTest.ets | 8 +-- .../ArrayBlockingQueue_PollTest.ets | 2 +- .../ArrayBlockingQueue_PopTest.ets | 12 ++-- .../ArrayBlockingQueue_PushTest.ets | 6 +- .../std/containers/blocking_queue.ets | 6 +- .../ConcurrentHashMap_ClearTest.ets | 4 +- .../ConcurrentHashMap_DeleteTest.ets | 20 +++--- .../ConcurrentHashMap_EntriesTest.ets | 12 ++-- .../ConcurrentHashMap_ForEachTest.ets | 64 +++++++++---------- .../ConcurrentHashMap_GetTest.ets | 28 ++++---- .../ConcurrentHashMap_HasTest.ets | 24 +++---- .../ConcurrentHashMap_IsEmptyTest.ets | 8 +-- .../ConcurrentHashMap_KeysTest.ets | 12 ++-- .../ConcurrentHashMap_PressureTest_Delete.ets | 2 +- .../ConcurrentHashMap_PressureTest_Remove.ets | 2 +- ...ConcurrentHashMap_PressureTest_Replace.ets | 2 +- .../ConcurrentHashMap_PressureTest_Set.ets | 2 +- .../ConcurrentHashMap_RemoveTest.ets | 4 +- .../ConcurrentHashMap_ReplaceTest.ets | 16 ++--- .../ConcurrentHashMap_SetTest_Three.ets | 32 +++++----- .../ConcurrentHashMap_SetTest_Two.ets | 24 +++---- .../ConcurrentHashMap_ValuesTest.ets | 12 ++-- .../ConcurrentHashMap_iteratorTest.ets | 12 ++-- .../concurrent_set/ConcurrentSet_AddTest.ets | 22 +++---- .../ConcurrentSet_DeleteTest.ets | 18 +++--- .../ConcurrentSet_EntriesTest.ets | 12 ++-- .../ConcurrentSet_ForEachTest_One.ets | 16 ++--- .../ConcurrentSet_ForEachTest_Three.ets | 16 ++--- .../ConcurrentSet_ForEachTest_Two.ets | 16 ++--- .../ConcurrentSet_ForEachTest_Zero.ets | 16 ++--- .../concurrent_set/ConcurrentSet_HasTest.ets | 4 +- .../concurrent_set/ConcurrentSet_KeysTest.ets | 14 ++-- .../ConcurrentSet_PressureTest_Delete.ets | 2 +- .../ConcurrentSet_PressureTest_Set.ets | 2 +- .../ConcurrentSet_ValuesTest.ets | 12 ++-- .../ConcurrentSet_iteratorTest.ets | 12 ++-- .../LinkedBlockingQueue_AddTest.ets | 10 +-- .../LinkedBlockingQueue_AddTest_Stress.ets | 2 +- .../LinkedBlockingQueue_PollTest_Stress.ets | 2 +- .../LinkedBlockingQueue_PopTest_Stress.ets | 2 +- .../LinkedBlockingQueue_PushTest_Stress.ets | 2 +- .../ets_test_suite/coroutines/affinity.ets | 2 +- .../tests/ets_test_suite/coroutines/await.ets | 2 +- .../coroutines/await_migrate.ets | 2 +- .../coroutines/class_load_race.ets | 2 +- .../coroutines/concurrent_await.ets | 4 +- .../coroutines/eaworker_coroutines.ets | 14 ++-- .../coroutines/execution_order.ets | 2 +- .../ets_test_suite/coroutines/launch.ets | 27 +++----- .../coroutines/launch_exception.ets | 4 +- .../coroutines/launch_instr_array.ets | 2 +- .../coroutines/launch_instruction.ets | 12 ++-- .../coroutines/launch_n_workers.ets | 10 +-- .../ets_test_suite/coroutines/launch_oom.ets | 2 +- .../coroutines/launch_yield.ets | 2 +- .../coroutines/multiple_launch.ets | 4 +- .../coroutines/scale_workers_pool.ets | 4 +- .../ets_test_suite/coroutines/setTimeout.ets | 4 +- .../tests/ets_test_suite/coroutines/stats.ets | 4 +- .../gc/finalization_registry_coro_test.ets | 12 ++-- .../gc/stress/test_stress_gc_humongous.ets | 4 +- .../gc/stress/test_stress_gc_humongous_bq.ets | 4 +- .../gc/test_finreg_in_different_coros.ets | 4 +- .../linker/runtime_linker_extensions.ets | 2 +- .../ts_to_ets/ets_coroutines_interop.ets | 2 +- ...lve_js_promise_from_non_main_coro_test.ets | 2 +- .../tests/promise/schedule_main_coro.ets | 2 +- .../interop_js/tests/timer/timer_tests.ets | 4 +- .../exclusive_worker_tests.ets | 26 ++++---- .../sync_primitives/queue_spinlock_tests.ets | 2 +- 93 files changed, 382 insertions(+), 386 deletions(-) diff --git a/static_core/plugins/ets/stdlib/escompat/taskpool.ets b/static_core/plugins/ets/stdlib/escompat/taskpool.ets index 8e7eda5c93..d61525f222 100644 --- a/static_core/plugins/ets/stdlib/escompat/taskpool.ets +++ b/static_core/plugins/ets/stdlib/escompat/taskpool.ets @@ -1451,7 +1451,7 @@ export namespace taskpool { * @param priority task execution priority */ function launchImpl(task: Task, priority?: Priority): Promise { - const job: Job = launch NullishType>( + const job: Job = launch( task.execute ); let promise = new Promise((resolve, reject) => { @@ -1518,6 +1518,6 @@ function launchPromise(f: Function, ...args: FixedArray): Promise void>(cb) + launch(cb) return p; } diff --git a/static_core/plugins/ets/stdlib/std/concurrency/AsyncLock.ets b/static_core/plugins/ets/stdlib/std/concurrency/AsyncLock.ets index b40b94e41c..96a38702e9 100644 --- a/static_core/plugins/ets/stdlib/std/concurrency/AsyncLock.ets +++ b/static_core/plugins/ets/stdlib/std/concurrency/AsyncLock.ets @@ -105,7 +105,7 @@ export final class AsyncLock { rejecter!(e) } } - launch void>(cb) + launch(cb) return p; } diff --git a/static_core/plugins/ets/stdlib/std/concurrency/ConcurrencyHelpers.ets b/static_core/plugins/ets/stdlib/std/concurrency/ConcurrencyHelpers.ets index d638ef6e20..1ba6d9cd11 100644 --- a/static_core/plugins/ets/stdlib/std/concurrency/ConcurrencyHelpers.ets +++ b/static_core/plugins/ets/stdlib/std/concurrency/ConcurrencyHelpers.ets @@ -41,7 +41,7 @@ class NativeAsyncWorkHelper { NativeAsyncWorkHelper.queueInternal(executeCb, completeCb, data); } static async queueInternal(executeCb: long, completeCb: long, data: long) { - let p = launch void>(NativeAsyncWorkHelper.asyncWorkNativeInvokeInternal, executeCb, data, true); + let p = launch(NativeAsyncWorkHelper.asyncWorkNativeInvokeInternal, executeCb, data, true); p.Await(); NativeAsyncWorkHelper.asyncWorkNativeInvokeInternal(completeCb, data, false); } diff --git a/static_core/plugins/ets/stdlib/std/concurrency/Launch.ets b/static_core/plugins/ets/stdlib/std/concurrency/Launch.ets index ef3e19eaa0..67fbbb5e42 100644 --- a/static_core/plugins/ets/stdlib/std/concurrency/Launch.ets +++ b/static_core/plugins/ets/stdlib/std/concurrency/Launch.ets @@ -42,7 +42,12 @@ type CoroFunT = ( * * @returns instance of the Job class that represents newly launched coroutine. */ -export function launch>(coroFun: F, ...args: FixedArray): Job { +// export function launch>(coroFun: F, ...args: FixedArray): Job { +// return launchInternal(coroFun, args as FixedArray); +// } + + +export function launch(coroFun: F, ...args: FixedArray): Job { return launchInternal(coroFun, args as FixedArray); } @@ -55,7 +60,7 @@ export function launch>(coroFun: F, ...args: Fix // return launchInternal(coroFun, launchParams, args as NullishType[]) // } -function launchInternal>(coroFun: F, args: FixedArray): Job { +function launchInternal(coroFun: F, args: FixedArray): Job { const paddedArgs = padArrayToMaxArgs(args); return launchInternalJobNative(coroFun, args as FixedArray); } diff --git a/static_core/plugins/ets/stdlib/std/core/EAWorker.ets b/static_core/plugins/ets/stdlib/std/core/EAWorker.ets index 4a01c10b91..e2e901228d 100644 --- a/static_core/plugins/ets/stdlib/std/core/EAWorker.ets +++ b/static_core/plugins/ets/stdlib/std/core/EAWorker.ets @@ -180,7 +180,7 @@ class StaticWorker implements InternalWorker { if (task === StaticWorker.closingTask) { break; } - launch void>(task); + launch(task); } } } diff --git a/static_core/plugins/ets/tests/checked/ets_promise_launch.ets b/static_core/plugins/ets/tests/checked/ets_promise_launch.ets index 5dd02e73bc..6099a1a3a4 100644 --- a/static_core/plugins/ets/tests/checked/ets_promise_launch.ets +++ b/static_core/plugins/ets/tests/checked/ets_promise_launch.ets @@ -26,7 +26,7 @@ import { launch } from "std/concurrency" function main(): int { for (let i = 0; i < 100; i++) { - let r = launch number>(((p: number): number => p + p), 42.0) + let r = launch(((p: number): number => p + p), 42.0) assertEQ((r.Await()), 84.0); } return 0; diff --git a/static_core/plugins/ets/tests/ets-common-tests/atomics/concurrent_compare_exchange.ets b/static_core/plugins/ets/tests/ets-common-tests/atomics/concurrent_compare_exchange.ets index 2435ac0717..3fd3d18340 100644 --- a/static_core/plugins/ets/tests/ets-common-tests/atomics/concurrent_compare_exchange.ets +++ b/static_core/plugins/ets/tests/ets-common-tests/atomics/concurrent_compare_exchange.ets @@ -30,14 +30,14 @@ function main() { arr_2 = new Int32Array(buf_2, 0, 1); for (let i = 0; i < 5; i++) { - launch Int>(worker_i8, i as byte) + launch(worker_i8, i as byte) } while (Atomics.load(arr, 0) != 5) { } L.log("Finished for Int8Array") for (let i = 0; i < 5; i++) { - launch Int>(worker_i32, i as int) + launch(worker_i32, i as int) } while (Atomics.load(arr_2, 0) != 5) { } diff --git a/static_core/plugins/ets/tests/ets-common-tests/atomics/concurrent_countdownlatch.ets b/static_core/plugins/ets/tests/ets-common-tests/atomics/concurrent_countdownlatch.ets index 5895c808e2..4d5d305941 100644 --- a/static_core/plugins/ets/tests/ets-common-tests/atomics/concurrent_countdownlatch.ets +++ b/static_core/plugins/ets/tests/ets-common-tests/atomics/concurrent_countdownlatch.ets @@ -36,7 +36,7 @@ function main() { bytearr_i64 = new BigInt64Array(buf_2, 0, 1) for (let i = 0; i < N; i++) { - launch Int>(task_1) + launch(task_1) } let cur: byte = Atomics.load(bytearr_i8, 0) as byte while (cur != N) { @@ -46,7 +46,7 @@ function main() { } for (let i = 0; i < N; i++) { - launch Int>(task_2) + launch(task_2) } let cur_64: long = Atomics.load(bytearr_i64, 0).getLong() while (cur_64 != N) { diff --git a/static_core/plugins/ets/tests/ets-common-tests/atomics/concurrent_increment.ets b/static_core/plugins/ets/tests/ets-common-tests/atomics/concurrent_increment.ets index 3026f50a05..f849705c44 100644 --- a/static_core/plugins/ets/tests/ets-common-tests/atomics/concurrent_increment.ets +++ b/static_core/plugins/ets/tests/ets-common-tests/atomics/concurrent_increment.ets @@ -28,12 +28,12 @@ function main() { arr_u32 = new Int32Array(buf_2, 0, 1); arr_u32[0] = N - launch Int>(incrementer) + launch(incrementer) while (Atomics.load(arr, 0) != RESULT) { wait() } - launch Int>(decrementer) + launch(decrementer) while (Atomics.load(arr_u32, 0) != 0) { wait() } diff --git a/static_core/plugins/ets/tests/ets-common-tests/atomics/concurrent_store_load.ets b/static_core/plugins/ets/tests/ets-common-tests/atomics/concurrent_store_load.ets index 300a483807..a46cea5b08 100644 --- a/static_core/plugins/ets/tests/ets-common-tests/atomics/concurrent_store_load.ets +++ b/static_core/plugins/ets/tests/ets-common-tests/atomics/concurrent_store_load.ets @@ -23,7 +23,7 @@ function main() { let buf = new ArrayBuffer(8); arr = new BigInt64Array(buf, 0, 1); - launch Int>(incrementer) + launch(incrementer) while (Atomics.load(arr, 0).getLong() != RESULT) { wait() diff --git a/static_core/plugins/ets/tests/ets-common-tests/atomics/concurrent_wait_store_notify.ets b/static_core/plugins/ets/tests/ets-common-tests/atomics/concurrent_wait_store_notify.ets index 4f9325090a..59e73add07 100644 --- a/static_core/plugins/ets/tests/ets-common-tests/atomics/concurrent_wait_store_notify.ets +++ b/static_core/plugins/ets/tests/ets-common-tests/atomics/concurrent_wait_store_notify.ets @@ -30,7 +30,7 @@ function main() { arr = new Int32Array(buf, 0, 1); bytearr = new Int8Array(buf, 0, 4) - launch Int>(writer) + launch(writer) let res = Atomics.wait(arr, 0, new BigInt(0)) as string c.println(res) diff --git a/static_core/plugins/ets/tests/ets-common-tests/atomics/skipped_cyclic_barrier.ets b/static_core/plugins/ets/tests/ets-common-tests/atomics/skipped_cyclic_barrier.ets index a06ed0cb8b..6579d93ce9 100644 --- a/static_core/plugins/ets/tests/ets-common-tests/atomics/skipped_cyclic_barrier.ets +++ b/static_core/plugins/ets/tests/ets-common-tests/atomics/skipped_cyclic_barrier.ets @@ -25,7 +25,7 @@ function main() { let corArrayTmp = new Array>>(); setUpBarrier(N) for (let i = 0; i < N; i++) { - let job = launch Int>(task) + let job = launch(task) corArrayTmp.push(job); } for (let i = 0; i < N; i++) { diff --git a/static_core/plugins/ets/tests/ets-common-tests/atomics/skipped_rendezvous_channel.ets b/static_core/plugins/ets/tests/ets-common-tests/atomics/skipped_rendezvous_channel.ets index 69a47a9e12..cd3800f707 100644 --- a/static_core/plugins/ets/tests/ets-common-tests/atomics/skipped_rendezvous_channel.ets +++ b/static_core/plugins/ets/tests/ets-common-tests/atomics/skipped_rendezvous_channel.ets @@ -19,9 +19,9 @@ let s = new ArrayBuffer(4); let arr = new Int32Array(s, 0, 1); function main() { - let consumerJob = launch Int>(consumer) + let consumerJob = launch(consumer) heavyComputation() - let producerJob = launch Int>(producer) + let producerJob = launch(producer) producerJob.Await(); consumerJob.Await(); diff --git a/static_core/plugins/ets/tests/ets-common-tests/intrinsics/to_string_cache.ets b/static_core/plugins/ets/tests/ets-common-tests/intrinsics/to_string_cache.ets index b846d27e71..400a2671da 100644 --- a/static_core/plugins/ets/tests/ets-common-tests/intrinsics/to_string_cache.ets +++ b/static_core/plugins/ets/tests/ets-common-tests/intrinsics/to_string_cache.ets @@ -150,7 +150,7 @@ function doTest(values: T[], workers: int) { const work = (w: Worker, s: long, i: int, c: boolean) => { return w.work(s, i, c); } - jobs[i] = launch, s: long, i: int, c: boolean) => string>(work, worker, state, iterCount, check); + jobs[i] = launch(work, worker, state, iterCount, check); } for (let i = 0; i < workers; i++) { let res = jobs[i]!.Await(); diff --git a/static_core/plugins/ets/tests/ets-common-tests/taskpool/common_tasks.ets b/static_core/plugins/ets/tests/ets-common-tests/taskpool/common_tasks.ets index 9be74b1f63..a6ed082150 100644 --- a/static_core/plugins/ets/tests/ets-common-tests/taskpool/common_tasks.ets +++ b/static_core/plugins/ets/tests/ets-common-tests/taskpool/common_tasks.ets @@ -68,7 +68,7 @@ function delayWithYield(duration: int): void { } function launchImpl(func: () => NullishType): Promise { - const job: Job = launch NullishType>( + const job: Job = launch( func ); return new Promise((resolve, reject) => { diff --git a/static_core/plugins/ets/tests/ets-common-tests/taskpool/group_tasks.ets b/static_core/plugins/ets/tests/ets-common-tests/taskpool/group_tasks.ets index 3a189b600d..0aaa239645 100644 --- a/static_core/plugins/ets/tests/ets-common-tests/taskpool/group_tasks.ets +++ b/static_core/plugins/ets/tests/ets-common-tests/taskpool/group_tasks.ets @@ -36,7 +36,7 @@ function delayWithYield(duration: int): void { } function launchImpl(func: () => NullishType): Promise { - const job: Job = launch NullishType>( + const job: Job = launch( func ); return new Promise((resolve, reject) => { diff --git a/static_core/plugins/ets/tests/ets-common-tests/taskpool/long_task.ets b/static_core/plugins/ets/tests/ets-common-tests/taskpool/long_task.ets index 500e3e8095..f44366c4ac 100644 --- a/static_core/plugins/ets/tests/ets-common-tests/taskpool/long_task.ets +++ b/static_core/plugins/ets/tests/ets-common-tests/taskpool/long_task.ets @@ -33,7 +33,7 @@ function delayWithYield(duration: int): void { } function launchImpl(func: () => NullishType): Promise { - const job: Job = launch NullishType>( + const job: Job = launch( func ); return new Promise((resolve, reject) => { diff --git a/static_core/plugins/ets/tests/ets-common-tests/taskpool/seqrunner_tasks.ets b/static_core/plugins/ets/tests/ets-common-tests/taskpool/seqrunner_tasks.ets index 8cc5c7a3e5..c7c2142f0f 100644 --- a/static_core/plugins/ets/tests/ets-common-tests/taskpool/seqrunner_tasks.ets +++ b/static_core/plugins/ets/tests/ets-common-tests/taskpool/seqrunner_tasks.ets @@ -32,7 +32,7 @@ function delayWithYield(duration: int): void { } function launchImpl(func: () => NullishType): Promise { - const job: Job = launch NullishType>( + const job: Job = launch( func ); return new Promise((resolve, reject) => { diff --git a/static_core/plugins/ets/tests/ets_func_tests/escompat/WeakMapGCTest.ets b/static_core/plugins/ets/tests/ets_func_tests/escompat/WeakMapGCTest.ets index b4261980d8..407024f2ca 100644 --- a/static_core/plugins/ets/tests/ets_func_tests/escompat/WeakMapGCTest.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/escompat/WeakMapGCTest.ets @@ -75,7 +75,7 @@ function weakMapKeyGarbageCollection(): void { reclaimedKeyId = NULL_ID // using coroutine to avoid WeakMap creation function inlining - const weakMapCreator = launch< WeakMap, (keyId: int) => WeakMap>(createTestWeakMap, KEY_ID) + const weakMapCreator = launch(createTestWeakMap, KEY_ID) const weakMap = weakMapCreator.Await() while (reclaimedKeyId != KEY_ID) { diff --git a/static_core/plugins/ets/tests/ets_func_tests/escompat/WeakSetGCTest.ets b/static_core/plugins/ets/tests/ets_func_tests/escompat/WeakSetGCTest.ets index 7f4964127e..4d008f019a 100644 --- a/static_core/plugins/ets/tests/ets_func_tests/escompat/WeakSetGCTest.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/escompat/WeakSetGCTest.ets @@ -67,7 +67,7 @@ function weakSetElementGarbageCollection(): void { reclaimedElemId = NULL_ID // using coroutine to avoid WeakSet creation function inlining - const weakSetCreator = launch, (elemId: int) => WeakSet>(createTestWeakSet, ELEM_ID) + const weakSetCreator = launch(createTestWeakSet, ELEM_ID) const weakSet = weakSetCreator.Await() while (reclaimedElemId != ELEM_ID) { diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/array_blocking_queue/ArrayBlockingQueue_AddTest.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/array_blocking_queue/ArrayBlockingQueue_AddTest.ets index c80d8dd66a..830d0580dc 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/array_blocking_queue/ArrayBlockingQueue_AddTest.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/array_blocking_queue/ArrayBlockingQueue_AddTest.ets @@ -47,10 +47,10 @@ function main(): int { while (!queueIntPopN.isEmpty()) { queueIntPopN.pop(); } - let p1 = launch void>(queueIntAdddata); - let p2 = launch void>(queueIntAdddata); - let p3 = launch void>(queueIntAdddata); - let p4 = launch void>(queueIntAdddata); + let p1 = launch(queueIntAdddata); + let p2 = launch(queueIntAdddata); + let p3 = launch(queueIntAdddata); + let p4 = launch(queueIntAdddata); p1.Await(); p2.Await(); p3.Await(); @@ -65,7 +65,7 @@ function main(): int { for (let i: int = 0; i < elementsNum; ++i) { queueInt.add(i); } - let p1 = launch void>(queueIntFrontF1data); + let p1 = launch(queueIntFrontF1data); p1.Await(); assertEQ(queueInt.size, elementsNum); }); @@ -77,7 +77,7 @@ function main(): int { for (let i: int = 0; i < elementsNum; ++i) { queueInt.add(i); } - let p1 = launch void>(queueIntBackB1data); + let p1 = launch(queueIntBackB1data); p1.Await(); assertFalse(queueInt.isEmpty()); }); diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/array_blocking_queue/ArrayBlockingQueue_GetEndTest.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/array_blocking_queue/ArrayBlockingQueue_GetEndTest.ets index e0bc016aa6..1b292e37e0 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/array_blocking_queue/ArrayBlockingQueue_GetEndTest.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/array_blocking_queue/ArrayBlockingQueue_GetEndTest.ets @@ -45,7 +45,7 @@ function main(): int { assertEQ(el, queueInt.pop()); } assertEQ(queueInt.size, 0); - let p1 = launch void>(queueIntGetEnddata); + let p1 = launch(queueIntGetEnddata); queueInt.push(elementsNum); p1.Await(); assertEQ(queueInt.size, 1); @@ -66,7 +66,7 @@ function main(): int { assertEQ(el, queueInt.pop()); } assertEQ(queueInt.size, 0); - let p1 = launch void>(queueIntGetEnddata); + let p1 = launch(queueIntGetEnddata); queueInt.push(elementsNum); p1.Await(); assertEQ(queueInt.size, 1); @@ -87,7 +87,7 @@ function main(): int { assertEQ(el, queueInt.pop()); } assertEQ(queueInt.size, 0); - let p1 = launch void>(queueIntGetEnddata); + let p1 = launch(queueIntGetEnddata); let a1: int = 10; let a2: int = 20; queueInt.push(a1); @@ -100,10 +100,10 @@ function main(): int { while (!queueInt.isEmpty()) { queueInt.pop(); } - let p1 = launch void>(queueIntGetEndB1data); - let p2 = launch void>(queueIntAddTwodata); - let p3 = launch void>(queueIntGetEndB2data); - let p4 = launch void>(queueIntAddTwodata); + let p1 = launch(queueIntGetEndB1data); + let p2 = launch(queueIntAddTwodata); + let p3 = launch(queueIntGetEndB2data); + let p4 = launch(queueIntAddTwodata); p1.Await(); p2.Await(); p3.Await(); @@ -116,12 +116,12 @@ function main(): int { queueInt.pop(); } queueInt.push(10); - let p1 = launch void>(queueIntGetEnddata); - let p2 = launch void>(queueIntGetEnddata); + let p1 = launch(queueIntGetEnddata); + let p2 = launch(queueIntGetEnddata); queueInt.push(20); p1.Await(); p2.Await(); - let p3 = launch void>(queueIntGetEnddata); + let p3 = launch(queueIntGetEnddata); p3.Await(); assertEQ(queueInt.getEnd(), 20); }); diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/array_blocking_queue/ArrayBlockingQueue_GetFirstTest.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/array_blocking_queue/ArrayBlockingQueue_GetFirstTest.ets index 1d0a11debc..77dfaed98b 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/array_blocking_queue/ArrayBlockingQueue_GetFirstTest.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/array_blocking_queue/ArrayBlockingQueue_GetFirstTest.ets @@ -128,7 +128,7 @@ function main(): int { let el = queueInt.getFirst(); assertEQ(el, queueInt.pop()); } - let p1 = launch void>(queueIntGetFirstdata); + let p1 = launch(queueIntGetFirstdata); let frontNum: int = 10; queueInt.push(frontNum); p1.Await(); @@ -149,7 +149,7 @@ function main(): int { assertEQ(el, queueInt.pop()); } assertEQ(queueInt.size, 0); - let p1 = launch void>(queueIntGetFirstdata); + let p1 = launch(queueIntGetFirstdata); let frontNum: int = 10; queueInt.push(frontNum); p1.Await(); @@ -161,11 +161,11 @@ function main(): int { while (!queueInt.isEmpty()) { queueInt.pop(); } - let p1 = launch void>(queueIntGetFirstF1data); + let p1 = launch(queueIntGetFirstF1data); queueInt.push(10); queueInt.push(20); p1.Await(); - let p2 = launch void>(queueIntGetEndB1data); + let p2 = launch(queueIntGetEndB1data); p2.Await(); assertEQ(queueInt.size, 2); }); @@ -177,9 +177,9 @@ function main(): int { queueInt.pop(); } assertTrue(queueInt.isEmpty()); - let p1 = launch void>(queueIntAddTwodata); - let p2 = launch void>(queueIntGetFirstF1data); - let p3 = launch void>(queueIntGetFirstF2data); + let p1 = launch(queueIntAddTwodata); + let p2 = launch(queueIntGetFirstF1data); + let p3 = launch(queueIntGetFirstF2data); p1.Await(); p2.Await(); p3.Await(); @@ -194,10 +194,10 @@ function main(): int { } queueInt.push(10); queueInt.push(30); - let p1 = launch void>(queueIntGetFirstdata); + let p1 = launch(queueIntGetFirstdata); queueInt.push(20); p1.Await(); - let p2 = launch void>(queueIntGetFirstdata); + let p2 = launch(queueIntGetFirstdata); p2.Await(); assertEQ(queueInt.getFirst(), 10); }); diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/array_blocking_queue/ArrayBlockingQueue_GetSizeTest.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/array_blocking_queue/ArrayBlockingQueue_GetSizeTest.ets index 5aa2dc14b5..6fede8c890 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/array_blocking_queue/ArrayBlockingQueue_GetSizeTest.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/array_blocking_queue/ArrayBlockingQueue_GetSizeTest.ets @@ -31,10 +31,10 @@ function main(): int { for (let i: int = 0; i < elementsNum; ++i) { queueInt.push(i); } - let p1 = launch void>(queueIntSizedata); - let p2 = launch void>(queueIntSizedata); - let p3 = launch void>(queueIntSizedata); - let p4 = launch void>(queueIntSizedata); + let p1 = launch(queueIntSizedata); + let p2 = launch(queueIntSizedata); + let p3 = launch(queueIntSizedata); + let p4 = launch(queueIntSizedata); p1.Await(); p2.Await(); p3.Await(); diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/array_blocking_queue/ArrayBlockingQueue_PollTest.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/array_blocking_queue/ArrayBlockingQueue_PollTest.ets index 108b61f90e..25fc6eec16 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/array_blocking_queue/ArrayBlockingQueue_PollTest.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/array_blocking_queue/ArrayBlockingQueue_PollTest.ets @@ -63,7 +63,7 @@ function main(): int { let jobs = new Array>(100); let p = 0; for (let i = 0; i < stressNum; i++) { - jobs[p++] = launch void>(sQueuePollData); + jobs[p++] = launch(sQueuePollData); } for (let i: int = 0; i < 100; i++) { jobs[i].Await(); diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/array_blocking_queue/ArrayBlockingQueue_PopTest.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/array_blocking_queue/ArrayBlockingQueue_PopTest.ets index 8d8d58eddc..a2357d4a32 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/array_blocking_queue/ArrayBlockingQueue_PopTest.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/array_blocking_queue/ArrayBlockingQueue_PopTest.ets @@ -32,7 +32,7 @@ function main(): int { ArrayBlockingQueueTestsuite.addTest("ConcurrentPushPopTestStr", () => { - let p1 = launch void>(pusherStr); + let p1 = launch(pusherStr); let arrayToCheck = popperStr(); p1.Await(); for (let i = 0; i < elementsNum; i++) { @@ -65,14 +65,14 @@ function main(): int { let el = queueIntPop2.getFirst(); assertEQ(el, queueIntPop2.pop()); } - let p1 = launch) => void>(ArrayBlockingQueuePop, queueIntPop2); + let p1 = launch(ArrayBlockingQueuePop, queueIntPop2); let i = queueIntPop2.pop(); p1.Await(); assertEQ(i, 10); }); ArrayBlockingQueueTestsuite.addTest("PopTestInt003", () => { - let p1 = launch void>(queueIntPopNdata); + let p1 = launch(queueIntPopNdata); for (let i: int = 0; i < elementsNum; ++i) { queueIntPopN.push(i); } @@ -102,7 +102,7 @@ function main(): int { } let jobs = new Array>(100); for (let i: int = 0; i < elementsNum; ++i) { - jobs[i] = launch void>(queueIntPopdata); + jobs[i] = launch(queueIntPopdata); } for (let i: int = 0; i < elementsNum; ++i) { queueIntPopN.push(i); @@ -120,8 +120,8 @@ function main(): int { for (let i: int = 0; i < elementsNum; ++i) { queueInt.push(i); } - let p1 = launch void>(queueIntFrontF1data); - let p2 = launch void>(queueIntPopFdata); + let p1 = launch(queueIntFrontF1data); + let p2 = launch(queueIntPopFdata); p1.Await(); p2.Await(); assertEQ(queueInt.size, elementsNum - 1); diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/array_blocking_queue/ArrayBlockingQueue_PushTest.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/array_blocking_queue/ArrayBlockingQueue_PushTest.ets index 542971fe95..912b801183 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/array_blocking_queue/ArrayBlockingQueue_PushTest.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/array_blocking_queue/ArrayBlockingQueue_PushTest.ets @@ -47,7 +47,7 @@ function main(): int { }); ArrayBlockingQueueTestsuite.addTest("ConcurrentPushPopTestInt", () => { - let p1 = launch void>(pusherInt); + let p1 = launch(pusherInt); let arrayToCheck = popperInt(); for (let i = 0; i < elementsNum; i++) { assertEQ(testArrayInt[i], arrayToCheck[i]); @@ -57,7 +57,7 @@ function main(): int { }); ArrayBlockingQueueTestsuite.addTest("ConcurrentPushPopTestObj", () => { - let p1 = launch void>(pusherObj); + let p1 = launch(pusherObj); let arrayToCheck = popperObj(); for (let i = 0; i < elementsNum; i++) { assertEQ(testArrayObj[i], arrayToCheck[i]); @@ -67,7 +67,7 @@ function main(): int { }); ArrayBlockingQueueTestsuite.addTest("ConcurrentPushPopTestStr", () => { - let p1 = launch void>(pusherStr); + let p1 = launch(pusherStr); let arrayToCheck = popperStr(); for (let i = 0; i < elementsNum; i++) { assertEQ(testArrayStr[i], arrayToCheck[i]); diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/blocking_queue.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/blocking_queue.ets index 03e9d13914..1497703c18 100644 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/blocking_queue.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/blocking_queue.ets @@ -104,7 +104,7 @@ function popperStr(): Array { } function concurrentPushPopTestInt() { - let p1 = launch void>(pusherInt); + let p1 = launch(pusherInt); p1.Await(); let arrayToCheck = popperInt(); for (let i = 0; i < elementsNum; i++) { @@ -114,7 +114,7 @@ function concurrentPushPopTestInt() { } function concurrentPushPopTestObj() { - let p1 = launch void>(pusherObj); + let p1 = launch(pusherObj); p1.Await(); let arrayToCheck = popperObj(); for (let i = 0; i < elementsNum; i++) { @@ -124,7 +124,7 @@ function concurrentPushPopTestObj() { } function concurrentPushPopTestStr() { - let p1 = launch void>(pusherStr); + let p1 = launch(pusherStr); p1.Await(); let arrayToCheck = popperStr(); for (let i = 0; i < elementsNum; i++) { diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_ClearTest.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_ClearTest.ets index c371557e62..64250a4fa9 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_ClearTest.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_ClearTest.ets @@ -59,8 +59,8 @@ function main(): int { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); setAll(); - let p1 = launch void>(removeAll); - let p2 = launch void>(clearAll); + let p1 = launch(removeAll); + let p2 = launch(clearAll); p1.Await(); p2.Await(); assertTrue(concurrentHashMapOne.isEmpty()); diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_DeleteTest.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_DeleteTest.ets index b9667d5d4b..91083f1bc5 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_DeleteTest.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_DeleteTest.ets @@ -79,8 +79,8 @@ function main(): int { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); setAll(); - let p1 = launch void>(deleteAll); - let p2 = launch void>(deleteAllBack); + let p1 = launch(deleteAll); + let p2 = launch(deleteAllBack); p1.Await(); p2.Await(); assertEQ(concurrentHashMapOne.size, 0); @@ -91,8 +91,8 @@ function main(): int { assertTrue(concurrentHashMapOne.isEmpty()); Atomics.store(flag, 0, 0); setAll(); - let p1 = launch void>(deleteAll); - let p2 = launch void>(replaceAll); + let p1 = launch(deleteAll); + let p2 = launch(replaceAll); p1.Await(); p2.Await(); assertTrue(Atomics.load(flag, 0) >= 10); @@ -103,8 +103,8 @@ function main(): int { assertTrue(concurrentHashMapOne.isEmpty()); Atomics.store(flag, 0, 0); setAll(); - let p1 = launch void>(deleteAll); - let p2 = launch void>(isEmptyFun); + let p1 = launch(deleteAll); + let p2 = launch(isEmptyFun); p1.Await(); p2.Await(); assertEQ(Atomics.load(flag, 0), 10); @@ -114,8 +114,8 @@ function main(): int { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); setAll(); - let p1 = launch void>(deleteAll); - let p2 = launch void>(clearAll); + let p1 = launch(deleteAll); + let p2 = launch(clearAll); p1.Await(); p2.Await(); assertTrue(concurrentHashMapOne.isEmpty()); @@ -126,8 +126,8 @@ function main(): int { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); setAll(); - let p1 = launch void>(removeAll); - let p2 = launch void>(deleteAllBack); + let p1 = launch(removeAll); + let p2 = launch(deleteAllBack); p1.Await(); p2.Await(); assertTrue(concurrentHashMapOne.isEmpty()); diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_EntriesTest.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_EntriesTest.ets index e54cab9d36..5db17aa466 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_EntriesTest.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_EntriesTest.ets @@ -134,8 +134,8 @@ function main(): int { { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); - let p1 = launch void>(setAll); - let p2 = launch void>(entriesAll); + let p1 = launch(setAll); + let p2 = launch(entriesAll); p1.Await(); p2.Await(); assertEQ(concurrentHashMapOne.size, 10); @@ -145,8 +145,8 @@ function main(): int { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); setAll(); - let p1 = launch void>(deleteAll); - let p2 = launch void>(entriesAll); + let p1 = launch(deleteAll); + let p2 = launch(entriesAll); p1.Await(); p2.Await(); assertTrue(concurrentHashMapOne.isEmpty()); @@ -157,8 +157,8 @@ function main(): int { assertTrue(concurrentHashMapOne.isEmpty()); setAll(); assertEQ(concurrentHashMapOne.size, 10); - let p1 = launch void>(entriesAll); - let p2 = launch void>(clearAll); + let p1 = launch(entriesAll); + let p2 = launch(clearAll); p1.Await(); p2.Await(); assertTrue(concurrentHashMapOne.isEmpty()); diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_ForEachTest.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_ForEachTest.ets index 2ef376683e..7eb1469a74 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_ForEachTest.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_ForEachTest.ets @@ -110,8 +110,8 @@ function main(): int { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); Atomics.store(flag, 0, 0); - let p1 = launch void>(forEachZero); - let p2 = launch void>(setAll); + let p1 = launch(forEachZero); + let p2 = launch(setAll); p1.Await(); p2.Await(); assertEQ(concurrentHashMapOne.size, 10); @@ -123,8 +123,8 @@ function main(): int { Atomics.store(flag, 0, 0); del = 0; setAll(); - let p1 = launch void>(forEachZero); - let p2 = launch void>(deleteAllBack); + let p1 = launch(forEachZero); + let p2 = launch(deleteAllBack); p1.Await(); p2.Await(); assertTrue(concurrentHashMapOne.isEmpty()); @@ -135,8 +135,8 @@ function main(): int { assertTrue(concurrentHashMapOne.isEmpty()); Atomics.store(flag, 0, 0); setAll(); - let p1 = launch void>(forEachZero); - let p2 = launch void>(getAll); + let p1 = launch(forEachZero); + let p2 = launch(getAll); p1.Await(); p2.Await(); assertEQ(Atomics.load(flag, 0), 10); @@ -147,8 +147,8 @@ function main(): int { assertTrue(concurrentHashMapOne.isEmpty()); Atomics.store(flag, 0, 0); setAll(); - let p1 = launch void>(clearAll); - let p2 = launch void>(forEachZero); + let p1 = launch(clearAll); + let p2 = launch(forEachZero); p1.Await(); p2.Await(); assertTrue(concurrentHashMapOne.isEmpty()); @@ -158,8 +158,8 @@ function main(): int { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); Atomics.store(flag, 0, 0); - let p1 = launch void>(setAll); - let p2 = launch void>(forEachOne); + let p1 = launch(setAll); + let p2 = launch(forEachOne); p1.Await(); p2.Await(); assertEQ(concurrentHashMapOne.size, 10); @@ -171,8 +171,8 @@ function main(): int { Atomics.store(flag, 0, 0); del = 0; setAll(); - let p1 = launch void>(deleteAllBack); - let p2 = launch void>(forEachOne); + let p1 = launch(deleteAllBack); + let p2 = launch(forEachOne); p1.Await(); p2.Await(); assertTrue(concurrentHashMapOne.isEmpty()); @@ -184,8 +184,8 @@ function main(): int { arrValuesTest = ["ten", "ten", "ten", "ten", "ten", "ten", "ten", "ten", "ten", "ten"]; Atomics.store(flag, 0, 0); setAll(); - let p1 = launch void>(getAll); - let p2 = launch void>(forEachOne); + let p1 = launch(getAll); + let p2 = launch(forEachOne); p1.Await(); p2.Await(); for (let i: int = 0; i < 10; i++) { @@ -198,8 +198,8 @@ function main(): int { assertTrue(concurrentHashMapOne.isEmpty()); Atomics.store(flag, 0, 0); setAll(); - let p1 = launch void>(clearAll); - let p2 = launch void>(forEachOne); + let p1 = launch(clearAll); + let p2 = launch(forEachOne); p1.Await(); p2.Await(); assertTrue(concurrentHashMapOne.isEmpty()); @@ -209,8 +209,8 @@ function main(): int { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); Atomics.store(flag, 0, 0); - let p1 = launch void>(setAll); - let p2 = launch void>(forEachTwo); + let p1 = launch(setAll); + let p2 = launch(forEachTwo); p1.Await(); p2.Await(); assertEQ(concurrentHashMapOne.size, 10); @@ -222,8 +222,8 @@ function main(): int { Atomics.store(flag, 0, 0); del = 0; setAll(); - let p1 = launch void>(forEachTwo); - let p2 = launch void>(deleteAllBack); + let p1 = launch(forEachTwo); + let p2 = launch(deleteAllBack); p1.Await(); p2.Await(); assertTrue(concurrentHashMapOne.isEmpty()); @@ -236,8 +236,8 @@ function main(): int { arrValuesTest = ["ten", "ten", "ten", "ten", "ten", "ten", "ten", "ten", "ten", "ten"]; Atomics.store(flag, 0, 0); setAll(); - let p1 = launch void>(getAll); - let p2 = launch void>(forEachTwo); + let p1 = launch(getAll); + let p2 = launch(forEachTwo); p1.Await(); p2.Await(); for (let i: int = 0; i < 10; i++) { @@ -253,8 +253,8 @@ function main(): int { assertTrue(concurrentHashMapOne.isEmpty()); Atomics.store(flag, 0, 0); setAll(); - let p1 = launch void>(clearAll); - let p2 = launch void>(forEachTwo); + let p1 = launch(clearAll); + let p2 = launch(forEachTwo); p1.Await(); p2.Await(); assertTrue(concurrentHashMapOne.isEmpty()); @@ -264,8 +264,8 @@ function main(): int { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); Atomics.store(flag, 0, 0); - let p1 = launch void>(setAll); - let p2 = launch void>(forEachThree); + let p1 = launch(setAll); + let p2 = launch(forEachThree); p1.Await(); p2.Await(); assertEQ(concurrentHashMapOne.size, 10); @@ -277,8 +277,8 @@ function main(): int { Atomics.store(flag, 0, 0); del = 0; setAll(); - let p1 = launch void>(forEachThree); - let p2 = launch void>(deleteAllBack); + let p1 = launch(forEachThree); + let p2 = launch(deleteAllBack); p1.Await(); p2.Await(); assertTrue(concurrentHashMapOne.isEmpty()); @@ -289,8 +289,8 @@ function main(): int { assertTrue(concurrentHashMapOne.isEmpty()); Atomics.store(flag, 0, 0); setAll(); - let p1 = launch void>(getAll); - let p2 = launch void>(forEachThree); + let p1 = launch(getAll); + let p2 = launch(forEachThree); p1.Await(); p2.Await(); for (let i: int = 0; i < 10; i++) { @@ -306,8 +306,8 @@ function main(): int { assertTrue(concurrentHashMapOne.isEmpty()); Atomics.store(flag, 0, 0); setAll(); - let p1 = launch void>(clearAll); - let p2 = launch void>(forEachThree); + let p1 = launch(clearAll); + let p2 = launch(forEachThree); p1.Await(); p2.Await(); assertTrue(concurrentHashMapOne.isEmpty()); diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_GetTest.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_GetTest.ets index 585d5ba792..e42e0fdeb5 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_GetTest.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_GetTest.ets @@ -72,8 +72,8 @@ function main(): int { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); setAll(); - let p1 = launch void>(getAll); - let p2 = launch void>(getAll1); + let p1 = launch(getAll); + let p2 = launch(getAll1); p1.Await(); p2.Await(); let flagCounter: int = 0; @@ -92,8 +92,8 @@ function main(): int { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); setAll(); - let p1 = launch void>(getAll); - let p2 = launch void>(hasAll); + let p1 = launch(getAll); + let p2 = launch(hasAll); p1.Await(); p2.Await(); let flagCounter: int = 0; @@ -111,8 +111,8 @@ function main(): int { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); setAll(); - let p1 = launch void>(getAll); - let p2 = launch void>(deleteAllBack); + let p1 = launch(getAll); + let p2 = launch(deleteAllBack); p1.Await(); p2.Await(); for (let i = 0; i < 10; i++) { @@ -128,8 +128,8 @@ function main(): int { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); setAll(); - let p1 = launch void>(replaceAll); - let p2 = launch void>(getAllBack); + let p1 = launch(replaceAll); + let p2 = launch(getAllBack); p1.Await(); p2.Await(); let flagCounter: int = 0; @@ -146,8 +146,8 @@ function main(): int { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); setAll(); - let p1 = launch void>(getAll); - let p2 = launch void>(isEmptyFun); + let p1 = launch(getAll); + let p2 = launch(isEmptyFun); p1.Await(); p2.Await(); let flagCounter: int = 0; @@ -164,8 +164,8 @@ function main(): int { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); setAll(); - let p1 = launch void>(getAll); - let p2 = launch void>(clearAll); + let p1 = launch(getAll); + let p2 = launch(clearAll); p1.Await(); p2.Await(); let flagCounter: int = 0; @@ -183,8 +183,8 @@ function main(): int { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); setAll(); - let p1 = launch void>(getAll1); - let p2 = launch void>(removeAll); + let p1 = launch(getAll1); + let p2 = launch(removeAll); p1.Await(); p2.Await(); let flagCounter: int = 0; diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_HasTest.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_HasTest.ets index 5aed232869..50c7c50ff6 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_HasTest.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_HasTest.ets @@ -65,8 +65,8 @@ function main(): int { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); setAll(); - let p1 = launch void>(hasAll); - let p2 = launch void>(hasAll); + let p1 = launch(hasAll); + let p2 = launch(hasAll); p1.Await(); p2.Await(); assertTrue(Atomics.load(flag, 0) >= 10); @@ -77,8 +77,8 @@ function main(): int { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); setAll(); - let p1 = launch void>(hasAll); - let p2 = launch void>(deleteAllBack); + let p1 = launch(hasAll); + let p2 = launch(deleteAllBack); p1.Await(); p2.Await(); assertTrue(Atomics.load(flag, 0) >= 10); @@ -89,8 +89,8 @@ function main(): int { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); setAll(); - let p1 = launch void>(hasAll); - let p2 = launch void>(replaceAll); + let p1 = launch(hasAll); + let p2 = launch(replaceAll); p1.Await(); p2.Await(); assertEQ(Atomics.load(flag, 0), 10); @@ -105,8 +105,8 @@ function main(): int { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); setAll(); - let p1 = launch void>(hasAll); - let p2 = launch void>(isEmptyFun); + let p1 = launch(hasAll); + let p2 = launch(isEmptyFun); p1.Await(); p2.Await(); assertEQ(Atomics.load(flag, 0), 10); @@ -117,8 +117,8 @@ function main(): int { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); setAll(); - let p1 = launch void>(hasAll); - let p2 = launch void>(clearAll); + let p1 = launch(hasAll); + let p2 = launch(clearAll); p1.Await(); p2.Await(); assertTrue(Atomics.load(flag, 0) >= 0); @@ -129,8 +129,8 @@ function main(): int { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); setAll(); - let p1 = launch void>(hasAll); - let p2 = launch void>(removeAllBack); + let p1 = launch(hasAll); + let p2 = launch(removeAllBack); p1.Await(); p2.Await(); assertTrue(Atomics.load(flag, 0) >= 0); diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_IsEmptyTest.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_IsEmptyTest.ets index 2288a6c1e1..d1cbc102c1 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_IsEmptyTest.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_IsEmptyTest.ets @@ -62,8 +62,8 @@ function main(): int { assertTrue(concurrentHashMapOne.isEmpty()); setAll(); assertFalse(concurrentHashMapOne.isEmpty()); - let p1 = launch void>(isEmptyFun); - let p2 = launch void>(clearAll); + let p1 = launch(isEmptyFun); + let p2 = launch(clearAll); p1.Await(); p2.Await(); assertTrue(concurrentHashMapOne.isEmpty()); @@ -75,8 +75,8 @@ function main(): int { assertTrue(concurrentHashMapOne.isEmpty()); setAll(); assertFalse(concurrentHashMapOne.isEmpty()); - let p1 = launch void>(isEmptyFun); - let p2 = launch void>(removeAll); + let p1 = launch(isEmptyFun); + let p2 = launch(removeAll); p1.Await(); p2.Await(); assertTrue(concurrentHashMapOne.isEmpty()); diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_KeysTest.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_KeysTest.ets index a77ec89264..befa2604d9 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_KeysTest.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_KeysTest.ets @@ -90,8 +90,8 @@ function main(): int { { concurrentHashMapKeys.clear(); assertTrue(concurrentHashMapKeys.isEmpty()); - let p1 = launch void>(setAll); - let p2 = launch void>(keysAll); + let p1 = launch(setAll); + let p2 = launch(keysAll); p1.Await(); p2.Await(); assertTrue(concurrentHashMapKeys.size >= 0); @@ -101,8 +101,8 @@ function main(): int { concurrentHashMapKeys.clear(); assertTrue(concurrentHashMapKeys.isEmpty()); setAll(); - let p1 = launch void>(deleteAll); - let p2 = launch void>(keysAll); + let p1 = launch(deleteAll); + let p2 = launch(keysAll); p1.Await(); p2.Await(); assertTrue(concurrentHashMapKeys.isEmpty()); @@ -112,8 +112,8 @@ function main(): int { concurrentHashMapKeys.clear(); assertTrue(concurrentHashMapKeys.isEmpty()); setAll(); - let p1 = launch void>(clearAll); - let p2 = launch void>(keysAll); + let p1 = launch(clearAll); + let p2 = launch(keysAll); p1.Await(); p2.Await(); assertTrue(concurrentHashMapKeys.isEmpty()); diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_PressureTest_Delete.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_PressureTest_Delete.ets index 76d3a27c83..8be81e0164 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_PressureTest_Delete.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_PressureTest_Delete.ets @@ -35,7 +35,7 @@ function main(): int { let jobs = new Array>(100); pressureFlag = 0; for (let i: int = 0; i < 100; i++) { - jobs[i] = launch void>(deleteForPressure, pressureFlag); + jobs[i] = launch(deleteForPressure, pressureFlag); pressureFlag += 1; } for (let i: int = 0; i < 100; i++) { diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_PressureTest_Remove.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_PressureTest_Remove.ets index 26681fceb3..e1986abc64 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_PressureTest_Remove.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_PressureTest_Remove.ets @@ -37,7 +37,7 @@ function main(): int { let jobs = new Array>(100); pressureFlag = 0; for (let i: int = 0; i < 100; i++) { - jobs[i] = launch void>(removeForPressure, pressureFlag); + jobs[i] = launch(removeForPressure, pressureFlag); pressureFlag += 1; } for (let i: int = 0; i < 100; i++) { diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_PressureTest_Replace.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_PressureTest_Replace.ets index f1b554f923..82d69b3135 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_PressureTest_Replace.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_PressureTest_Replace.ets @@ -35,7 +35,7 @@ function main(): int { let jobs = new Array>(100); pressureFlag = 0; for (let i: int = 0; i < 100; i++) { - jobs[i] = launch void>(replaceForPressure, pressureFlag); + jobs[i] = launch(replaceForPressure, pressureFlag); pressureFlag += 1; } for (let i: int = 0; i < 100; i++) { diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_PressureTest_Set.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_PressureTest_Set.ets index 61e94faf26..32ffff32cd 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_PressureTest_Set.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_PressureTest_Set.ets @@ -31,7 +31,7 @@ function main(): int { let jobs = new Array>(100); pressureFlag = 0; for (let i: int = 0; i < 100; i++) { - jobs[i] = launch void>(setForPressure, pressureFlag); + jobs[i] = launch(setForPressure, pressureFlag); pressureFlag += 1; } for (let i: int = 0; i < 100; i++) { diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_RemoveTest.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_RemoveTest.ets index 72689a340c..057a76904c 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_RemoveTest.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_RemoveTest.ets @@ -68,8 +68,8 @@ function main(): int { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); setAll(); - let p1 = launch void>(removeAll); - let p2 = launch void>(removeAllBack); + let p1 = launch(removeAll); + let p2 = launch(removeAllBack); p1.Await(); p2.Await(); assertTrue(concurrentHashMapOne.isEmpty()); diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_ReplaceTest.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_ReplaceTest.ets index e024cb41dd..3267faedf0 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_ReplaceTest.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_ReplaceTest.ets @@ -78,8 +78,8 @@ function main(): int { assertTrue(concurrentHashMapOne.isEmpty()); setAll(); Atomics.store(flag, 0, 0); - let p1 = launch void>(replaceAll); - let p2 = launch void>(replaceAll); + let p1 = launch(replaceAll); + let p2 = launch(replaceAll); p1.Await(); p2.Await(); for (let i = 0; i < 10; i++) { @@ -93,8 +93,8 @@ function main(): int { assertTrue(concurrentHashMapOne.isEmpty()); Atomics.store(flag, 0, 0); setAll(); - let p1 = launch void>(replaceAll); - let p2 = launch void>(isEmptyFun); + let p1 = launch(replaceAll); + let p2 = launch(isEmptyFun); p1.Await(); p2.Await(); assertEQ(Atomics.load(flag, 0), 10); @@ -109,8 +109,8 @@ function main(): int { assertTrue(concurrentHashMapOne.isEmpty()); Atomics.store(flag, 0, 0); setAll(); - let p1 = launch void>(replaceAllBack); - let p2 = launch void>(clearAll); + let p1 = launch(replaceAllBack); + let p2 = launch(clearAll); p1.Await(); p2.Await(); assertTrue(concurrentHashMapOne.isEmpty()); @@ -122,8 +122,8 @@ function main(): int { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); setAll(); - let p1 = launch void>(replaceAll); - let p2 = launch void>(removeAllBack); + let p1 = launch(replaceAll); + let p2 = launch(removeAllBack); p1.Await(); p2.Await(); let flagCounter: int = 0; diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_SetTest_Three.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_SetTest_Three.ets index 68f8a7f012..a9479df869 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_SetTest_Three.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_SetTest_Three.ets @@ -32,8 +32,8 @@ function main(): int { { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); - let p1 = launch void>(setAll); - let p2 = launch void>(keysAll); + let p1 = launch(setAll); + let p2 = launch(keysAll); p1.Await(); p2.Await(); assertEQ(concurrentHashMapOne.size, 10); @@ -42,8 +42,8 @@ function main(): int { { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); - let p1 = launch void>(setAll); - let p2 = launch void>(valuesAll); + let p1 = launch(setAll); + let p2 = launch(valuesAll); p1.Await(); p2.Await(); assertEQ(concurrentHashMapOne.size, 10); @@ -52,8 +52,8 @@ function main(): int { { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); - let p1 = launch void>(setAll); - let p2 = launch void>($_iteratorAll); + let p1 = launch(setAll); + let p2 = launch($_iteratorAll); p1.Await(); p2.Await(); assertEQ(concurrentHashMapOne.size, 10); @@ -62,8 +62,8 @@ function main(): int { { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); - let p1 = launch void>(setAll); - let p2 = launch void>(entriesAll); + let p1 = launch(setAll); + let p2 = launch(entriesAll); p1.Await(); p2.Await(); assertEQ(concurrentHashMapOne.size, 10); @@ -73,8 +73,8 @@ function main(): int { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); flag = 0; - let p1 = launch void>(forEachZero); - let p2 = launch void>(setAll); + let p1 = launch(forEachZero); + let p2 = launch(setAll); p1.Await(); p2.Await(); assertEQ(concurrentHashMapOne.size, 10); @@ -84,8 +84,8 @@ function main(): int { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); flag = 0; - let p1 = launch void>(setAll); - let p2 = launch void>(forEachOne); + let p1 = launch(setAll); + let p2 = launch(forEachOne); p1.Await(); p2.Await(); assertEQ(concurrentHashMapOne.size, 10); @@ -95,8 +95,8 @@ function main(): int { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); flag = 0; - let p1 = launch void>(setAll); - let p2 = launch void>(forEachTwo); + let p1 = launch(setAll); + let p2 = launch(forEachTwo); p1.Await(); p2.Await(); assertEQ(concurrentHashMapOne.size, 10); @@ -106,8 +106,8 @@ function main(): int { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); flag = 0; - let p1 = launch void>(setAll); - let p2 = launch void>(forEachThree); + let p1 = launch(setAll); + let p2 = launch(forEachThree); p1.Await(); p2.Await(); assertEQ(concurrentHashMapOne.size, 10); diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_SetTest_Two.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_SetTest_Two.ets index c757c4c81b..6427d9f6f7 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_SetTest_Two.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_SetTest_Two.ets @@ -38,8 +38,8 @@ function main(): int { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); setFront(); - let p1 = launch void>(setBack); - let p2 = launch void>(getAll); + let p1 = launch(setBack); + let p2 = launch(getAll); p1.Await(); p2.Await(); for (let i: int = 0; i < 10; i++) { @@ -58,8 +58,8 @@ function main(): int { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); setFront(); - let p1 = launch void>(setBack); - let p2 = launch void>(deleteAll); + let p1 = launch(setBack); + let p2 = launch(deleteAll); p1.Await(); p2.Await(); assertTrue(concurrentHashMapOne.size <= 5); @@ -69,8 +69,8 @@ function main(): int { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); setFront(); - let p1 = launch void>(setBack); - let p2 = launch void>(replaceAll); + let p1 = launch(setBack); + let p2 = launch(replaceAll); p1.Await(); p2.Await(); flag = 0; @@ -86,8 +86,8 @@ function main(): int { { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); - let p1 = launch void>(setAll); - let p2 = launch void>(isEmptyFun); + let p1 = launch(setAll); + let p2 = launch(isEmptyFun); p1.Await(); p2.Await(); assertEQ(concurrentHashMapOne.size, 10); @@ -96,8 +96,8 @@ function main(): int { { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); - let p1 = launch void>(setAll); - let p2 = launch void>(clearAll); + let p1 = launch(setAll); + let p2 = launch(clearAll); p1.Await(); p2.Await(); assertTrue(concurrentHashMapOne.get(9) == undefined || concurrentHashMapOne.get(9) == "nine"); @@ -108,8 +108,8 @@ function main(): int { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); setFront(); - let p1 = launch void>(setBack); - let p2 = launch void>(removeAll); + let p1 = launch(setBack); + let p2 = launch(removeAll); p1.Await(); p2.Await(); flag = 0; diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_ValuesTest.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_ValuesTest.ets index 9a0b153ea5..5602c4ae57 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_ValuesTest.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_ValuesTest.ets @@ -90,8 +90,8 @@ function main(): int { { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); - let p1 = launch void>(setAll); - let p2 = launch void>(valuesAll); + let p1 = launch(setAll); + let p2 = launch(valuesAll); p1.Await(); p2.Await(); assertEQ(concurrentHashMapOne.size, 10); @@ -101,8 +101,8 @@ function main(): int { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); setAll(); - let p1 = launch void>(deleteAll); - let p2 = launch void>(valuesAll); + let p1 = launch(deleteAll); + let p2 = launch(valuesAll); p1.Await(); p2.Await(); assertTrue(concurrentHashMapOne.isEmpty()); @@ -112,8 +112,8 @@ function main(): int { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); setAll(); - let p1 = launch void>(clearAll); - let p2 = launch void>(valuesAll); + let p1 = launch(clearAll); + let p2 = launch(valuesAll); p1.Await(); p2.Await(); assertTrue(concurrentHashMapOne.isEmpty()); diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_iteratorTest.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_iteratorTest.ets index 182e39650e..f91cc57221 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_iteratorTest.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_hash_map/ConcurrentHashMap_iteratorTest.ets @@ -88,8 +88,8 @@ function main(): int { { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); - let p1 = launch void>(setAll); - let p2 = launch void>($_iteratorAll); + let p1 = launch(setAll); + let p2 = launch($_iteratorAll); p1.Await(); p2.Await(); assertEQ(concurrentHashMapOne.size, 10); @@ -99,8 +99,8 @@ function main(): int { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); setAll(); - let p1 = launch void>(deleteAll); - let p2 = launch void>($_iteratorAll); + let p1 = launch(deleteAll); + let p2 = launch($_iteratorAll); p1.Await(); p2.Await(); assertTrue(concurrentHashMapOne.isEmpty()); @@ -110,8 +110,8 @@ function main(): int { concurrentHashMapOne.clear(); assertTrue(concurrentHashMapOne.isEmpty()); setAll(); - let p1 = launch void>(clearAll); - let p2 = launch void>($_iteratorAll); + let p1 = launch(clearAll); + let p2 = launch($_iteratorAll); p1.Await(); p2.Await(); assertTrue(concurrentHashMapOne.isEmpty()); diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_AddTest.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_AddTest.ets index 91a8108fef..56ff879839 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_AddTest.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_AddTest.ets @@ -73,8 +73,8 @@ function main(): int { { ConcurrentSetTestOne.clear(); assertEQ(ConcurrentSetTestOne.size, 0); - let p1 = launch void>(addAll); - let p2 = launch void>(toStringTest); + let p1 = launch(addAll); + let p2 = launch(toStringTest); p1.Await(); p2.Await(); let str: string = ConcurrentSetTestOne.toString(); @@ -84,7 +84,7 @@ function main(): int { { ConcurrentSetTestOne.clear(); assertEQ(ConcurrentSetTestOne.size, 0); - let p = launch void>(addAll); + let p = launch(addAll); p.Await(); assertEQ(ConcurrentSetTestOne.size, 10); }); @@ -92,8 +92,8 @@ function main(): int { { ConcurrentSetTestOne.clear(); assertEQ(ConcurrentSetTestOne.size, 0); - let p1 = launch void>(addAll); - let p2 = launch void>(hasAll); + let p1 = launch(addAll); + let p2 = launch(hasAll); p1.Await(); p2.Await(); for (let i: int = 0; i < 10; i++) { @@ -104,8 +104,8 @@ function main(): int { { ConcurrentSetTestOne.clear(); assertEQ(ConcurrentSetTestOne.size, 0); - let p1 = launch void>(addAll); - let p2 = launch void>(getSize); + let p1 = launch(addAll); + let p2 = launch(getSize); p1.Await(); p2.Await(); assertEQ(ConcurrentSetTestOne.size, 10); @@ -115,8 +115,8 @@ function main(): int { ConcurrentSetTestOne.clear(); assertEQ(ConcurrentSetTestOne.size, 0); addFront(); - let p1 = launch void>(addBack); - let p2 = launch void>(deleteAll); + let p1 = launch(addBack); + let p2 = launch(deleteAll); p1.Await(); p2.Await(); assertTrue(ConcurrentSetTestOne.size < 6); @@ -125,8 +125,8 @@ function main(): int { { ConcurrentSetTestOne.clear(); assertEQ(ConcurrentSetTestOne.size, 0); - let p1 = launch void>(addOneTest, 2); - let p2 = launch void>(clearTest); + let p1 = launch(addOneTest, 2); + let p2 = launch(clearTest); p1.Await(); p2.Await(); assertTrue(ConcurrentSetTestOne.size < 2); diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_DeleteTest.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_DeleteTest.ets index 4f776ec245..437d12c34b 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_DeleteTest.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_DeleteTest.ets @@ -81,10 +81,10 @@ function main(): int { ConcurrentSetTestOne.clear(); assertEQ(ConcurrentSetTestOne.size, 0); addAll(); - let p1 = launch void>(deleteOne, 0); - let p2 = launch void>(deleteOne, 1); - let p3 = launch void>(deleteOne, 2); - let p4 = launch void>(getSize); + let p1 = launch(deleteOne, 0); + let p2 = launch(deleteOne, 1); + let p3 = launch(deleteOne, 2); + let p4 = launch(getSize); p1.Await(); p2.Await(); p3.Await(); @@ -96,9 +96,9 @@ function main(): int { ConcurrentSetTestOne.clear(); assertEQ(ConcurrentSetTestOne.size, 0); addAll(); - let p1 = launch void>(deleteOne, 0); - let p2 = launch void>(deleteOne, 1); - let p3 = launch void>(hasOne, 3); + let p1 = launch(deleteOne, 0); + let p2 = launch(deleteOne, 1); + let p3 = launch(hasOne, 3); p1.Await(); p2.Await(); p3.Await(); @@ -109,8 +109,8 @@ function main(): int { ConcurrentSetTestOne.clear(); assertEQ(ConcurrentSetTestOne.size, 0); addAll(); - let p1 = launch void>(deleteOne, 0); - let p2 = launch void>(clearTest); + let p1 = launch(deleteOne, 0); + let p2 = launch(clearTest); p1.Await(); p2.Await(); assertEQ(ConcurrentSetTestOne.has(0), false); diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_EntriesTest.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_EntriesTest.ets index 2ba56fc978..61f87c7cfc 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_EntriesTest.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_EntriesTest.ets @@ -40,8 +40,8 @@ function main(): int { ConcurrentSetTestOne.clear(); assertEQ(ConcurrentSetTestOne.size, 0); addFront(); - let p1 = launch void>(addBack); - let p2 = launch void>(entriesAll); + let p1 = launch(addBack); + let p2 = launch(entriesAll); p1.Await(); p2.Await(); assertEQ(ConcurrentSetTestOne.size, 10); @@ -51,8 +51,8 @@ function main(): int { ConcurrentSetTestOne.clear(); assertEQ(ConcurrentSetTestOne.size, 0); addAll(); - let p1 = launch void>(deleteAll); - let p2 = launch void>(entriesAll); + let p1 = launch(deleteAll); + let p2 = launch(entriesAll); p1.Await(); p2.Await(); assertTrue(ConcurrentSetTestOne.size < 10); @@ -62,8 +62,8 @@ function main(): int { ConcurrentSetTestOne.clear(); assertEQ(ConcurrentSetTestOne.size, 0); addAll(); - let p1 = launch void>(entriesAll); - let p2 = launch void>(clearTest); + let p1 = launch(entriesAll); + let p2 = launch(clearTest); p1.Await(); p2.Await(); assertTrue(ConcurrentSetTestOne.size < 10); diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_ForEachTest_One.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_ForEachTest_One.ets index a7807d3760..610fea4d54 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_ForEachTest_One.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_ForEachTest_One.ets @@ -44,8 +44,8 @@ function main(): int { ConcurrentSetTestOne.clear(); assertEQ(ConcurrentSetTestOne.size, 0); flag = 0; - let p1 = launch void>(forEachOne); - let p2 = launch void>(addAll); + let p1 = launch(forEachOne); + let p2 = launch(addAll); p1.Await(); p2.Await(); assertTrue(ConcurrentSetTestOne.size >= 0); @@ -65,8 +65,8 @@ function main(): int { assertEQ(ConcurrentSetTestOne.size, 0); flag = 0; addAll(); - let p1 = launch void>(forEachOne); - let p2 = launch void>(deleteAllBack); + let p1 = launch(forEachOne); + let p2 = launch(deleteAllBack); p1.Await(); p2.Await(); assertTrue(ConcurrentSetTestOne.size < 11); @@ -77,8 +77,8 @@ function main(): int { assertEQ(ConcurrentSetTestOne.size, 0); flag = 0; addAll(); - let p1 = launch void>(forEachOne); - let p2 = launch void>(hasAll); + let p1 = launch(forEachOne); + let p2 = launch(hasAll); p1.Await(); p2.Await(); assertEQ(ConcurrentSetTestOne.size, 10); @@ -89,8 +89,8 @@ function main(): int { assertEQ(ConcurrentSetTestOne.size, 0); flag = 0; addAll(); - let p1 = launch void>(forEachOne); - let p2 = launch void>(clearTest); + let p1 = launch(forEachOne); + let p2 = launch(clearTest); p1.Await(); p2.Await(); assertTrue(ConcurrentSetTestOne.size < 11); diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_ForEachTest_Three.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_ForEachTest_Three.ets index bc1582ee64..a729491163 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_ForEachTest_Three.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_ForEachTest_Three.ets @@ -49,8 +49,8 @@ function main(): int { ConcurrentSetTestOne.clear(); assertEQ(ConcurrentSetTestOne.size, 0); flag = 0; - let p1 = launch void>(forEachThree); - let p2 = launch void>(addAll); + let p1 = launch(forEachThree); + let p2 = launch(addAll); p1.Await(); p2.Await(); assertTrue(ConcurrentSetTestOne.size >= 0); @@ -61,8 +61,8 @@ function main(): int { assertEQ(ConcurrentSetTestOne.size, 0); flag = 0; addAll(); - let p1 = launch void>(forEachThree); - let p2 = launch void>(deleteAllBack); + let p1 = launch(forEachThree); + let p2 = launch(deleteAllBack); p1.Await(); p2.Await(); assertTrue(ConcurrentSetTestOne.size < 11); @@ -73,8 +73,8 @@ function main(): int { assertEQ(ConcurrentSetTestOne.size, 0); flag = 0; addAll(); - let p1 = launch void>(forEachThree); - let p2 = launch void>(hasAll); + let p1 = launch(forEachThree); + let p2 = launch(hasAll); p1.Await(); p2.Await(); assertEQ(ConcurrentSetTestOne.size, 10); @@ -85,8 +85,8 @@ function main(): int { assertEQ(ConcurrentSetTestOne.size, 0); flag = 0; addAll(); - let p1 = launch void>(forEachThree); - let p2 = launch void>(clearTest); + let p1 = launch(forEachThree); + let p2 = launch(clearTest); p1.Await(); p2.Await(); assertTrue(ConcurrentSetTestOne.size < 11); diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_ForEachTest_Two.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_ForEachTest_Two.ets index 9d8ebe8095..0d3425dd10 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_ForEachTest_Two.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_ForEachTest_Two.ets @@ -49,8 +49,8 @@ function main(): int { ConcurrentSetTestOne.clear(); assertEQ(ConcurrentSetTestOne.size, 0); flag = 0; - let p1 = launch void>(forEachTwo); - let p2 = launch void>(addAll); + let p1 = launch(forEachTwo); + let p2 = launch(addAll); p1.Await(); p2.Await(); assertTrue(ConcurrentSetTestOne.size >= 0); @@ -61,8 +61,8 @@ function main(): int { assertEQ(ConcurrentSetTestOne.size, 0); flag = 0; addAll(); - let p1 = launch void>(forEachTwo); - let p2 = launch void>(deleteAllBack); + let p1 = launch(forEachTwo); + let p2 = launch(deleteAllBack); p1.Await(); p2.Await(); assertTrue(ConcurrentSetTestOne.size < 11); @@ -73,8 +73,8 @@ function main(): int { assertEQ(ConcurrentSetTestOne.size, 0); flag = 0; addAll(); - let p1 = launch void>(forEachTwo); - let p2 = launch void>(hasAll); + let p1 = launch(forEachTwo); + let p2 = launch(hasAll); p1.Await(); p2.Await(); assertEQ(ConcurrentSetTestOne.size, 10); @@ -85,8 +85,8 @@ function main(): int { assertEQ(ConcurrentSetTestOne.size, 0); flag = 0; addAll(); - let p1 = launch void>(forEachTwo); - let p2 = launch void>(clearTest); + let p1 = launch(forEachTwo); + let p2 = launch(clearTest); p1.Await(); p2.Await(); assertTrue(ConcurrentSetTestOne.size < 11); diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_ForEachTest_Zero.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_ForEachTest_Zero.ets index 22e620d284..3ff588178f 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_ForEachTest_Zero.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_ForEachTest_Zero.ets @@ -40,8 +40,8 @@ function main(): int { ConcurrentSetTestOne.clear(); assertEQ(ConcurrentSetTestOne.size, 0); flag = 0; - let p1 = launch void>(forEachZero); - let p2 = launch void>(addAll); + let p1 = launch(forEachZero); + let p2 = launch(addAll); p1.Await(); p2.Await(); assertTrue(ConcurrentSetTestOne.size >= 0); @@ -61,8 +61,8 @@ function main(): int { assertEQ(ConcurrentSetTestOne.size, 0); flag = 0; addAll(); - let p1 = launch void>(forEachZero); - let p2 = launch void>(deleteAllBack); + let p1 = launch(forEachZero); + let p2 = launch(deleteAllBack); p1.Await(); p2.Await(); assertTrue(ConcurrentSetTestOne.size < 11); @@ -73,8 +73,8 @@ function main(): int { assertEQ(ConcurrentSetTestOne.size, 0); flag = 0; addAll(); - let p1 = launch void>(forEachZero); - let p2 = launch void>(hasAll); + let p1 = launch(forEachZero); + let p2 = launch(hasAll); p1.Await(); p2.Await(); assertEQ(ConcurrentSetTestOne.size, 10); @@ -85,8 +85,8 @@ function main(): int { assertEQ(ConcurrentSetTestOne.size, 0); flag = 0; addAll(); - let p1 = launch void>(forEachZero); - let p2 = launch void>(clearTest); + let p1 = launch(forEachZero); + let p2 = launch(clearTest); p1.Await(); p2.Await(); assertTrue(ConcurrentSetTestOne.size < 11); diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_HasTest.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_HasTest.ets index 0261f6ce43..a4a3dfd6a4 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_HasTest.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_HasTest.ets @@ -98,8 +98,8 @@ function main(): int { assertEQ(ConcurrentSetTestOne.size, 0); addAll(); assertEQ(ConcurrentSetTestOne.has(3), true); - let p1 = launch void>(hasOne, 0); - let p2 = launch void>(clearTest); + let p1 = launch(hasOne, 0); + let p2 = launch(clearTest); p1.Await(); p2.Await(); assertEQ(ConcurrentSetTestOne.has(0), false); diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_KeysTest.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_KeysTest.ets index 0f1dff41ca..a4fbdedd45 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_KeysTest.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_KeysTest.ets @@ -58,8 +58,8 @@ function main(): int { ConcurrentSetTestOne.clear(); assertEQ(ConcurrentSetTestOne.size, 0); addFront(); - let p1 = launch void>(addBack); - let p2 = launch void>(keysAll); + let p1 = launch(addBack); + let p2 = launch(keysAll); p1.Await(); p2.Await(); assertEQ(ConcurrentSetTestOne.size, 10); @@ -69,8 +69,8 @@ function main(): int { ConcurrentSetTestOne.clear(); assertEQ(ConcurrentSetTestOne.size, 0); addAll(); - let p1 = launch void>(deleteAll); - let p2 = launch void>(keysAll); + let p1 = launch(deleteAll); + let p2 = launch(keysAll); p1.Await(); p2.Await(); assertEQ(ConcurrentSetTestOne.size, 0); @@ -89,8 +89,8 @@ function main(): int { ConcurrentSetTestOne.clear(); assertEQ(ConcurrentSetTestOne.size, 0); addAll(); - let p1 = launch void>(keysAll); - let p2 = launch void>(clearTest); + let p1 = launch(keysAll); + let p2 = launch(clearTest); p1.Await(); p2.Await(); assertTrue(ConcurrentSetTestOne.size < 11); @@ -100,7 +100,7 @@ function main(): int { ConcurrentSetTestOne.clear(); assertEQ(ConcurrentSetTestOne.size, 0); addAll(); - let p = launch void>(keysAll); + let p = launch(keysAll); clearTest(); p.Await(); assertEQ(ConcurrentSetTestOne.size, 0); diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_PressureTest_Delete.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_PressureTest_Delete.ets index d9f53c8792..df3ed986f2 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_PressureTest_Delete.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_PressureTest_Delete.ets @@ -31,7 +31,7 @@ function main(): int { assertEQ(ConcurrentSetTestOne.size, 100); let jobs = new Array>(100); for (let i: int = 0; i < 100; i++) { - jobs[i] = launch void>(deleteMore, i); + jobs[i] = launch(deleteMore, i); } for (let i: int = 0; i < 100; i++) { jobs[i].Await(); diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_PressureTest_Set.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_PressureTest_Set.ets index ae60d1f284..3e7530c90f 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_PressureTest_Set.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_PressureTest_Set.ets @@ -28,7 +28,7 @@ function main(): int { let jobs = new Array>(100); for (let i: int = 0; i < 100; i++) { - jobs[i] = launch void>(addMore, i); + jobs[i] = launch(addMore, i); } for (let i: int = 0; i < 100; i++) { jobs[i].Await(); diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_ValuesTest.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_ValuesTest.ets index 26c2ff314d..be179596e1 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_ValuesTest.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_ValuesTest.ets @@ -78,8 +78,8 @@ function main(): int { ConcurrentSetTestOne.clear(); assertEQ(ConcurrentSetTestOne.size, 0); addFront(); - let p1 = launch void>(addBack); - let p2 = launch void>(valuesAll); + let p1 = launch(addBack); + let p2 = launch(valuesAll); p1.Await(); p2.Await(); assertEQ(ConcurrentSetTestOne.size, 10); @@ -89,8 +89,8 @@ function main(): int { ConcurrentSetTestOne.clear(); assertEQ(ConcurrentSetTestOne.size, 0); addAll(); - let p1 = launch void>(deleteAll); - let p2 = launch void>(valuesAll); + let p1 = launch(deleteAll); + let p2 = launch(valuesAll); p1.Await(); p2.Await(); assertEQ(ConcurrentSetTestOne.size, 0); @@ -109,8 +109,8 @@ function main(): int { ConcurrentSetTestOne.clear(); assertEQ(ConcurrentSetTestOne.size, 0); addAll(); - let p1 = launch void>(valuesAll); - let p2 = launch void>(clearTest); + let p1 = launch(valuesAll); + let p2 = launch(clearTest); p1.Await(); p2.Await(); assertTrue(ConcurrentSetTestOne.size < 11); diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_iteratorTest.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_iteratorTest.ets index e7774e5a2e..45a3d72fde 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_iteratorTest.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/concurrent_set/ConcurrentSet_iteratorTest.ets @@ -58,8 +58,8 @@ function main(): int { ConcurrentSetTestOne.clear(); assertEQ(ConcurrentSetTestOne.size, 0); addFront(); - let p1 = launch void>(addBack); - let p2 = launch void>($_iteratorAll); + let p1 = launch(addBack); + let p2 = launch($_iteratorAll); p1.Await(); p2.Await(); assertEQ(ConcurrentSetTestOne.size, 10); @@ -69,8 +69,8 @@ function main(): int { ConcurrentSetTestOne.clear(); assertEQ(ConcurrentSetTestOne.size, 0); addAll(); - let p1 = launch void>(deleteAll); - let p2 = launch void>($_iteratorAll); + let p1 = launch(deleteAll); + let p2 = launch($_iteratorAll); p1.Await(); p2.Await(); assertEQ(ConcurrentSetTestOne.size, 0); @@ -89,8 +89,8 @@ function main(): int { ConcurrentSetTestOne.clear(); assertEQ(ConcurrentSetTestOne.size, 0); addAll(); - let p1 = launch void>($_iteratorAll); - let p2 = launch void>(clearTest); + let p1 = launch($_iteratorAll); + let p2 = launch(clearTest); p1.Await(); p2.Await(); assertTrue(ConcurrentSetTestOne.size < 11); diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/linked_blocking_queue/LinkedBlockingQueue_AddTest.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/linked_blocking_queue/LinkedBlockingQueue_AddTest.ets index 2dbf205920..089f6dd51b 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/linked_blocking_queue/LinkedBlockingQueue_AddTest.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/linked_blocking_queue/LinkedBlockingQueue_AddTest.ets @@ -53,7 +53,7 @@ function main(): int { } let jobs = new Array>(5); for (let i = 0; i < 5; i++) { - jobs[i] = launch void>(queueAddData); + jobs[i] = launch(queueAddData); } for (let i: int = 0; i < 5; i++) { jobs[i].Await(); @@ -68,8 +68,8 @@ function main(): int { let jobs = new Array>(6); let p = 0; for (let i = 0; i < 3; i++) { - jobs[p++] = launch void>(queueAddData); - jobs[p++] = launch void>(queuePopData); + jobs[p++] = launch(queueAddData); + jobs[p++] = launch(queuePopData); } for (let i: int = 0; i < 6; i++) { jobs[i].Await(); @@ -84,10 +84,10 @@ function main(): int { let jobs = new Array>(10); let p = 0; for (let i = 0; i < 5; i++) { - jobs[p++] = launch void>(queueAddData); + jobs[p++] = launch(queueAddData); } for (let i = 5; i < 10; i++) { - jobs[p++] = launch void>(queueGetFirstData); + jobs[p++] = launch(queueGetFirstData); } for (let i: int = 0; i < 10; i++) { jobs[i].Await(); diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/linked_blocking_queue/LinkedBlockingQueue_AddTest_Stress.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/linked_blocking_queue/LinkedBlockingQueue_AddTest_Stress.ets index e581e53053..4f2bd67124 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/linked_blocking_queue/LinkedBlockingQueue_AddTest_Stress.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/linked_blocking_queue/LinkedBlockingQueue_AddTest_Stress.ets @@ -31,7 +31,7 @@ function main(): int { let jobs = new Array>(100); let p = 0; for (let i = 0; i < 100; i++) { - jobs[p++] = launch void>(sQueueAddData, i); + jobs[p++] = launch(sQueueAddData, i); } for (let i: int = 0; i < 100; i++) { jobs[i].Await(); diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/linked_blocking_queue/LinkedBlockingQueue_PollTest_Stress.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/linked_blocking_queue/LinkedBlockingQueue_PollTest_Stress.ets index 581b25caf7..39ad40b3fc 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/linked_blocking_queue/LinkedBlockingQueue_PollTest_Stress.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/linked_blocking_queue/LinkedBlockingQueue_PollTest_Stress.ets @@ -34,7 +34,7 @@ function main(): int { let jobs = new Array>(100); let p = 0; for (let i = 0; i < stressNum; i++) { - jobs[p++] = launch void>(sQueuePollData); + jobs[p++] = launch(sQueuePollData); } for (let i: int = 0; i < 100; i++) { jobs[i].Await(); diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/linked_blocking_queue/LinkedBlockingQueue_PopTest_Stress.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/linked_blocking_queue/LinkedBlockingQueue_PopTest_Stress.ets index 7b0984f9f1..e4e292ad77 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/linked_blocking_queue/LinkedBlockingQueue_PopTest_Stress.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/linked_blocking_queue/LinkedBlockingQueue_PopTest_Stress.ets @@ -33,7 +33,7 @@ function main(): int { } let jobs = new Array>(100); for (let i = 0; i < stressNum; i++) { - jobs[i] = launch void>(sQueuePopData); + jobs[i] = launch(sQueuePopData); } for (let i: int = 0; i < 100; i++) { jobs[i].Await(); diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/containers/linked_blocking_queue/LinkedBlockingQueue_PushTest_Stress.ets b/static_core/plugins/ets/tests/ets_func_tests/std/containers/linked_blocking_queue/LinkedBlockingQueue_PushTest_Stress.ets index 6c21c9c2ed..32b180b2fe 100755 --- a/static_core/plugins/ets/tests/ets_func_tests/std/containers/linked_blocking_queue/LinkedBlockingQueue_PushTest_Stress.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/containers/linked_blocking_queue/LinkedBlockingQueue_PushTest_Stress.ets @@ -32,7 +32,7 @@ function main(): int { let jobs = new Array>(100); let p = 0; for (let i = 0; i < stressNum; i++) { - jobs[p++] = launch void>(sQueuePushData); + jobs[p++] = launch(sQueuePushData); } for (let i: int = 0; i < 100; i++) { jobs[i].Await(); diff --git a/static_core/plugins/ets/tests/ets_test_suite/coroutines/affinity.ets b/static_core/plugins/ets/tests/ets_test_suite/coroutines/affinity.ets index 5f5515930c..7cb83510f2 100644 --- a/static_core/plugins/ets/tests/ets_test_suite/coroutines/affinity.ets +++ b/static_core/plugins/ets/tests/ets_test_suite/coroutines/affinity.ets @@ -49,7 +49,7 @@ function check_sync_id_nonmain(number_of_coros: int): int { let promises: (Job | undefined)[] = new (Job | undefined)[number_of_coros]; for (let i = 0; i < number_of_coros; ++i) { - promises[i] = launch Int>(checker, id_current); + promises[i] = launch(checker, id_current); } continue_execution.set(true); let result: int = 0; diff --git a/static_core/plugins/ets/tests/ets_test_suite/coroutines/await.ets b/static_core/plugins/ets/tests/ets_test_suite/coroutines/await.ets index aabf319d74..9736262115 100644 --- a/static_core/plugins/ets/tests/ets_test_suite/coroutines/await.ets +++ b/static_core/plugins/ets/tests/ets_test_suite/coroutines/await.ets @@ -24,7 +24,7 @@ function set_flag(): String { } export function main(): int { - let p = launch String>(set_flag); + let p = launch(set_flag); let result = p.Await(); if (!flag) { diff --git a/static_core/plugins/ets/tests/ets_test_suite/coroutines/await_migrate.ets b/static_core/plugins/ets/tests/ets_test_suite/coroutines/await_migrate.ets index a4dd81da40..6f1a1f8d54 100644 --- a/static_core/plugins/ets/tests/ets_test_suite/coroutines/await_migrate.ets +++ b/static_core/plugins/ets/tests/ets_test_suite/coroutines/await_migrate.ets @@ -46,7 +46,7 @@ function testLaunch(): void { } function checkLaunchMigration(): void { - launch void>(testLaunch).Await(); + launch (testLaunch).Await(); } function main() { diff --git a/static_core/plugins/ets/tests/ets_test_suite/coroutines/class_load_race.ets b/static_core/plugins/ets/tests/ets_test_suite/coroutines/class_load_race.ets index 69cd705387..aa07fcf95d 100644 --- a/static_core/plugins/ets/tests/ets_test_suite/coroutines/class_load_race.ets +++ b/static_core/plugins/ets/tests/ets_test_suite/coroutines/class_load_race.ets @@ -42,7 +42,7 @@ function reader(): Int { function raceInTheCCtor(): void { for (let i = 0; i < 20; i++) { - launch Int>(reader); + launch(reader); } } diff --git a/static_core/plugins/ets/tests/ets_test_suite/coroutines/concurrent_await.ets b/static_core/plugins/ets/tests/ets_test_suite/coroutines/concurrent_await.ets index 57f07e5b54..e2de5590bd 100644 --- a/static_core/plugins/ets/tests/ets_test_suite/coroutines/concurrent_await.ets +++ b/static_core/plugins/ets/tests/ets_test_suite/coroutines/concurrent_await.ets @@ -44,9 +44,9 @@ function bar(p: Job) : int { } function main() { - let p1 = launch int>(foo); + let p1 = launch(foo); for (let i = 0; i < 2; ++i) { - let p2 = launch) => int>(bar, p1); + let p2 = launch(bar, p1); } // NOTE(panferovi): for more determinism we need to make sure // that bar coroutines are waiting for its awakening diff --git a/static_core/plugins/ets/tests/ets_test_suite/coroutines/eaworker_coroutines.ets b/static_core/plugins/ets/tests/ets_test_suite/coroutines/eaworker_coroutines.ets index 7010e6b0da..119f6c63e0 100644 --- a/static_core/plugins/ets/tests/ets_test_suite/coroutines/eaworker_coroutines.ets +++ b/static_core/plugins/ets/tests/ets_test_suite/coroutines/eaworker_coroutines.ets @@ -48,7 +48,7 @@ async function throwAsyncError(): Promise { } function testFooLaunch(): number { - let job : Job = launchnumber>(foo); + let job : Job = launch(foo); let result = job.Await(); return result; @@ -56,19 +56,19 @@ function testFooLaunch(): number { function testAddSchedule(): void { clearCounter(); - let job: Job = launchvoid>(add, INCREMENT); + let job: Job = launch(add, INCREMENT); Coroutine.Schedule(); } function recursiveFoo(): Job { - let job: Job = launchnumber>(testFooLaunch); + let job: Job = launch(testFooLaunch); return job; } function testRecursiveLaunch(): number { - let job: Job> = launch, ()=>Job>(recursiveFoo); + let job: Job> = launch>(recursiveFoo); let result = job.Await().Await(); return result; @@ -76,7 +76,7 @@ function testRecursiveLaunch(): number { function testLaunchThrow(): boolean { try { - let job: Job = launchvoid>(throwLaunchError); + let job: Job = launch(throwLaunchError); job.Await(); } catch (e) { return e instanceof Error; @@ -170,7 +170,7 @@ function testACAJcoroutine(): void { function testACoroutineCallAJCoroutine(): void { let ew = new EAWorker(); let job1 = ew.run(() => { - let job2: Job> = launch, ()=>Promise>(fooAsync) + let job2: Job> = launch>(fooAsync) let p = job2.Await(); let result = await p; @@ -183,7 +183,7 @@ function testACoroutineCallAJCoroutine(): void { } async function AsyncCallLaunch(): Promise> { - let job: Job = launchnumber>(foo); + let job: Job = launch(foo); return job; } diff --git a/static_core/plugins/ets/tests/ets_test_suite/coroutines/execution_order.ets b/static_core/plugins/ets/tests/ets_test_suite/coroutines/execution_order.ets index 1ff9739213..e984f50e26 100644 --- a/static_core/plugins/ets/tests/ets_test_suite/coroutines/execution_order.ets +++ b/static_core/plugins/ets/tests/ets_test_suite/coroutines/execution_order.ets @@ -48,7 +48,7 @@ async function foo() { async function bar() { executionOrder.checkpoint(2); let emptyBody = () => { return 0; }; - promiseIsPending ? launch Int>(emptyBody).Await() + promiseIsPending ? launch(emptyBody).Await() : await Promise.resolve(0); executionOrder.checkpoint(5); } diff --git a/static_core/plugins/ets/tests/ets_test_suite/coroutines/launch.ets b/static_core/plugins/ets/tests/ets_test_suite/coroutines/launch.ets index 658a7cdde7..c7e3fdcd4c 100644 --- a/static_core/plugins/ets/tests/ets_test_suite/coroutines/launch.ets +++ b/static_core/plugins/ets/tests/ets_test_suite/coroutines/launch.ets @@ -51,47 +51,38 @@ class C { } function main(): void { - const l0Result = launch string>(l0).Await(); - const l1Result = launch string>(l1, "l1_arg_0").Await(); + const l0Result = launch(l0).Await(); + const l1Result = launch(l1, "l1_arg_0").Await(); - const l2ResultJob: Job = launch< - string, - (a0: string, a1: number, a2: MyPayload) => string - >(l2, "l2_arg_0", 2.73, new MyPayload(3.14)); + const l2ResultJob: Job = launch(l2, "l2_arg_0", 2.73, new MyPayload(3.14)); const l2Result = l2ResultJob.Await(); assertEQ(l0Result, "l0"); assertEQ(l1Result, "l1: l1_arg_0"); assertEQ(l2Result, "l2: l2_arg_0 2.73 MyPayload.s=3.14"); - const f0ResultJob: Job = launch string>( + const f0ResultJob: Job = launch( f0 ); const f0Result = f0ResultJob.Await(); - const f1ResultJob: Job = launch string>( + const f1ResultJob: Job = launch( f1, "f1_arg_0" ); const f1Result = f1ResultJob.Await(); - const f2ResultJob: Job = launch< - string, - (a0: string, a1: number, a2: MyPayload) => string - >(f2, "f2_arg_0", 2.73, new MyPayload(3.14)); + const f2ResultJob: Job = launch(f2, "f2_arg_0", 2.73, new MyPayload(3.14)); const f2Result = f2ResultJob.Await(); assertEQ(f0Result, "f0"); assertEQ(f1Result, "f1: f1_arg_0"); assertEQ(f2Result, "f2: f2_arg_0 2.73 MyPayload.s=3.14"); - const s0Result = launch string>(C.s0).Await(); - const s1Result = launch string>(C.s1, "C.s1_arg_0" ).Await(); + const s0Result = launch(C.s0).Await(); + const s1Result = launch(C.s1, "C.s1_arg_0" ).Await(); - const s2ResultJob = launch< - string, - (a0: string, a1: number, a2: MyPayload) => string - >(C.s2, "C.s2_arg_0", 2.73, new MyPayload(3.14)); + const s2ResultJob = launch(C.s2, "C.s2_arg_0", 2.73, new MyPayload(3.14)); const s2Result = s2ResultJob.Await(); assertEQ(s0Result, "s0"); diff --git a/static_core/plugins/ets/tests/ets_test_suite/coroutines/launch_exception.ets b/static_core/plugins/ets/tests/ets_test_suite/coroutines/launch_exception.ets index 6a6f30cfe5..048a8ed1f0 100644 --- a/static_core/plugins/ets/tests/ets_test_suite/coroutines/launch_exception.ets +++ b/static_core/plugins/ets/tests/ets_test_suite/coroutines/launch_exception.ets @@ -32,7 +32,7 @@ function coro_error(): Object { function test_stack_overflow(): boolean { try { - launch Object | null>(coro_stack_overflow).Await(); + launch(coro_stack_overflow).Await(); console.println("No exceptions thrown by coro_stack_overflow() but should be!") return false; } catch (e) { @@ -46,7 +46,7 @@ function test_stack_overflow(): boolean { function test_error(): boolean { try { - launch Object>(coro_error).Await(); + launch(coro_error).Await(); console.println("No exceptions thrown by coro_error() but should be!") return false; } catch (e) { diff --git a/static_core/plugins/ets/tests/ets_test_suite/coroutines/launch_instr_array.ets b/static_core/plugins/ets/tests/ets_test_suite/coroutines/launch_instr_array.ets index 28544a77cf..4059a93280 100644 --- a/static_core/plugins/ets/tests/ets_test_suite/coroutines/launch_instr_array.ets +++ b/static_core/plugins/ets/tests/ets_test_suite/coroutines/launch_instr_array.ets @@ -25,7 +25,7 @@ class TestCoroutine { public jCor(): Job { const factory = () => {return new Object();} - return launch Object>(factory); + return launch(factory); } public run(): void { diff --git a/static_core/plugins/ets/tests/ets_test_suite/coroutines/launch_instruction.ets b/static_core/plugins/ets/tests/ets_test_suite/coroutines/launch_instruction.ets index 50335f605f..58ccd4e2da 100644 --- a/static_core/plugins/ets/tests/ets_test_suite/coroutines/launch_instruction.ets +++ b/static_core/plugins/ets/tests/ets_test_suite/coroutines/launch_instruction.ets @@ -120,32 +120,32 @@ function fiveargs(x1: int, x2: int, x3: int, x4: int, x5: int): Object | null { export function main(): int { reset() - launch Object | null>(noarg); + launch(noarg); Coroutine.Schedule(); check("noarg"); reset() - launch Object | null>(onearg, 1); + launch(onearg, 1); Coroutine.Schedule(); check("onearg"); reset() - launch Object | null>(twoargs, 1, 2); + launch(twoargs, 1, 2); Coroutine.Schedule(); check("twoargs"); reset() - launch Object | null>(threeargs, 1, 2, 3); + launch(threeargs, 1, 2, 3); Coroutine.Schedule(); check("threeargs"); reset() - launch Object | null>(fourargs, 1, 2, 3, 4); + launch(fourargs, 1, 2, 3, 4); Coroutine.Schedule(); check("fourargs"); reset() - launch Object | null>(fiveargs, 1, 2, 3, 4, 5); + launch(fiveargs, 1, 2, 3, 4, 5); Coroutine.Schedule(); check("fiveargs"); return 0; diff --git a/static_core/plugins/ets/tests/ets_test_suite/coroutines/launch_n_workers.ets b/static_core/plugins/ets/tests/ets_test_suite/coroutines/launch_n_workers.ets index adfcfc4c22..701553165c 100644 --- a/static_core/plugins/ets/tests/ets_test_suite/coroutines/launch_n_workers.ets +++ b/static_core/plugins/ets/tests/ets_test_suite/coroutines/launch_n_workers.ets @@ -55,7 +55,7 @@ function compare_worker_ids(): int { L.log("Testing launch in a separate worker"); let id_main: int = CoroutineExtras.getWorkerId(); - let id_coro: int = (launch Int>(return_worker_id).Await()) as int; + let id_coro: int = (launch(return_worker_id).Await()) as int; if (id_main != id_coro) { L.log("Successfully ran coro in a separate worker. Main WID: " + id_main + ", Coro WID: " + id_coro); return 0; @@ -76,21 +76,21 @@ function job(n: int): NullableType { function run_batch_launch(batch_size: int, iters: int): int { L.log("Testing batch launch of " + batch_size + " coroutines"); for (let i = 0; i < batch_size; ++i) { - launch NullableType>(job, iters); + launch(job, iters); } return 0; } function await_chain(n: int): NullableType { if (n > 0) { - launch NullableType>(await_chain, n-1).Await(); + launch(await_chain, n-1).Await(); } return null; } function run_await_chain(len: int): int { L.log("Testing await chain of " + len + " items"); - launch NullableType>(await_chain, len); + launch(await_chain, len); return 0; } @@ -101,7 +101,7 @@ function simple(): NullableType { function run_batch_await(batch_size: int): int { L.log("Testing batch await of " + batch_size + " coroutines"); for (let i = 0; i < batch_size; ++i) { - let j = launch NullableType>(simple); + let j = launch(simple); j.Await(); } return 0; diff --git a/static_core/plugins/ets/tests/ets_test_suite/coroutines/launch_oom.ets b/static_core/plugins/ets/tests/ets_test_suite/coroutines/launch_oom.ets index 0539f5729e..ee374eced9 100644 --- a/static_core/plugins/ets/tests/ets_test_suite/coroutines/launch_oom.ets +++ b/static_core/plugins/ets/tests/ets_test_suite/coroutines/launch_oom.ets @@ -24,7 +24,7 @@ function body(): Object { export function main(): int { try { for (let i = 0; i < 50000; ++i) { - launch Object>(body); + launch(body); ++counter; } } catch (e) { diff --git a/static_core/plugins/ets/tests/ets_test_suite/coroutines/launch_yield.ets b/static_core/plugins/ets/tests/ets_test_suite/coroutines/launch_yield.ets index 25b3e9348b..93129b4247 100644 --- a/static_core/plugins/ets/tests/ets_test_suite/coroutines/launch_yield.ets +++ b/static_core/plugins/ets/tests/ets_test_suite/coroutines/launch_yield.ets @@ -23,7 +23,7 @@ function add(a: int): String { } export function main(): int { - launch String>(add, 5); + launch(add, 5); Coroutine.Schedule(); if (counter != 5) { console.println("Invalid counter: expected 5 but was " + counter); diff --git a/static_core/plugins/ets/tests/ets_test_suite/coroutines/multiple_launch.ets b/static_core/plugins/ets/tests/ets_test_suite/coroutines/multiple_launch.ets index 2a3c338608..4b8fd70251 100644 --- a/static_core/plugins/ets/tests/ets_test_suite/coroutines/multiple_launch.ets +++ b/static_core/plugins/ets/tests/ets_test_suite/coroutines/multiple_launch.ets @@ -23,7 +23,7 @@ function return_value(i: int): String { function n_cor_launch(n_cor: int): int { let p: (Job | undefined)[] = new (Job | undefined)[n_cor]; for (let i = 0; i < n_cor; ++i) { - p[i] = launch String>(return_value, i); + p[i] = launch(return_value, i); } for (let i = 0; i < n_cor; ++i) { let val = (p[i]!).Await(); @@ -42,7 +42,7 @@ function throw_exception(): Object { function n_cor_exection_launch(n_cor: int): int { let p: (Job | undefined)[] = new (Job | undefined)[n_cor]; for (let i = 0; i < n_cor; ++i) { - p[i] = launch Object>(throw_exception); + p[i] = launch(throw_exception); } for (let i = 0; i < n_cor; ++i) { try { diff --git a/static_core/plugins/ets/tests/ets_test_suite/coroutines/scale_workers_pool.ets b/static_core/plugins/ets/tests/ets_test_suite/coroutines/scale_workers_pool.ets index 93f6e45690..930deee330 100644 --- a/static_core/plugins/ets/tests/ets_test_suite/coroutines/scale_workers_pool.ets +++ b/static_core/plugins/ets/tests/ets_test_suite/coroutines/scale_workers_pool.ets @@ -18,11 +18,11 @@ function main() { CoroutineExtras.scaleWorkersPool(1); CoroutineExtras.setSchedulingPolicy(CoroutineExtras.POLICY_NON_MAIN); - let workerId = launch Int>((): Int => { return CoroutineExtras.getWorkerId(); }).Await(); + let workerId = launch((): Int => { return CoroutineExtras.getWorkerId(); }).Await(); CoroutineExtras.scaleWorkersPool(-1); assertNE(mainId, workerId); CoroutineExtras.setSchedulingPolicy(CoroutineExtras.POLICY_ANY); - workerId = launch Int>((): Int => { return CoroutineExtras.getWorkerId(); }).Await(); + workerId = launch((): Int => { return CoroutineExtras.getWorkerId(); }).Await(); assertEQ(mainId, workerId); } diff --git a/static_core/plugins/ets/tests/ets_test_suite/coroutines/setTimeout.ets b/static_core/plugins/ets/tests/ets_test_suite/coroutines/setTimeout.ets index efadaecc0f..0281b358e4 100644 --- a/static_core/plugins/ets/tests/ets_test_suite/coroutines/setTimeout.ets +++ b/static_core/plugins/ets/tests/ets_test_suite/coroutines/setTimeout.ets @@ -75,7 +75,7 @@ function clearIntervalFromAnotherTimer() { function clearTimeoutFromAnotherWorkerTest() { let id = setTimeout(() => { assertTrue(false); }, longTimeout); - launch void>(clearTimeout, id); + launch(clearTimeout, id); } function sameWorkerIdTest() { @@ -86,6 +86,6 @@ function sameWorkerIdTest() { function main() { CoroutineExtras.setSchedulingPolicy(CoroutineExtras.POLICY_NON_MAIN); for (let test of tests) { - launch void>(test); + launch(test); } } diff --git a/static_core/plugins/ets/tests/ets_test_suite/coroutines/stats.ets b/static_core/plugins/ets/tests/ets_test_suite/coroutines/stats.ets index ddc5f3611a..ef9e18d0a4 100644 --- a/static_core/plugins/ets/tests/ets_test_suite/coroutines/stats.ets +++ b/static_core/plugins/ets/tests/ets_test_suite/coroutines/stats.ets @@ -27,10 +27,10 @@ async function async_f(a: int): Promise { export function main(): int { for (let i = 0; i < 10; ++i) { - launch String>(sync_f, 5); + launch(sync_f, 5); } for (let i = 0; i < 10; ++i) { - launch String>(sync_f, 5).Await(); + launch(sync_f, 5).Await(); } for (let i = 0; i < 10; ++i) { async_f(5); diff --git a/static_core/plugins/ets/tests/ets_test_suite/gc/finalization_registry_coro_test.ets b/static_core/plugins/ets/tests/ets_test_suite/gc/finalization_registry_coro_test.ets index ecb36587cb..92667e76b8 100644 --- a/static_core/plugins/ets/tests/ets_test_suite/gc/finalization_registry_coro_test.ets +++ b/static_core/plugins/ets/tests/ets_test_suite/gc/finalization_registry_coro_test.ets @@ -57,7 +57,7 @@ let promise_array: Array> = new Array>; function getSizeTests(finreg: FinalizationRegistry | null) { for (let i = 0; i < promise_count; i++) { - promise_array.push(launch | null, b: Int, c: Object) => void>(addToRegistry, finreg, 3, token)); + promise_array.push(launch(addToRegistry, finreg, 3, token)); } for (let i = 0; i < promise_array.length; i++) { @@ -92,10 +92,10 @@ function unregisterTests(finreg: FinalizationRegistry | null) { return finreg.unregister(s); }; - launch, token: Object) => void>(unregister, finreg!, token1).Await(); - launch, token: Object) => void>(unregister, finreg!, token2).Await(); - launch, token: Object) => void>(unregister, finreg!, token3).Await(); - launch, token: Object) => void>(unregister, finreg!, token4).Await(); + launch(unregister, finreg!, token1).Await(); + launch(unregister, finreg!, token2).Await(); + launch(unregister, finreg!, token3).Await(); + launch(unregister, finreg!, token4).Await(); assertEQ(0, finreg!.getSize(), "Size of unregister is invalid"); @@ -106,7 +106,7 @@ function unregisterTests(finreg: FinalizationRegistry | null) { assertEQ(obj_array.length * object_count, finreg!.getSize(), "Register function is invalid"); for (let i = 0; i < obj_array.length; i++) { - unreg_array.push(launch | null, b: Object) => void>(removeFromRegistry, finreg!, obj_array[i])); + unreg_array.push(launch(removeFromRegistry, finreg!, obj_array[i])); } for (let i = 0; i < unreg_array.length; ++i) { diff --git a/static_core/plugins/ets/tests/ets_test_suite/gc/stress/test_stress_gc_humongous.ets b/static_core/plugins/ets/tests/ets_test_suite/gc/stress/test_stress_gc_humongous.ets index 7ada0aaebf..3b535a200b 100644 --- a/static_core/plugins/ets/tests/ets_test_suite/gc/stress/test_stress_gc_humongous.ets +++ b/static_core/plugins/ets/tests/ets_test_suite/gc/stress/test_stress_gc_humongous.ets @@ -78,9 +78,9 @@ class TestHumongousStress { let corArrayTmp = new Array>(); for(let i = 0; i < this.threadsCount - 1; i++) { - corArrayTmp.push(launch Object|null>(cor, objPerCoroutine, this.humongousSize)); + corArrayTmp.push(launch(cor, objPerCoroutine, this.humongousSize)); } - let corArrayLast = launch Object|null>(cor, lastCoroutuneNumObjects, this.humongousSize); + let corArrayLast = launch(cor, lastCoroutuneNumObjects, this.humongousSize); Coroutine.Schedule(); diff --git a/static_core/plugins/ets/tests/ets_test_suite/gc/stress/test_stress_gc_humongous_bq.ets b/static_core/plugins/ets/tests/ets_test_suite/gc/stress/test_stress_gc_humongous_bq.ets index a63b02db5f..c8a12168ff 100644 --- a/static_core/plugins/ets/tests/ets_test_suite/gc/stress/test_stress_gc_humongous_bq.ets +++ b/static_core/plugins/ets/tests/ets_test_suite/gc/stress/test_stress_gc_humongous_bq.ets @@ -83,9 +83,9 @@ class TestHumongousStress { let corArrayTmp = new Array>(); for(let i = 0; i < this.threadsCount - 1; i++) { - corArrayTmp.push(launch Object|null>(TestHumongousStress.cor, objPerCoroutine, this.humongousSize)); + corArrayTmp.push(launch(TestHumongousStress.cor, objPerCoroutine, this.humongousSize)); } - let corArrayLast = launch Object|null>(TestHumongousStress.cor, lastCoroutuneNumObjects, this.humongousSize); + let corArrayLast = launch(TestHumongousStress.cor, lastCoroutuneNumObjects, this.humongousSize); Coroutine.Schedule(); diff --git a/static_core/plugins/ets/tests/ets_test_suite/gc/test_finreg_in_different_coros.ets b/static_core/plugins/ets/tests/ets_test_suite/gc/test_finreg_in_different_coros.ets index fa0a2f78e5..ffddcef7af 100644 --- a/static_core/plugins/ets/tests/ets_test_suite/gc/test_finreg_in_different_coros.ets +++ b/static_core/plugins/ets/tests/ets_test_suite/gc/test_finreg_in_different_coros.ets @@ -51,7 +51,7 @@ function InitFinRegAndFill(callback: (value: int) => void, isMainCoro: boolean = function runGCInDiffThreads() { doFullGC(); CoroutineExtras.setSchedulingPolicy(CoroutineExtras.POLICY_NON_MAIN); - launch void>(doFullGC).Await(); + launch(doFullGC).Await(); CoroutineExtras.setSchedulingPolicy(CoroutineExtras.POLICY_ANY); } @@ -62,7 +62,7 @@ function testFinRegOnMainAndDiffCoro() { result_finreg_not_main = value; } CoroutineExtras.setSchedulingPolicy(CoroutineExtras.POLICY_NON_MAIN); - launch void, f: boolean) => void>(InitFinRegAndFill, cb, false).Await(); + launch(InitFinRegAndFill, cb, false).Await(); CoroutineExtras.setSchedulingPolicy(CoroutineExtras.POLICY_ANY); InitFinRegAndFill((value: int) => { result_finreg_main = value; diff --git a/static_core/plugins/ets/tests/ets_test_suite/linker/runtime_linker_extensions.ets b/static_core/plugins/ets/tests/ets_test_suite/linker/runtime_linker_extensions.ets index f0218a2154..f99e4ab05e 100644 --- a/static_core/plugins/ets/tests/ets_test_suite/linker/runtime_linker_extensions.ets +++ b/static_core/plugins/ets/tests/ets_test_suite/linker/runtime_linker_extensions.ets @@ -252,7 +252,7 @@ class Test { const promises = new Array>(); // Add all files except "additional1.ets" for (let i = 1; i < allAbcFiles.length; i++) { - promises.push(launch void>(Test.addSingleAbcFile, linker, allAbcFiles[i])); + promises.push(launch(Test.addSingleAbcFile, linker, allAbcFiles[i])); } // Try to load a class from "additional1.ets" expectThrow(() => { linker.loadClass(Test.additionalClass1Name, true); }, diff --git a/static_core/plugins/ets/tests/interop_js/tests/coroutines/ts_to_ets/ets_coroutines_interop.ets b/static_core/plugins/ets/tests/interop_js/tests/coroutines/ts_to_ets/ets_coroutines_interop.ets index f1d5c5de19..23cef9b7b8 100644 --- a/static_core/plugins/ets/tests/interop_js/tests/coroutines/ts_to_ets/ets_coroutines_interop.ets +++ b/static_core/plugins/ets/tests/interop_js/tests/coroutines/ts_to_ets/ets_coroutines_interop.ets @@ -30,7 +30,7 @@ function checkInteropNegative(): boolean { CoroutineExtras.setSchedulingPolicy(CoroutineExtras.POLICY_NON_MAIN); EtsGlobalInitPlaceholder(); try { - launch JSValue>(Bar).Await(); + launch(Bar).Await(); } catch (e: NoInteropContextError) { return true; } diff --git a/static_core/plugins/ets/tests/interop_js/tests/promise/resolve_js_promise_from_non_main_coro_test.ets b/static_core/plugins/ets/tests/interop_js/tests/promise/resolve_js_promise_from_non_main_coro_test.ets index a5b1438ceb..4a1290d4fa 100644 --- a/static_core/plugins/ets/tests/interop_js/tests/promise/resolve_js_promise_from_non_main_coro_test.ets +++ b/static_core/plugins/ets/tests/interop_js/tests/promise/resolve_js_promise_from_non_main_coro_test.ets @@ -62,6 +62,6 @@ function testPromiseResolve(value: int): Promise { globalResolver = resolve; }); CoroutineExtras.setSchedulingPolicy(CoroutineExtras.POLICY_NON_MAIN); - launch int>(resolverFunction, value); + launch(resolverFunction, value); return p; } \ No newline at end of file diff --git a/static_core/plugins/ets/tests/interop_js/tests/promise/schedule_main_coro.ets b/static_core/plugins/ets/tests/interop_js/tests/promise/schedule_main_coro.ets index 2b942d0cbe..51527c995d 100644 --- a/static_core/plugins/ets/tests/interop_js/tests/promise/schedule_main_coro.ets +++ b/static_core/plugins/ets/tests/interop_js/tests/promise/schedule_main_coro.ets @@ -40,6 +40,6 @@ function foo() { function waitUntillJsIsReady() { CoroutineExtras.setSchedulingPolicy(CoroutineExtras.POLICY_NON_MAIN); - let p = launch void>(foo); + let p = launch(foo); asyncFoo(p); } diff --git a/static_core/plugins/ets/tests/interop_js/tests/timer/timer_tests.ets b/static_core/plugins/ets/tests/interop_js/tests/timer/timer_tests.ets index 7c985fdae5..a77c871d5b 100644 --- a/static_core/plugins/ets/tests/interop_js/tests/timer/timer_tests.ets +++ b/static_core/plugins/ets/tests/interop_js/tests/timer/timer_tests.ets @@ -355,7 +355,7 @@ function testClearTimerCrossWorker() setTimeout(() => { while (!isCleared.get()) {} }, 0); return setTimeout(() => { assertTrue(false); }, delay); }; - let id = launch number>(workerTimerCb).Await(); + let id = launch(workerTimerCb).Await(); clearTimeout(id); isCleared.set(true); } @@ -365,7 +365,7 @@ function testClearTimerCrossWorker() let triedToClear = false; let id = setTimeout(() => { assertTrue(triedToClear); }, delay); try { - launch void>(clearTimeout, id).Await(); + launch(clearTimeout, id).Await(); } catch (e) { assertEQ(e.toString(), "Error: Failed to clear timer. Unable to clear interop timer from non-interop worker"); triedToClear = true; diff --git a/static_core/plugins/ets/tests/native/exclusive_worker/exclusive_worker_tests.ets b/static_core/plugins/ets/tests/native/exclusive_worker/exclusive_worker_tests.ets index 5b948696e2..7db8265c25 100644 --- a/static_core/plugins/ets/tests/native/exclusive_worker/exclusive_worker_tests.ets +++ b/static_core/plugins/ets/tests/native/exclusive_worker/exclusive_worker_tests.ets @@ -43,7 +43,7 @@ function asyncCall(): boolean { // LaunchCallMethod function launchCall(): boolean { - let p = launch boolean>(call); + let p = launch(call); return p.Await(); } @@ -77,7 +77,7 @@ function mainRoutine() { eWorkerLaunchEvent.wait(); mainEvent.fire(); } - launch void>(l); + launch(l); } function eWorkerRoutine(): boolean { @@ -90,7 +90,7 @@ function eWorkerRoutine(): boolean { mainEvent.wait(); eWorkerAsyncEvent.fire(); } - launch void>(l); + launch(l); return true; } @@ -104,7 +104,7 @@ function clearCounter() { function scheduleACoroutine(): boolean { clearCounter(); - launchvoid>(():void => { + launch(():void => { add(5); }); Coroutine.Schedule(); @@ -112,7 +112,7 @@ function scheduleACoroutine(): boolean { } async function asyncAdd(a: int) { - launchvoid>(():void => { + launch(():void => { add(6); }); counter += a; @@ -126,12 +126,12 @@ function scheduleAJCoroutine(): boolean { } function launchCallWithoutAwait(): Job { - return launchboolean>(call) as Job; + return launch(call) as Job; } // recursive launch function recursiveLaunch(): boolean { - let res : Job> = launch, ()=>Job>(launchCallWithoutAwait) as Job>; + let res : Job> = launch>(launchCallWithoutAwait) as Job>; return res.Await().Await(); } @@ -154,12 +154,12 @@ function launchAsyncFunctions(): Promise { } function ACoroutineCallAsyncFunctions(): boolean { - let res : Job> = launch, ()=>Promise>(launchAsyncFunctions) as Job> + let res : Job> = launch>(launchAsyncFunctions) as Job> return await res.Await(); } async function asyncFunctionLaunchCall() { - return launchboolean>(call); + return launch(call); } function asyncFunctionLaunchACoroutine(): boolean { @@ -175,7 +175,7 @@ function body(): Object { function testOOM(): boolean { try { for (let i = 0; i < 50000; ++i) { - launchObject>(body); + launch(body); } } catch (e) { if (e instanceof OutOfMemoryError) { @@ -192,7 +192,7 @@ function testOOM(): boolean { function test_stack_overflow(): boolean { try { - launchObject | null>(coro_stack_overflow).Await(); + launch(coro_stack_overflow).Await(); console.println("No exceptions thrown by coro_stack_overflow() but should be!") return false; } catch (e) { @@ -219,7 +219,7 @@ function coro_error(): Object { function test_error(): boolean { try { - let res = launchObject>(coro_error); + let res = launch(coro_error); res.Await(); console.println("No exceptions thrown by coro_error() but should be!") return false; @@ -247,7 +247,7 @@ let e2m: LinkedBlockingQueue = new LinkedBlockingQueue(); let m2e: LinkedBlockingQueue = new LinkedBlockingQueue(); function EACoroutineSendToMain(): boolean { - launchvoid>(():void => { + launch(():void => { e2m.push(true); }); return m2e.pop(); diff --git a/static_core/plugins/ets/tests/native/sync_primitives/queue_spinlock_tests.ets b/static_core/plugins/ets/tests/native/sync_primitives/queue_spinlock_tests.ets index 595014f34e..667d1cf652 100644 --- a/static_core/plugins/ets/tests/native/sync_primitives/queue_spinlock_tests.ets +++ b/static_core/plugins/ets/tests/native/sync_primitives/queue_spinlock_tests.ets @@ -25,7 +25,7 @@ function runConcurrently(coroutinesCount: number, callback: () => void) { return true; }; for (let i = 0; i < coroutinesCount; ++i) { - let j = launch boolean>(guard); + let j = launch(guard); jobs.push(j); } for (let job of jobs) { -- Gitee