]> gerrit.simantics Code Review - simantics/platform.git/commitdiff
Rudimentary Linux and MacOSX support for org.simantics.nativemem 52/452/3
authorTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Fri, 21 Apr 2017 10:22:58 +0000 (13:22 +0300)
committerTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Fri, 21 Apr 2017 10:41:28 +0000 (13:41 +0300)
Linux now supports current and peak RSS and OSX only supports peak RSS
information.

Moved org.simantics.nativemem + JNA into a separate feature
org.simantics.nativemem.feature from org.simantics.utils.feature to not
force the dependency onto all products.

refs #7166

Change-Id: Id114659065097ecd45f8b40ff9d07e2df0b33db2

27 files changed:
bundles/org.simantics.nativemem/.classpath
bundles/org.simantics.nativemem/.settings/org.eclipse.jdt.core.prefs
bundles/org.simantics.nativemem/META-INF/MANIFEST.MF
bundles/org.simantics.nativemem/build.properties
bundles/org.simantics.nativemem/jna-4.2.1.jar [deleted file]
bundles/org.simantics.nativemem/jna-platform-4.2.1.jar [deleted file]
bundles/org.simantics.nativemem/src/org/simantics/nativemem/NativeMem.java
bundles/org.simantics.nativemem/src/org/simantics/nativemem/ProcessMemoryInfo.java [new file with mode: 0644]
bundles/org.simantics.nativemem/src/org/simantics/nativemem/internal/Arch.java
bundles/org.simantics.nativemem/src/org/simantics/nativemem/internal/CMemoryInfo.java [new file with mode: 0644]
bundles/org.simantics.nativemem/src/org/simantics/nativemem/internal/DummyProcessMemoryInfo.java [new file with mode: 0644]
bundles/org.simantics.nativemem/src/org/simantics/nativemem/internal/OS.java
bundles/org.simantics.nativemem/src/org/simantics/nativemem/internal/Resource.java [new file with mode: 0644]
bundles/org.simantics.nativemem/src/org/simantics/nativemem/internal/Resource32.java [new file with mode: 0644]
bundles/org.simantics.nativemem/src/org/simantics/nativemem/internal/Resource64.java [new file with mode: 0644]
bundles/org.simantics.nativemem/src/org/simantics/nativemem/internal/Test.java
bundles/org.simantics.nativemem/src/org/simantics/nativemem/internal/Util.java [new file with mode: 0644]
bundles/org.simantics.nativemem/src/org/simantics/nativemem/internal/linux/Stat.java [new file with mode: 0644]
bundles/org.simantics.nativemem/src/org/simantics/nativemem/internal/win/ProcessMemoryCounters.java [moved from bundles/org.simantics.nativemem/src/org/simantics/nativemem/ProcessMemoryCounters.java with 63% similarity]
bundles/org.simantics.nativemem/src/org/simantics/nativemem/internal/win/Psapi32.java [moved from bundles/org.simantics.nativemem/src/org/simantics/nativemem/internal/Psapi32.java with 76% similarity]
bundles/org.simantics.nativemem/src/org/simantics/nativemem/internal/win/Psapi64.java [moved from bundles/org.simantics.nativemem/src/org/simantics/nativemem/internal/Psapi64.java with 76% similarity]
features/org.simantics.nativemem.feature/.project [new file with mode: 0644]
features/org.simantics.nativemem.feature/build.properties [new file with mode: 0644]
features/org.simantics.nativemem.feature/feature.xml [new file with mode: 0644]
features/org.simantics.sdk.feature/feature.xml
features/org.simantics.utils.feature/feature.xml
features/pom.xml

index 4464ccc38106eb050c08a03b2d8dbf4ecceae4df..b862a296d38fe04269faeee6c9d77d11ff77380d 100644 (file)
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="src" path="src"/>
-       <classpathentry exported="true" kind="lib" path="jna-4.2.1.jar"/>
-       <classpathentry kind="lib" path="jna-platform-4.2.1.jar"/>
-       <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>\r
+<classpath>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
+       <classpathentry kind="src" path="src"/>\r
+       <classpathentry kind="output" path="bin"/>\r
+</classpath>\r
index f42de363afaae68bbd968318f1d331877f5514fc..0c68a61dca867ceb49e79d2402935261ec3e3809 100644 (file)
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
index d1de018f93fbce179e3633d6498e225fb2665c5d..5ea49f1861b9334bf8c05441aef4386ca3f585b5 100644 (file)
@@ -4,8 +4,8 @@ Bundle-Name: Native Memory Tracking
 Bundle-SymbolicName: org.simantics.nativemem
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Semantum Oy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Bundle-ClassPath: .,
- jna-4.2.1.jar,
- jna-platform-4.2.1.jar
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ClassPath: .
 Export-Package: org.simantics.nativemem
