Skip to content

Commit

Permalink
Merge pull request #43753 from ballerina-platform/2201.11.0-stage
Browse files Browse the repository at this point in the history 
Sync 2201.11.x with 2201.11.0-stage
  • Loading branch information
@chiranSachintha
chiranSachintha authored Feb 14, 2025
2 parents aa52ca7 + 02f7e64 commit 8b422ce
Show file tree
Hide file tree
Showing 34 changed files with 728 additions and 500 deletions.
18 changes: 17 additions & 1 deletion .github/workflows/publish_release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@ jobs:
with:
distribution: 'temurin'
java-version: '21.0.3'
- name: Setup GraalVM
uses: graalvm/setup-graalvm@v1
with:
java-version: '21.0.3'
distribution: 'graalvm'
components: 'native-image'
github-token: ${{ secrets.GITHUB_TOKEN }}
set-java-home: 'false'
- name: Set version env variable
run: |
echo "VERSION=$(./gradlew properties | grep ^version: | cut -d\ -f2 | sed 's@-SNAPSHOT@@')" >> $GITHUB_ENV
Expand All @@ -28,8 +36,16 @@ jobs:
git config user.name ${{ secrets.BALLERINA_BOT_USERNAME }}
git config user.email ${{ secrets.BALLERINA_BOT_EMAIL }}
git checkout -b release-${VERSION}
./gradlew release -Prelease.useAutomaticVersion=true
./gradlew build -Pversion=${VERSION}
./gradlew -Pversion=${VERSION} publish -x test --continue
- name: Create Release Tag
run: |
git config --local user.name ${{ secrets.BALLERINA_BOT_USERNAME }}
git config --local user.email ${{ secrets.BALLERINA_BOT_EMAIL }}
git tag -a v${VERSION} -m "Release v${VERSION}"
git push origin v${VERSION}
env:
GITHUB_TOKEN: ${{ secrets.BALLERINA_BOT_TOKEN }}
- name: Create Github release from the release tag
run: |
curl --request POST 'https://api.github.com/repos/ballerina-platform/ballerina-lang/releases' \
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/pull_request_full_build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ on:
pull_request:
branches:
- master
- 2201.[0-9]+.x
- 2201.[0-9]+.[0-9]+-stage

