#include "JniRcsResourceContainer.h"
+#include "JavaClasses.h"
#include "JavaLocalRef.h"
#include "JNIEnvWrapper.h"
#include "Log.h"
#include "Verify.h"
-#include "JniRcsObject.h"
+#include <dlfcn.h>
+#include "ResourceContainerBundleAPI.h"
+#include "JniBundleResource.h"
#include "RCSResourceContainer.h"
-#include "RCSBundleInfo.h"
-#define LOG_TAG "JNI-RCSResourceContainer"
-using namespace OIC::Service;
-#define CLS_NAME_BUNDLE_INFO PACKAGE_NAME "/resourcecontainer/RcsBundleInfo"
+#define LOG_TAG "JNI-RCSResourceContainer"
-#include <android/log.h>
+using namespace OIC::Service;
+#define CLS_NAME_BUNDLE_INFO "org/iotivity/service/resourcecontainer/RcsBundleInfo"
+std::map< string, BundleResource::Ptr > android_resources;
namespace
{
jclass g_cls_RCSBundleInfo;
+ jfieldID g_field_mNativeHandle;
jmethodID g_ctor_RCSBundleInfo;
JavaLocalObject entryObj { env, invoke_Iterator_next(env, iterObj) };
JavaLocalString keyObj { env,
- static_cast< jstring >(invoke_MapEntry_getKey(env, entryObj))
- };
+ static_cast< jstring >(invoke_MapEntry_getKey(env, entryObj)) };
+
JavaLocalString valueObj { env,
- static_cast< jstring >(invoke_MapEntry_getValue(env, entryObj))
- };
+ static_cast< jstring >(invoke_MapEntry_getValue(env, entryObj)) };
ret.emplace(toStdString(env, keyObj), toStdString(env, valueObj));
}
return ret;
}
+
+ jobject newBundleInfoObj(JNIEnvWrapper *env, const std::unique_ptr< RCSBundleInfo > &bundleInfo)
+ {
+ LOGD("new bundle info");
+ __android_log_print(ANDROID_LOG_DEBUG, "CONTAINER", "newBundleInfoObj %s",bundleInfo->getActivatorName().c_str());
+ JavaLocalString id{env, newStringObject(env, bundleInfo->getID()) };
+ JavaLocalString path{env, newStringObject(env, bundleInfo->getPath()) };
+ JavaLocalString activatorName{env, newStringObject(env, bundleInfo->getActivatorName()) };
+ JavaLocalString libraryPath{env, newStringObject(env, bundleInfo->getLibraryPath()) };
+ JavaLocalString version{env, newStringObject(env, bundleInfo->getVersion()) };
+
+ return env->NewObject(g_cls_RCSBundleInfo, g_ctor_RCSBundleInfo,
+ id.get(), path.get(), activatorName.get(), libraryPath.get(), version.get(),
+ bundleInfo->isActivated());
+ }
}
void initRCSResourceContainer(JNIEnvWrapper *env)
{
g_cls_RCSBundleInfo = env->FindClassAsGlobalRef(CLS_NAME_BUNDLE_INFO);
- g_ctor_RCSBundleInfo = env->GetConstructorID(g_cls_RCSBundleInfo, "()V");
+ g_ctor_RCSBundleInfo = env->GetConstructorID(g_cls_RCSBundleInfo, "("
+ AS_SIG(CLS_NAME_STRING)
+ AS_SIG(CLS_NAME_STRING)
+ AS_SIG(CLS_NAME_STRING)
+ AS_SIG(CLS_NAME_STRING)
+ AS_SIG(CLS_NAME_STRING)
+ ")V");
+
+ auto clsJniBundleResource = env->FindClass(PACKAGE_NAME "/BundleResource");
+
+ g_field_mNativeHandle = env->GetFieldID(clsJniBundleResource, "mNativeHandle", "J");
}
void clearRCSResourceContainer(JNIEnvWrapper *env)
{
LOGD("nativeStartContainer");
+ // A strange error message happens if the container is used as native library on Android
+ // and further native libraries are loaded at runtime.
+ const char *error;
+ if ((error = dlerror()) != NULL)
+ {
+ __android_log_print(ANDROID_LOG_DEBUG, "JNI-RCSResourceContainer",
+ "dlerror: %s.", error);
+ }
+
EXPECT(configFileObj, "ConfigFile is null.");
auto configFile = toStdString(env, configFileObj);
}
JNIEXPORT void JNICALL
-Java_org_iotivity_service_resourcecontainer_RcsResourceContainer_nativeStopContainer
-(JNIEnv *env, jobject)
+Java_org_iotivity_service_resourcecontainer_RcsResourceContainer_nativeStopContainer(JNIEnv *env, jobject)
{
LOGD("nativeStopContainers");
+ // A strange error message happens if the container is used as native library on Android
+ // and further native libraries are loaded at runtime.
+ const char *error;
+ if ((error = dlerror()) != NULL)
+ {
+ __android_log_print(ANDROID_LOG_DEBUG, "JNI-RCSResourceContainer",
+ "dlerror: %s.", error);
+ }
+
RCSResourceContainer::getInstance()->stopContainer();
}
{
LOGD("nativeAddBundle");
+ // A strange error message happens if the container is used as native library on Android
+ // and further native libraries are loaded at runtime.
+ const char *error;
+ if ((error = dlerror()) != NULL)
+ {
+ __android_log_print(ANDROID_LOG_DEBUG, "JNI-RCSResourceContainer",
+ "dlerror: %s.", error);
+ }
+
EXPECT(idObj, "BundleId is null.");
EXPECT(pathObj, "BundlePath is null.");
EXPECT(activatorObj, "Activator is null.");
{
LOGD("nativeRemoveBundle");
+ // A strange error message happens if the container is used as native library on Android
+ // and further native libraries are loaded at runtime.
+ const char *error;
+ if ((error = dlerror()) != NULL)
+ {
+ __android_log_print(ANDROID_LOG_DEBUG, "JNI-RCSResourceContainer",
+ "dlerror: %s.", error);
+ }
+
EXPECT(idObj, "BundleId is null.");
auto id = toStdString(env, idObj);
{
LOGD("nativeListBundles");
+ // A strange error message happens if the container is used as native library on Android
+ // and further native libraries are loaded at runtime.
+ const char *error;
+ if ((error = dlerror()) != NULL)
+ {
+ __android_log_print(ANDROID_LOG_DEBUG, "JNI-RCSResourceContainer",
+ "dlerror: %s.", error);
+ }
+
JNIEnvWrapper envWrapper(env);
try
{
auto listObj = newArrayList(&envWrapper);
- for (auto& uniqeBundleInfo : RCSResourceContainer::getInstance()->listBundles())
+ for (const auto& bundleInfo : RCSResourceContainer::getInstance()->listBundles())
{
- RCSBundleInfo* bundleInfo = uniqeBundleInfo.release();
- // FIXME we need a safe way to keep bundle info in java obj!!
- // because we currently put raw pointer in the java obj.
-
- JavaLocalObject bundleInfoObj { &envWrapper,
- envWrapper.NewObject(g_cls_RCSBundleInfo, g_ctor_RCSBundleInfo) };
-
- setSafeNativeHandle< RCSBundleInfo* >(&envWrapper, bundleInfoObj, bundleInfo);
-
+ JavaLocalObject bundleInfoObj{ &envWrapper, newBundleInfoObj(&envWrapper, bundleInfo) };
invoke_Collection_add(&envWrapper, listObj, bundleInfoObj);
}
return listObj;
{
LOGD("nativeStartBundle");
+ // A strange error message happens if the container is used as native library on Android
+ // and further native libraries are loaded at runtime.
+ const char *error;
+ if ((error = dlerror()) != NULL)
+ {
+ __android_log_print(ANDROID_LOG_DEBUG, "JNI-RCSResourceContainer",
+ "dlerror: %s.", error);
+ }
+
EXPECT(idObj, "BundleId is null.");
auto id = env->GetStringUTFChars(idObj, NULL);
{
LOGD("nativeStopBundle");
+ // A strange error message happens if the container is used as native library on Android
+ // and further native libraries are loaded at runtime.
+ const char *error;
+ if ((error = dlerror()) != NULL)
+ {
+ __android_log_print(ANDROID_LOG_DEBUG, "JNI-RCSResourceContainer",
+ "dlerror: %s.", error);
+ }
+
EXPECT(idObj, "BundleId is null.");
auto id = env->GetStringUTFChars(idObj, NULL);
auto listObj = newArrayList(&envWrapper);
- for (const auto & s : RCSResourceContainer::getInstance()->listBundleResources(id))
+ for (const auto& s : RCSResourceContainer::getInstance()->listBundleResources(id))
{
- JavaLocalString strObj { &envWrapper, newStringObject(&envWrapper, s) };
+ JavaLocalString strObj{ &envWrapper, newStringObject(&envWrapper, s) };
invoke_Collection_add(&envWrapper, listObj, strObj);
}
return nullptr;
}
+
+JNIEXPORT void JNICALL
+Java_org_iotivity_service_resourcecontainer_RcsResourceContainer_nativeRegisterBundleResource
+(JNIEnv *env, jobject obj, jobject bundleResource, jobjectArray attributes, jstring bundleId,
+ jstring uri, jstring resourceType, jstring res_name)
+{
+ JNIEnvWrapper envWrapper(env);
+ LOGD("nativeRegisterJniBundleResource");
+ auto str_bundle_id = toStdString(&envWrapper, bundleId);
+ __android_log_print(ANDROID_LOG_DEBUG, "JNI-RCSResourceContainer", "retrieved bundle id: %s.",
+ str_bundle_id.c_str());
+ auto str_uri = toStdString(&envWrapper, uri);
+ __android_log_print(ANDROID_LOG_DEBUG, "JNI-RCSResourceContainer", "retrieved uri: %s.",
+ str_uri.c_str());
+ auto str_resourceType = toStdString(&envWrapper, resourceType);
+ __android_log_print(ANDROID_LOG_DEBUG, "JNI-RCSResourceContainer", "retrieved resource type: %s.",
+ str_resourceType.c_str());
+ auto str_res_name = toStdString(&envWrapper, res_name);
+ LOGD("retrieved res name.");
+ JniBundleResource res;
+
+ BundleResource::Ptr androidResource = std::make_shared< JniBundleResource >
+ (env, obj, bundleResource, str_bundle_id, attributes);
+ ResourceContainerImpl *container = ResourceContainerImpl::getImplInstance();
+
+ androidResource->m_uri = str_uri;
+ androidResource->m_resourceType = str_resourceType;
+ androidResource->m_name = str_res_name;
+ androidResource->m_bundleId = str_bundle_id;
+
+ // link java resource instance to c++ resource instance
+ env->SetLongField(bundleResource, g_field_mNativeHandle, reinterpret_cast< jlong >(androidResource.get()));
+
+ container->registerResource(androidResource);
+
+ android_resources[str_uri] = androidResource;
+}
+
+/*
+ * Class: org_iotivity_resourcecontainer_bundle_api_BaseActivator
+ * Method: unregisterJavaResource
+ * Signature: (Lorg/iotivity/resourcecontainer/bundle/api/BundleResource;)V
+ */
+JNIEXPORT void JNICALL
+Java_org_iotivity_service_resourcecontainer_RcsResourceContainer_nativeUnregisterBundleResource
+(JNIEnv *env, jobject obj, jobject bundleResource, jstring uri)
+{
+ (void)obj;
+ (void)bundleResource;
+ const char *str_uri = env->GetStringUTFChars(uri, 0);
+
+ if (android_resources[str_uri] != NULL)
+ {
+ ResourceContainerImpl *container = ResourceContainerImpl::getImplInstance();
+ container->unregisterResource(android_resources[str_uri]);
+ android_resources.erase(str_uri);
+ }
+}
+
+/*
+ * Class: org_iotivity_resourcecontainer_bundle_api_BaseActivator
+ * Method: getNumberOfConfiguredResources
+ * Signature: (Ljava/lang/String;)I
+ */
+JNIEXPORT jint JNICALL
+Java_org_iotivity_service_resourcecontainer_RcsResourceContainer_nativeGetNumberOfConfiguredResources(
+ JNIEnv *env, jobject obj, jstring bundleId)
+{
+ (void)obj;
+ LOGD("nativeGetNumberOfConfiguredResources");
+ const char *str_bundleId = env->GetStringUTFChars(bundleId, 0);
+ LOGD("retrieved bundle id");
+ __android_log_print(ANDROID_LOG_DEBUG, "CONTAINER", "getNumberOfConfiguredResources %s",str_bundleId);
+ ResourceContainerImpl *container = ResourceContainerImpl::getImplInstance();
+ vector< resourceInfo > resourceConfig;
+ container->getResourceConfiguration(str_bundleId, &resourceConfig);
+
+ return resourceConfig.size();
+}
+
+/*
+ * Class: org_iotivity_resourcecontainer_bundle_api_BaseActivator
+ * Method: getConfiguredResourceParams
+ * Signature: (Ljava/lang/String;I)[Ljava/lang/String;
+ */
+JNIEXPORT jobjectArray JNICALL
+Java_org_iotivity_service_resourcecontainer_RcsResourceContainer_nativeGetConfiguredResourceParams(
+ JNIEnv *env, jobject obj, jstring bundleId, jint resourceId)
+{
+ (void)obj;
+ jobjectArray ret;
+ ret = (jobjectArray) env->NewObjectArray(4, env->FindClass("java/lang/String"),
+ env->NewStringUTF(""));
+ if(bundleId != NULL){
+ const char *str_bundleId = env->GetStringUTFChars(bundleId, 0);
+
+ ResourceContainerImpl *container = ResourceContainerImpl::getImplInstance();
+ vector< resourceInfo > resourceConfig;
+ container->getResourceConfiguration(str_bundleId, &resourceConfig);
+
+ if(resourceConfig.size() > resourceId && resourceId >=0){
+ resourceInfo conf = resourceConfig[resourceId];
+ env->SetObjectArrayElement(ret, 0, env->NewStringUTF(conf.name.c_str()));
+ env->SetObjectArrayElement(ret, 1, env->NewStringUTF(conf.uri.c_str()));
+ env->SetObjectArrayElement(ret, 2, env->NewStringUTF(conf.resourceType.c_str()));
+ env->SetObjectArrayElement(ret, 3, env->NewStringUTF(conf.address.c_str()));
+ }
+ }
+ return ret;
+}
+
projects / platform / upstream / iotivity.git / blobdiff