+Require-Bundle: com.sun.jna;bundle-version="4.3.0",
+ com.sun.jna.platform;bundle-version="4.3.0"
index 75db1f17c5703ad6ec76c4fd6c4f196024c546a2..34d2e4d2dad529ceaeb953bfcdb63c51d69ffed2 100644 (file)
@@ -1,6 +1,4 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .,\
-               jna-4.2.1.jar,\
-               jna-platform-4.2.1.jar
+               .
diff --git a/bundles/org.simantics.nativemem/jna-4.2.1.jar b/bundles/org.simantics.nativemem/jna-4.2.1.jar
deleted file mode 100644 (file)
index c21183e..0000000
Binary files a/bundles/org.simantics.nativemem/jna-4.2.1.jar and /dev/null differ
diff --git a/bundles/org.simantics.nativemem/jna-platform-4.2.1.jar b/bundles/org.simantics.nativemem/jna-platform-4.2.1.jar
deleted file mode 100644 (file)
index ca6ea47..0000000
Binary files a/bundles/org.simantics.nativemem/jna-platform-4.2.1.jar and /dev/null differ
index c902214ac9bcee3711f747bbb31451100719a2f8..bf761380312de52f69e32e574a3dc4dc16ab9482 100644 (file)
@@ -1,9 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2016, 2017 Association for Decentralized Information Management
+ * in Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Semantum Oy - initial API and implementation
+ *******************************************************************************/
 package org.simantics.nativemem;
 
+import java.lang.reflect.InvocationTargetException;
+
 import org.simantics.nativemem.internal.Arch;
+import org.simantics.nativemem.internal.DummyProcessMemoryInfo;
+import org.simantics.nativemem.internal.CMemoryInfo;
 import org.simantics.nativemem.internal.OS;
-import org.simantics.nativemem.internal.Psapi32;
-import org.simantics.nativemem.internal.Psapi64;
+import org.simantics.nativemem.internal.Resource;
+import org.simantics.nativemem.internal.Resource32;
+import org.simantics.nativemem.internal.Resource64;
+import org.simantics.nativemem.internal.linux.Stat;
+import org.simantics.nativemem.internal.win.ProcessMemoryCounters;
+import org.simantics.nativemem.internal.win.Psapi32;
+import org.simantics.nativemem.internal.win.Psapi64;
 
 import com.sun.jna.platform.win32.Kernel32;
 import com.sun.jna.platform.win32.WinNT.HANDLE;
