JNI - GPS API added - not finished

d3scomp · Jan 30, 2014 · f69694d · f69694d
1 parent 8065b31
commit f69694d
Show file tree

Hide file tree

Showing 7 changed files with 125 additions and 7 deletions.
diff --git a/jdeeco-simulation-demo/libintegration.dll b/jdeeco-simulation-demo/libintegration.dll
diff --git a/jdeeco-simulation-demo/libmodel.dll b/jdeeco-simulation-demo/libmodel.dll
diff --git a/jdeeco-simulation-integration/jDEECoModule.h b/jdeeco-simulation-integration/jDEECoModule.h
@@ -35,16 +35,23 @@ class DLLEXPORT_OR_IMPORT jDEECoModule {
 	virtual const char * jDEECoGetModuleId() {return NULL;};
 	//Needs to be implemented by the module
 	virtual void jDEECoSendPacket(JDEECoPacket *packet, const char *recipient) {};
+	//Needs to be implemented by the module
+	virtual void jDEECoScheduleAt(double absoluteTime, cMessage *msg) {};
+	//Needs to be implemented by the module
+	virtual bool jDEECoIsGPSAvailable() {return false;};
+	//Needs to be implemented by the module
+	virtual double jDEECoGetPositionX() {return 0;};
+	//Needs to be implemented by the module
+	virtual double jDEECoGetPositionY() {return 0;};
+	//Needs to be implemented by the module
+	virtual double jDEECoGetPositionZ() {return 0;};
 
 protected:
 	//Needs to be called at the module initialisation
 	void jDEECoInitialize();
 	//Needs to be called from the handleMessage method
 	void jDEECoOnHandleMessage(cMessage *msg);
 
-	//Needs to be implemented by the module
-	virtual void jDEECoScheduleAt(double absoluteTime, cMessage *msg) {};
-
 };
 
 #endif /* JDEECOMODULE_H_ */
diff --git a/jdeeco-simulation-integration/simulation.cpp b/jdeeco-simulation-integration/simulation.cpp
@@ -328,6 +328,66 @@ JNIEXPORT void JNICALL _Java_cz_cuni_mff_d3s_deeco_simulation_Simulation_nativeC
 	env->ReleaseStringUTFChars(id, cstring);
 }
 
+JNIEXPORT jboolean JNICALL _Java_cz_cuni_mff_d3s_deeco_simulation_Simulation_nativeIsGPSAvailable
+  (JNIEnv *env, jobject jsimulation, jstring id) {
+	const char * cstring = env->GetStringUTFChars(id, 0);
+	jboolean result = 0;
+	for (std::vector<jDEECoModule *>::iterator it = jDEECoModules.begin();
+		it != jDEECoModules.end(); ++it) {
+		if (opp_strcmp((*it)->jDEECoGetModuleId(), cstring) == 0) {
+			result = (*it)->jDEECoIsGPSAvailable();
+			break;
+		}
+	}
+	env->ReleaseStringUTFChars(id, cstring);
+	return result;
+}
+
+JNIEXPORT jdouble JNICALL _Java_cz_cuni_mff_d3s_deeco_simulation_Simulation_nativeGetPositionX
+  (JNIEnv *env, jobject jsimulation, jstring id) {
+	const char * cstring = env->GetStringUTFChars(id, 0);
+	jdouble result = 0;
+	for (std::vector<jDEECoModule *>::iterator it = jDEECoModules.begin();
+		it != jDEECoModules.end(); ++it) {
+		if (opp_strcmp((*it)->jDEECoGetModuleId(), cstring) == 0) {
+			result = (*it)->jDEECoGetPositionX();
+			break;
+		}
+	}
+	env->ReleaseStringUTFChars(id, cstring);
+	return result;
+}
+
+JNIEXPORT jdouble JNICALL _Java_cz_cuni_mff_d3s_deeco_simulation_Simulation_nativeGetPositionY
+  (JNIEnv *env, jobject jsimulation, jstring id) {
+	const char * cstring = env->GetStringUTFChars(id, 0);
+	jdouble result = 0;
+	for (std::vector<jDEECoModule *>::iterator it = jDEECoModules.begin();
+		it != jDEECoModules.end(); ++it) {
+		if (opp_strcmp((*it)->jDEECoGetModuleId(), cstring) == 0) {
+			result = (*it)->jDEECoGetPositionY();
+			break;
+		}
+	}
+	env->ReleaseStringUTFChars(id, cstring);
+	return result;
+}
+
+JNIEXPORT jdouble JNICALL _Java_cz_cuni_mff_d3s_deeco_simulation_Simulation_nativeGetPositionZ
+(JNIEnv *env, jobject jsimulation, jstring id) {
+	const char * cstring = env->GetStringUTFChars(id, 0);
+	jdouble result = 0;
+	for (std::vector<jDEECoModule *>::iterator it = jDEECoModules.begin();
+		it != jDEECoModules.end(); ++it) {
+		if (opp_strcmp((*it)->jDEECoGetModuleId(), cstring) == 0) {
+			result = (*it)->jDEECoGetPositionZ();
+			break;
+		}
+	}
+	env->ReleaseStringUTFChars(id, cstring);
+	return result;
+}
+
 DLLEXPORT_OR_IMPORT void jDEECoModule::jDEECoCallAt(double absoluteTime) {
 	//::printf("Adding callback at: %f for %f\n", simTime().dbl(), absoluteTime);
 	if (currentCallAtTime != absoluteTime && simTime().dbl() < absoluteTime) {

diff --git a/jdeeco-simulation-integration/simulation.h b/jdeeco-simulation-integration/simulation.h
diff --git a/jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/Host.java b/jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/Host.java
@@ -66,12 +66,10 @@ protected void sendPacket(byte[] packet, String recipient) {
 	}
 
 	public double getPositionX() {
-		// TODO Auto-generated method stub
-		return 0;
+		return simulation.getPositionX(id);
 	}
 
 	public double getPositionY() {
-		// TODO Auto-generated method stub
-		return 0;
+		return simulation.getPositionY(id);
 	}
 }
diff --git a/jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/Simulation.java b/jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/Simulation.java
@@ -52,6 +52,11 @@ public class Simulation {
 	 * @param nodeId
 	 */
 	private native void nativeCallAt(double absoluteTime, String nodeId);
+
+	private native boolean nativeIsGPSAvailable(String nodeId);
+	private native double nativeGetPositionX(String nodeId);
+	private native double nativeGetPositionY(String nodeId);
+	private native double nativeGetPositionZ(String nodeId);
 
 	public void initialize() {
 		System.loadLibrary("libintegration");
@@ -83,6 +88,22 @@ public void run(String environment) {
 	public void callAt(long absoluteTime, String nodeId) {
 		nativeCallAt(timeLongToDouble(absoluteTime), nodeId);
 	}
+
+	public boolean isGPSAvailable(String id) {
+		return nativeIsGPSAvailable(id);
+	}
+
+	public double getPositionX(String id) {
+		return nativeGetPositionX(id);
+	}
+
+	public double getPositionY(String id) {
+		return nativeGetPositionY(id);
+	}
+
+	public double getPositionZ(String id) {
+		return nativeGetPositionZ(id);
+	}
 
 	public long getSimulationTime() {
 		double nativeTime = nativeGetCurrentTime();