Add more logging level to Msg

diff --git a/org/simgrid/msg/Msg.java b/org/simgrid/msg/Msg.java
index c2b9cd7..63a5a45 100644 (file)
--- a/org/simgrid/msg/Msg.java
+++ b/org/simgrid/msg/Msg.java
@@ -29,14 +29,35 @@ public final class Msg {
      */
        public final static native double getClock();
        /**
      */
        public final static native double getClock();
        /**

-        * Issue an "debug" logging message.
+        * Issue a debug logging message.

         * @param s message to log.
         */
        public final static native void debug(String s);
         * @param s message to log.
         */
        public final static native void debug(String s);

-    /** Issue an information logging message
+       /**
+        * Issue an verbose logging message.
+        * @param s message to log.
+        */
+       public final static native void verb(String s);
+
+       /** Issue an information logging message

      * @param s
      */
        public final static native void info(String s);
      * @param s
      */
        public final static native void info(String s);

+       /**
+        * Issue an warning logging message.
+        * @param s message to log.
+        */
+       public final static native void warn(String s);
+       /**
+        * Issue an error logging message.
+        * @param s message to log.
+        */
+       public final static native void error(String s);
+       /**
+        * Issue an critical logging message.
+        * @param s message to log.
+        */
+       public final static native void critical(String s);

 
        /*********************************************************************************
         * Deployment and initialization related functions                               *
 
        /*********************************************************************************
         * Deployment and initialization related functions                               *

diff --git a/src/jmsg.c b/src/jmsg.c
index 620a427..6010fb5 100644 (file)
--- a/src/jmsg.c
+++ b/src/jmsg.c
@@ -186,13 +186,40 @@ Java_org_simgrid_msg_Msg_debug(JNIEnv * env, jclass cls, jstring js)
   (*env)->ReleaseStringUTFChars(env, js, s);
 }
 JNIEXPORT void JNICALL
   (*env)->ReleaseStringUTFChars(env, js, s);
 }
 JNIEXPORT void JNICALL

+Java_org_simgrid_msg_Msg_verb(JNIEnv * env, jclass cls, jstring js)
+{
+  const char *s = (*env)->GetStringUTFChars(env, js, 0);
+  XBT_VERB("%s", s);
+  (*env)->ReleaseStringUTFChars(env, js, s);
+}
+JNIEXPORT void JNICALL

 Java_org_simgrid_msg_Msg_info(JNIEnv * env, jclass cls, jstring js)
 {
   const char *s = (*env)->GetStringUTFChars(env, js, 0);
   XBT_INFO("%s", s);
   (*env)->ReleaseStringUTFChars(env, js, s);
 }
 Java_org_simgrid_msg_Msg_info(JNIEnv * env, jclass cls, jstring js)
 {
   const char *s = (*env)->GetStringUTFChars(env, js, 0);
   XBT_INFO("%s", s);
   (*env)->ReleaseStringUTFChars(env, js, s);
 }

-
+JNIEXPORT void JNICALL
+Java_org_simgrid_msg_Msg_warn(JNIEnv * env, jclass cls, jstring js)
+{
+  const char *s = (*env)->GetStringUTFChars(env, js, 0);
+  XBT_WARN("%s", s);
+  (*env)->ReleaseStringUTFChars(env, js, s);
+}
+JNIEXPORT void JNICALL
+Java_org_simgrid_msg_Msg_error(JNIEnv * env, jclass cls, jstring js)
+{
+  const char *s = (*env)->GetStringUTFChars(env, js, 0);
+  XBT_ERROR("%s", s);
+  (*env)->ReleaseStringUTFChars(env, js, s);
+}
+JNIEXPORT void JNICALL
+Java_org_simgrid_msg_Msg_critical(JNIEnv * env, jclass cls, jstring js)
+{
+  const char *s = (*env)->GetStringUTFChars(env, js, 0);
+  XBT_CRITICAL("%s", s);
+  (*env)->ReleaseStringUTFChars(env, js, s);
+}

 JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Msg_deployApplication(JNIEnv * env, jclass cls,
                                        jstring jdeploymentFile)
 JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Msg_deployApplication(JNIEnv * env, jclass cls,
                                        jstring jdeploymentFile)

diff --git a/src/jmsg.h b/src/jmsg.h
index 16c10fb..0810d60 100644 (file)
--- a/src/jmsg.h
+++ b/src/jmsg.h
@@ -44,10 +44,21 @@ Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs);
 JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_debug(JNIEnv *, jclass,
                                                  jstring);
 
 JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_debug(JNIEnv *, jclass,
                                                  jstring);
 

+JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_verb(JNIEnv *, jclass,
+                                                 jstring);

 
 JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_info(JNIEnv *, jclass,
                                                  jstring);
 
 
 JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_info(JNIEnv *, jclass,
                                                  jstring);
 

+JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_warn(JNIEnv *, jclass,
+                                                 jstring);
+
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_error(JNIEnv *, jclass,
+                                                 jstring);
+
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_critical(JNIEnv *, jclass,
+                                                 jstring);
+

 JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Msg_createEnvironment(JNIEnv * env, jclass cls,
                                        jstring jplatformFile);
 JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Msg_createEnvironment(JNIEnv * env, jclass cls,
                                        jstring jplatformFile);