This repository was archived by the owner on Mar 8, 2020. It is now read-only.
Migrate to SDK.v3 - protocol.v2 with decode #84
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| BasedOnStyle: Google | ||
| AllowShortIfStatementsOnASingleLine: true | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,57 +1,66 @@ | ||
| dist: trusty | ||
| language: scala | ||
| jdk: | ||
| - openjdk8 | ||
| scala: | ||
| - 2.11.11 | ||
|
|
||
| services: | ||
| - docker | ||
|
|
||
| cache: | ||
| directories: | ||
| - $HOME/.ivy2 | ||
| - $HOME/.sbt | ||
|
|
||
| stages: | ||
| - name: test | ||
| - name: release | ||
| if: tag IS present | ||
|
|
||
|
|
||
| jobs: | ||
| include: | ||
| - name: 'All tests' | ||
| stage: test | ||
| if: tag IS present # TODO(bzz): enable on PRs as soon as migrated to V2 | ||
| install: &test_setup_anchor | ||
| - docker run --privileged -d -p 9432:9432 --name bblfsh bblfsh/bblfshd | ||
| - docker exec -it bblfsh bblfshctl driver install --recommended | ||
| - sudo apt-get update | ||
| - sudo apt-get install -y --no-install-recommends clang g++ gcc gcc-multilib libc6-dev libc6-dev-i386 mingw-w64 patch xz-utils | ||
| script: | ||
| - ./sbt assembly test | ||
| after_failure: &failure_logs_anchor | ||
| - docker logs bblfsh | ||
|
|
||
| - name: 'V2: passing tests' # TODO(#83): remove, after both tests sets converge | ||
| install: *test_setup_anchor | ||
| script: | ||
| - sudo apt-get install -y binutils | ||
| - ./sbt assembly | ||
| - ./sbt "testOnly *Close* *ClientVersion* *SupportedLanguages*" | ||
| - ./sbt "testOnly org.bblfsh.client.v2.BblfshClientParseTest -- -z \"Decoded UAST after parsing\"" | ||
| - ./sbt "testOnly org.bblfsh.client.v2.BblfshClientParseTest -- -z \"Decoded UAST RootNode\"" | ||
| after_failure: *failure_logs_anchor | ||
|
|
||
| - name: 'Cross-compile, release & publish to Sonatype' | ||
bzz marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| stage: release | ||
| before_install: | ||
| - mkdir -p /tmp/osxcross | ||
| - cd /tmp/osxcross | ||
| - curl -sSL "https://codeload.github.com/tpoechtrager/osxcross/tar.gz/${OSXCROSS_REV}" | tar -C /tmp/osxcross --strip=1 -xzf - | ||
| - curl -s -S -L -o tarballs/MacOSX${SDK_VERSION}.sdk.tar.xz ${OSXCROSS_SDK_URL} | ||
| - UNATTENDED=yes ./build.sh >/dev/null | ||
| - mv target "${OSXCROSS_PATH}" | ||
| - curl -S -L "https://github.com/karalabe/xgo/blob/647f256c447ee20f9bf13ebc42e612d55994a383/docker/base/patch.tar.xz?raw=true" | xz -dc - | tar -xf - | ||
| - mv v1 "${OSXCROSS_PATH}/SDK/MacOSX${SDK_VERSION}.sdk/usr/include/c++/v1" | ||
| - rm -rf /tmp/osxcross "${OSXCROSS_PATH}/SDK/MacOSX${SDK_VERSION}.sdk/usr/share/man" | ||
| script: | ||
| - cd $TRAVIS_BUILD_DIR | ||
| - ./sbt assembly | ||
| - ./sbt publishLocal | ||
| - openssl aes-256-cbc -K $encrypted_97aef7f4ae04_key -iv $encrypted_97aef7f4ae04_iv -in key.asc.enc -out key.asc -d | ||
| - gpg --no-default-keyring --primary-keyring ./project/.gnupg/pubring.gpg --secret-keyring ./project/.gnupg/secring.gpg --keyring ./project/.gnupg/pubring.gpg --fingerprint --import key.asc | ||
| - ./sbt publishSigned | ||
| - ./sbt sonatypeRelease | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| #include "jni_utils.h" | ||
|
|
||
| // Class fully qualified names | ||
| const char *CLS_NODE = "org/bblfsh/client/v2/Node"; | ||
| const char *CLS_CTX = "org/bblfsh/client/v2/Context"; | ||
|
|
||
| extern JavaVM *jvm; // FIXME(bzz): double-check and document | ||
|
|
||
| JNIEnv *getJNIEnv() { | ||
| JNIEnv *pEnv = NULL; | ||
|
|
||
| switch (jvm->GetEnv((void **)&pEnv, JNI_VERSION_1_8)) { | ||
| case JNI_OK: // Thread is ready to use, nothing to do | ||
| break; | ||
|
|
||
| case JNI_EDETACHED: // Thread is detached, need to attach | ||
| jvm->AttachCurrentThread((void **)&pEnv, NULL); | ||
| break; | ||
| } | ||
|
|
||
| return pEnv; | ||
| } | ||
|
|
||
| jobject NewJavaObject(JNIEnv *env, const char *className, const char *initSign, | ||
| ...) { | ||
| jclass cls = env->FindClass(className); | ||
| if (env->ExceptionOccurred() || !cls) { | ||
| return NULL; | ||
| } | ||
|
|
||
| jmethodID initId = env->GetMethodID(cls, "<init>", initSign); | ||
| if (env->ExceptionOccurred() || !initId) { | ||
| return NULL; | ||
| } | ||
|
|
||
| va_list varargs; | ||
| va_start(varargs, initSign); | ||
| jobject instance = env->NewObjectV(cls, initId, varargs); | ||
| va_end(varargs); | ||
| if (env->ExceptionOccurred() || !instance) { | ||
| return NULL; | ||
| } | ||
|
|
||
| return instance; | ||
| } | ||
|
|
||
| jfieldID getField(JNIEnv *env, jobject obj, const char *name) { | ||
| jclass cls = env->GetObjectClass(obj); | ||
| if (env->ExceptionOccurred() || !cls) { | ||
| return nullptr; | ||
| } | ||
|
|
||
| jfieldID jfid = env->GetFieldID(cls, name, "J"); | ||
| if (env->ExceptionOccurred() || !jfid) { | ||
| return nullptr; | ||
| } | ||
| return jfid; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| #ifndef _Included_org_bblfsh_client_libuast_Libuast_jni_utils | ||
| #define _Included_org_bblfsh_client_libuast_Libuast_jni_utils | ||
|
|
||
| #include <jni.h> | ||
|
|
||
| extern const char *CLS_NODE; | ||
| extern const char *CLS_CTX; | ||
|
|
||
| JNIEnv *getJNIEnv(); | ||
| jobject NewJavaObject(JNIEnv *, const char *, const char *, ...); | ||
|
There was a problem hiding this comment. I'm not sure I follow the naming convention in use here. Google style is (I'm not wedded to Google style, I only mentioned that because you included a clang-format config based on that style) There was a problem hiding this comment. This is an old code, I belive it follow the same that was used in libuast. I'm not settled on this one either, but I think it's totally fine to use almost whatever in a the well-localized JNI wrappers themselves. Will be happy to refactor it, if needed, and add a better formatter config to all the projects later on, as soon as we have something functional in scala-client. For now, I'm mostly not very worried about it because of the limited scope and no expectations for this native piece to grow. There was a problem hiding this comment. Yeah, this doesn't need to be addressed right now, I just wanted to make a note of it while we're paying attention to this code. 🙂 |
||
| jfieldID getField(JNIEnv *env, jobject obj, const char *name); | ||
|
|
||
| #endif | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.