X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/49e85177c669d793e84242983a1b1f430e47184e..be6e8d3215d3e25f48c7d2d0b359cf178f978d41:/src/bindings/java/jmsg_host.c

diff --git a/src/bindings/java/jmsg_host.c b/src/bindings/java/jmsg_host.c
index 81ed7f7340..c173e33fca 100644
--- a/src/bindings/java/jmsg_host.c
+++ b/src/bindings/java/jmsg_host.c
@@ -1,16 +1,18 @@
 /* Functions related to the java host instances.                            */
 
-/* Copyright (c) 2007-2014. The SimGrid Team.
+/* Copyright (c) 2007-2015. 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 "xbt/str.h"
-#include "msg/msg.h"
+#include "simgrid/msg.h"
 #include "jmsg.h"
 #include "jmsg_host.h"
 #include "jxbt_utilities.h"
+#include "jmsg_storage.h"
+#include <surf/surf_routing.h>
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
 
@@ -32,11 +34,11 @@ void jhost_unref(JNIEnv * env, jobject jhost) {
 }
 
 void jhost_bind(jobject jhost, msg_host_t host, JNIEnv * env) {
-  (*env)->SetLongField(env, jhost, jhost_field_Host_bind, (jlong) (long) (host));
+  (*env)->SetLongField(env, jhost, jhost_field_Host_bind, (jlong) (uintptr_t) (host));
 }
 
 msg_host_t jhost_get_native(JNIEnv * env, jobject jhost) {
-  return (msg_host_t) (long) (*env)->GetLongField(env, jhost, jhost_field_Host_bind);
+  return (msg_host_t) (uintptr_t) (*env)->GetLongField(env, jhost, jhost_field_Host_bind);
 }
 
 const char *jhost_get_name(jobject jhost, JNIEnv * env) {
@@ -69,13 +71,13 @@ Java_org_simgrid_msg_Host_getByName(JNIEnv * env, jclass cls,
   jobject jhost;                /* global reference to the java host instance returned  */
 
   /* get the C string from the java string */
-  const char *name = (*env)->GetStringUTFChars(env, jname, 0);
-  if (name == NULL) {
+  if (jname == NULL) {
   	jxbt_throw_null(env,bprintf("No host can have a null name"));
   	return NULL;
   }
+  const char *name = (*env)->GetStringUTFChars(env, jname, 0);
   /* get the host by name       (the hosts are created during the grid resolution) */
-  host = MSG_get_host_by_name(name);
+  host = MSG_host_by_name(name);
 
   if (!host) {                  /* invalid name */
     jxbt_throw_host_not_found(env, name);
@@ -163,7 +165,7 @@ Java_org_simgrid_msg_Host_on(JNIEnv *env, jobject jhost) {
 JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Host_off(JNIEnv *env, jobject jhost) {
   msg_host_t host = jhost_get_native(env, jhost);
-  MSG_host_off(host);
+  MSG_host_off(host); 
 }
 
 JNIEXPORT jint JNICALL
@@ -243,16 +245,16 @@ Java_org_simgrid_msg_Host_setProperty(JNIEnv *env, jobject jhost, jobject jname,
   }
   const char *name = (*env)->GetStringUTFChars(env, jname, 0);
   const char *value_java = (*env)->GetStringUTFChars(env, jvalue, 0);
-  char *value = strdup(value_java);
+  char *value = xbt_strdup(value_java);
 
-  MSG_host_set_property_value(host,name,value,xbt_free);
+  MSG_host_set_property_value(host, name, value, xbt_free_f);
 
   (*env)->ReleaseStringUTFChars(env, jvalue, value);
   (*env)->ReleaseStringUTFChars(env, jname, name);
 
 }
 JNIEXPORT jboolean JNICALL
-Java_org_simgrid_msg_Host_isAvail(JNIEnv * env, jobject jhost) {
+Java_org_simgrid_msg_Host_isOn(JNIEnv * env, jobject jhost) {
   msg_host_t host = jhost_get_native(env, jhost);
 
   if (!host) {
@@ -260,9 +262,85 @@ Java_org_simgrid_msg_Host_isAvail(JNIEnv * env, jobject jhost) {
     return 0;
   }
 
-  return (jboolean) MSG_host_is_avail(host);
+  return (jboolean) MSG_host_is_on(host);
 }
 
+JNIEXPORT jobjectArray JNICALL
+Java_org_simgrid_msg_Host_getMountedStorage(JNIEnv * env, jobject jhost){
+
+  msg_host_t host = jhost_get_native(env, jhost);
+  jobject jstorage;
+  jstring jname;
+
+  if (!host) {
+    jxbt_throw_notbound(env, "host", jhost);
+    return 0;
+  }
+
+  int index = 0;
+	jobjectArray jtable;
+	xbt_dict_t dict =  MSG_host_get_mounted_storage_list(host);
+	int count = xbt_dict_length(dict);
+	jclass cls = (*env)->FindClass(env, "org/simgrid/msg/Storage");
+
+	jtable = (*env)->NewObjectArray(env, (jsize) count, cls, NULL);
+
+	if (!jtable) {
+	 jxbt_throw_jni(env, "Storages table allocation failed");
+	 return NULL;
+	}
+
+	xbt_dict_cursor_t cursor=NULL;
+	const char *mount_name, *storage_name;
+
+	xbt_dict_foreach(dict,cursor,mount_name,storage_name) {
+		jname = (*env)->NewStringUTF(env, storage_name);
+	  jstorage = Java_org_simgrid_msg_Storage_getByName(env,cls,jname);
+	  (*env)->SetObjectArrayElement(env, jtable, index, jstorage);
+    index++;
+	}
+	xbt_dict_free(&dict);
+	return jtable;
+}
+
+JNIEXPORT jobjectArray JNICALL
+Java_org_simgrid_msg_Host_getAttachedStorage(JNIEnv * env, jobject jhost){
+  msg_host_t host = jhost_get_native(env, jhost);
+
+  if (!host) {
+    jxbt_throw_notbound(env, "host", jhost);
+    return 0;
+  }
+  jobjectArray jtable;
+
+  xbt_dynar_t dyn = MSG_host_get_attached_storage_list(host);
+  int count = xbt_dynar_length(dyn);
+  jclass cls = jxbt_get_class(env, "java/lang/String");
+  jtable = (*env)->NewObjectArray(env, (jsize) count, cls, NULL);
+  int index;
+  char *storage_name;
+  jstring jstorage_name;
+  for (index = 0; index < count; index++) {
+  	storage_name = xbt_dynar_get_as(dyn,index,char*);
+  	jstorage_name = (*env)->NewStringUTF(env,storage_name);
+  	(*env)->SetObjectArrayElement(env, jtable, index, jstorage_name);
+  }
+
+  return jtable;
+}
+
+JNIEXPORT jobjectArray JNICALL
+Java_org_simgrid_msg_Host_getStorageContent(JNIEnv * env, jobject jhost){
+  msg_host_t host = jhost_get_native(env, jhost);
+
+  if (!host) {
+    jxbt_throw_notbound(env, "host", jhost);
+    return 0;
+  }
+  return (jobjectArray)MSG_host_get_storage_content(host);
+}
+
+
 JNIEXPORT jobjectArray JNICALL
 Java_org_simgrid_msg_Host_all(JNIEnv * env, jclass cls_arg)
 {