@@ -17,39 +37,107 @@ public class NativeMem {
      *            create a new structure
      * @return the result structure
      */
-    public static ProcessMemoryCounters getMemoryCounters(ProcessMemoryCounters out) {
-        if (out == null)
-            out = new ProcessMemoryCounters();
-
-        OS os = OS.calculate();
-        Arch arch = Arch.calculate();
-        switch (os) {
-        case WINDOWS: {
-            HANDLE proc = Kernel32.INSTANCE.GetCurrentProcess();
-            switch (arch) {
-            case X86: {
-                Psapi32.PROCESS_MEMORY_COUNTERS_EX pmem = new Psapi32.PROCESS_MEMORY_COUNTERS_EX();
-                boolean ok = Psapi32.INSTANCE.GetProcessMemoryInfo(proc, pmem, pmem.size());
-                if (ok)
-                    pmem.writeTo(out);
-                return out;
-            }
-
-            case X86_64: {
-                Psapi64.PROCESS_MEMORY_COUNTERS_EX pmem = new Psapi64.PROCESS_MEMORY_COUNTERS_EX();
-                boolean ok = Psapi64.INSTANCE.GetProcessMemoryInfo(proc, pmem, pmem.size());
-                if (ok)
-                    pmem.writeTo(out);
-                return out;
-            }
-
-            default:
-                throw new UnsupportedOperationException("Architecture " + arch + " not supported on operating system " + os);
-            }
+    public static ProcessMemoryInfo getMemoryInfo(ProcessMemoryInfo out) {
+        switch (OS.calculate()) {
+        case WINDOWS:
+            return getProcessMemoryCounters(out);
+
+        case APPLE:
+            return getCMemoryInfo(out);
+
+        case LINUX: {
+            CMemoryInfo info = getCMemoryInfo(out);
+            info.peakRSS *= 1024L;
+            getCurrentRSS(info);
+            return info;
+        }
+
+        default:
+            return DummyProcessMemoryInfo.INSTANCE;
+        }
+    }
+
+    private static ProcessMemoryCounters getProcessMemoryCounters(ProcessMemoryInfo out) {
+        ProcessMemoryCounters counters = castOrCreate(out, ProcessMemoryCounters.class);
+        HANDLE proc = Kernel32.INSTANCE.GetCurrentProcess();
+        switch (Arch.calculate()) {
+        case X86: {
+            Psapi32.PROCESS_MEMORY_COUNTERS_EX pmem = new Psapi32.PROCESS_MEMORY_COUNTERS_EX();
+            boolean ok = Psapi32.INSTANCE.GetProcessMemoryInfo(proc, pmem, pmem.size());
+            if (ok)
+                pmem.writeTo(counters);
+            return counters;
+        }
+
+        case X86_64: {
+            Psapi64.PROCESS_MEMORY_COUNTERS_EX pmem = new Psapi64.PROCESS_MEMORY_COUNTERS_EX();
+            boolean ok = Psapi64.INSTANCE.GetProcessMemoryInfo(proc, pmem, pmem.size());
+            if (ok)
+                pmem.writeTo(counters);
+            return counters;
+        }
+
+        default:
+            return counters;
+        }
+    }
+
+    private static CMemoryInfo getCMemoryInfo(ProcessMemoryInfo out) {
+        CMemoryInfo info = castOrCreate(out, CMemoryInfo.class);
+
+        switch (Arch.calculate()) {
+        case X86: {
+            Resource32.Rusage rusage = new Resource32.Rusage();
+            int ok = Resource32.INSTANCE.getrusage(Resource.RUSAGE_SELF, rusage);
+            if (ok == 0)
+                rusage.writeTo(info);
+            return info;
+        }
+
+        case X86_64: {
+            Resource64.Rusage rusage = new Resource64.Rusage();
+            int ok = Resource64.INSTANCE.getrusage(Resource.RUSAGE_SELF, rusage);
+            if (ok == 0)
+                rusage.writeTo(info);
+            return info;
+        }
+
+        default:
+            return info;
+        }
+    }
+
+    private static CMemoryInfo getCurrentRSS(ProcessMemoryInfo out) {
+        CMemoryInfo info = castOrCreate(out, CMemoryInfo.class);
+
+        switch (Arch.calculate()) {
+        case X86: {
+            long rss = Stat.getCurrentRSS(Resource32.INSTANCE);
+            if (rss >= 0)
+                info.currentRSS = rss;
+            return info;
+        }
+
+        case X86_64: {
+            long rss = Stat.getCurrentRSS(Resource64.INSTANCE);
+            if (rss >= 0)
+                info.currentRSS = rss;
+            return info;
         }
 
         default:
-            throw new UnsupportedOperationException("Operating system " + os + " not supported");
+            return info;
+        }
+    }
+
+    private static <T> T castOrCreate(Object o, Class<T> clazz) {
+        if (clazz.isInstance(o))
+            return clazz.cast(o);
+        try {
+            return clazz.getConstructor().newInstance();
+        } catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException
+                | NoSuchMethodException | SecurityException e) {
+            throw new Error("Class " + clazz + " does not have a public parameterless constructor", e);
         }
     }
 
diff --git a/bundles/org.simantics.nativemem/src/org/simantics/nativemem/ProcessMemoryInfo.java b/bundles/org.simantics.nativemem/src/org/simantics/nativemem/ProcessMemoryInfo.java
new file mode 100644 (file)
index 0000000..fb7a17a
--- /dev/null
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2016, 2017 Association for Decentralized Information Management
+ * in Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Semantum Oy - initial API and implementation
+ *******************************************************************************/
+package org.simantics.nativemem;
+
+/**
+ * Architecture-independent representation of a native processes memory usage
+ * state.
+ * 
+ * @author Tuukka Lehtonen
+ */
+public interface ProcessMemoryInfo {
+
+    public String toHumanReadableString();
+
+}
\ No newline at end of file
index 653200d89f1272562f58a7a1e8b2b4371e72be7f..73ecd6ebd203ede54d7ff2948e8ff0447575ebaa 100644 (file)
@@ -1,3 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2017 Association for Decentralized Information Management
+ * in Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Semantum Oy - initial API and implementation
+ *******************************************************************************/
 package org.simantics.nativemem.internal;
 
 /**
diff --git a/bundles/org.simantics.nativemem/src/org/simantics/nativemem/internal/CMemoryInfo.java b/bundles/org.simantics.nativemem/src/org/simantics/nativemem/internal/CMemoryInfo.java
new file mode 100644 (file)
index 0000000..aca7fa9
--- /dev/null
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright (c) 2016, 2017 Association for Decentralized Information Management
+ * in Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Semantum Oy - initial API and implementation
+ *******************************************************************************/
+package org.simantics.nativemem.internal;
+
+import org.simantics.nativemem.ProcessMemoryInfo;
+
+/**
+ * @author Tuukka Lehtonen
+ */
+public class CMemoryInfo implements ProcessMemoryInfo {
+
+    public long currentRSS;
+    public long peakRSS;
+
+    @Override
+    public String toString() {
+        return "CMemoryInfo [Current RSS="
+                + currentRSS + ", Peak RSS="
+                + peakRSS + "]";
+    }
+
+    public String toHumanReadableString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("Memory Use [Current RSS = ").append(currentRSS)
+        .append(" MB, Peak RSS = ").append(Util.toMb(peakRSS))
+        .append(" MB]");
+        return sb.toString();
+    }
+
+}
\ No newline at end of file
diff --git a/bundles/org.simantics.nativemem/src/org/simantics/nativemem/internal/DummyProcessMemoryInfo.java b/bundles/org.simantics.nativemem/src/org/simantics/nativemem/internal/DummyProcessMemoryInfo.java
new file mode 100644 (file)
index 0000000..8f001c4
--- /dev/null
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2016, 2017 Association for Decentralized Information Management
+ * in Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Semantum Oy - initial API and implementation
+ *******************************************************************************/
+package org.simantics.nativemem.internal;
+
+import org.simantics.nativemem.ProcessMemoryInfo;
+
+/**
+ * @author Tuukka Lehtonen
+ */
+public enum DummyProcessMemoryInfo implements ProcessMemoryInfo {
+       INSTANCE;
+
+       @Override
+       public String toHumanReadableString() {
+               return "Memory consumption information not available for this platform (" + OS.calculate() + "; " + Arch.calculate() + ")";
+       }
+
+}
index c05bcbcee657dbf8fee502c3c85695d9db2513ec..2351c18bb03efc8836a22b3a44850fd25b5e875f 100644 (file)
@@ -1,5 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2017 Association for Decentralized Information Management
+ * in Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Semantum Oy - initial API and implementation
+ *******************************************************************************/
 package org.simantics.nativemem.internal;
 
+/**
+ * @author Tuukka Lehtonen
+ */
 public enum OS {
     APPLE, LINUX, SUN, WINDOWS, UNKNOWN;
 
diff --git a/bundles/org.simantics.nativemem/src/org/simantics/nativemem/internal/Resource.java b/bundles/org.simantics.nativemem/src/org/simantics/nativemem/internal/Resource.java
new file mode 100644 (file)
index 0000000..43473aa
--- /dev/null
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2016, 2017 Association for Decentralized Information Management
+ * in Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Semantum Oy - initial API and implementation
+ *******************************************************************************/
+package org.simantics.nativemem.internal;
+
+/**
+ * @author Tuukka Lehtonen
+ * @since 1.29.0
+ */
+public interface Resource {
+
+    int RUSAGE_SELF = 0;
+    int RUSAGE_CHILDREN = -1;
+    int RUSAGE_BOTH = -2;  /* sys_wait4() uses this */
+    int RUSAGE_THREAD = 1; /* only the calling thread */
+
+    /**
+     * Size of a page in bytes. Must not be less than 1. (Some systems use
+     * PAGE_SIZE instead.)
+     */
+    int _SC_PAGESIZE = 30;
+
+    long sysconf(int name);
+
+}
\ No newline at end of file
diff --git a/bundles/org.simantics.nativemem/src/org/simantics/nativemem/internal/Resource32.java b/bundles/org.simantics.nativemem/src/org/simantics/nativemem/internal/Resource32.java
new file mode 100644 (file)
index 0000000..117ff2c
--- /dev/null
@@ -0,0 +1,75 @@
+/*******************************************************************************
+ * Copyright (c) 2016, 2017 Association for Decentralized Information Management
+ * in Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Semantum Oy - initial API and implementation
+ *******************************************************************************/
+package org.simantics.nativemem.internal;
+
+import java.util.List;
+
+import com.sun.jna.Native;
+import com.sun.jna.Structure;
+
+/**
+ * This should work for Linux, MacOSX and BSD.
+
+ * @author Tuukka Lehtonen
+ * @since 1.29.0
+ */
+public interface Resource32 extends Resource {
+    Resource32 INSTANCE = Native.loadLibrary("c", Resource32.class);
+
+    public static class Timeval extends Structure {
+
+        public static final List<String> FIELDS = createFieldsOrder("tv_sec", "tv_usec");
+
+        int v_sec;    /* seconds */
+        int tv_usec;  /* microseconds */
+
+        public List<String> getFieldOrder() {
+            return FIELDS;
+        }
+    };
+
+    public static class Rusage extends Structure {
+
+        public static final List<String> FIELDS = createFieldsOrder("ru_utime", "ru_stime", "ru_maxrss", "ru_ixrss",
+                "ru_idrss", "ru_isrss", "ru_minflt", "ru_maxflt", "ru_nswap", "ru_inblock", "ru_oublock", "ru_msgsnd",
+                "ru_msgrcv", "ru_nsignals", "ru_nvcsw", "ru_nivcsw");
+
+        Timeval ru_utime;        /* user CPU time used */
+        Timeval ru_stime;        /* system CPU time used */
+        long   ru_maxrss;        /* maximum resident set size */
+        long   ru_ixrss;         /* integral shared memory size */
+        long   ru_idrss;         /* integral unshared data size */
+        long   ru_isrss;         /* integral unshared stack size */
+        long   ru_minflt;        /* page reclaims (soft page faults) */
+        long   ru_majflt;        /* page faults (hard page faults) */
+        long   ru_nswap;         /* swaps */
+        long   ru_inblock;       /* block input operations */
+        long   ru_oublock;       /* block output operations */
+        long   ru_msgsnd;        /* IPC messages sent */
+        long   ru_msgrcv;        /* IPC messages received */
+        long   ru_nsignals;      /* signals received */
+        long   ru_nvcsw;         /* voluntary context switches */
+        long   ru_nivcsw;        /* involuntary context switches */
+
+        @Override
+        protected List<String> getFieldOrder() {
+            return FIELDS;
+        }
+
+        public void writeTo(CMemoryInfo to) {
+            to.peakRSS = ru_maxrss;
+        }
+
+    }
+
+    int getrusage(int who, Rusage rusage);
+}
diff --git a/bundles/org.simantics.nativemem/src/org/simantics/nativemem/internal/Resource64.java b/bundles/org.simantics.nativemem/src/org/simantics/nativemem/internal/Resource64.java
new file mode 100644 (file)
index 0000000..cf54b68
--- /dev/null
@@ -0,0 +1,75 @@
+/*******************************************************************************
+ * Copyright (c) 2016, 2017 Association for Decentralized Information Management
+ * in Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Semantum Oy - initial API and implementation
+ *******************************************************************************/
+package org.simantics.nativemem.internal;
+
+import java.util.List;
+
+import com.sun.jna.Native;
+import com.sun.jna.Structure;
+
+/**
+ * This should work for Linux, MacOSX and BSD.
+
+ * @author Tuukka Lehtonen
+ * @since 1.29.0
+ */
+public interface Resource64 extends Resource {
+    Resource64 INSTANCE = Native.loadLibrary("c", Resource64.class);
+
+    public static class Timeval extends Structure {
+
+        public static final List<String> FIELDS = createFieldsOrder("tv_sec", "tv_usec");
+
+        long v_sec;     /* seconds */
+        long tv_usec;  /* microseconds */
+
+        public List<String> getFieldOrder() {
+            return FIELDS;
+        }
+    };
+
+    public static class Rusage extends Structure {
+
+        public static final List<String> FIELDS = createFieldsOrder("ru_utime", "ru_stime", "ru_maxrss", "ru_ixrss",
+                "ru_idrss", "ru_isrss", "ru_minflt", "ru_maxflt", "ru_nswap", "ru_inblock", "ru_oublock", "ru_msgsnd",
+                "ru_msgrcv", "ru_nsignals", "ru_nvcsw", "ru_nivcsw");
+
+        Timeval ru_utime;        /* user CPU time used */
+        Timeval ru_stime;        /* system CPU time used */
+        long   ru_maxrss;        /* maximum resident set size */
+        long   ru_ixrss;         /* integral shared memory size */
+        long   ru_idrss;         /* integral unshared data size */
+        long   ru_isrss;         /* integral unshared stack size */
+        long   ru_minflt;        /* page reclaims (soft page faults) */
+        long   ru_majflt;        /* page faults (hard page faults) */
+        long   ru_nswap;         /* swaps */
+        long   ru_inblock;       /* block input operations */
+        long   ru_oublock;       /* block output operations */
+        long   ru_msgsnd;        /* IPC messages sent */
+        long   ru_msgrcv;        /* IPC messages received */
+        long   ru_nsignals;      /* signals received */
+        long   ru_nvcsw;         /* voluntary context switches */
+        long   ru_nivcsw;        /* involuntary context switches */
+
+        @Override
+        protected List<String> getFieldOrder() {
+            return FIELDS;
+        }
+
+        public void writeTo(CMemoryInfo to) {
+            to.peakRSS = ru_maxrss;
+        }
+
+    }
+
+    int getrusage(int who, Rusage rusage);
+}
index 0d1a4cd082ab14bbb6f9f8766829db0a10164dba..97785c371c54ece56f24a8134588fbc07f648eb2 100644 (file)
@@ -1,12 +1,12 @@
 package org.simantics.nativemem.internal;
 
 import org.simantics.nativemem.NativeMem;
-import org.simantics.nativemem.ProcessMemoryCounters;
+import org.simantics.nativemem.ProcessMemoryInfo;
 
 public class Test {
 
     public static void main(String[] args) {
-        ProcessMemoryCounters mem = NativeMem.getMemoryCounters(null);
+        ProcessMemoryInfo mem = NativeMem.getMemoryInfo(null);
         System.out.println(mem.toHumanReadableString());
     }
 
diff --git a/bundles/org.simantics.nativemem/src/org/simantics/nativemem/internal/Util.java b/bundles/org.simantics.nativemem/src/org/simantics/nativemem/internal/Util.java
new file mode 100644 (file)
index 0000000..fcfb07f
--- /dev/null
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2016, 2017 Association for Decentralized Information Management
+ * in Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Semantum Oy - initial API and implementation
+ *******************************************************************************/
+package org.simantics.nativemem.internal;
+
+/**
+ * @author Tuukka Lehtonen
+ */
+public class Util {
+
+    public static double toMb(long bytes) {
+        return (double) bytes / 1048576.0;
+    }
+
+}
\ No newline at end of file
diff --git a/bundles/org.simantics.nativemem/src/org/simantics/nativemem/internal/linux/Stat.java b/bundles/org.simantics.nativemem/src/org/simantics/nativemem/internal/linux/Stat.java
new file mode 100644 (file)
index 0000000..591fd1f
--- /dev/null
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * Copyright (c) 2017 Association for Decentralized Information Management
+ * in Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Semantum Oy - initial API and implementation
+ *******************************************************************************/
+package org.simantics.nativemem.internal.linux;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+import org.simantics.nativemem.internal.Resource;
+
+/**
+ * @author Tuukka Lehtonen
+ * @since 1.29.0
+ */
+public class Stat {
+
+       private static final String SELF_STATM = "/proc/self/statm";
+       private static final Charset ASCII = Charset.forName("US-ASCII");
+
+       public static long getCurrentRSS(Resource r) {
+               try (BufferedReader rdr = Files.newBufferedReader(Paths.get(SELF_STATM), ASCII)) {
+                       String line = rdr.readLine();
+                       String[] nums = line.split(" ");
+                       if (nums.length == 0)
+                               return 0L;
+                       long rss = Long.parseLong(nums[0]);
+                       long pageSize = r.sysconf(Resource._SC_PAGESIZE);
+                       return rss * pageSize;
+               } catch (NumberFormatException e) {
+                       return 0L;
+               } catch (IOException e) {
+                       return 0L;
+               }
+       }
+
+}
\ No newline at end of file
similarity index 63%
rename from bundles/org.simantics.nativemem/src/org/simantics/nativemem/ProcessMemoryCounters.java
rename to bundles/org.simantics.nativemem/src/org/simantics/nativemem/internal/win/ProcessMemoryCounters.java
index eb60540f6612ce02f6f87120c2037cc5943421ee..9c68a54483a437616562823c89d9b8d88757ebf8 100644 (file)
@@ -1,4 +1,18 @@
-package org.simantics.nativemem;
+/*******************************************************************************
+ * Copyright (c) 2016, 2017 Association for Decentralized Information Management
+ * in Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Semantum Oy - initial API and implementation
+ *******************************************************************************/
+package org.simantics.nativemem.internal.win;
+
+import org.simantics.nativemem.ProcessMemoryInfo;
+import org.simantics.nativemem.internal.Util;
 
 /**
  * Architecture-independent version of the Windows PsApi PROCESS_MEMORY_COUNTERS
@@ -6,7 +20,7 @@ package org.simantics.nativemem;
  * 
  * @author Tuukka Lehtonen
  */
-public class ProcessMemoryCounters {
+public class ProcessMemoryCounters implements ProcessMemoryInfo {
     public int PageFaultCount;
     public long PeakWorkingSetSize;
     public long WorkingSetSize;
@@ -34,21 +48,17 @@ public class ProcessMemoryCounters {
     public String toHumanReadableString() {
         StringBuilder sb = new StringBuilder();
         sb.append("ProcessMemoryCounters [\n\tPageFaultCount             = ").append(PageFaultCount)
-        .append(",\n\tPeakWorkingSetSize         = ").append(toMb(PeakWorkingSetSize))
-        .append(" MB,\n\tWorkingSetSize             = ").append(toMb(WorkingSetSize))
-        .append(" MB,\n\tQuotaPeakPagedPoolUsage    = ").append(toMb(QuotaPeakPagedPoolUsage))
-        .append(" MB,\n\tQuotaPagedPoolUsage        = ").append(toMb(QuotaPagedPoolUsage))
-        .append(" MB,\n\tQuotaPeakNonPagedPoolUsage = ").append(toMb(QuotaPeakNonPagedPoolUsage))
-        .append(" MB,\n\tQuotaNonPagedPoolUsage     = ").append(toMb(QuotaNonPagedPoolUsage))
-        .append(" MB,\n\tPagefileUsage              = ").append(toMb(PagefileUsage))
-        .append(" MB,\n\tPeakPagefileUsage          = ").append(toMb(PeakPagefileUsage))
-        .append(" MB,\n\tPrivateUsage               = ").append(toMb(PrivateUsage))
+        .append(",\n\tPeakWorkingSetSize         = ").append(Util.toMb(PeakWorkingSetSize))
+        .append(" MB,\n\tWorkingSetSize             = ").append(Util.toMb(WorkingSetSize))
+        .append(" MB,\n\tQuotaPeakPagedPoolUsage    = ").append(Util.toMb(QuotaPeakPagedPoolUsage))
+        .append(" MB,\n\tQuotaPagedPoolUsage        = ").append(Util.toMb(QuotaPagedPoolUsage))
+        .append(" MB,\n\tQuotaPeakNonPagedPoolUsage = ").append(Util.toMb(QuotaPeakNonPagedPoolUsage))
+        .append(" MB,\n\tQuotaNonPagedPoolUsage     = ").append(Util.toMb(QuotaNonPagedPoolUsage))
+        .append(" MB,\n\tPagefileUsage              = ").append(Util.toMb(PagefileUsage))
+        .append(" MB,\n\tPeakPagefileUsage          = ").append(Util.toMb(PeakPagefileUsage))
+        .append(" MB,\n\tPrivateUsage               = ").append(Util.toMb(PrivateUsage))
         .append(" MB]");
         return sb.toString();
     }
 
-    private double toMb(long bytes) {
-        return (double) bytes / 1048576.0;
-    }
-
 }
\ No newline at end of file
similarity index 76%
rename from bundles/org.simantics.nativemem/src/org/simantics/nativemem/internal/Psapi32.java
rename to bundles/org.simantics.nativemem/src/org/simantics/nativemem/internal/win/Psapi32.java
index 7c59eff2ba025b5ce58aa4c576e856222fcc8f2c..a60b8939dedce4509974520c114c9fb9f52966ac 100644 (file)
@@ -1,10 +1,19 @@
-package org.simantics.nativemem.internal;
+/*******************************************************************************
+ * Copyright (c) 2016, 2017 Association for Decentralized Information Management
+ * in Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Semantum Oy - initial API and implementation
+ *******************************************************************************/
+package org.simantics.nativemem.internal.win;
 
 import java.util.Arrays;
 import java.util.List;
 
-import org.simantics.nativemem.ProcessMemoryCounters;
-
 import com.sun.jna.Native;
 import com.sun.jna.Structure;
 import com.sun.jna.platform.win32.WinNT.HANDLE;
@@ -30,9 +39,8 @@ public interface Psapi32 extends StdCallLibrary {
         public int PeakPagefileUsage;
         public int PrivateUsage;
 
-        @SuppressWarnings("rawtypes")
         @Override
-        protected List getFieldOrder() {
+        protected List<String> getFieldOrder() {
             return PROCESS_MEMORY_COUNTERS_EX_FIELDS;
         }
 
similarity index 76%
rename from bundles/org.simantics.nativemem/src/org/simantics/nativemem/internal/Psapi64.java
rename to bundles/org.simantics.nativemem/src/org/simantics/nativemem/internal/win/Psapi64.java
index 182c046a16e42426fbde76d7bb20df1d99357cdd..9eb145f66d870a1ce9f846e34f685fdaed25d1d9 100644 (file)
@@ -1,10 +1,19 @@
-package org.simantics.nativemem.internal;
+/*******************************************************************************
+ * Copyright (c) 2016, 2017 Association for Decentralized Information Management
+ * in Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Semantum Oy - initial API and implementation
+ *******************************************************************************/
+package org.simantics.nativemem.internal.win;
 
 import java.util.Arrays;
 import java.util.List;
 
-import org.simantics.nativemem.ProcessMemoryCounters;
-
 import com.sun.jna.Native;
 import com.sun.jna.Structure;
 import com.sun.jna.platform.win32.WinNT.HANDLE;
@@ -30,9 +39,8 @@ public interface Psapi64 extends StdCallLibrary {
         public long PeakPagefileUsage;
         public long PrivateUsage;
 
-        @SuppressWarnings("rawtypes")
         @Override
-        protected List getFieldOrder() {
+        protected List<String> getFieldOrder() {
             return PROCESS_MEMORY_COUNTERS_EX_FIELDS;
         }
 
diff --git a/features/org.simantics.nativemem.feature/.project b/features/org.simantics.nativemem.feature/.project
new file mode 100644 (file)
index 0000000..d04dc6e
--- /dev/null
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>org.simantics.nativemem.feature</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.pde.FeatureBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>org.eclipse.pde.FeatureNature</nature>
+       </natures>
+</projectDescription>
diff --git a/features/org.simantics.nativemem.feature/build.properties b/features/org.simantics.nativemem.feature/build.properties
new file mode 100644 (file)
index 0000000..871129a
--- /dev/null
@@ -0,0 +1,12 @@
+###############################################################################
+# Copyright (c) 2007, 2010 Association for Decentralized Information Management
+# in Industry THTH ry.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     VTT Technical Research Centre of Finland - initial API and implementation
+###############################################################################
+bin.includes = feature.xml
diff --git a/features/org.simantics.nativemem.feature/feature.xml b/features/org.simantics.nativemem.feature/feature.xml
new file mode 100644 (file)
index 0000000..0fed315
--- /dev/null
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2007, 2010 Association for Decentralized Information Management
+    in Industry THTH ry.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+   
+    Contributors:
+        VTT Technical Research Centre of Finland - initial API and implementation
+ -->
+<feature
+      id="org.simantics.nativemem.feature"
+      label="Native Memory Inspection Facilities"
+      version="1.0.0.qualifier"
+      provider-name="Semantum Oy">
+
+   <copyright>
+      Copyright (c) 2017 Association for Decentralized Information
+Management in Industry THTH ry.
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License
+v1.0 which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+
+Contributors:
+Semantum Oy - initial API and implementation
+   </copyright>
+
+   <license url="https://www.eclipse.org/legal/epl-v10.html">
+      Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT&apos;S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+&quot;Contribution&quot; means:
+
+a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+
+b) in the case of each subsequent Contributor:
+
+i) changes to the Program, and
+
+ii) additions to the Program;
+
+where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution &apos;originates&apos; from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor&apos;s behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
+
+&quot;Contributor&quot; means any person or entity that distributes the Program.
+
+&quot;Licensed Patents&quot; mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+&quot;Program&quot; means the Contributions distributed in accordance with this Agreement.
+
+&quot;Recipient&quot; means anyone who receives the Program under this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient&apos;s responsibility to acquire that license before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+
+iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
+
+iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor (&quot;Commercial Contributor&quot;) hereby agrees to defend and indemnify every other Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor&apos;s responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient&apos;s patent(s), then such Recipient&apos;s rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient&apos;s rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient&apos;s rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient&apos;s obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
+   </license>
+
+   <plugin
+         id="org.simantics.nativemem"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.sun.jna"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.sun.jna.platform"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
index 51fab183e724f3de0b6cedea11ffe722a9f892c1..fd56d697213a50233ff8ad0f14464daa6822f52c 100644 (file)
          id="org.simantics.modeling.ui.workbench.feature"
          version="0.0.0"/>
 
+   <includes
+         id="org.simantics.nativemem.feature"
+         version="0.0.0"/>
+
    <includes
          id="org.simantics.wiki.ui.feature"
          version="0.0.0"/>
index 56e7e7976804381fcac1917814eea5ff178f3e2e..1f71304389839698ca1308b308da0f897f37142b 100644 (file)
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.simantics.nativemem"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
index e9b0252675badcee6796bf71e82f0947d8321810..7c31bd537c51df49c6407989a160c783c8e5e6e9 100644 (file)
         <module>org.simantics.migration.feature</module>
         <module>org.simantics.modeling.feature</module>
         <module>org.simantics.modeling.ui.workbench.feature</module>
+        <module>org.simantics.nativemem.feature</module>
         <module>org.simantics.platform.feature</module>
         <module>org.simantics.platform.ui.feature</module>
         <module>org.simantics.rcp.feature</module>