X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dff9e15c44ab6340d27215957c56fa72fad246a2..0f5e8daaa6e9f74521068aa75837200bcd182ea6:/src/java/jmsg_process.c

diff --git a/src/java/jmsg_process.c b/src/java/jmsg_process.c
index 60c346415f..6ebb133fc8 100644
--- a/src/java/jmsg_process.c
+++ b/src/java/jmsg_process.c
@@ -1,20 +1,16 @@
-/*
- * $Id$
- *
- * Copyright 2006,2007 Martin Quinson, Malek Cherier All right 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.
- *
- * This contains the implementation of the functions in relation with the java
- * process instance. 
- */
+/* Functions related to the java process instances.                         */
+
+/* Copyright (c) 2007, 2008, 2009, 2010. 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 "jmsg_process.h"
 #include "jmsg.h"
 #include "jxbt_utilities.h"
 
-#include "xbt/xbt_context_java.h"
+#include "simix/smx_context_java.h"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
 
@@ -31,7 +27,7 @@ void jprocess_delete_global_ref(jobject jprocess, JNIEnv * env)
 jboolean jprocess_is_alive(jobject jprocess, JNIEnv * env)
 {
   jmethodID id =
-    jxbt_get_smethod(env, "simgrid/msg/Process", "isAlive", "()Z");
+      jxbt_get_smethod(env, "simgrid/msg/Process", "isAlive", "()Z");
 
   if (!id)
     return 0;
@@ -41,7 +37,8 @@ jboolean jprocess_is_alive(jobject jprocess, JNIEnv * env)
 
 void jprocess_join(jobject jprocess, JNIEnv * env)
 {
-  jmethodID id = jxbt_get_smethod(env, "simgrid/msg/Process", "join", "()V");
+  jmethodID id =
+      jxbt_get_smethod(env, "simgrid/msg/Process", "join", "()V");
 
   if (!id)
     return;
@@ -52,7 +49,7 @@ void jprocess_join(jobject jprocess, JNIEnv * env)
 void jprocess_exit(jobject jprocess, JNIEnv * env)
 {
   jmethodID id =
-    jxbt_get_smethod(env, "simgrid/msg/Process", "interrupt", "()V");
+      jxbt_get_smethod(env, "simgrid/msg/Process", "interrupt", "()V");
 
   if (!id)
     return;
@@ -63,7 +60,7 @@ void jprocess_exit(jobject jprocess, JNIEnv * env)
 void jprocess_yield(jobject jprocess, JNIEnv * env)
 {
   jmethodID id =
-    jxbt_get_smethod(env, "simgrid/msg/Process", "switchProcess", "()V");
+      jxbt_get_smethod(env, "simgrid/msg/Process", "switchProcess", "()V");
 
   if (!id)
     return;
@@ -74,7 +71,7 @@ void jprocess_yield(jobject jprocess, JNIEnv * env)
 void jprocess_lock_mutex(jobject jprocess, JNIEnv * env)
 {
   jmethodID id =
-    jxbt_get_smethod(env, "simgrid/msg/Process", "lockMutex", "()V");
+      jxbt_get_smethod(env, "simgrid/msg/Process", "lockMutex", "()V");
 
   if (!id)
     return;
@@ -85,7 +82,7 @@ void jprocess_lock_mutex(jobject jprocess, JNIEnv * env)
 void jprocess_unlock_mutex(jobject jprocess, JNIEnv * env)
 {
   jmethodID id =
-    jxbt_get_smethod(env, "simgrid/msg/Process", "unlockMutex", "()V");
+      jxbt_get_smethod(env, "simgrid/msg/Process", "unlockMutex", "()V");
 
   if (!id)
     return;
@@ -97,7 +94,7 @@ void jprocess_unlock_mutex(jobject jprocess, JNIEnv * env)
 void jprocess_signal_cond(jobject jprocess, JNIEnv * env)
 {
   jmethodID id =
-    jxbt_get_smethod(env, "simgrid/msg/Process", "signalCond", "()V");
+      jxbt_get_smethod(env, "simgrid/msg/Process", "signalCond", "()V");
 
   if (!id)
     return;
@@ -108,7 +105,7 @@ void jprocess_signal_cond(jobject jprocess, JNIEnv * env)
 void jprocess_wait_cond(jobject jprocess, JNIEnv * env)
 {
   jmethodID id =
-    jxbt_get_smethod(env, "simgrid/msg/Process", "waitCond", "()V");
+      jxbt_get_smethod(env, "simgrid/msg/Process", "waitCond", "()V");
 
   if (!id)
     return;
@@ -119,7 +116,8 @@ void jprocess_wait_cond(jobject jprocess, JNIEnv * env)
 
 void jprocess_start(jobject jprocess, JNIEnv * env)
 {
-  jmethodID id = jxbt_get_smethod(env, "simgrid/msg/Process", "start", "()V");
+  jmethodID id =
+      jxbt_get_smethod(env, "simgrid/msg/Process", "start", "()V");
 
   if (!id)
     return;
@@ -161,8 +159,8 @@ jlong jprocess_get_id(jobject jprocess, JNIEnv * env)
 
 jstring jprocess_get_name(jobject jprocess, JNIEnv * env)
 {
-  jfieldID id =
-    jxbt_get_sfield(env, "simgrid/msg/Process", "name", "Ljava/lang/String;");
+  jfieldID id = jxbt_get_sfield(env, "simgrid/msg/Process", "name",
+                                "Ljava/lang/String;");
   jobject jname;
 
   if (!id)
@@ -184,7 +182,7 @@ jboolean jprocess_is_valid(jobject jprocess, JNIEnv * env)
   return (*env)->GetLongField(env, jprocess, id) ? JNI_TRUE : JNI_FALSE;
 }
 
-void jprocess_schedule(xbt_context_t context)
+void jprocess_schedule(smx_context_t context)
 {
   JNIEnv *env;
   jmethodID id;
@@ -196,12 +194,12 @@ void jprocess_schedule(xbt_context_t context)
   if (!id)
     return;
 
-  (*env)->CallVoidMethod(env, ((xbt_ctx_java_t) context)->jprocess, id);
+  (*env)->CallVoidMethod(env, ((smx_ctx_java_t) context)->jprocess, id);
 }
 
 
 
-void jprocess_unschedule(xbt_context_t context)
+void jprocess_unschedule(smx_context_t context)
 {
   JNIEnv *env;
   jmethodID id;
@@ -214,5 +212,5 @@ void jprocess_unschedule(xbt_context_t context)
   if (!id)
     return;
 
-  (*env)->CallVoidMethod(env, ((xbt_ctx_java_t) context)->jprocess, id);
+  (*env)->CallVoidMethod(env, ((smx_ctx_java_t) context)->jprocess, id);
 }