jobs:
build-lang:
Expand Down Expand Up @@ -59,7 +61,7 @@ jobs:
strategy:
fail-fast: false
matrix:
level: [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
level: [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]

steps:
- name: Checkout Repository
Expand Down
127 changes: 71 additions & 56 deletions bvm/ballerina-runtime/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,17 @@ Dependency versions can be found [here](https://github.com/ballerina-platform/ba
## Ballerina Java Runtime API
Ballerina runtime API will contain the following sub packages.

| **Package** | **Description** |
|---------------------------------------|--------------------------------------------------|
| io.ballerina.runtime.api | Basic runtime constructs |
| io.ballerina.runtime.api.concurrent | Handle Ballerina asynchronous related constructs |
| io.ballerina.runtime.api.constants | Runtime constants |
| io.ballerina.runtime.api.creators | APIs to create types, values, etc. |
| io.ballerina.runtime.api.flags | Runtime flags |
| io.ballerina.runtime.api.launch | Constructs for startup runtime |
| io.ballerina.runtime.api.types | Represent Ballerina Java types |
| io.ballerina.runtime.api.utils | Utils methods |
| io.ballerina.runtime.api.utils.values | Represent Ballerina Java values |
| **Package** | **Description** |
|-------------------------------------|-----------------------------------------------------|
| io.ballerina.runtime.api | Basic runtime constructs |
| io.ballerina.runtime.api.concurrent | Handle Ballerina-related asynchronous constructs |
| io.ballerina.runtime.api.constants | Runtime constants |
| io.ballerina.runtime.api.creators | APIs to create types, values, errors, etc. |
| io.ballerina.runtime.api.flags | Runtime flags for types and symbols |
| io.ballerina.runtime.api.repository | Runtime repository constructs for remote-management |
| io.ballerina.runtime.api.types | Represent Ballerina Java types |
| io.ballerina.runtime.api.utils | Utils methods |
| io.ballerina.runtime.api.values | Represent Ballerina Java values |

## Map Java types to Ballerina types
The following table summarizes how Java types are mapped to corresponding Ballerina types. This is applicable when mapping a return type of a Java method to a Ballerina type.
Expand Down Expand Up @@ -98,13 +98,12 @@ The following table summarizes how Ballerina types are mapped to corresponding J

## Main API constructs

| **Construct** | **Description** |
|------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| io.ballerina.runtime.api.Environment | Developers can use this as the first argument of an interop method, Ballerina will inject an instance of `Environment` class when calling. That instance can be used to communicate with the currently executing Ballerina runtime. With `Environment` instance, you can get interop Ballerina function name, path parameters, strand id, strand metadata, current module, current runtime, etc. |
| io.ballerina.runtime.api.Future | This will contain the future value once we call the Ballerina method from API asynchronously. |
| io.ballerina.runtime.api.Module | Represent Java runtime module. |
| **Construct** | **Description** |
|------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| io.ballerina.runtime.api.Environment | Developers can use this as the first argument of an interop method, Ballerina will inject an instance of `Environment` class when calling. That instance can be used to communicate with the currently executing Ballerina runtime. With `Environment` instance, you can get interop Ballerina function name, path parameters, strand id, strand metadata, current module, current runtime, etc. |
| io.ballerina.runtime.api.Module | Represent Java runtime module. |
| io.ballerina.runtime.api.types.PredefinedTypes | Contains predefined types. |
| io.ballerina.runtime.api.Runtime | An instance of the current runtime can be obtained through an `Environment` instance. This will contain APIs to call Ballerina object methods asynchronously. |
| io.ballerina.runtime.api.Runtime | An instance of the current runtime can be obtained through an `Environment` instance. This will contain APIs to call Ballerina object methods asynchronously. |
| io.ballerina.runtime.api.types.TypeTags | Contains runtime type tags. |

## Create a Ballerina value
Expand Down Expand Up @@ -134,23 +133,16 @@ types will not work correctly in the Ballerina code since those type definitions

Those can only be used for Java unit tests.

## Calling a Ballerina object method

Ballerina runtime exposes APIs to call a Ballerina object method and Ballerina function pointer using Java.

`io.ballerina.runtime.api.Runtime` class exposes two Java APIs to call object methods.

1. `invokeMethodAsyncSequentially`

Invoke the object method asynchronously and sequentially. This method will ensure that the object methods are invoked in the same thread where other object methods are executed. So, the methods will be executed sequentially per object level.
## Calling Ballerina object methods and functions

2. `invokeMethodAsyncConcurrently`
Ballerina runtime exposes APIs to call Ballerina object methods and functions using Java. If the method is called with an available running strand, the method will be executed in the same strand. The caller can decide whether to execute the method concurrently or sequentially using the `StrandMetadata` argument.
The `isConcurrentSafe` property of the `StrandMetadata` argument should be set to `true` only if the caller guarantees that the mutable state is free of data races for the given method and arguments, allowing the method to run concurrently.

Invoke the object method asynchronously and concurrently. The caller needs to ensure that no data race is possible for the mutable state with a given object method and arguments so that the method can be concurrently run with different OS threads.
## Calling a Ballerina object method

>**Note:** If the caller can ensure that the given object and object method are isolated and no data race is possible for the mutable state with given arguments, use `invokeMethodAsyncConcurrently`, otherwise use `invokeMethodAsyncSequentially`. We can decide the object method isolation if and only if both `object.getType().isIsolated()` and `object.getType().isIsolated(methodName)` return `true`.
Ballerina runtime exposes `callMethod` API to call a Ballerina object method using the `io.ballerina.runtime.api.Runtime` class.

The following code shows an example of calling an isolated method using Java API.
The following code shows an example of calling an object method using Java API.

#### Ballerina

Expand Down Expand Up @@ -178,35 +170,64 @@ public class Person {
public function main() {
Person p = new Person("John", 30);
string sport = p.callPlay("football");
string sport = p.callPlayWithArgs("football");
}
```

#### Java

```java
class Test {
public static BString callPlay(Environment env, BObject object, BString bString) {
env.getRuntime().invokeMethodAsyncConcurrently(object, "play", "play", null,
new Callback() {
@Override
public void notifySuccess(Object result) {
future.complete(result);
}

@Override
public void notifyFailure(BError error) {
future.complete(error);
}
}, null, PredefinedTypes.TYPE_STRING, bString, true);
return null;
}
public static BString callPlayWithArgs(Environment env, BObject object, BString bString) {
return env.getRuntime().callMethod(object, "play", null, bString);
}
}
```

## Calling a Ballerina function

Ballerina runtime exposes APIs to call a Ballerina function using Java. This can be done in two ways that are described below.

### Calling a Function using `io.ballerina.runtime.api.Runtime` class

Developers can call a Ballerina function using the `io.ballerina.runtime.api.Runtime` class. This class exposes the `callFunction` method to call a Ballerina function.

E.g.

#### Ballerina

The following Ballerina code defines a function in module `foo` from organization `testOrg`.

```ballerina
public function main() returns error? {
boolean b = <boolean>callIsEven(2);
}
function isEven(int n) returns boolean {
return n % 2 == 0;
}
public isolated function callIsEven(int n) returns any = @java:Method {
'class: "org.ballerinalang.examples.Test",
name: "callIsEven"
} external;
```

#### Java

```java

class Test {
public static Object callIsEven(Environment env, long arg) {
return env.getRuntime().callFunction(new Module("testOrg", "foo"), "isEven", null, arg);
}
}
```

### Calling a Function Pointer

Developers can call a function through a function pointer which passes through an interop function. Runtime exposes the `asyncCall` method in `io.ballerina.runtime.api.values.BFunctionPointer` class.
Developers can call a function through a function pointer which passes through an interop function. Runtime exposes the `call` method in `io.ballerina.runtime.api.values.BFunctionPointer` class.

E.g.

Expand All @@ -233,15 +254,9 @@ public isolated function invokeFunctionPointer(function func, any|error... args)

```java
class Test {
public static Object invokeFunctionPointer(Object func, Object[] args) {
public static Object invokeFunctionPointer(Environment env, Object func, Object[] args) {
BFunctionPointer function = (BFunctionPointer) func;
List<Object> argList = new ArrayList<>();
for (Object arg : args) {
argList.add(arg);
argList.add(true); // Due to a limitation in the current API we need to pass `true` as every other
// parameter value to handle default values.
}
return function.asyncCall(argList.toArray(), o -> o, METADATA);
return function.call(env.getRuntime(), args);
}
}
```
```
10 changes: 3 additions & 7 deletions bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/BalRuntime.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,8 @@
import io.ballerina.runtime.internal.errors.ErrorCodes;
import io.ballerina.runtime.internal.errors.ErrorHelper;
import io.ballerina.runtime.internal.launch.LaunchUtils;
import io.ballerina.runtime.internal.scheduling.AsyncUtils;
import io.ballerina.runtime.internal.scheduling.RuntimeRegistry;
import io.ballerina.runtime.internal.scheduling.Scheduler;
import io.ballerina.runtime.internal.values.FutureValue;

import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
Expand Down Expand Up @@ -74,9 +72,7 @@ public Object init() {
handleAlreadyCalled(moduleInitialized, "init");
try {
this.invokeConfigInit();
FutureValue future = scheduler.startIsolatedFunction(rootModule, "$moduleInit",
new StrandMetadata(true, null));
Object result = AsyncUtils.getFutureResult(future.completableFuture);
Object result = scheduler.callFunction(rootModule, "$moduleInit", new StrandMetadata(true, null));
this.moduleInitialized = true;
return result;
} catch (ClassNotFoundException e) {
Expand Down Expand Up @@ -212,11 +208,11 @@ private void validateArgs(BObject object, String methodName) {
}
}

Object invokeModuleStop() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException,
void invokeModuleStop() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException,
IllegalAccessException {
Class<?> configClass = loadClass(MODULE_INIT_CLASS_NAME);
Method method = configClass.getDeclaredMethod("$currentModuleStop", BalRuntime.class);
return method.invoke(null, this);
method.invoke(null, this);
}

protected Class<?> loadClass(String className) throws ClassNotFoundException {
Expand Down
Loading

0 comments on commit 8b422ce

Please sign in to comment.