You are viewing a plain text version of this content. The canonical link for it is here.
Posted to kato-commits@incubator.apache.org by sp...@apache.org on 2009/09/29 11:10:06 UTC
svn commit: r819887 - in
/incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi:
pom.xml src/main/native/katovmapi.c
tests/src/test/java/test/apache/kato/vmapi/TestLibraryLoad.java win32/pom.xml
Author: spoole
Date: Tue Sep 29 11:10:05 2009
New Revision: 819887
URL: http://svn.apache.org/viewvc?rev=819887&view=rev
Log:
added linux x86 module for vm api native build
Modified:
incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/pom.xml
incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/src/main/native/katovmapi.c
incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/tests/src/test/java/test/apache/kato/vmapi/TestLibraryLoad.java
incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/win32/pom.xml
Modified: incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/pom.xml?rev=819887&r1=819886&r2=819887&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/pom.xml (original)
+++ incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/pom.xml Tue Sep 29 11:10:05 2009
@@ -55,6 +55,7 @@
<modules>
<module>javah</module>
<module>win32</module>
+ <module>tests</module>
</modules>
</profile>
@@ -69,6 +70,7 @@
<modules>
<module>javah</module>
<module>linux-x86</module>
+ <module>tests</module>
</modules>
</profile>
@@ -83,6 +85,7 @@
<modules>
<module>javah</module>
<module>aix</module>
+ <module>tests</module>
</modules>
</profile>
Modified: incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/src/main/native/katovmapi.c
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/src/main/native/katovmapi.c?rev=819887&r1=819886&r2=819887&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/src/main/native/katovmapi.c (original)
+++ incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/src/main/native/katovmapi.c Tue Sep 29 11:10:05 2009
@@ -14,8 +14,10 @@
#include "org_apache_kato_common_DumpTrigger.h"
-
-#ifdef WIN32
+
+#ifdef __linux__
+#include <signal.h>
+#elif WIN32
#include <Windows.h>
#endif
/*
@@ -26,8 +28,11 @@
JNIEXPORT jint JNICALL Java_org_apache_kato_common_DumpTrigger_getNativeProcessID
(JNIEnv *env, jobject obj) {
jint result=0;
-
-#ifdef WIN32
+
+#ifdef __linux__
+ int pid=getpid();
+ result=pid;
+#elif WIN32
DWORD ProcessId = GetCurrentProcessId();
result=ProcessId;
#endif
@@ -44,9 +49,17 @@
(JNIEnv *env, jobject obj, jint processID) {
- jboolean result=JNI_TRUE;
-
- GenerateConsoleCtrlEvent(CTRL_BREAK_EVENT,0);
+ jboolean result=JNI_FALSE;
+#ifdef __linux__
+
+ pid_t pid=processID;
+ kill(pid,SIGQUIT);
+ result=JNI_TRUE;
+#elif WIN32
+
+ GenerateConsoleCtrlEvent(CTRL_BREAK_EVENT,0);
+ result=JNI_TRUE;
+#endif
return result;
Modified: incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/tests/src/test/java/test/apache/kato/vmapi/TestLibraryLoad.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/tests/src/test/java/test/apache/kato/vmapi/TestLibraryLoad.java?rev=819887&r1=819886&r2=819887&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/tests/src/test/java/test/apache/kato/vmapi/TestLibraryLoad.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/tests/src/test/java/test/apache/kato/vmapi/TestLibraryLoad.java Tue Sep 29 11:10:05 2009
@@ -40,7 +40,8 @@
public void testTrigger() {
loadLibrary();
- DumpTrigger.triggerDump();
+ boolean result=DumpTrigger.triggerDump();
+ assertTrue(result);
}
public void testGetProcessID() {
Modified: incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/win32/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/win32/pom.xml?rev=819887&r1=819886&r2=819887&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/win32/pom.xml (original)
+++ incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/win32/pom.xml Tue Sep 29 11:10:05 2009
@@ -14,11 +14,11 @@
- <artifactId>katovmapi</artifactId>
+ <artifactId>libkatovmapi</artifactId>
- <name>Win32 Version of Kato VM Native Library</name>
+ <name>Linux x86 Version of Kato VM Native Library</name>
- <packaging>dll</packaging>
+ <packaging>so</packaging>
@@ -29,12 +29,12 @@
<artifactId>native-maven-plugin</artifactId>
<extensions>true</extensions>
<configuration>
- <compilerProvider>msvc</compilerProvider>
+
<compilerStartOptions>
- <compilerStartOption>/LD /D "WIN32" /DBUILD_DLL</compilerStartOption>
+ <compilerStartOption>-fPIC -O</compilerStartOption>
</compilerStartOptions>
- <javahOS>win32</javahOS>
+ <javahOS>linux</javahOS>
<sources>
<source>
@@ -50,8 +50,8 @@
</sources>
- <linkerStartOptions>
- <linkerStartOption>/DLL</linkerStartOption>
+ <linkerStartOptions>
+ <linkerStartOption>-shared</linkerStartOption>
</linkerStartOptions>
@@ -76,7 +76,7 @@
<resource>
<directory>${basedir}/target/</directory>
<includes>
- <include>*.dll</include>
+ <include>*.so</include>
</includes>
</resource>
</resources>