/* Java bindings of the Storage API. */
-/* Copyright (c) 2012-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2012-2020. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include "simgrid/msg.h"
+#include "simgrid/plugins/file_system.h"
+#include "simgrid/storage.h"
-#include "jmsg.h"
+#include "include/xbt/signal.hpp"
+#include "jmsg.hpp"
#include "jmsg_storage.h"
-#include "jxbt_utilities.h"
+#include "jxbt_utilities.hpp"
+#include "simgrid/s4u/Storage.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java);
-SG_BEGIN_DECL()
-
static jmethodID jstorage_method_Storage_constructor;
static jfieldID jstorage_field_Storage_bind;
static jfieldID jstorage_field_Storage_name;
"Native initialization of msg/Storage failed. Please report that bug");
}
-void jstorage_bind(jobject jstorage, msg_storage_t storage, JNIEnv * env) {
+void jstorage_bind(jobject jstorage, sg_storage_t storage, JNIEnv* env)
+{
env->SetLongField(jstorage, jstorage_field_Storage_bind, (jlong) (uintptr_t) (storage));
}
}
JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Storage_getByName(JNIEnv * env, jclass cls, jstring jname) {
- msg_storage_t storage;
+ sg_storage_t storage;
jobject jstorage = nullptr;
/* get the C string from the java string */
if (jname == nullptr) {
- jxbt_throw_null(env,bprintf("No host can have a null name"));
+ jxbt_throw_null(env, "No host can have a null name");
return nullptr;
}
- const char *name = env->GetStringUTFChars(jname, 0);
- storage = MSG_storage_get_by_name(name);
+ const char* name = env->GetStringUTFChars(jname, nullptr);
+ storage = sg_storage_get_by_name(name);
if (not storage) { /* invalid name */
jxbt_throw_storage_not_found(env, name);
}
JNIEXPORT jlong JNICALL Java_org_simgrid_msg_Storage_getSize(JNIEnv * env,jobject jstorage) {
- msg_storage_t storage = jstorage_get_native(env, jstorage);
+ const_sg_storage_t storage = jstorage_get_native(env, jstorage);
if (not storage) {
jxbt_throw_notbound(env, "storage", jstorage);
return -1;
}
- return (jlong) MSG_storage_get_size(storage);
+ return (jlong)sg_storage_get_size(storage);
}
JNIEXPORT jlong JNICALL Java_org_simgrid_msg_Storage_getFreeSize(JNIEnv * env,jobject jstorage) {
- msg_storage_t storage = jstorage_get_native(env, jstorage);
+ const_sg_storage_t storage = jstorage_get_native(env, jstorage);
if (not storage) {
jxbt_throw_notbound(env, "storage", jstorage);
return -1;
}
- return (jlong) MSG_storage_get_free_size(storage);
+ return (jlong)sg_storage_get_size_free(storage);
}
JNIEXPORT jlong JNICALL Java_org_simgrid_msg_Storage_getUsedSize(JNIEnv * env,jobject jstorage) {
- msg_storage_t storage = jstorage_get_native(env, jstorage);
+ const_sg_storage_t storage = jstorage_get_native(env, jstorage);
if (not storage) {
jxbt_throw_notbound(env, "storage", jstorage);
return -1;
}
- return (jlong) MSG_storage_get_used_size(storage);
+ return (jlong)sg_storage_get_size_used(storage);
}
JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Storage_getProperty(JNIEnv *env, jobject jstorage, jobject jname) {
- msg_storage_t storage = jstorage_get_native(env, jstorage);
+ const_sg_storage_t storage = jstorage_get_native(env, jstorage);
if (not storage) {
jxbt_throw_notbound(env, "storage", jstorage);
return nullptr;
}
- const char *name = env->GetStringUTFChars((jstring) jname, 0);
+ const char* name = env->GetStringUTFChars((jstring)jname, nullptr);
- const char *property = MSG_storage_get_property_value(storage, name);
+ const char* property = sg_storage_get_property_value(storage, name);
if (not property) {
return nullptr;
}
JNIEXPORT void JNICALL
Java_org_simgrid_msg_Storage_setProperty(JNIEnv *env, jobject jstorage, jobject jname, jobject jvalue) {
- msg_storage_t storage = jstorage_get_native(env, jstorage);
+ sg_storage_t storage = jstorage_get_native(env, jstorage);
if (not storage) {
jxbt_throw_notbound(env, "storage", jstorage);
return;
}
- const char *name = env->GetStringUTFChars((jstring) jname, 0);
- const char *value_java = env->GetStringUTFChars((jstring) jvalue, 0);
- char *value = xbt_strdup(value_java);
+ const char* name = env->GetStringUTFChars((jstring)jname, nullptr);
+ const char* value_java = env->GetStringUTFChars((jstring)jvalue, nullptr);
- MSG_storage_set_property_value(storage, name, value);
+ storage->set_property(name, std::string(value_java));
env->ReleaseStringUTFChars((jstring) jvalue, value_java);
env->ReleaseStringUTFChars((jstring) jname, name);
-
}
JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Storage_getHost(JNIEnv * env,jobject jstorage) {
- msg_storage_t storage = jstorage_get_native(env, jstorage);
+ const_sg_storage_t storage = jstorage_get_native(env, jstorage);
if (not storage) {
jxbt_throw_notbound(env, "storage", jstorage);
return nullptr;
}
- const char *host_name = MSG_storage_get_host(storage);
+ const char* host_name = sg_storage_get_host(storage);
if (not host_name) {
return nullptr;
}
jobjectArray jtable;
jobject jstorage;
jstring jname;
- msg_storage_t storage;
+ sg_storage_t storage;
- xbt_dynar_t table = MSG_storages_as_dynar();
+ xbt_dynar_t table = sg_storages_as_dynar();
int count = xbt_dynar_length(table);
jclass cls = jxbt_get_class(env, "org/simgrid/msg/Storage");
}
for (index = 0; index < count; index++) {
- storage = xbt_dynar_get_as(table,index,msg_storage_t);
+ storage = xbt_dynar_get_as(table, index, sg_storage_t);
if (java_storage_map.find(storage) != java_storage_map.end()) {
jstorage = java_storage_map.at(storage);
} else {
- jname = env->NewStringUTF(MSG_storage_get_name(storage));
+ jname = env->NewStringUTF(sg_storage_get_name(storage));
jstorage = Java_org_simgrid_msg_Storage_getByName(env, cls_arg, jname);
}
xbt_dynar_free(&table);
return jtable;
}
-
-SG_END_DECL()
