X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8f34741f2ecbd5b008788605bdec0333ef365007..d77b1484a375297cabd5ef038ed056cc5ccee367:/src/bindings/java/jmsg_vm.h

diff --git a/src/bindings/java/jmsg_vm.h b/src/bindings/java/jmsg_vm.h
index 12de5fd706..88c3619fad 100644
--- a/src/bindings/java/jmsg_vm.h
+++ b/src/bindings/java/jmsg_vm.h
@@ -1,7 +1,6 @@
-/* Functions related to the MSG VM API. */
+/* Functions related to the Virtual Machines.                               */
 
-/* Copyright (c) 2012-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2012-2017. 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. */
@@ -14,146 +13,40 @@
 
 SG_BEGIN_DECL()
 
+/* Shut up some errors in eclipse online compiler. I wish such a pimple wouldn't be needed */
+#ifndef JNIEXPORT
+#define JNIEXPORT
+#endif
+#ifndef JNICALL
+#define JNICALL
+#endif
+/* end of eclipse-mandated pimple */
+
 void jvm_bind(JNIEnv *env, jobject jvm, msg_vm_t vm);
 msg_vm_t jvm_get_native(JNIEnv *env, jobject jvm);
 
-/*
- * Class      org_simgrid_msg_VM
- * Method      nativeInit
- * Signature  ()V
- */
-JNIEXPORT void JNICALL
-Java_org_simgrid_msg_VM_nativeInit(JNIEnv *env, jclass);
+JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_nativeInit(JNIEnv* env, jclass cls);
+
+JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_VM_all(JNIEnv* env, jclass cls_arg);
 
-/**
- * Class      org_simgrid_msg_VM
- * Method      isCreated
- * Signature  ()B
- */
-JNIEXPORT jint JNICALL
-Java_org_simgrid_msg_VM_isCreated(JNIEnv *env, jobject jvm);
-/**
- * Class      org_simgrid_msg_VM
- * Method      isRunning
- * Signature  ()B
- */
-JNIEXPORT jint JNICALL
-Java_org_simgrid_msg_VM_isRunning(JNIEnv *env, jobject jvm);
-/**
- * Class      org_simgrid_msg_VM
- * Method      isMigrating
- * Signature  ()B
- */
-JNIEXPORT jint JNICALL
-Java_org_simgrid_msg_VM_isMigrating(JNIEnv *env, jobject jvm);
-/**
- * Class      org_simgrid_msg_VM
- * Method      isSuspended
- * Signature  ()B
- */
-JNIEXPORT jint JNICALL
-Java_org_simgrid_msg_VM_isSuspended(JNIEnv *env, jobject jvm);
-/**
- * Class      org_simgrid_msg_VM
- * Method      isResuming
- * Signature  ()B
- */
-JNIEXPORT jint JNICALL
-Java_org_simgrid_msg_VM_isResuming(JNIEnv *env, jobject jvm);
-/**
- * Class      org_simgrid_msg_VM
- * Method      isSuspended
- * Signature  ()B
- */
-JNIEXPORT jint JNICALL
-Java_org_simgrid_msg_VM_isSaving(JNIEnv *env, jobject jvm);
-/**
- * Class      org_simgrid_msg_VM
- * Method      isSave
- * Signature  ()B
- */
-JNIEXPORT jint JNICALL
-Java_org_simgrid_msg_VM_isSaved(JNIEnv *env, jobject jvm);
-/**
- * Class      org_simgrid_msg_VM
- * Method      isResuming
- * Signature  ()B
- */
-JNIEXPORT jint JNICALL
-Java_org_simgrid_msg_VM_isRestoring(JNIEnv *env, jobject jvm);
-/**
- * Class      org_simgrid_msg_VM
- * Method      setBound
- * Signature  (D)B
- */
-JNIEXPORT void JNICALL
-Java_org_simgrid_msg_VM_setBound(JNIEnv *env, jobject jvm, jdouble bound); 
+JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isCreated(JNIEnv* env, jobject jvm);
+JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isRunning(JNIEnv* env, jobject jvm);
+JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isMigrating(JNIEnv* env, jobject jvm);
+JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isSuspended(JNIEnv* env, jobject jvm);
+JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isResuming(JNIEnv* env, jobject jvm);
 
-/**
- * Class            org_simgrid_msg_VM
- * Method           create
- * Signature    ()V
- */
-JNIEXPORT void JNICALL
-Java_org_simgrid_msg_VM_create(JNIEnv *env, jobject jvm, jobject jhost, jstring jname,
-                   jint jncore, jint jramsize, jint jnetcap, jstring jdiskpath, jint jdisksize, jint dprate, jint mig_netspeed);
+JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_setBound(JNIEnv* env, jobject jvm, jdouble bound);
 
-/**
- * Class            org_simgrid_msg_VM
- * Method           destroy
- * Signature    ()V
- */
-JNIEXPORT void JNICALL
-Java_org_simgrid_msg_VM_nativeFinalize(JNIEnv *env, jobject jvm);
-/**
- * Class      org_simgrid_msg_VM
- * Method      start
- * Signature  (I)V
- */
-JNIEXPORT void JNICALL
-Java_org_simgrid_msg_VM_start(JNIEnv *env, jobject jvm);
-/**
- * Class      org_simgrid_msg_VM
- * Method      nativeMigrate
- * Signature  (Lorg/simgrid/msg/Host;)V
- */
-JNIEXPORT void JNICALL
-Java_org_simgrid_msg_VM_internalmig(JNIEnv *env, jobject jvm, jobject jhost);
-/**
- * Class      org_simgrid_msg_VM
- * Method      suspend
- * Signature  ()V
- */
-JNIEXPORT void JNICALL
-Java_org_simgrid_msg_VM_suspend(JNIEnv *env, jobject jvm);
-/**
- * Class      org_simgrid_msg_VM
- * Method      resume
- * Signature  ()V
- */
-JNIEXPORT void JNICALL
-Java_org_simgrid_msg_VM_resume(JNIEnv *env, jobject jvm);
-/**
- * Class      org_simgrid_msg_VM
- * Method      shutdown
- * Signature  ()V
- */
-JNIEXPORT void JNICALL
-Java_org_simgrid_msg_VM_shutdown(JNIEnv *env, jobject jvm);
-/**
- * Class            org_simgrid_msg_VM
- * Method           save
- * Signature    ()V
- */
-JNIEXPORT void JNICALL
-Java_org_simgrid_msg_VM_save(JNIEnv *env, jobject jvm);
-/**
- * Class            org_simgrid_msg_VM
- * Method           restore
- * Signature    ()V
- */
-JNIEXPORT void JNICALL
-Java_org_simgrid_msg_VM_restore(JNIEnv *env, jobject jvm);
+JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_create(JNIEnv* env, jobject jvm, jobject jhost, jstring jname,
+                                                      jint coreAmount, jint jramsize, jint dprate, jint mig_netspeed);
+JNIEXPORT jobject JNICALL Java_org_simgrid_msg_VM_getVMByName(JNIEnv* env, jclass cls, jstring jname);
+JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_nativeFinalize(JNIEnv* env, jobject jvm);
+JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_start(JNIEnv* env, jobject jvm);
+JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_nativeMigration(JNIEnv* env, jobject jvm, jobject jhost);
+JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_suspend(JNIEnv* env, jobject jvm);
+JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_resume(JNIEnv* env, jobject jvm);
+JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_shutdown(JNIEnv* env, jobject jvm);
+JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_destroy(JNIEnv* env, jobject jvm);
 
 SG_END_DECL()